simplesamlphp / simplesamlphp-module-statistics

lib/StatDataset.php

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
 
         $timeresconfig = $timeresconfigs->getConfigItem($timeres);
         if ($timeresconfig === null) {
-            throw new Error\ConfigurationError('Missing \'timeres.' . $timeres . '\' in module configuration.');
+            throw new Error\ConfigurationError('Missing \'timeres.'.$timeres.'\' in module configuration.');
         }
 
         $this->timeresconfig = $timeresconfig;
@@ -357,7 +357,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);
 
@@ -399,17 +399,17 @@ 
         $rules = $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/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";
                 $ret = print_r($content, true);
                 echo htmlentities($ret);
                 if ($i >= 13) {
@@ -361,7 +361,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/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";
                 $ret = print_r($content, true);
                 echo htmlentities($ret);
                 if ($i >= 13) {
@@ -150,14 +150,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');
@@ -189,7 +189,7 @@ 
             $content = $logparser->parseContent($logline);
 
             if (($i % 10000) == 0) {
-                echo "Read line " . $i . "\n";
+                echo "Read line ".$i."\n";
             }
 
             $trackid = $content[4];