simplesamlphp / simplesamlphp-module-statistics

config-templates/module_statistics.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
     'statrules' => [
         'sloratio' => [
             'name'         => 'SLO to SSO ratio',
-            'descr'        => 'Comparison of the number of Single Log-Out compared to Single Sign-On.' .
+            'descr'        => 'Comparison of the number of Single Log-Out compared to Single Sign-On.'.
                 ' Graph shows how many logouts where initiated for each Single Sign-On.',
             'type'         => 'calculated',
             'presenter'    => 'statistics:Ratio',
@@ -108,7 +108,7 @@ 
         ],
         'ssomulti' => [
             'name'         => 'Requests per session',
-            'descr'        => 'Number of SSO request pairs exchanged between IdP and SP within the same IdP session.' .
+            'descr'        => 'Number of SSO request pairs exchanged between IdP and SP within the same IdP session.'.
                 ' A high number indicates that the session at the SP is timing out faster than at the IdP.',
             'type'         => 'calculated',
             'presenter'    => 'statistics:Ratio',
@@ -150,7 +150,7 @@ 
         ],
         'consent' => [
             'name'         => 'Consent',
-            'descr'        => 'Consent statistics. Everytime a user logs in to a service an entry is logged for' .
+            'descr'        => 'Consent statistics. Everytime a user logs in to a service an entry is logged for'.
                 ' one of three states: consent was found, consent was not found or consent storage was not available.',
             'action'       => 'consent',
             'col'          => 6,
@@ -161,7 +161,7 @@ 
         ],
         'consentresponse' => [
             'name'         => 'Consent response',
-            'descr'        => 'Consent response statistics. Everytime a user accepts consent,' .
+            'descr'        => 'Consent response statistics. Everytime a user accepts consent,'.
                 ' it is logged whether the user selected to remember the consent to next time.',
             'action'       => 'consentResponse',
             'col'          => 6,

lib/DateHandlerMonth.php

Spacing +1 added lines, -1 removed lines

@@ -57,6 +57,6 @@
     {
         $month = ($from % 12) + 1;
         $year = 2000 + intval(floor($from / 12));
-        return $year . '-' . $month;
+        return $year.'-'.$month;
     }
 }

lib/AccessCheck.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
         $as->requireAuth();
 
         // User logged in with auth source.
-        Logger::debug('Statistics auth - valid login with auth source [' . $authsource . ']');
+        Logger::debug('Statistics auth - valid login with auth source ['.$authsource.']');
 
         // Retrieving attributes
         $attributes = $as->getAttributes();
@@ -69,12 +69,12 @@ 
             // Check if userid is allowed access..
             if (in_array($attributes[$useridattr][0], $allowedusers, true)) {
                 Logger::debug(
-                    'Statistics auth - User granted access by user ID [' . $attributes[$useridattr][0] . ']'
+                    'Statistics auth - User granted access by user ID ['.$attributes[$useridattr][0].']'
                 );
                 return;
             }
             Logger::debug(
-                'Statistics auth - User denied access by user ID [' . $attributes[$useridattr][0] . ']'
+                'Statistics auth - User denied access by user ID ['.$attributes[$useridattr][0].']'
             );
         } else {
             Logger::debug('Statistics auth - no allowedUsers list.');

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/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/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/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);