Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / admin / system_diagnostics.php

diff --git a/admin/system_diagnostics.php b/admin/system_diagnostics.php
index 45fa5dd102ab1793af6301acf8997f71ec7e3f03..8fba181051c23a9329cf89983e6cc5e732074832 100644 (file)
--- a/admin/system_diagnostics.php
+++ b/admin/system_diagnostics.php
@@ -146,12 +146,13 @@ function tst_logging()
 //
 function tst_dbversion()
 {
+       global $core_version;
        $test['descr'] = _('Current database version');
        $test['type'] = 3;
        $test['test'] = get_company_pref('version_id');
-       $test['result'] = $test['test'] == '2.2';
+       $test['result'] = $test['test'] == $core_version;
        $test['comments'] = _('Database structure seems to be not upgraded to current version')
-               .' (2.2)';
+               ." ($core_version)";
 
        return $test;
 }
@@ -159,25 +160,26 @@ function tst_dbversion()
 
 function tst_subdirs()
 {
-       global $db_connections, $comp_path;
+       global $db_connections;
 
        $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache');
 
        $test['descr'] = _('Company subdirectories consistency');
        $test['type'] = 3;
-       $test['test'] = array($comp_path.'/*');
+       $test['test'] = array(company_path().'/*');
        foreach($comp_subdirs as $sub) {
-               $test['test'][] = $comp_path.'/*/'.$sub;
+               $test['test'][] = company_path().'/*/'.$sub;
        }
        $test['result'] = true;
-
+       
+       $comp_path = company_path();
        if (!is_dir($comp_path) || !is_writable($comp_path) ) {
                $test['result'] = false;
                $test['comments'][] = sprintf(_("'%s' is not writeable"), $comp_path);
                return $test;
        };
        foreach ($db_connections as $n => $comp) {
-               $path = "$comp_path/$n";
+               $path = company_path($n);
                if (!is_dir($path) || !is_writable($path) ) {
                        $test['result'] = false;
                        $test['comments'][] = sprintf(_("'%s' is not writeable"), $path);
@@ -188,6 +190,16 @@ function tst_subdirs()
                        if (!is_dir($spath) || !is_writable($spath) ) {
                                $test['result'] = false;
                                $test['comments'][] = sprintf(_("'%s' is not writeable"), $spath);
+                       } else {
+                               $dir = opendir($spath);
+                               while (false !== ($fname = readdir($dir))) {
+                                       // check only *.js files. Manually installed package can contain other
+                                       // non-writable files which are non-crucial for normal operations
+                                       if (preg_match('/.*(\.js)/', $fname) && !is_writable("$spath/$fname")) {
+                                               $test['result'] = false;
+                                               $test['comments'][] = sprintf(_("'%s' is not writeable"), "$spath/$fname");
+                                       }
+                               }
                        }
                }
        }
@@ -230,7 +242,7 @@ function tst_langs()
                        $test['result'] = false;
                        $test['comments'][] = sprintf( _('Missing %s translation file.'), $file);
                }
-        if (!setlocale(LC_MESSAGES, $lang['code'].".".$lang['encoding'])) 
+               if (!$_SESSION['get_text']->check_support($lang['code'], $lang['encoding']))
         {
                        $test['result'] = false;
                        $test['comments'][] = sprintf(_('Missing system locale: %s'), $lang['code'].".".$lang['encoding']);
@@ -271,17 +283,17 @@ function tst_dbconfig()
 
 function tst_extconfig()
 {
-       global $path_to_root, $db_connections, $comp_path;
+       global $path_to_root, $db_connections;
 
        $test['descr'] = _('Extensions configuration files');
        $test['type'] = 3;
        $test['test'] = $path_to_root.'/installed_extensions.php';
        $test['result'] = is_file($test['test']) && is_writable($test['test']);
-       $test['test'] . ','.$comp_path.'/*/installed_extensions.php';
+       $test['test'] . ','.company_path().'/*/installed_extensions.php';
        $test['comments'][] = sprintf(_("'%s' file should be writeable"), $test['test']);
 
        foreach ($db_connections as $n => $comp) {
-               $path = "$comp_path/$n";
+               $path = company_path($n);
                if (!is_dir($path)) continue;
 
                $path .= "/installed_extensions.php";
@@ -295,7 +307,7 @@ function tst_extconfig()
 }
 //-------------------------------------------------------------------------------------------------
 
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 $th = array(_("Test"), _('Test type'), _("Value"), _("Comments"));
 table_header($th);
 
@@ -314,7 +326,11 @@ foreach ($system_tests as $test)
 
     $comm = is_array(@$result['comments']) ? implode('<br>', $result['comments']) 
                : @$result['comments'];
-    label_cell($result['result'] ? _('Ok') : '<b>'.$comm.'</b>');
+       $color = ($result['result'] ? 'green': 
+       ($result['type']==3 ? 'red' :
+        ($result['type']==2 ? 'orange' : 'green')));
+    label_cell("<span style='color:$color'>".
+       ($result['result'] ? _('Ok') : '<b>'.$comm.'</b>').'</span>');
     end_row();
 }