gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add optional parameter $plain to exitError()

Browse Source 
if set, the resulting html will only be a html fragment to be embedded
in a page
This commit is contained in:
Uwe Steinmann 2016-08-22 17:01:53 +02:00
parent 34ce80eb3d
commit 3fbfadeebd
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassUI.php
View File

@ -128,12 +128,12 @@ class UI extends UI_Default {
return $themes; return $themes;
} /* }}} */ } /* }}} */
static function exitError($pagetitle, $error) { static function exitError($pagetitle, $error, $noexit=false, $plain=false) {
global $theme, $dms; global $theme, $dms;
$tmp = 'ErrorDlg'; $tmp = 'ErrorDlg';
$view = UI::factory($theme, $tmp); $view = UI::factory($theme, $tmp);
$view->setParam('dms', $dms); $view->setParam('dms', $dms);
$view->exitError($pagetitle, $error); $view->exitError($pagetitle, $error, $noexit, $plain);
} }
} }

22
views/bootstrap/class.Bootstrap.php
View File

@ -1438,20 +1438,24 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
echo "</div>\n"; echo "</div>\n";
} /* }}} */ } /* }}} */
function exitError($pagetitle, $error, $noexit=false) { /* {{{ */ function exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */
$this->htmlStartPage($pagetitle); if(!$plain) {
$this->globalNavigation(); $this->htmlStartPage($pagetitle);
$this->contentStart(); $this->globalNavigation();
$this->contentStart();
}
print "<div class=\"alert alert-error\">"; print "<div class=\"alert alert-error\">";
print "<h4>".getMLText('error')."!</h4>"; print "<h4>".getMLText('error')."!</h4>";
print htmlspecialchars($error); print htmlspecialchars($error);
print "</div>"; print "</div>";
print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>"; if(!$plain) {
print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
$this->contentEnd();
$this->htmlEndPage(); $this->contentEnd();
$this->htmlEndPage();
}
// add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR); // add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);