Skip to content
GitLab
Commit 14a3f111 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5184 Avoid displaying the {t} tag and fixed styling problems

parent 21a38c74
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 21 deletions
+24 -21
include/class_msg_dialog.inc
+ 24
− 21
View file @ 14a3f111
......@@ -155,38 +155,41 @@ class msg_dialog
global $config;
if ($this->i_Type == FATAL_ERROR_DIALOG) {
$display =
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
\"http://www.w3.org/TR/html4/transitional.dtd\">
'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/transitional.dtd">
<html><head>
<title>FusionDirectory startup failed</title>
</head><body>";
</head><body>';
if (isset($config) && is_object($config) &&
$config->get_cfg_value("displayerrors") == "TRUE") {
$config->get_cfg_value('displayerrors') == 'TRUE') {
list($trace,) = html_trace();
$display .= $trace;
}
$display .=
"<table style='width:100%; border:2px solid red;'>
<tr><td style='vertical-align:top;padding:10px'>
<img src='geticon.php?context=status&amp;icon=dialog-error&amp;size=32' alt='{t}Error{/t}'/>
</td><td style='width:100%'>
<b>".$this->s_Title."</b><br>
".$this->s_Message."<br><br>
"._("Please fix the above error and reload the page.")."
</td></tr>
</table></body></html>";
'<table style="width:100%; border:2px solid red;">
<tr>
<td style="vertical-align:top;padding:10px">
<img src="geticon.php?context=status&amp;icon=dialog-error&amp;size=32" alt="'._('Error').'"/>
</td>
<td style="width:100%">
<b>'.$this->s_Title.'</b><br/>
'.$this->s_Message.'<br><br/>
'._('Please fix the above error and reload the page.').'
</td>
</tr>
</table></body></html>';
return $display;
} else {
$smarty = get_smarty();
$smarty->assign("s_Trace", print_a($this->a_Trace, TRUE));
$smarty->assign("i_TraceCnt", count($this->a_Trace));
$smarty->assign("i_Type", $this->i_Type);
$smarty->assign("s_Message", $this->s_Message);
$smarty->assign("s_Title", $this->s_Title);
$smarty->assign("i_ID", $this->i_ID);
$smarty->assign("frame", FALSE);
$smarty->assign("JS", TRUE);
$smarty->assign('s_Trace', print_a($this->a_Trace, TRUE));
$smarty->assign('i_TraceCnt', count($this->a_Trace));
$smarty->assign('i_Type', $this->i_Type);
$smarty->assign('s_Message', $this->s_Message);
$smarty->assign('s_Title', $this->s_Title);
$smarty->assign('i_ID', $this->i_ID);
$smarty->assign('frame', FALSE);
$smarty->assign('JS', TRUE);
return $smarty->fetch(get_template_path('msg_dialog.tpl'));
}
}
......
  • bmortier @bmortier

    mentioned in issue #1647 (closed)

    By Côme Chilliet on 2017-09-02T15:33:45 (imported from GitLab)

     ·

    mentioned in issue #1647 (closed)

    By Côme Chilliet on 2017-09-02T15:33:45 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment