[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

[fa-stable.git] / includes / system_tests.inc

diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index dca83e51c4858245c54fcc536d815769cd76ab6b..17d89b63b433a26b44a9bcc8fa89b831c070f588 100644 (file)
--- a/includes/system_tests.inc
+++ b/includes/system_tests.inc
@@ -24,7 +24,10 @@ function tst_mysql()
        $test['descr'] = _('MySQL version'). ' >=4.1';
        $test['type'] = 3;
        $test['test'] = db_get_version();
-       $test['result'] = $test['test']>='4.1';
+       if (!($test['result'] = ($test['test']>='4.1'))) {
+               $db_str = explode('-', $test['test']);
+               $test['result'] = ($db_str[1] == 'MariaDB');
+       }
        $test['comments'] = _('Upgrade MySQL server to version at least 4.1');
 
        return $test;
@@ -43,11 +46,11 @@ function tst_phpmysql()
 
 function tst_php() 
 {
-       $test['descr'] = _('PHP version').' >=4.3.3';
+       $test['descr'] = _('PHP version').' >=5.0.0';
        $test['type'] = 3;
        $test['test'] = phpversion();
-       $test['result'] = $test['test']>='4.3.3';
-       $test['comments'] = _('Upgrade PHP to version at least 4.3.3');
+       $test['result'] = $test['test']>='5.0.0';
+       $test['comments'] = _('Upgrade PHP to version at least 5.0.0');
 
        return $test;
 }
@@ -120,11 +123,11 @@ function tst_gettext()
 
 function tst_debug() 
 {
-       global $go_debug;
+       global $SysPrefs;
        $test['descr'] = _('Debugging mode');
        $test['type'] = 0;
-       $test['test'] = $go_debug ? _("Yes") : _("No");
-       $test['result'] = $go_debug != 0;
+       $test['test'] = $SysPrefs->go_debug ? _("Yes") : _("No");
+       $test['result'] = $SysPrefs->go_debug != 0;
        $test['comments'] = _('To switch debugging on set $go_debug>0 in config.php file');
 
        return $test;
@@ -132,8 +135,9 @@ function tst_debug()
 
 function tst_logging() 
 {
-       global $error_logfile;
+       global $SysPrefs;
        
+       $error_logfile = $SysPrefs->error_logfile;
        $test['descr'] = _('Error logging');
        $test['type'] = 2;
        // if error lgging is on, but log file does not exists try write
@@ -220,7 +224,7 @@ function tst_tmpdir()
        
        $test['descr'] = _('Temporary directory');
        $test['type'] = 3;
-       $test['test'] = $path_to_root.'/tmp';
+       $test['test'] = VARLIB_PATH;
        $test['result'] = is_dir($test['test']) && is_writable($test['test']);
        $test['comments'][] = sprintf(_("'%s' is not writeable"), $test['test']);
        return $test;
@@ -374,8 +378,8 @@ function tst_extconfig($install)
        $themedir = opendir($fname);
        while (false !== ($fname = readdir($themedir)))
        {
-               if ($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path_to_root.'/themes/'.$fname)
-                       && !in_array($fname, array('aqua', 'cool', 'default')))
+               if ($fname!='.' && $fname!='..' && is_dir($path_to_root.'/themes/'.$fname)
+                       && !in_array($fname, array('canvas', 'default', 'dropdown')))
                {
                        $test['test'][] = $fname;
                        $test['result'] = is_writable($path_to_root.'/themes/'.$fname);
@@ -416,7 +420,7 @@ function display_system_tests($install = false)
                );
 
 
-       start_table(TABLESTYLE, "width=80%");
+       start_table(TABLESTYLE, "width='80%'");
        $th = array(_("Test"), _('Test type'), _("Value"), _("Comments"));
        table_header($th);