simplesamlphp / simplesamlphp-module-statistics

hooks/hook_sanitycheck.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
     try {
         $statconfig = Configuration::getConfig('module_statistics.php');
     } catch (Exception $e) {
-        $hookinfo['errors'][] = '[statistics] Could not get configuration: ' . $e->getMessage();
+        $hookinfo['errors'][] = '[statistics] Could not get configuration: '.$e->getMessage();
         return;
     }
 
@@ -25,19 +25,19 @@ 
     $inputfile = $statconfig->getValue('inputfile');
 
     if (file_exists($statdir)) {
-        $hookinfo['info'][] = '[statistics] Statistics dir [' . $statdir . '] exists';
+        $hookinfo['info'][] = '[statistics] Statistics dir ['.$statdir.'] exists';
         if (is_writable($statdir)) {
-            $hookinfo['info'][] = '[statistics] Statistics dir [' . $statdir . '] is writable';
+            $hookinfo['info'][] = '[statistics] Statistics dir ['.$statdir.'] is writable';
         } else {
-            $hookinfo['errors'][] = '[statistics] Statistics dir [' . $statdir . '] is not writable';
+            $hookinfo['errors'][] = '[statistics] Statistics dir ['.$statdir.'] is not writable';
         }
     } else {
-        $hookinfo['errors'][] = '[statistics] Statistics dir [' . $statdir . '] does not exist';
+        $hookinfo['errors'][] = '[statistics] Statistics dir ['.$statdir.'] does not exist';
     }
 
     if (file_exists($inputfile)) {
-        $hookinfo['info'][] = '[statistics] Input file [' . $inputfile . '] exists';
+        $hookinfo['info'][] = '[statistics] Input file ['.$inputfile.'] exists';
     } else {
-        $hookinfo['errors'][] = '[statistics] Input file [' . $inputfile . '] does not exist';
+        $hookinfo['errors'][] = '[statistics] Input file ['.$inputfile.'] does not exist';
     }
 }

hooks/hook_cron.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             $aggregator->store($results);
         }
     } catch (Exception $e) {
-        $message = 'Loganalyzer threw exception: ' . $e->getMessage();
+        $message = 'Loganalyzer threw exception: '.$e->getMessage();
         Logger::warning($message);
         $croninfo['summary'][] = $message;
     }

lib/StatDataset.php

Spacing +5 added lines, -5 removed lines

@@ -345,7 +345,7 @@ 
                 'Statistics\FieldPresentation'
             );
             if (!class_exists($classname)) {
-                throw new Exception('Could not find field presentation plugin [' . $classname . ']: No class found');
+                throw new Exception('Could not find field presentation plugin ['.$classname.']: No class found');
             }
             $presentationHandler = new $classname($availdelimiters, $fieldpresConfig->getValue('config'), $t);
 
@@ -387,17 +387,17 @@ 
         $rules = Arrays::arrayize($this->ruleid);
         foreach ($rules as $rule) {
             // Get file and extract results.
-            $resultFileName = $statdir . '/' . $rule . '-' . $this->timeres . '-' . $this->fileslot . '.stat';
+            $resultFileName = $statdir.'/'.$rule.'-'.$this->timeres.'-'.$this->fileslot.'.stat';
             if (!file_exists($resultFileName)) {
-                throw new Exception('Aggregated statitics file [' . $resultFileName . '] not found.');
+                throw new Exception('Aggregated statitics file ['.$resultFileName.'] not found.');
             }
             if (!is_readable($resultFileName)) {
-                throw new Exception('Could not read statitics file [' . $resultFileName . ']. Bad file permissions?');
+                throw new Exception('Could not read statitics file ['.$resultFileName.']. Bad file permissions?');
             }
             $resultfile = file_get_contents($resultFileName);
             $newres = unserialize($resultfile);
             if (empty($newres)) {
-                throw new Exception('Aggregated statistics in file [' . $resultFileName . '] was empty.');
+                throw new Exception('Aggregated statistics in file ['.$resultFileName.'] was empty.');
             }
             $resarray[] = $newres;
         }

lib/Ruleset.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
          * Walk through file lists, and get available [rule][fileslot]...
          */
         if (!is_dir($statdir)) {
-            throw new Exception('Statisics output directory [' . $statdir . '] does not exist.');
+            throw new Exception('Statisics output directory ['.$statdir.'] does not exist.');
         }
         $filelist = scandir($statdir);
         $this->available = [];
@@ -65,7 +65,7 @@ 
             }
         }
         if (empty($this->available)) {
-            throw new Exception('No aggregated statistics files found in [' . $statdir . ']');
+            throw new Exception('No aggregated statistics files found in ['.$statdir.']');
         }
 
         /**

lib/Aggregator.php

Spacing +14 added lines, -14 removed lines

@@ -64,9 +64,9 @@ 
      */
     public function dumpConfig(): void
     {
-        echo 'Statistics directory   : ' . $this->statdir . "\n";
-        echo 'Input file             : ' . $this->inputfile . "\n";
-        echo 'Offset                 : ' . $this->offset . "\n";
+        echo 'Statistics directory   : '.$this->statdir."\n";
+        echo 'Input file             : '.$this->inputfile."\n";
+        echo 'Offset                 : '.$this->offset."\n";
     }
 
 
@@ -76,7 +76,7 @@ 
     public function debugInfo(): void
     {
         // 1024*1024=1048576
-        echo 'Memory usage           : ' . number_format(memory_get_usage() / 1048576, 2) . " MB\n";
+        echo 'Memory usage           : '.number_format(memory_get_usage() / 1048576, 2)." MB\n";
     }
 
 
@@ -85,7 +85,7 @@ 
      */
     public function loadMetadata(): void
     {
-        $filename = $this->statdir . '/.stat.metadata';
+        $filename = $this->statdir.'/.stat.metadata';
         $metadata = null;
         if (file_exists($filename)) {
             $metadata = unserialize(file_get_contents($filename));
@@ -112,7 +112,7 @@ 
         $this->metadata['memory'] = memory_get_usage();
         $this->metadata['lastrun'] = time();
 
-        $filename = $this->statdir . '/.stat.metadata';
+        $filename = $this->statdir.'/.stat.metadata';
         file_put_contents($filename, serialize($this->metadata), LOCK_EX);
     }
 
@@ -127,17 +127,17 @@ 
         $this->loadMetadata();
 
         if (!is_dir($this->statdir)) {
-            throw new Exception('Statistics module: output dir does not exist [' . $this->statdir . ']');
+            throw new Exception('Statistics module: output dir does not exist ['.$this->statdir.']');
         }
 
         if (!file_exists($this->inputfile)) {
-            throw new Exception('Statistics module: input file does not exist [' . $this->inputfile . ']');
+            throw new Exception('Statistics module: input file does not exist ['.$this->inputfile.']');
         }
 
         $file = fopen($this->inputfile, 'r');
 
         if ($file === false) {
-            throw new Exception('Statistics module: unable to open file [' . $this->inputfile . ']');
+            throw new Exception('Statistics module: unable to open file ['.$this->inputfile.']');
         }
 
         $logparser = new LogParser(
@@ -182,14 +182,14 @@ 
             $action = trim($content[5]);
 
             if ($this->fromcmdline && ($i % 10000) == 0) {
-                echo "Read line " . $i . "\n";
+                echo "Read line ".$i."\n";
             }
 
             if ($debug) {
                 echo "----------------------------------------\n";
-                echo 'Log line: ' . $logline . "\n";
-                echo 'Date parse [' . substr($logline, 0, $this->statconfig->getValue('datelength', 15)) .
-                    '] to [' . date(DATE_RFC822, $epoch) . ']' . "\n";
+                echo 'Log line: '.$logline."\n";
+                echo 'Date parse ['.substr($logline, 0, $this->statconfig->getValue('datelength', 15)).
+                    '] to ['.date(DATE_RFC822, $epoch).']'."\n";
                 /** @var string $ret */
                 $ret = print_r($content, true);
                 echo htmlentities($ret);
@@ -362,7 +362,7 @@ 
                         }
                     }
 
-                    $filename = $this->statdir . '/' . $rulename . '-' . $tres . '-' . $fileno . '.stat';
+                    $filename = $this->statdir.'/'.$rulename.'-'.$tres.'-'.$fileno.'.stat';
                     if (file_exists($filename)) {
                         $previousData = unserialize(file_get_contents($filename));
                         $filledresult = $this->cummulateData($previousData, $filledresult);

lib/Graph/GoogleCharts.php

Spacing +18 added lines, -18 removed lines

@@ -53,7 +53,7 @@ 
         foreach ($datasets as $dataset) {
             $setstr[] = self::extEncode($dataset);
         }
-        return 'e:' . join(',', $setstr);
+        return 'e:'.join(',', $setstr);
     }
 
 
@@ -94,31 +94,31 @@ 
      */
     public function show(array $axis, array $axispos, array $datasets, array $maxes): string
     {
-        $labeld = '&chxt=x,y' . '&chxr=0,0,1|1,0,' . $maxes[0];
+        $labeld = '&chxt=x,y'.'&chxr=0,0,1|1,0,'.$maxes[0];
         if (count($datasets) > 1) {
             if (count($datasets) !== count($maxes)) {
                 throw new \Exception('Incorrect number of max calculations for graph plotting.');
             }
-            $labeld = '&chxt=x,y,r' . '&chxr=0,0,1|1,0,' . $maxes[0] . '|2,0,' . $maxes[1];
+            $labeld = '&chxt=x,y,r'.'&chxr=0,0,1|1,0,'.$maxes[0].'|2,0,'.$maxes[1];
         }
 
-        $url = 'https://chart.apis.google.com/chart?' .
+        $url = 'https://chart.apis.google.com/chart?'.
             // Dimension of graph. Default is 800x350
-            'chs=' . $this->x . 'x' . $this->y .
+            'chs='.$this->x.'x'.$this->y.
 
             // Dateset values
-            '&chd=' . $this->encodedata($datasets) .
+            '&chd='.$this->encodedata($datasets).
 
             // Fill area...
-            '&chco=ff5c00,cca600' .
-            '&chls=1,1,0|1,6,3' .
+            '&chco=ff5c00,cca600'.
+            '&chls=1,1,0|1,6,3'.
 
             // chart type is linechart
-            '&cht=lc' .
-            $labeld .
-            '&chxl=0:|' . $this->encodeaxis($axis) . #.$'|1:||top' .
-            '&chxp=0,' . join(',', $axispos) .
-            '&chg=' . (2400 / (count($datasets[0]) - 1)) . ',-1,3,3'; // lines
+            '&cht=lc'.
+            $labeld.
+            '&chxl=0:|'.$this->encodeaxis($axis).#.$'|1:||top' .
+            '&chxp=0,'.join(',', $axispos).
+            '&chg='.(2400 / (count($datasets[0]) - 1)).',-1,3,3'; // lines
 
         return $url;
     }
@@ -131,18 +131,18 @@ 
      */
     public function showPie(array $axis, array $datasets): string
     {
-        $url = 'https://chart.apis.google.com/chart?' .
+        $url = 'https://chart.apis.google.com/chart?'.
 
         // Dimension of graph. Default is 800x350
-        'chs=' . $this->x . 'x' . $this->y .
+        'chs='.$this->x.'x'.$this->y.
 
         // Dateset values.
-        '&chd=' . $this->encodedata([$datasets]) .
+        '&chd='.$this->encodedata([$datasets]).
 
         // chart type is linechart
-        '&cht=p' .
+        '&cht=p'.
 
-        '&chl=' . $this->encodeaxis($axis);
+        '&chl='.$this->encodeaxis($axis);
 
         return $url;
     }

lib/LogCleaner.php

Spacing +13 added lines, -13 removed lines

@@ -52,9 +52,9 @@ 
      */
     public function dumpConfig(): void
     {
-        echo 'Statistics directory   : ' . $this->statdir . "\n";
-        echo 'Input file             : ' . $this->inputfile . "\n";
-        echo 'Offset                 : ' . $this->offset . "\n";
+        echo 'Statistics directory   : '.$this->statdir."\n";
+        echo 'Input file             : '.$this->inputfile."\n";
+        echo 'Offset                 : '.$this->offset."\n";
     }
 
 
@@ -66,11 +66,11 @@ 
     public function clean(bool $debug = false): array
     {
         if (!is_dir($this->statdir)) {
-            throw new Exception('Statistics module: output dir do not exists [' . $this->statdir . ']');
+            throw new Exception('Statistics module: output dir do not exists ['.$this->statdir.']');
         }
 
         if (!file_exists($this->inputfile)) {
-            throw new Exception('Statistics module: input file do not exists [' . $this->inputfile . ']');
+            throw new Exception('Statistics module: input file do not exists ['.$this->inputfile.']');
         }
 
         $file = fopen($this->inputfile, 'r');
@@ -99,7 +99,7 @@ 
             $content = $logparser->parseContent($logline);
 
             if (($i % 10000) == 0) {
-                echo "Read line " . $i . "\n";
+                echo "Read line ".$i."\n";
             }
 
             $trackid = $content[4];
@@ -111,9 +111,9 @@ 
 
             if ($debug) {
                 echo "----------------------------------------\n";
-                echo 'Log line: ' . $logline . "\n";
-                echo 'Date parse [' . substr($logline, 0, $this->statconfig->getValue('datelength', 15)) .
-                    '] to [' . date(DATE_RFC822, $epoch) . ']' . "\n";
+                echo 'Log line: '.$logline."\n";
+                echo 'Date parse ['.substr($logline, 0, $this->statconfig->getValue('datelength', 15)).
+                    '] to ['.date(DATE_RFC822, $epoch).']'."\n";
                 /** @var string $ret */
                 $ret = print_r($content, true);
                 echo htmlentities($ret);
@@ -151,14 +151,14 @@ 
      */
     public function store(array $todelete, string $outputfile): void
     {
-        echo "Preparing to delete [" . count($todelete) . "] trackids\n";
+        echo "Preparing to delete [".count($todelete)."] trackids\n";
 
         if (!is_dir($this->statdir)) {
-            throw new Exception('Statistics module: output dir do not exists [' . $this->statdir . ']');
+            throw new Exception('Statistics module: output dir do not exists ['.$this->statdir.']');
         }
 
         if (!file_exists($this->inputfile)) {
-            throw new Exception('Statistics module: input file do not exists [' . $this->inputfile . ']');
+            throw new Exception('Statistics module: input file do not exists ['.$this->inputfile.']');
         }
 
         $file = fopen($this->inputfile, 'r');
@@ -190,7 +190,7 @@ 
             $content = $logparser->parseContent($logline);
 
             if (($i % 10000) == 0) {
-                echo "Read line " . $i . "\n";
+                echo "Read line ".$i."\n";
             }
 
             $trackid = $content[4];