Skip to content
Permalink
Browse files

Format code, fix message

  • Loading branch information...
jmontoyaa committed Jul 27, 2016
1 parent 8c1aa2a commit 4643f1d525ff365a27fc0c232435676cbf5b17a5
Showing with 10 additions and 8 deletions.
  1. +6 −6 main/inc/lib/display.lib.php
  2. +1 −1 main/inc/lib/online.inc.php
  3. +3 −1 main/messages/new_message.php
@@ -518,9 +518,9 @@ public static function return_message_and_translate($message, $type='normal', $f
/**
* Returns a div html string with
* @param string The message
* @param string The message type (confirm,normal,warning,error)
* @param bool Whether to XSS-filter or not
* @param string $message
* @param string $type Example: confirm, normal, warning, error
* @param bool $filter Whether to XSS-filter or not
* @return string Message wrapped into an HTML div
*/
public static function return_message($message, $type = 'normal', $filter = true)
@@ -533,8 +533,8 @@ public static function return_message($message, $type = 'normal', $filter = true
$message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding());
}
$class = "";
switch($type) {
$class = '';
switch ($type) {
case 'warning':
$class .= 'alert alert-warning';
break;
@@ -562,7 +562,7 @@ public static function return_message($message, $type = 'normal', $filter = true
* @param string optional, class from stylesheet
* @return string encrypted mailto hyperlink
*/
public static function encrypted_mailto_link ($email, $clickable_text = null, $style_class = '')
public static function encrypted_mailto_link($email, $clickable_text = null, $style_class = '')
{
if (is_null($clickable_text)) {
$clickable_text = $email;
@@ -153,7 +153,7 @@ function online_logout($user_id = null, $logout_redirect = false)
Session::destroy();
if ($logout_redirect) {
header("Location: ".api_get_path(WEB_PATH)."index.php");
return;
exit;
}
}
@@ -242,7 +242,9 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null)
if ($res) {
$userInfo = api_get_user_info($userId);
Display::addFlash(Display::return_message(
get_lang('MessageSentTo') ."&nbsp;<b>" .$userInfo['complete_name'] ."</b>"
get_lang('MessageSentTo') ."&nbsp;<b>" .$userInfo['complete_name'] ."</b>",
'confirmation',
false
));
}
}

0 comments on commit 4643f1d

Please sign in to comment.
You can’t perform that action at this time.