Completed
Push — master ( 46dc99...a217e2 )
by Michael
50:47 queued 35:27
created
htdocs/modules/monolog/admin/admin_header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,6 +17,6 @@
 block discarded – undo
17 17
  * @author       XOOPS Development Team
18 18
  */
19 19
 
20
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
20
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
21 21
 $xoops = Xoops::getInstance();
22 22
 $xoops->header();
Please login to merge, or discard this patch.
htdocs/modules/monolog/admin/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
  * @author       XOOPS Development Team
18 18
  */
19 19
 
20
-include_once __DIR__ . '/admin_header.php';
20
+include_once __DIR__.'/admin_header.php';
21 21
 
22 22
 $moduleAdmin = new \Xoops\Module\Admin();
23 23
 $moduleAdmin->displayNavigation('index.php');
@@ -25,4 +25,4 @@  discard block
 block discarded – undo
25 25
 $moduleAdmin->addConfigBoxLine($path, 'folder');
26 26
 $moduleAdmin->displayIndex();
27 27
 
28
-include_once __DIR__ . '/admin_footer.php';
28
+include_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
htdocs/modules/monolog/xoops_version.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
     'description' => '',
155 155
     'formtype'    => 'textbox',
156 156
     'valuetype'   => 'text',
157
-    'default'     => \XoopsBaseConfig::get('var-path') . '/logs/xoops_monolog.log',
157
+    'default'     => \XoopsBaseConfig::get('var-path').'/logs/xoops_monolog.log',
158 158
     'options'     => array(),
159 159
 );
160 160
 
Please login to merge, or discard this patch.
htdocs/modules/monolog/preloads/preload.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $path = dirname(__DIR__);
96 96
         XoopsLoad::addMap(array(
97
-            'monologlogger' => $path . '/class/monologlogger.php',
97
+            'monologlogger' => $path.'/class/monologlogger.php',
98 98
         ));
99 99
     }
100 100
 
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
         $cache = \Xoops::getInstance()->cache();
111 111
         $key = 'system/module/configs/monolog';
112 112
 
113
-        self::$configs=array();
113
+        self::$configs = array();
114 114
         self::$configs['monolog_enable'] = false;
115
-        self::$configs['monolog_default_configs']=true;
115
+        self::$configs['monolog_default_configs'] = true;
116 116
 
117 117
         // we will not regenerate this on a miss - will wait until auth is complete
118 118
         $monolog_configs = $cache->read($key);
119
-        if ($monolog_configs!==false) {
119
+        if ($monolog_configs !== false) {
120 120
             self::$configs = $monolog_configs;
121 121
         }
122 122
         $logger = MonologLogger::getInstance();
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
     {
309 309
         /* @var $block XoopsBlock */
310 310
         $block = $args[0];
311
-        $isCached= $args[1];
311
+        $isCached = $args[1];
312 312
         $context = array('channel'=>'Blocks', 'cached'=>$isCached, 'cachetime'=>$block->getVar('bcachetime'));
313 313
         MonologLogger::getInstance()->log(LogLevel::INFO, $block->getVar('name'), $context);
314 314
 
@@ -382,8 +382,8 @@  discard block
 block discarded – undo
382 382
             _MD_MONOLOG_MEMORY,
383 383
             sprintf(
384 384
                 _MD_MONOLOG_MEM_USAGE,
385
-                (float) memory_get_usage(true)/1000000,
386
-                (float) memory_get_peak_usage(true)/1000000
385
+                (float)memory_get_usage(true) / 1000000,
386
+                (float)memory_get_peak_usage(true) / 1000000
387 387
             )
388 388
         );
389 389
         $logger->addExtra(
@@ -455,15 +455,15 @@  discard block
 block discarded – undo
455 455
             $cache->delete($key);
456 456
 
457 457
             $helper = \Xoops::getInstance()->getModuleHelper('monolog');
458
-            $configs['monolog_enable'] = (bool) $helper->getConfig('monolog_enable');
459
-            $configs['include_blocks'] = (bool) $helper->getConfig('include_blocks');
460
-            $configs['include_deprecated'] = (bool) $helper->getConfig('include_deprecated');
461
-            $configs['include_extra'] = (bool) $helper->getConfig('include_extra');
462
-            $configs['include_queries'] = (bool) $helper->getConfig('include_queries');
463
-            $configs['include_timers'] = (bool) $helper->getConfig('include_timers');
458
+            $configs['monolog_enable'] = (bool)$helper->getConfig('monolog_enable');
459
+            $configs['include_blocks'] = (bool)$helper->getConfig('include_blocks');
460
+            $configs['include_deprecated'] = (bool)$helper->getConfig('include_deprecated');
461
+            $configs['include_extra'] = (bool)$helper->getConfig('include_extra');
462
+            $configs['include_queries'] = (bool)$helper->getConfig('include_queries');
463
+            $configs['include_timers'] = (bool)$helper->getConfig('include_timers');
464 464
             $configs['logging_threshold'] = $helper->getConfig('logging_threshold');
465 465
             $configs['log_file_path'] = $helper->getConfig('log_file_path');
466
-            $configs['max_versions'] = (int) $helper->getConfig('max_versions');
466
+            $configs['max_versions'] = (int)$helper->getConfig('max_versions');
467 467
 
468 468
             $cache->write($key, $configs);
469 469
         }
Please login to merge, or discard this patch.
htdocs/modules/monolog/language/english/modinfo.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -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');
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
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');
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
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.');
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
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' => '',
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
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:
Please login to merge, or discard this patch.