From c7a9680a8316d4398284fcd83a955fb66c7622ed Mon Sep 17 00:00:00 2001 From: Shayne Bartlett Date: Wed, 27 May 2015 23:28:33 +0800 Subject: [PATCH 1/2] #2 Removed System Info from com_admin --- .../com_admin/helpers/html/directory.php | 69 ---- .../com_admin/helpers/html/phpsetting.php | 97 ----- .../com_admin/helpers/html/system.php | 39 -- .../components/com_admin/models/sysinfo.php | 336 ------------------ .../com_admin/views/sysinfo/tmpl/default.php | 46 --- .../views/sysinfo/tmpl/default_config.php | 43 --- .../views/sysinfo/tmpl/default_directory.php | 43 --- .../views/sysinfo/tmpl/default_phpinfo.php | 15 - .../sysinfo/tmpl/default_phpsettings.php | 162 --------- .../views/sysinfo/tmpl/default_system.php | 105 ------ .../com_admin/views/sysinfo/view.html.php | 99 ------ .../language/en-GB/en-GB.com_admin.ini | 3 - .../modules/mod_menu/tmpl/default_enabled.php | 6 - 13 files changed, 1063 deletions(-) delete mode 100644 administrator/components/com_admin/helpers/html/directory.php delete mode 100644 administrator/components/com_admin/helpers/html/phpsetting.php delete mode 100644 administrator/components/com_admin/helpers/html/system.php delete mode 100644 administrator/components/com_admin/models/sysinfo.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default_config.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php delete mode 100644 administrator/components/com_admin/views/sysinfo/tmpl/default_system.php delete mode 100644 administrator/components/com_admin/views/sysinfo/view.html.php diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php deleted file mode 100644 index 9ea9a8b458..0000000000 --- a/administrator/components/com_admin/helpers/html/directory.php +++ /dev/null @@ -1,69 +0,0 @@ -' . JText::_('COM_ADMIN_WRITABLE') . ''; - } - else - { - return '' . JText::_('COM_ADMIN_UNWRITABLE') . ''; - } - } - - /** - * Method to generate a message for a directory - * - * @param string $dir the directory - * @param boolean $message the message - * @param boolean $visible is the $dir visible? - * - * @return string html code - */ - public static function message($dir, $message, $visible = true) - { - if ($visible) - { - $output = $dir; - } - else - { - $output = ''; - } - - if (empty($message)) - { - return $output; - } - else - { - return $output . ' ' . JText::_($message) . ''; - } - } -} diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php deleted file mode 100644 index 3577eeb11d..0000000000 --- a/administrator/components/com_admin/helpers/html/phpsetting.php +++ /dev/null @@ -1,97 +0,0 @@ -php_settings)) - { - $this->php_settings = array(); - $this->php_settings['safe_mode'] = ini_get('safe_mode') == '1'; - $this->php_settings['display_errors'] = ini_get('display_errors') == '1'; - $this->php_settings['short_open_tag'] = ini_get('short_open_tag') == '1'; - $this->php_settings['file_uploads'] = ini_get('file_uploads') == '1'; - $this->php_settings['magic_quotes_gpc'] = ini_get('magic_quotes_gpc') == '1'; - $this->php_settings['register_globals'] = ini_get('register_globals') == '1'; - $this->php_settings['output_buffering'] = (bool) ini_get('output_buffering'); - $this->php_settings['open_basedir'] = ini_get('open_basedir'); - $this->php_settings['session.save_path'] = ini_get('session.save_path'); - $this->php_settings['session.auto_start'] = ini_get('session.auto_start'); - $this->php_settings['disable_functions'] = ini_get('disable_functions'); - $this->php_settings['xml'] = extension_loaded('xml'); - $this->php_settings['zlib'] = extension_loaded('zlib'); - $this->php_settings['zip'] = function_exists('zip_open') && function_exists('zip_read'); - $this->php_settings['mbstring'] = extension_loaded('mbstring'); - $this->php_settings['iconv'] = function_exists('iconv'); - } - - return $this->php_settings; - } - - /** - * Method to get the config - * - * @return array config values - * - * @since 1.6 - */ - public function &getConfig() - { - if (is_null($this->config)) - { - $registry = new JRegistry(new JConfig); - $this->config = $registry->toArray(); - $hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass'); - - foreach ($hidden as $key) - { - $this->config[$key] = 'xxxxxx'; - } - } - - return $this->config; - } - - /** - * Method to get the system information - * - * @return array system information values - * - * @since 1.6 - */ - public function &getInfo() - { - if (is_null($this->info)) - { - $this->info = array(); - $version = new JVersion; - $platform = new JPlatform; - $db = JFactory::getDbo(); - - if (isset($_SERVER['SERVER_SOFTWARE'])) - { - $sf = $_SERVER['SERVER_SOFTWARE']; - } - else - { - $sf = getenv('SERVER_SOFTWARE'); - } - - $this->info['php'] = php_uname(); - $this->info['dbversion'] = $db->getVersion(); - $this->info['dbcollation'] = $db->getCollation(); - $this->info['phpversion'] = phpversion(); - $this->info['server'] = $sf; - $this->info['sapi_name'] = php_sapi_name(); - $this->info['version'] = $version->getLongVersion(); - $this->info['platform'] = $platform->getLongVersion(); - $this->info['useragent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ""; - } - - return $this->info; - } - - /** - * Method to get the PHP info - * - * @return string PHP info - * - * @since 1.6 - */ - public function &getPHPInfo() - { - if (is_null($this->php_info)) - { - ob_start(); - date_default_timezone_set('UTC'); - phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES); - $phpInfo = ob_get_contents(); - ob_end_clean(); - preg_match_all('#]*>(.*)#siU', $phpInfo, $output); - $output = preg_replace('#]*>#', '', $output[1][0]); - $output = preg_replace('#(\w),(\w)#', '\1, \2', $output); - $output = preg_replace('#
#', '', $output); - $output = str_replace('
', '', $output); - $output = preg_replace('#
(.*)<\/tr>#', '$1', $output); - $output = str_replace('
', '', $output); - $output = str_replace('', '', $output); - $this->php_info = $output; - } - - return $this->php_info; - } - - /** - * Method to get the directory states - * - * @return array States of directories - * - * @since 1.6 - */ - public function getDirectory() - { - if (is_null($this->directories)) - { - $this->directories = array(); - - $registry = JFactory::getConfig(); - $cparams = JComponentHelper::getParams('com_media'); - - $this->_addDirectory('administrator/components', JPATH_ADMINISTRATOR . '/components'); - $this->_addDirectory('administrator/language', JPATH_ADMINISTRATOR . '/language'); - - // List all admin languages - $admin_langs = new DirectoryIterator(JPATH_ADMINISTRATOR . '/language'); - - foreach ($admin_langs as $folder) - { - if (!$folder->isDir() || $folder->isDot()) - { - continue; - } - - $this->_addDirectory('administrator/language/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/language/' . $folder->getFilename()); - } - - // List all manifests folders - $manifests = new DirectoryIterator(JPATH_ADMINISTRATOR . '/manifests'); - - foreach ($manifests as $folder) - { - if (!$folder->isDir() || $folder->isDot()) - { - continue; - } - - $this->_addDirectory('administrator/manifests/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/manifests/' . $folder->getFilename()); - } - - $this->_addDirectory('administrator/modules', JPATH_ADMINISTRATOR . '/modules'); - $this->_addDirectory('administrator/templates', JPATH_THEMES); - - $this->_addDirectory('components', JPATH_SITE . '/components'); - - $this->_addDirectory($cparams->get('image_path'), JPATH_SITE . '/' . $cparams->get('image_path')); - - // List all images folders - $image_folders = new DirectoryIterator(JPATH_SITE . '/' . $cparams->get('image_path')); - - foreach ($image_folders as $folder) - { - if (!$folder->isDir() || $folder->isDot()) - { - continue; - } - - $this->_addDirectory('images/' . $folder->getFilename(), JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename()); - } - - $this->_addDirectory('language', JPATH_SITE . '/language'); - - // List all site languages - $site_langs = new DirectoryIterator(JPATH_SITE . '/language'); - - foreach ($site_langs as $folder) - { - if (!$folder->isDir() || $folder->isDot()) - { - continue; - } - - $this->_addDirectory('language/' . $folder->getFilename(), JPATH_SITE . '/language/' . $folder->getFilename()); - } - - $this->_addDirectory('libraries', JPATH_LIBRARIES); - - $this->_addDirectory('media', JPATH_SITE . '/media'); - $this->_addDirectory('modules', JPATH_SITE . '/modules'); - $this->_addDirectory('plugins', JPATH_PLUGINS); - - $plugin_groups = new DirectoryIterator(JPATH_SITE . '/plugins'); - - foreach ($plugin_groups as $folder) - { - if (!$folder->isDir() || $folder->isDot()) - { - continue; - } - - $this->_addDirectory('plugins/' . $folder->getFilename(), JPATH_PLUGINS . '/' . $folder->getFilename()); - } - - $this->_addDirectory('templates', JPATH_SITE . '/templates'); - $this->_addDirectory('configuration.php', JPATH_CONFIGURATION . '/configuration.php'); - $this->_addDirectory('cache', JPATH_SITE . '/cache', 'COM_ADMIN_CACHE_DIRECTORY'); - $this->_addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY'); - - $this->_addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY'); - $this->_addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY'); - } - - return $this->directories; - } - - /** - * Method to add a directory - * - * @return void - * @since 1.6 - */ - /** - * Method to add a directory - * - * @param string $name Directory Name - * @param string $path Directory path - * @param string $message Message - * - * @return void - */ - private function _addDirectory($name, $path, $message = '') - { - $this->directories[$name] = array('writable' => is_writable($path), 'message' => $message); - } - - /** - * Method to get the editor - * - * @return string The default editor - * - * @note: has to be removed (it is present in the config...) - * - * @since 1.6 - */ - public function &getEditor() - { - if (is_null($this->editor)) - { - $config = JFactory::getConfig(); - $this->editor = $config->get('editor'); - } - - return $this->editor; - } -} diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/administrator/components/com_admin/views/sysinfo/tmpl/default.php deleted file mode 100644 index a380134568..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default.php +++ /dev/null @@ -1,46 +0,0 @@ - - -
-
- -
- 'site')); ?> - - - loadTemplate('system'); ?> - - - - loadTemplate('phpsettings'); ?> - - - - loadTemplate('config'); ?> - - - - loadTemplate('directory'); ?> - - - - loadTemplate('phpinfo'); ?> - - - -
- -
-
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php deleted file mode 100644 index 408fca4b53..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php +++ /dev/null @@ -1,43 +0,0 @@ - -
- - - - - - - - - - - - - - - config as $key => $value): ?> - - - - - - -
- - - -
 
- - - -
-
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php deleted file mode 100644 index 439cffea4e..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php +++ /dev/null @@ -1,43 +0,0 @@ - -
- - - - - - - - - - - - - - - directory as $dir => $info) : ?> - - - - - - -
- - - -
 
- - - -
-
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php deleted file mode 100644 index d2218260fa..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php +++ /dev/null @@ -1,15 +0,0 @@ - -
- - php_info; ?> -
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php deleted file mode 100644 index 3bd9519d22..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php +++ /dev/null @@ -1,162 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
  -
- - - php_settings['safe_mode']); ?> -
- - - php_settings['open_basedir']); ?> -
- - - php_settings['display_errors']); ?> -
- - - php_settings['short_open_tag']); ?> -
- - - php_settings['file_uploads']); ?> -
- - - php_settings['magic_quotes_gpc']); ?> -
- - - php_settings['register_globals']); ?> -
- - - php_settings['output_buffering']); ?> -
- - - php_settings['session.save_path']); ?> -
- - - php_settings['session.auto_start']); ?> -
- - - php_settings['xml']); ?> -
- - - php_settings['zlib']); ?> -
- - - php_settings['zip']); ?> -
- - - php_settings['disable_functions']); ?> -
- - - php_settings['mbstring']); ?> -
- - - php_settings['iconv']); ?> -
-
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php deleted file mode 100644 index 9b8f9c4cd2..0000000000 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php +++ /dev/null @@ -1,105 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
 
- - - info['php']; ?> -
- - - info['dbversion']; ?> -
- - - info['dbcollation']; ?> -
- - - info['phpversion']; ?> -
- - - info['server']); ?> -
- - - info['sapi_name']; ?> -
- - - info['version']; ?> -
- - - info['platform']; ?> -
- - - info['useragent']); ?> -
-
diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php deleted file mode 100644 index 331a6cf863..0000000000 --- a/administrator/components/com_admin/views/sysinfo/view.html.php +++ /dev/null @@ -1,99 +0,0 @@ -authorise('core.admin')) - { - return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR')); - } - - $this->php_settings = $this->get('PhpSettings'); - $this->config = $this->get('config'); - $this->info = $this->get('info'); - $this->php_info = $this->get('PhpInfo'); - $this->directory = $this->get('directory'); - - $this->addToolbar(); - $this->_setSubMenu(); - parent::display($tpl); - } - - /** - * Setup the SubMenu - * - * @return void - * - * @since 1.6 - * @note Necessary for Hathor compatibility - */ - protected function _setSubMenu() - { - try - { - $contents = $this->loadTemplate('navigation'); - $document = JFactory::getDocument(); - $document->setBuffer($contents, 'modules', 'submenu'); - } - catch (Exception $e) - { - } - } - - /** - * Setup the Toolbar - * - * @since 1.6 - */ - protected function addToolbar() - { - JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo'); - JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION'); - } -} diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index 7394b7da3b..6fd1303a53 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -66,7 +66,6 @@ COM_ADMIN_HELP_SITE_GLOBAL_CONFIGURATION="Global Configuration" COM_ADMIN_HELP_SITE_MAINTENANCE_CLEAR_CACHE="Cache Manager: Clear Cache" COM_ADMIN_HELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Global Check-in" COM_ADMIN_HELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Cache Manager: Purge Expired Cache" -COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information" COM_ADMIN_HELP_START_HERE="Start Here" COM_ADMIN_HELP_USERS_ACCESS_LEVELS="User Manager: Access Levels" COM_ADMIN_HELP_USERS_ACCESS_LEVELS_EDIT="User Manager: Access Levels - New/Edit" @@ -104,8 +103,6 @@ COM_ADMIN_SETTING="Setting" COM_ADMIN_SHORT_OPEN_TAGS="Short Open Tags" COM_ADMIN_START_HERE="Start here" COM_ADMIN_STATUS="Status" -COM_ADMIN_SYSTEM_INFO="System Info" -COM_ADMIN_SYSTEM_INFORMATION="System Information" COM_ADMIN_TEMP_DIRECTORY="(Temp directory)" COM_ADMIN_UNWRITABLE="Unwritable" COM_ADMIN_USER_ACCOUNT_DETAILS="My Profile Details" diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index 52c1c2a675..9503278b65 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -40,12 +40,6 @@ $menu->addChild(new JMenuNode(JText::_('MOD_MENU_PURGE_EXPIRED_CACHE'), 'index.php?option=com_cache&view=purge', 'class:purge')); } -if ($user->authorise('core.admin')) -{ - $menu->addSeparator(); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo', 'class:info')); -} - $menu->getParent(); /* From 9d267a3f84cf7e2129ac9f9594117b26de1aae02 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Wed, 27 May 2015 23:53:10 +0200 Subject: [PATCH 2/2] #2 - Cleanup language strings --- administrator/language/en-GB/en-GB.ini | 1 - administrator/language/en-GB/en-GB.mod_menu.ini | 1 - 2 files changed, 2 deletions(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 99a6607968..a4846e8902 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -703,7 +703,6 @@ JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration" JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Site_Maintenance_Clear_Cache" JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Site_Maintenance_Global_Check-in" JHELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Site_Maintenance_Purge_Expired_Cache" -JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information" JHELP_ADMIN_USER_PROFILE_EDIT="Site_My_Profile" JHELP_START_HERE="Start_Here" JHELP_USERS_ACCESS_LEVELS="Users_Access_Levels" diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index 38dbaeaad9..47fedb0676 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -70,7 +70,6 @@ MOD_MENU_PURGE_EXPIRED_CACHE="Purge Expired Cache" MOD_MENU_READ_PRIVATE_MESSAGES="Read Private Messages" MOD_MENU_SETTINGS="Settings" MOD_MENU_MAINTENANCE="Maintenance" -MOD_MENU_SYSTEM_INFORMATION="System Information" MOD_MENU_SYSTEM="System" MOD_MENU_TOOLS="Tools" MOD_MENU_USER_PROFILE="My Profile"