From 3b45735be2843bd5b3d10d97f4184144d99a47e9 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 4 Mar 2010 16:46:44 -0500 Subject: [PATCH] Adding \"system/server settings\" feature from Chamilo 2.0 see #496 --- main/admin/system_status.php | 82 ++++++++++++++++++++ main/inc/lib/diagnoser.lib.php | 133 ++++++++++++++++----------------- 2 files changed, 148 insertions(+), 67 deletions(-) create mode 100644 main/admin/system_status.php diff --git a/main/admin/system_status.php b/main/admin/system_status.php new file mode 100644 index 0000000000..50a8c333e4 --- /dev/null +++ b/main/admin/system_status.php @@ -0,0 +1,82 @@ + + +show_html(); + +Display :: display_footer(); \ No newline at end of file diff --git a/main/inc/lib/diagnoser.lib.php b/main/inc/lib/diagnoser.lib.php index 68ed0c5298..017cebf007 100644 --- a/main/inc/lib/diagnoser.lib.php +++ b/main/inc/lib/diagnoser.lib.php @@ -1,13 +1,13 @@ manager = $manager; } - function to_html() + function show_html() { $sections = array('chamilo', 'php', 'mysql', 'webserver'); - $current_section = Request :: get('section'); - $current_section = $current_section ? $current_section : 'chamilo'; - $html[] = '
'; + $html .= '
'; $data = call_user_func(array($this, 'get_' . $current_section . '_data')); - - $table = new SimpleTable($data, new DiagnoserCellRenderer(), null, 'diagnoser'); - $html[] = $table->toHTML(); - - $html[] = '
'; - - return implode("\n", $html); + + echo $html; + $table = new SortableTableFromArray($data); + $table->display(); + echo '
'; } /** @@ -67,20 +68,18 @@ class Diagnoser */ function get_chamilo_data() { - $array = array(); - - $writable_folders = array('/files', '/files/repository/', '/files/temp', '/common/configuration'); - - foreach ($writable_folders as $index => $folder) - { - $writable = is_writable(Path :: get(SYS_PATH) . $folder); + $array = array(); + $writable_folders = array('archive', 'courses', 'home', 'main/upload/users/','main/default_course_document/images/'); + foreach ($writable_folders as $index => $folder) { + //echo api_get_path(SYS_PATH) . $folder; + $writable = is_writable(api_get_path(SYS_PATH) . $folder); $status = $writable ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[FILES]', Translation :: get('IsWritable') . ': ' . $folder, 'http://be2.php.net/manual/en/function.is-writable.php', $writable, 1, 'yes_no', Translation :: get('DirectoryMustBeWritable')); + $array[] = $this->build_setting($status, '[FILES]', get_lang('IsWritable') . ': ' . $folder, 'http://be2.php.net/manual/en/function.is-writable.php', $writable, 1, 'yes_no', get_lang('DirectoryMustBeWritable')); } - $exists = ! file_exists(Path :: get(SYS_PATH) . '/install'); + $exists = ! file_exists(api_get_path(SYS_PATH) . '/install'); $status = $exists ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[FILES]', Translation :: get('DirectoryExists') . ': /install', 'http://be2.php.net/file_exists', $writable, 0, 'yes_no', Translation :: get('DirectoryShouldBeRemoved')); + $array[] = $this->build_setting($status, '[FILES]', get_lang('DirectoryExists') . ': /install', 'http://be2.php.net/file_exists', $writable, 0, 'yes_no', get_lang('DirectoryShouldBeRemoved')); return $array; } @@ -98,47 +97,47 @@ class Diagnoser $version = phpversion(); $status = $version > '5.2' ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[PHP]', 'phpversion()', 'http://www.php.net/manual/en/function.phpversion.php', phpversion(), '>= 5.2', null, Translation :: get('PHPVersionInfo')); + $array[] = $this->build_setting($status, '[PHP]', 'phpversion()', 'http://www.php.net/manual/en/function.phpversion.php', phpversion(), '>= 5.2', null, get_lang('PHPVersionInfo')); $setting = ini_get('output_buffering'); $req_setting = 1; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'output_buffering', 'http://www.php.net/manual/en/outcontrol.configuration.php#ini.output-buffering', $setting, $req_setting, 'on_off', Translation :: get('FileUploadsInfo')); + $array[] = $this->build_setting($status, '[INI]', 'output_buffering', 'http://www.php.net/manual/en/outcontrol.configuration.php#ini.output-buffering', $setting, $req_setting, 'on_off', get_lang('FileUploadsInfo')); $setting = ini_get('file_uploads'); $req_setting = 1; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'file_uploads', 'http://www.php.net/manual/en/ini.core.php#ini.file-uploads', $setting, $req_setting, 'on_off', Translation :: get('FileUploadsInfo')); + $array[] = $this->build_setting($status, '[INI]', 'file_uploads', 'http://www.php.net/manual/en/ini.core.php#ini.file-uploads', $setting, $req_setting, 'on_off', get_lang('FileUploadsInfo')); $setting = ini_get('magic_quotes_runtime'); $req_setting = 0; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'magic_quotes_runtime', 'http://www.php.net/manual/en/ini.core.php#ini.magic-quotes-runtime', $setting, $req_setting, 'on_off', Translation :: get('MagicQuotesRuntimeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'magic_quotes_runtime', 'http://www.php.net/manual/en/ini.core.php#ini.magic-quotes-runtime', $setting, $req_setting, 'on_off', get_lang('MagicQuotesRuntimeInfo')); $setting = ini_get('safe_mode'); $req_setting = 0; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[INI]', 'safe_mode', 'http://www.php.net/manual/en/ini.core.php#ini.safe-mode', $setting, $req_setting, 'on_off', Translation :: get('SafeModeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'safe_mode', 'http://www.php.net/manual/en/ini.core.php#ini.safe-mode', $setting, $req_setting, 'on_off', get_lang('SafeModeInfo')); $setting = ini_get('register_globals'); $req_setting = 0; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'register_globals', 'http://www.php.net/manual/en/ini.core.php#ini.register-globals', $setting, $req_setting, 'on_off', Translation :: get('RegisterGlobalsInfo')); + $array[] = $this->build_setting($status, '[INI]', 'register_globals', 'http://www.php.net/manual/en/ini.core.php#ini.register-globals', $setting, $req_setting, 'on_off', get_lang('RegisterGlobalsInfo')); $setting = ini_get('short_open_tag'); $req_setting = 1; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[INI]', 'short_open_tag', 'http://www.php.net/manual/en/ini.core.php#ini.short-open-tag', $setting, $req_setting, 'on_off', Translation :: get('ShortOpenTagInfo')); + $array[] = $this->build_setting($status, '[INI]', 'short_open_tag', 'http://www.php.net/manual/en/ini.core.php#ini.short-open-tag', $setting, $req_setting, 'on_off', get_lang('ShortOpenTagInfo')); $setting = ini_get('magic_quotes_gpc'); $req_setting = 0; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'magic_quotes_gpc', 'http://www.php.net/manual/en/ini.core.php#ini.magic_quotes_gpc', $setting, $req_setting, 'on_off', Translation :: get('MagicQuotesGpcInfo')); + $array[] = $this->build_setting($status, '[INI]', 'magic_quotes_gpc', 'http://www.php.net/manual/en/ini.core.php#ini.magic_quotes_gpc', $setting, $req_setting, 'on_off', get_lang('MagicQuotesGpcInfo')); $setting = ini_get('display_errors'); $req_setting = 0; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', Translation :: get('DisplayErrorsInfo')); + $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo')); $setting = ini_get('upload_max_filesize'); $req_setting = '10M - 100M - ...'; @@ -148,24 +147,24 @@ class Diagnoser $status = self :: STATUS_WARNING; if ($setting >= 100) $status = self :: STATUS_OK; - $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, Translation :: get('UploadMaxFilesizeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo')); $setting = ini_get('default_charset'); if ($setting == '') $setting = null; $req_setting = null; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, Translation :: get('DefaultCharsetInfo')); + $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo')); $setting = ini_get('max_execution_time'); - $req_setting = '300 (' . Translation :: get('minimum') . ')'; + $req_setting = '300 (' . get_lang('minimum') . ')'; $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[INI]', 'max_execution_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-execution-time', $setting, $req_setting, null, Translation :: get('MaxExecutionTimeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'max_execution_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-execution-time', $setting, $req_setting, null, get_lang('MaxExecutionTimeInfo')); $setting = ini_get('max_input_time'); - $req_setting = '300 (' . Translation :: get('minimum') . ')'; + $req_setting = '300 (' . get_lang('minimum') . ')'; $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[INI]', 'max_input_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-input-time', $setting, $req_setting, null, Translation :: get('MaxInputTimeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'max_input_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-input-time', $setting, $req_setting, null, get_lang('MaxInputTimeInfo')); $setting = ini_get('memory_limit'); $req_setting = '10M - 100M - ...'; @@ -175,7 +174,7 @@ class Diagnoser $status = self :: STATUS_WARNING; if ($setting >= 100) $status = self :: STATUS_OK; - $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, Translation :: get('MemoryLimitInfo')); + $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo')); $setting = ini_get('post_max_size'); $req_setting = '10M - 100M - ...'; @@ -185,17 +184,17 @@ class Diagnoser $status = self :: STATUS_WARNING; if ($setting >= 100) $status = self :: STATUS_OK; - $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, Translation :: get('PostMaxSizeInfo')); + $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo')); $setting = ini_get('variables_order'); $req_setting = 'GPCS'; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[INI]', 'variables_order', 'http://www.php.net/manual/en/ini.core.php#ini.variables-order', $setting, $req_setting, null, Translation :: get('VariablesOrderInfo')); + $array[] = $this->build_setting($status, '[INI]', 'variables_order', 'http://www.php.net/manual/en/ini.core.php#ini.variables-order', $setting, $req_setting, null, get_lang('VariablesOrderInfo')); $setting = ini_get('session.gc_maxlifetime'); $req_setting = '4320'; $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; - $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, Translation :: get('SessionGCMaxLifetimeInfo')); + $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo')); //Extensions $extensions = array('gd' => 'http://www.php.net/gd', 'mysql' => 'http://www.php.net/mysql', 'pcre' => 'http://www.php.net/pcre', 'session' => 'http://www.php.net/session', 'standard' => 'http://www.php.net/spl', 'zlib' => 'http://www.php.net/zlib', 'xsl' => 'http://be2.php.net/xsl'); @@ -204,7 +203,7 @@ class Diagnoser { $loaded = extension_loaded($extension); $status = $loaded ? self :: STATUS_OK : self :: STATUS_ERROR; - $array[] = $this->build_setting($status, '[EXTENSION]', Translation :: get('ExtensionLoaded') . ': ' . $extension, $url, $loaded, 1, 'yes_no', Translation :: get('ExtensionMustBeLoaded')); + $array[] = $this->build_setting($status, '[EXTENSION]', get_lang('ExtensionLoaded') . ': ' . $extension, $url, $loaded, 1, 'yes_no', get_lang('ExtensionMustBeLoaded')); } return $array; @@ -218,11 +217,11 @@ class Diagnoser { $array = array(); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_host_info()', 'http://www.php.net/manual/en/function.mysql-get-host-info.php', mysql_get_host_info(), null, null, Translation :: get('MysqlHostInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_host_info()', 'http://www.php.net/manual/en/function.mysql-get-host-info.php', mysql_get_host_info(), null, null, get_lang('MysqlHostInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_server_info()', 'http://www.php.net/manual/en/function.mysql-get-server-info.php', mysql_get_server_info(), null, null, Translation :: get('MysqlServerInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_server_info()', 'http://www.php.net/manual/en/function.mysql-get-server-info.php', mysql_get_server_info(), null, null, get_lang('MysqlServerInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_proto_info()', 'http://www.php.net/manual/en/function.mysql-get-proto-info.php', mysql_get_proto_info(), null, null, Translation :: get('MysqlProtoInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[MySQL]', 'mysql_get_proto_info()', 'http://www.php.net/manual/en/function.mysql-get-proto-info.php', mysql_get_proto_info(), null, null, get_lang('MysqlProtoInfo')); return $array; } @@ -235,22 +234,22 @@ class Diagnoser { $array = array(); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_ADDR"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_ADDR"], null, null, Translation :: get('ServerIPInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_ADDR"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_ADDR"], null, null, get_lang('ServerIPInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_SOFTWARE"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_SOFTWARE"], null, null, Translation :: get('ServerSoftwareInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_SOFTWARE"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_SOFTWARE"], null, null, get_lang('ServerSoftwareInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["REMOTE_ADDR"]', 'http://be.php.net/reserved.variables.server', $_SERVER["REMOTE_ADDR"], null, null, Translation :: get('ServerRemoteInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["REMOTE_ADDR"]', 'http://be.php.net/reserved.variables.server', $_SERVER["REMOTE_ADDR"], null, null, get_lang('ServerRemoteInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["HTTP_USER_AGENT"]', 'http://be.php.net/reserved.variables.server', $_SERVER["HTTP_USER_AGENT"], null, null, Translation :: get('ServerRemoteInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["HTTP_USER_AGENT"]', 'http://be.php.net/reserved.variables.server', $_SERVER["HTTP_USER_AGENT"], null, null, get_lang('ServerRemoteInfo')); - $path = $this->manager->get_url(array('section' => Request :: get('section'))); + /*$path = $this->manager->get_url(array('section' => Request :: get('section'))); $request = $_SERVER["REQUEST_URI"]; $status = $request != $path ? self :: STATUS_ERROR : self :: STATUS_OK; - $array[] = $this->build_setting($status, '[SERVER]', '$_SERVER["REQUEST_URI"]', 'http://be.php.net/reserved.variables.server', $request, $path, null, Translation :: get('RequestURIInfo')); - - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_PROTOCOL"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_PROTOCOL"], null, null, Translation :: get('ServerProtocolInfo')); + $array[] = $this->build_setting($status, '[SERVER]', '$_SERVER["REQUEST_URI"]', 'http://be.php.net/reserved.variables.server', $request, $path, null, get_lang('RequestURIInfo')); + */ + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', '$_SERVER["SERVER_PROTOCOL"]', 'http://be.php.net/reserved.variables.server', $_SERVER["SERVER_PROTOCOL"], null, null, get_lang('ServerProtocolInfo')); - $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', 'php_uname()', 'http://be2.php.net/php_uname', php_uname(), null, null, Translation :: get('UnameInfo')); + $array[] = $this->build_setting(self :: STATUS_INFORMATION, '[SERVER]', 'php_uname()', 'http://be2.php.net/php_uname', php_uname(), null, null, get_lang('UnameInfo')); return $array; } @@ -279,7 +278,7 @@ class Diagnoser if (! $img_path) { - $img_path = Theme :: get_common_image_path(); + // $img_path = Theme :: get_common_image_path(); } $image = '' . $status . ''; @@ -313,12 +312,12 @@ class Diagnoser function format_yes_no($value) { - return $value ? Translation :: get('Yes') : Translation :: get('No'); + return $value ? get_lang('Yes') : get_lang('No'); } function format_on_off($value) { - return $value ? Translation :: get('On') : Translation :: get('Off'); + return $value ? get_lang('On') : get_lang('Off'); } } ?> \ No newline at end of file