gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- distinguish between errors and warnings

Browse Source
This commit is contained in:
steinm 2011-10-26 07:32:57 +00:00
parent 8f2ec90fb2
commit c7b0d1979b
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
install/install.php
View File

@ -46,7 +46,15 @@ if (!file_exists("settings.xml.template_install")) {
* Functions * Functions
*/ */
function printError($error) { /* {{{ */ function printError($error) { /* {{{ */
print "<div class=\"error\">"; print "<div class=\"install_error\">";
print "Error<br />";
print $error;
print "</div>";
} /* }}} */
function printWarning($error) { /* {{{ */
print "<div class=\"install_warning\">";
print "Warning<br />";
print $error; print $error;
print "</div>"; print "</div>";
} /* }}} */ } /* }}} */
@ -54,7 +62,8 @@ function printError($error) { /* {{{ */
function printCheckError($resCheck) { /* {{{ */ function printCheckError($resCheck) { /* {{{ */
$hasError = false; $hasError = false;
foreach($resCheck as $keyRes => $paramRes) { foreach($resCheck as $keyRes => $paramRes) {
$hasError = true; if(isset($paramRes['type']) && $paramRes['type'] == 'error')
$hasError = true;
$errorMes = getMLText("settings_$keyRes"). " : " . getMLText("settings_".$paramRes["status"]); $errorMes = getMLText("settings_$keyRes"). " : " . getMLText("settings_".$paramRes["status"]);
if (isset($paramRes["currentvalue"])) if (isset($paramRes["currentvalue"]))
@ -66,7 +75,10 @@ function printCheckError($resCheck) { /* {{{ */
if (isset($paramRes["systemerror"])) if (isset($paramRes["systemerror"]))
$errorMes .= "<br/> =&gt; " . $paramRes["systemerror"]; $errorMes .= "<br/> =&gt; " . $paramRes["systemerror"];
printError($errorMes); if(isset($paramRes['type']) && $paramRes['type'] == 'error')
printError($errorMes);
else
printWarning($errorMes);
} }
return $hasError; return $hasError;
@ -169,6 +181,8 @@ if (printCheckError( $settings->checkSystem())) {
echo "<br/>PHP version: " . phpversion(); echo "<br/>PHP version: " . phpversion();
echo "<br/>PHP include path: " . ini_get('include_path');
echo '<br/>'; echo '<br/>';
echo '<br/>'; echo '<br/>';
echo '<a href="' . $httpRoot . 'install/install.php">' . getMLText("refresh") . '</a>'; echo '<a href="' . $httpRoot . 'install/install.php">' . getMLText("refresh") . '</a>';
@ -204,9 +218,9 @@ if ($action=="setSettings") {
$settings->_luceneClassDir = $_POST["luceneClassDir"]; $settings->_luceneClassDir = $_POST["luceneClassDir"];
/** /**
* Check Parameters * Check Parameters, require version 3.3.x
*/ */
$hasError = printCheckError( $settings->check()); $hasError = printCheckError( $settings->check('33'));
if (!$hasError) if (!$hasError)
{ {