Inspection of "Merge pull request #579 from geekwright/yiimsgfmt" - XOOPS/XoopsCore - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 490f47...e6442b )

by Michael

created 2018-07-08 06:44 UTC

Status

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -16,35 +16,35 @@
 block discarded – undo
  * @version         $Id$
  */
 
-define('_MI_MONOLOG_NAME','Monolog');
-define('_MI_MONOLOG_DSC','Error and performance data logging');
+define('_MI_MONOLOG_NAME', 'Monolog');
+define('_MI_MONOLOG_DSC', 'Error and performance data logging');
 
-define('_MI_MONOLOG_ENABLE',"Enable Logging");
-define('_MI_MONOLOG_SMARTYDEBUG',"Enable Smarty Debug");
+define('_MI_MONOLOG_ENABLE', "Enable Logging");
+define('_MI_MONOLOG_SMARTYDEBUG', "Enable Smarty Debug");
 
-define('_MI_MONOLOG_UCONF_CAT_OPT','Options');
-define('_MI_MONOLOG_UCONF_CAT_OPT_DESC','Monolog Options');
+define('_MI_MONOLOG_UCONF_CAT_OPT', 'Options');
+define('_MI_MONOLOG_UCONF_CAT_OPT_DESC', 'Monolog Options');
 
-define('_MI_MONOLOG_UCONF_ENABLE_PHPFIRE','Enable FirePHP Output');
+define('_MI_MONOLOG_UCONF_ENABLE_PHPFIRE', 'Enable FirePHP Output');
 
-define('_MI_MONOLOG_ADMENU1','Home');
-define('_MI_MONOLOG_ADMENU2','About');
-define('_MI_MONOLOG_ADMENU3','Permissions');
+define('_MI_MONOLOG_ADMENU1', 'Home');
+define('_MI_MONOLOG_ADMENU2', 'About');
+define('_MI_MONOLOG_ADMENU3', 'Permissions');
 
-define('_MI_MONOLOG_THRESHOLD_LEVEL','Log level threshold');
-define('_MI_MONOLOG_THRESHOLD_DEBUG','Debugging');
-define('_MI_MONOLOG_THRESHOLD_INFO','Informational');
-define('_MI_MONOLOG_THRESHOLD_WARNING','Warnings');
-define('_MI_MONOLOG_THRESHOLD_ERROR','Errors');
+define('_MI_MONOLOG_THRESHOLD_LEVEL', 'Log level threshold');
+define('_MI_MONOLOG_THRESHOLD_DEBUG', 'Debugging');
+define('_MI_MONOLOG_THRESHOLD_INFO', 'Informational');
+define('_MI_MONOLOG_THRESHOLD_WARNING', 'Warnings');
+define('_MI_MONOLOG_THRESHOLD_ERROR', 'Errors');
 
-define('_MI_MONOLOG_INCLUDE_BLOCKS','Include blocks');
-define('_MI_MONOLOG_INCLUDE_DEPRECATED','Include deprecated');
-define('_MI_MONOLOG_INCLUDE_EXTRA','Include extra');
-define('_MI_MONOLOG_INCLUDE_QUERIES','Include queries');
-define('_MI_MONOLOG_INCLUDE_TIMERS','Include timers');
+define('_MI_MONOLOG_INCLUDE_BLOCKS', 'Include blocks');
+define('_MI_MONOLOG_INCLUDE_DEPRECATED', 'Include deprecated');
+define('_MI_MONOLOG_INCLUDE_EXTRA', 'Include extra');
+define('_MI_MONOLOG_INCLUDE_QUERIES', 'Include queries');
+define('_MI_MONOLOG_INCLUDE_TIMERS', 'Include timers');
 
-define('_MI_MONOLOG_LOG_FILE_PATH','Absolute path and name of log file');
-define('_MI_MONOLOG_LOG_MAX_VERSIONS','Maximum number of daily versions of the log to keep. (Use 0 for no versioning.)');
+define('_MI_MONOLOG_LOG_FILE_PATH', 'Absolute path and name of log file');
+define('_MI_MONOLOG_LOG_MAX_VERSIONS', 'Maximum number of daily versions of the log to keep. (Use 0 for no versioning.)');
 
-define('_MI_MONOLOG_HELP','Help');
-define('_MI_MONOLOG_HACKING','Hacking');
+define('_MI_MONOLOG_HELP', 'Help');
+define('_MI_MONOLOG_HACKING', 'Hacking');

Please login to merge, or discard this patch.

htdocs/modules/monolog/language/english/main.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -16,23 +16,23 @@  discard block
 block discarded – undo
  * @version         $Id$
  */
 
-define('_MD_MONOLOG_DEBUG',"Debug");
+define('_MD_MONOLOG_DEBUG', "Debug");
 define('_MD_MONOLOG_INCLUDED_FILES', "Included files");
-define('_MD_MONOLOG_FILES',"%s files");
-define('_MD_MONOLOG_MEM_USAGE',"Usage: %.03fM  Peak: %.03fM");
-define('_MD_MONOLOG_MEMORY',"Memory");
+define('_MD_MONOLOG_FILES', "%s files");
+define('_MD_MONOLOG_MEM_USAGE', "Usage: %.03fM  Peak: %.03fM");
+define('_MD_MONOLOG_MEMORY', "Memory");
 define('_MD_MONOLOG_NONE', "None");
 //define('_MD_MONOLOG_ALL', "All");
-define('_MD_MONOLOG_ERRORS',"Errors");
-define('_MD_MONOLOG_DEPRECATED',"Deprecated");
-define('_MD_MONOLOG_QUERIES',"Queries");
-define('_MD_MONOLOG_BLOCKS',"Blocks");
-define('_MD_MONOLOG_EXTRA',"Extra");
-define('_MD_MONOLOG_TIMERS',"Timers");
-define('_MD_MONOLOG_TIMETOLOAD',"%s took %.04f seconds to load.");
+define('_MD_MONOLOG_ERRORS', "Errors");
+define('_MD_MONOLOG_DEPRECATED', "Deprecated");
+define('_MD_MONOLOG_QUERIES', "Queries");
+define('_MD_MONOLOG_BLOCKS', "Blocks");
+define('_MD_MONOLOG_EXTRA', "Extra");
+define('_MD_MONOLOG_TIMERS', "Timers");
+define('_MD_MONOLOG_TIMETOLOAD', "%s took %.04f seconds to load.");
 //define('_MD_MONOLOG_TOTAL',"Total");
-define('_MD_MONOLOG_NOT_CACHED',"Not cached");
-define('_MD_MONOLOG_CACHED',"Cached (regenerates every %s seconds)");
+define('_MD_MONOLOG_NOT_CACHED', "Not cached");
+define('_MD_MONOLOG_CACHED', "Cached (regenerates every %s seconds)");
 //define('_MD_MONOLOG_UNKNOWN', "Unknown");
 //define('_MD_MONOLOG_E_USER_NOTICE', "Notice");
 //define('_MD_MONOLOG_E_USER_WARNING', "Warning");
@@ -41,5 +41,5 @@  discard block
 block discarded – undo
 //define('_MD_MONOLOG_E_WARNING', "Warning");
 //define('_MD_MONOLOG_E_STRICT', "Strict");
 //define('_MD_MONOLOG_FILELINE', "%s in file %s line %s");
-define('_MD_MONOLOG_EXCEPTION','Exception : %s : file %s line %s');
-define('_MD_MONOLOG_MESSAGES','Message');
+define('_MD_MONOLOG_EXCEPTION', 'Exception : %s : file %s line %s');
+define('_MD_MONOLOG_MESSAGES', 'Message');

Please login to merge, or discard this patch.

htdocs/modules/monolog/language/english/admin.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@
 block discarded – undo
  * @version         $Id$
  */
 
-define('_MA_MONOLOG_PERMISSION_FORM','Monolog Usage Permissions');
-define('_MA_MONOLOG_PERMISSION_GROUPS','Select groups that may use Monolog');
-define('_MA_MONOLOG_FORM_SUBMIT','Save');
-define('_MA_MONOLOG_FORM_PROCESSED','Permissions updated.');
+define('_MA_MONOLOG_PERMISSION_FORM', 'Monolog Usage Permissions');
+define('_MA_MONOLOG_PERMISSION_GROUPS', 'Select groups that may use Monolog');
+define('_MA_MONOLOG_FORM_SUBMIT', 'Save');
+define('_MA_MONOLOG_FORM_PROCESSED', 'Permissions updated.');

Please login to merge, or discard this patch.

htdocs/modules/monolog/class/plugin/userconfigs.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@
 block discarded – undo
      */
     public function configs()
     {
-        $config[]=array(
+        $config[] = array(
             'name' => 'phpfire_enable',
             'title' => '_MI_MONOLOG_UCONF_ENABLE_PHPFIRE',
             'description' => '',

Please login to merge, or discard this patch.

htdocs/modules/monolog/class/monologlogger.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -106,23 +106,23 @@  discard block
 block discarded – undo
             $this->monolog = new \Monolog\Logger('app');
             $proc = new WebProcessor();
             $this->monolog->pushProcessor($proc);
-            $this->monolog->pushProcessor(array($this,'xoopsDataProcessor'));
+            $this->monolog->pushProcessor(array($this, 'xoopsDataProcessor'));
 
             $formatter = new LineFormatter();
             //$formatter = new LogstashFormatter;
             switch ($this->configs['logging_threshold']) {
                 case 'error':
-                    $threshold=MLogger::ERROR;
+                    $threshold = MLogger::ERROR;
                     break;
                 case 'warning':
-                    $threshold=MLogger::WARNING;
+                    $threshold = MLogger::WARNING;
                     break;
                 case 'info':
-                    $threshold=MLogger::INFO;
+                    $threshold = MLogger::INFO;
                     break;
                 case 'debug':
                 default:
-                    $threshold=MLogger::DEBUG;
+                    $threshold = MLogger::DEBUG;
                     break;
             }
             if ((int)($this->configs['max_versions']) == 0) {
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
      */
     public function setConfigs($configs)
     {
-        $this->configs=$configs;
+        $this->configs = $configs;
     }
 
     /**
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
                         return;
                     }
                     //$channel = 'Blocks';
-                    $msg = _MD_MONOLOG_BLOCKS . ' : ' . $message . ': ';
+                    $msg = _MD_MONOLOG_BLOCKS.' : '.$message.': ';
                     if ($context['cached']) {
                         $msg .= sprintf(_MD_MONOLOG_CACHED, (int)($context['cachetime']));
                     } else {
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
                         return;
                     }
                     //$channel = 'Deprecated';
-                    $msg = $this->messageTag('_MD_MONOLOG_DEPRECATED', 'Deprecated*') . ' : ' . $message;
+                    $msg = $this->messageTag('_MD_MONOLOG_DEPRECATED', 'Deprecated*').' : '.$message;
                     //$msg = _MD_MONOLOG_DEPRECATED . ' : ' . $message;
                     break;
                 case 'extra':
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
                         return;
                     }
                     //$channel = 'Extra';
-                    $msg = _MD_MONOLOG_EXTRA . ' : ' . $context['name'] . ': ' . $message;
+                    $msg = _MD_MONOLOG_EXTRA.' : '.$context['name'].': '.$message;
                     break;
                 case 'queries':
                     if (!$this->configs['include_queries']) {
@@ -547,24 +547,24 @@  discard block
 block discarded – undo
                         //    \Xmf\Debug::dump($context);
                         //}
                         $msg .= ' -- Error number: '
-                            . (is_scalar($context['errno']) ?  $context['errno'] : '?')
+                            . (is_scalar($context['errno']) ? $context['errno'] : '?')
                             . ' Error message: '
-                            . (is_scalar($context['error']) ?  $context['error'] : '?');
+                            . (is_scalar($context['error']) ? $context['error'] : '?');
                     }
-                    $msg = $this->messageTag('_MD_MONOLOG_QUERIES', 'Queries*') . ' : ' . $qt . $msg;
+                    $msg = $this->messageTag('_MD_MONOLOG_QUERIES', 'Queries*').' : '.$qt.$msg;
                     break;
                 case 'timers':
                     if (!$this->configs['include_timers']) {
                         return;
                     }
-                    $msg = $this->messageTag('_MD_MONOLOG_TIMERS', 'Timers*') . ' : ' . $message;
+                    $msg = $this->messageTag('_MD_MONOLOG_TIMERS', 'Timers*').' : '.$message;
                     break;
                 default:
-                    $msg = $this->messageTag('_MD_MONOLOG_ERRORS', 'Errors*') . ' : ' . $message;
+                    $msg = $this->messageTag('_MD_MONOLOG_ERRORS', 'Errors*').' : '.$message;
                     break;
             }
         } else {
-            $msg = $this->messageTag('_MD_MONOLOG_MESSAGES', 'Message*') . ' : ' . $message;
+            $msg = $this->messageTag('_MD_MONOLOG_MESSAGES', 'Message*').' : '.$message;
         }
         switch ($level) {
             case LogLevel::EMERGENCY:

Please login to merge, or discard this patch.

htdocs/modules/system/locale/en_US/en_US.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -408,7 +408,7 @@
 block discarded – undo
     const USERS_MANAGEMENT = "Users management";
     const USERS_TIPS = "<ul><li>Manage Xoops users</li></ul>";
     const VIEW_USER_INFO = "View user info";
-	const WEBMASTERS = "Webmasters";
+    const WEBMASTERS = "Webmasters";
     const WEBMASTERS_OF_THIS_SITE = "Webmasters of this site";
     const WELCOME_TO_XOOPS_HELP_CENTER = "Welcome to XOOPS Help Center";
     const WORD_CENSORING = "Word censoring";

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -89,7 +89,7 @@  discard block
 block discarded – undo
     const CONF_BAD_IPS_DESC = "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc";
     const CONF_BAD_USERNAMES = "Enter names that should not be selected as username";
     const CONF_BLOCKS_EDITOR = "Editor for blocks:";
-    const CONF_BREADCRUMB ="Breadcrumb";
+    const CONF_BREADCRUMB = "Breadcrumb";
     const CONF_CENSORRPLC = "Censored words will be replaced with:";
     const CONF_CENSORRPLC_DESC = "Censored words will be replaced with the characters entered in this textbox";
     const CONF_CENSORWRD = "Words to censor";
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
     const CONF_METACOPYR_DEFAULT = "Copyright @ 2001-%s";
     const CONF_METACOPYR_DESC = "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents.";
     const CONF_METADESC = "Meta Description";
-    const CONF_METADESC_DEFAULT= "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
+    const CONF_METADESC_DEFAULT = "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
     const CONF_METADESC_DESC = "The description meta tag is a general description of what is contained in your web page";
     const CONF_METAKEY = "Meta Keywords";
     const CONF_METAKEY_DEFAULT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";

Please login to merge, or discard this patch.

htdocs/modules/system/admin/services/main.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -41,9 +41,9 @@  discard block
 block discarded – undo
     // we need to decide how to handle that. Right now, some js will redirect us from
     // provider sort to service select just before the token should expire.
     if (isset($_POST['token']) && $security->validateToken($_POST['token'], false)) {
-        if (isset($_POST['op']) && $_POST['op']==='order') {
+        if (isset($_POST['op']) && $_POST['op'] === 'order') {
             if (isset($_POST['service'])) {
-                $service=$_POST['service'];
+                $service = $_POST['service'];
                 if (isset($_POST[$service]) && is_array($_POST[$service])) {
                     $service_order = array_flip($_POST[$service]);
                     $sm = Manager::getInstance();
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 $xoops->header('admin:system/system_services.tpl');
 
 $admin_page = new \Xoops\Module\Admin();
-$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
 $admin_page->addBreadcrumbLink(
     SystemLocale::SERVICES_MANAGER,
     $system->adminVersion('services', 'adminpath')
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 $admin_page->renderBreadcrumb();
 $admin_page->renderTips();
 
-$selected_service='';
+$selected_service = '';
 if (isset($_GET['service'])) {
     $selected_service = strtolower(XoopsFilterInput::clean($_GET['service'], 'WORD'));
 }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
     $service_list[] = array(
         'name' => $v,
         'display' => ucfirst($v),
-        'active' => ($v==$selected_service),
+        'active' => ($v == $selected_service),
         );
 }
 $xoops->tpl()->assign('service_list', $service_list);

Please login to merge, or discard this patch.

htdocs/modules/system/admin/modulesadmin/main.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addScript('modules/system/js/module.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')

Please login to merge, or discard this patch.

htdocs/modules/system/admin/extensions/main.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -146,7 +146,7 @@
 block discarded – undo
         }
         $folder = array(1, 2, 3);
         $system->cleanCache($folder);
-         //Set active modules in cache folder
+            //Set active modules in cache folder
         $xoops->setActiveModules();
         // Call Footer
         $xoops->footer();

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addScript('modules/system/js/module.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')

Please login to merge, or discard this patch.

		@@ -106,23 +106,23 @@ discard block
		block discarded – undo
106	106	$this->monolog = new \Monolog\Logger('app');
107	107	$proc = new WebProcessor();
108	108	$this->monolog->pushProcessor($proc);
109		- $this->monolog->pushProcessor(array($this,'xoopsDataProcessor'));
	109	+ $this->monolog->pushProcessor(array($this, 'xoopsDataProcessor'));
110	110
111	111	$formatter = new LineFormatter();
112	112	//$formatter = new LogstashFormatter;
113	113	switch ($this->configs['logging_threshold']) {
114	114	case 'error':
115		- $threshold=MLogger::ERROR;
	115	+ $threshold = MLogger::ERROR;
116	116	break;
117	117	case 'warning':
118		- $threshold=MLogger::WARNING;
	118	+ $threshold = MLogger::WARNING;
119	119	break;
120	120	case 'info':
121		- $threshold=MLogger::INFO;
	121	+ $threshold = MLogger::INFO;
122	122	break;
123	123	case 'debug':
124	124	default:
125		- $threshold=MLogger::DEBUG;
	125	+ $threshold = MLogger::DEBUG;
126	126	break;
127	127	}
128	128	if ((int)($this->configs['max_versions']) == 0) {
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	*/
168	168	public function setConfigs($configs)
169	169	{
170		- $this->configs=$configs;
	170	+ $this->configs = $configs;
171	171	}
172	172
173	173	/**
		@@ -512,7 +512,7 @@ discard block
		block discarded – undo
512	512	return;
513	513	}
514	514	//$channel = 'Blocks';
515		- $msg = _MD_MONOLOG_BLOCKS . ' : ' . $message . ': ';
	515	+ $msg = _MD_MONOLOG_BLOCKS.' : '.$message.': ';
516	516	if ($context['cached']) {
517	517	$msg .= sprintf(_MD_MONOLOG_CACHED, (int)($context['cachetime']));
518	518	} else {
		@@ -524,7 +524,7 @@ discard block
		block discarded – undo
524	524	return;
525	525	}
526	526	//$channel = 'Deprecated';
527		- $msg = $this->messageTag('_MD_MONOLOG_DEPRECATED', 'Deprecated*') . ' : ' . $message;
	527	+ $msg = $this->messageTag('_MD_MONOLOG_DEPRECATED', 'Deprecated*').' : '.$message;
528	528	//$msg = _MD_MONOLOG_DEPRECATED . ' : ' . $message;
529	529	break;
530	530	case 'extra':
		@@ -532,7 +532,7 @@ discard block
		block discarded – undo
532	532	return;
533	533	}
534	534	//$channel = 'Extra';
535		- $msg = _MD_MONOLOG_EXTRA . ' : ' . $context['name'] . ': ' . $message;
	535	+ $msg = _MD_MONOLOG_EXTRA.' : '.$context['name'].': '.$message;
536	536	break;
537	537	case 'queries':
538	538	if (!$this->configs['include_queries']) {
		@@ -547,24 +547,24 @@ discard block
		block discarded – undo
547	547	// \Xmf\Debug::dump($context);
548	548	//}
549	549	$msg .= ' -- Error number: '
550		- . (is_scalar($context['errno']) ? $context['errno'] : '?')
	550	+ . (is_scalar($context['errno']) ? $context['errno'] : '?')
551	551	. ' Error message: '
552		- . (is_scalar($context['error']) ? $context['error'] : '?');
	552	+ . (is_scalar($context['error']) ? $context['error'] : '?');
553	553	}
554		- $msg = $this->messageTag('_MD_MONOLOG_QUERIES', 'Queries*') . ' : ' . $qt . $msg;
	554	+ $msg = $this->messageTag('_MD_MONOLOG_QUERIES', 'Queries*').' : '.$qt.$msg;
555	555	break;
556	556	case 'timers':
557	557	if (!$this->configs['include_timers']) {
558	558	return;
559	559	}
560		- $msg = $this->messageTag('_MD_MONOLOG_TIMERS', 'Timers*') . ' : ' . $message;
	560	+ $msg = $this->messageTag('_MD_MONOLOG_TIMERS', 'Timers*').' : '.$message;
561	561	break;
562	562	default:
563		- $msg = $this->messageTag('_MD_MONOLOG_ERRORS', 'Errors*') . ' : ' . $message;
	563	+ $msg = $this->messageTag('_MD_MONOLOG_ERRORS', 'Errors*').' : '.$message;
564	564	break;
565	565	}
566	566	} else {
567		- $msg = $this->messageTag('_MD_MONOLOG_MESSAGES', 'Message*') . ' : ' . $message;
	567	+ $msg = $this->messageTag('_MD_MONOLOG_MESSAGES', 'Message*').' : '.$message;
568	568	}
569	569	switch ($level) {
570	570	case LogLevel::EMERGENCY:

		@@ -146,7 +146,7 @@
		block discarded – undo
146	146	}
147	147	$folder = array(1, 2, 3);
148	148	$system->cleanCache($folder);
149		- //Set active modules in cache folder
	149	+ //Set active modules in cache folder
150	150	$xoops->setActiveModules();
151	151	// Call Footer
152	152	$xoops->footer();

		@@ -16,35 +16,35 @@
		block discarded – undo
16	16	* @version $Id$
17	17	*/
18	18
19		-define('_MI_MONOLOG_NAME','Monolog');
20		-define('_MI_MONOLOG_DSC','Error and performance data logging');
	19	+define('_MI_MONOLOG_NAME', 'Monolog');
	20	+define('_MI_MONOLOG_DSC', 'Error and performance data logging');
21	21
22		-define('_MI_MONOLOG_ENABLE',"Enable Logging");
23		-define('_MI_MONOLOG_SMARTYDEBUG',"Enable Smarty Debug");
	22	+define('_MI_MONOLOG_ENABLE', "Enable Logging");
	23	+define('_MI_MONOLOG_SMARTYDEBUG', "Enable Smarty Debug");
24	24
25		-define('_MI_MONOLOG_UCONF_CAT_OPT','Options');
26		-define('_MI_MONOLOG_UCONF_CAT_OPT_DESC','Monolog Options');
	25	+define('_MI_MONOLOG_UCONF_CAT_OPT', 'Options');
	26	+define('_MI_MONOLOG_UCONF_CAT_OPT_DESC', 'Monolog Options');
27	27
28		-define('_MI_MONOLOG_UCONF_ENABLE_PHPFIRE','Enable FirePHP Output');
	28	+define('_MI_MONOLOG_UCONF_ENABLE_PHPFIRE', 'Enable FirePHP Output');
29	29
30		-define('_MI_MONOLOG_ADMENU1','Home');
31		-define('_MI_MONOLOG_ADMENU2','About');
32		-define('_MI_MONOLOG_ADMENU3','Permissions');
	30	+define('_MI_MONOLOG_ADMENU1', 'Home');
	31	+define('_MI_MONOLOG_ADMENU2', 'About');
	32	+define('_MI_MONOLOG_ADMENU3', 'Permissions');
33	33
34		-define('_MI_MONOLOG_THRESHOLD_LEVEL','Log level threshold');
35		-define('_MI_MONOLOG_THRESHOLD_DEBUG','Debugging');
36		-define('_MI_MONOLOG_THRESHOLD_INFO','Informational');
37		-define('_MI_MONOLOG_THRESHOLD_WARNING','Warnings');
38		-define('_MI_MONOLOG_THRESHOLD_ERROR','Errors');
	34	+define('_MI_MONOLOG_THRESHOLD_LEVEL', 'Log level threshold');
	35	+define('_MI_MONOLOG_THRESHOLD_DEBUG', 'Debugging');
	36	+define('_MI_MONOLOG_THRESHOLD_INFO', 'Informational');
	37	+define('_MI_MONOLOG_THRESHOLD_WARNING', 'Warnings');
	38	+define('_MI_MONOLOG_THRESHOLD_ERROR', 'Errors');
39	39
40		-define('_MI_MONOLOG_INCLUDE_BLOCKS','Include blocks');
41		-define('_MI_MONOLOG_INCLUDE_DEPRECATED','Include deprecated');
42		-define('_MI_MONOLOG_INCLUDE_EXTRA','Include extra');
43		-define('_MI_MONOLOG_INCLUDE_QUERIES','Include queries');
44		-define('_MI_MONOLOG_INCLUDE_TIMERS','Include timers');
	40	+define('_MI_MONOLOG_INCLUDE_BLOCKS', 'Include blocks');
	41	+define('_MI_MONOLOG_INCLUDE_DEPRECATED', 'Include deprecated');
	42	+define('_MI_MONOLOG_INCLUDE_EXTRA', 'Include extra');
	43	+define('_MI_MONOLOG_INCLUDE_QUERIES', 'Include queries');
	44	+define('_MI_MONOLOG_INCLUDE_TIMERS', 'Include timers');
45	45
46		-define('_MI_MONOLOG_LOG_FILE_PATH','Absolute path and name of log file');
47		-define('_MI_MONOLOG_LOG_MAX_VERSIONS','Maximum number of daily versions of the log to keep. (Use 0 for no versioning.)');
	46	+define('_MI_MONOLOG_LOG_FILE_PATH', 'Absolute path and name of log file');
	47	+define('_MI_MONOLOG_LOG_MAX_VERSIONS', 'Maximum number of daily versions of the log to keep. (Use 0 for no versioning.)');
48	48
49		-define('_MI_MONOLOG_HELP','Help');
50		-define('_MI_MONOLOG_HACKING','Hacking');
	49	+define('_MI_MONOLOG_HELP', 'Help');
	50	+define('_MI_MONOLOG_HACKING', 'Hacking');

		@@ -16,23 +16,23 @@ discard block
		block discarded – undo
16	16	* @version $Id$
17	17	*/
18	18
19		-define('_MD_MONOLOG_DEBUG',"Debug");
	19	+define('_MD_MONOLOG_DEBUG', "Debug");
20	20	define('_MD_MONOLOG_INCLUDED_FILES', "Included files");
21		-define('_MD_MONOLOG_FILES',"%s files");
22		-define('_MD_MONOLOG_MEM_USAGE',"Usage: %.03fM Peak: %.03fM");
23		-define('_MD_MONOLOG_MEMORY',"Memory");
	21	+define('_MD_MONOLOG_FILES', "%s files");
	22	+define('_MD_MONOLOG_MEM_USAGE', "Usage: %.03fM Peak: %.03fM");
	23	+define('_MD_MONOLOG_MEMORY', "Memory");
24	24	define('_MD_MONOLOG_NONE', "None");
25	25	//define('_MD_MONOLOG_ALL', "All");
26		-define('_MD_MONOLOG_ERRORS',"Errors");
27		-define('_MD_MONOLOG_DEPRECATED',"Deprecated");
28		-define('_MD_MONOLOG_QUERIES',"Queries");
29		-define('_MD_MONOLOG_BLOCKS',"Blocks");
30		-define('_MD_MONOLOG_EXTRA',"Extra");
31		-define('_MD_MONOLOG_TIMERS',"Timers");
32		-define('_MD_MONOLOG_TIMETOLOAD',"%s took %.04f seconds to load.");
	26	+define('_MD_MONOLOG_ERRORS', "Errors");
	27	+define('_MD_MONOLOG_DEPRECATED', "Deprecated");
	28	+define('_MD_MONOLOG_QUERIES', "Queries");
	29	+define('_MD_MONOLOG_BLOCKS', "Blocks");
	30	+define('_MD_MONOLOG_EXTRA', "Extra");
	31	+define('_MD_MONOLOG_TIMERS', "Timers");
	32	+define('_MD_MONOLOG_TIMETOLOAD', "%s took %.04f seconds to load.");
33	33	//define('_MD_MONOLOG_TOTAL',"Total");
34		-define('_MD_MONOLOG_NOT_CACHED',"Not cached");
35		-define('_MD_MONOLOG_CACHED',"Cached (regenerates every %s seconds)");
	34	+define('_MD_MONOLOG_NOT_CACHED', "Not cached");
	35	+define('_MD_MONOLOG_CACHED', "Cached (regenerates every %s seconds)");
36	36	//define('_MD_MONOLOG_UNKNOWN', "Unknown");
37	37	//define('_MD_MONOLOG_E_USER_NOTICE', "Notice");
38	38	//define('_MD_MONOLOG_E_USER_WARNING', "Warning");
		@@ -41,5 +41,5 @@ discard block
		block discarded – undo
41	41	//define('_MD_MONOLOG_E_WARNING', "Warning");
42	42	//define('_MD_MONOLOG_E_STRICT', "Strict");
43	43	//define('_MD_MONOLOG_FILELINE', "%s in file %s line %s");
44		-define('_MD_MONOLOG_EXCEPTION','Exception : %s : file %s line %s');
45		-define('_MD_MONOLOG_MESSAGES','Message');
	44	+define('_MD_MONOLOG_EXCEPTION', 'Exception : %s : file %s line %s');
	45	+define('_MD_MONOLOG_MESSAGES', 'Message');

		@@ -16,7 +16,7 @@
		block discarded – undo
16	16	* @version $Id$
17	17	*/
18	18
19		-define('_MA_MONOLOG_PERMISSION_FORM','Monolog Usage Permissions');
20		-define('_MA_MONOLOG_PERMISSION_GROUPS','Select groups that may use Monolog');
21		-define('_MA_MONOLOG_FORM_SUBMIT','Save');
22		-define('_MA_MONOLOG_FORM_PROCESSED','Permissions updated.');
	19	+define('_MA_MONOLOG_PERMISSION_FORM', 'Monolog Usage Permissions');
	20	+define('_MA_MONOLOG_PERMISSION_GROUPS', 'Select groups that may use Monolog');
	21	+define('_MA_MONOLOG_FORM_SUBMIT', 'Save');
	22	+define('_MA_MONOLOG_FORM_PROCESSED', 'Permissions updated.');

		@@ -58,7 +58,7 @@
		block discarded – undo
58	58	*/
59	59	public function configs()
60	60	{
61		- $config[]=array(
	61	+ $config[] = array(
62	62	'name' => 'phpfire_enable',
63	63	'title' => '_MI_MONOLOG_UCONF_ENABLE_PHPFIRE',
64	64	'description' => '',

		@@ -408,7 +408,7 @@
		block discarded – undo
408	408	const USERS_MANAGEMENT = "Users management";
409	409	const USERS_TIPS = "<ul><li>Manage Xoops users</li></ul>";
410	410	const VIEW_USER_INFO = "View user info";
411		- const WEBMASTERS = "Webmasters";
	411	+ const WEBMASTERS = "Webmasters";
412	412	const WEBMASTERS_OF_THIS_SITE = "Webmasters of this site";
413	413	const WELCOME_TO_XOOPS_HELP_CENTER = "Welcome to XOOPS Help Center";
414	414	const WORD_CENSORING = "Word censoring";

		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	const CONF_BAD_IPS_DESC = "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc";
90	90	const CONF_BAD_USERNAMES = "Enter names that should not be selected as username";
91	91	const CONF_BLOCKS_EDITOR = "Editor for blocks:";
92		- const CONF_BREADCRUMB ="Breadcrumb";
	92	+ const CONF_BREADCRUMB = "Breadcrumb";
93	93	const CONF_CENSORRPLC = "Censored words will be replaced with:";
94	94	const CONF_CENSORRPLC_DESC = "Censored words will be replaced with the characters entered in this textbox";
95	95	const CONF_CENSORWRD = "Words to censor";
		@@ -177,7 +177,7 @@ discard block
		block discarded – undo
177	177	const CONF_METACOPYR_DEFAULT = "Copyright @ 2001-%s";
178	178	const CONF_METACOPYR_DESC = "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents.";
179	179	const CONF_METADESC = "Meta Description";
180		- const CONF_METADESC_DEFAULT= "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
	180	+ const CONF_METADESC_DEFAULT = "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
181	181	const CONF_METADESC_DESC = "The description meta tag is a general description of what is contained in your web page";
182	182	const CONF_METAKEY = "Meta Keywords";
183	183	const CONF_METAKEY_DEFAULT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";

		@@ -41,9 +41,9 @@ discard block
		block discarded – undo
41	41	// we need to decide how to handle that. Right now, some js will redirect us from
42	42	// provider sort to service select just before the token should expire.
43	43	if (isset($_POST['token']) && $security->validateToken($_POST['token'], false)) {
44		- if (isset($_POST['op']) && $_POST['op']==='order') {
	44	+ if (isset($_POST['op']) && $_POST['op'] === 'order') {
45	45	if (isset($_POST['service'])) {
46		- $service=$_POST['service'];
	46	+ $service = $_POST['service'];
47	47	if (isset($_POST[$service]) && is_array($_POST[$service])) {
48	48	$service_order = array_flip($_POST[$service]);
49	49	$sm = Manager::getInstance();
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	$xoops->header('admin:system/system_services.tpl');
67	67
68	68	$admin_page = new \Xoops\Module\Admin();
69		-$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
	69	+$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
70	70	$admin_page->addBreadcrumbLink(
71	71	SystemLocale::SERVICES_MANAGER,
72	72	$system->adminVersion('services', 'adminpath')
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	$admin_page->renderBreadcrumb();
77	77	$admin_page->renderTips();
78	78
79		-$selected_service='';
	79	+$selected_service = '';
80	80	if (isset($_GET['service'])) {
81	81	$selected_service = strtolower(XoopsFilterInput::clean($_GET['service'], 'WORD'));
82	82	}
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	$service_list[] = array(
101	101	'name' => $v,
102	102	'display' => ucfirst($v),
103		- 'active' => ($v==$selected_service),
	103	+ 'active' => ($v == $selected_service),
104	104	);
105	105	}
106	106	$xoops->tpl()->assign('service_list', $service_list);

		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	$xoops->theme()->addScript('modules/system/js/module.js');
59	59	// Define Breadcrumb and tips
60	60	$admin_page = new \Xoops\Module\Admin();
61		- $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
	61	+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
62	62	$admin_page->addBreadcrumbLink(
63	63	SystemLocale::MODULES_ADMINISTRATION,
64	64	$system->adminVersion('modulesadmin', 'adminpath')
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	$xoops->theme()->addStylesheet('modules/system/css/admin.css');
183	183	// Define Breadcrumb and tips
184	184	$admin_page = new \Xoops\Module\Admin();
185		- $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
	185	+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
186	186	$admin_page->addBreadcrumbLink(
187	187	SystemLocale::MODULES_ADMINISTRATION,
188	188	$system->adminVersion('modulesadmin', 'adminpath')
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	$xoops->theme()->addStylesheet('modules/system/css/admin.css');
223	223	// Define Breadcrumb and tips
224	224	$admin_page = new \Xoops\Module\Admin();
225		- $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
	225	+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
226	226	$admin_page->addBreadcrumbLink(
227	227	SystemLocale::MODULES_ADMINISTRATION,
228	228	$system->adminVersion('modulesadmin', 'adminpath')
		@@ -259,7 +259,7 @@ discard block
		block discarded – undo
259	259	$xoops->theme()->addStylesheet('modules/system/css/admin.css');
260	260	// Define Breadcrumb and tips
261	261	$admin_page = new \Xoops\Module\Admin();
262		- $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
	262	+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
263	263	$admin_page->addBreadcrumbLink(
264	264	SystemLocale::MODULES_ADMINISTRATION,
265	265	$system->adminVersion('modulesadmin', 'adminpath')

XOOPS / XoopsCore

Push — master ( 490f47...e6442b )

Status

Category

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch