@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | 'statrules' => [ |
97 | 97 | 'sloratio' => [ |
98 | 98 | 'name' => 'SLO to SSO ratio', |
99 | - 'descr' => 'Comparison of the number of Single Log-Out compared to Single Sign-On.' . |
|
99 | + 'descr' => 'Comparison of the number of Single Log-Out compared to Single Sign-On.'. |
|
100 | 100 | ' Graph shows how many logouts where initiated for each Single Sign-On.', |
101 | 101 | 'type' => 'calculated', |
102 | 102 | 'presenter' => 'statistics:Ratio', |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | ], |
109 | 109 | 'ssomulti' => [ |
110 | 110 | 'name' => 'Requests per session', |
111 | - 'descr' => 'Number of SSO request pairs exchanged between IdP and SP within the same IdP session.' . |
|
111 | + 'descr' => 'Number of SSO request pairs exchanged between IdP and SP within the same IdP session.'. |
|
112 | 112 | ' A high number indicates that the session at the SP is timing out faster than at the IdP.', |
113 | 113 | 'type' => 'calculated', |
114 | 114 | 'presenter' => 'statistics:Ratio', |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | ], |
151 | 151 | 'consent' => [ |
152 | 152 | 'name' => 'Consent', |
153 | - 'descr' => 'Consent statistics. Everytime a user logs in to a service an entry is logged for' . |
|
153 | + 'descr' => 'Consent statistics. Everytime a user logs in to a service an entry is logged for'. |
|
154 | 154 | ' one of three states: consent was found, consent was not found or consent storage was not available.', |
155 | 155 | 'action' => 'consent', |
156 | 156 | 'col' => 6, |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | ], |
162 | 162 | 'consentresponse' => [ |
163 | 163 | 'name' => 'Consent response', |
164 | - 'descr' => 'Consent response statistics. Everytime a user accepts consent,' . |
|
164 | + 'descr' => 'Consent response statistics. Everytime a user accepts consent,'. |
|
165 | 165 | ' it is logged whether the user selected to remember the consent to next time.', |
166 | 166 | 'action' => 'consentResponse', |
167 | 167 | 'col' => 6, |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $data = $dataset->getDebugData(); |
161 | 161 | foreach ($data as $de) { |
162 | 162 | if (isset($de[1])) { |
163 | - echo '"' . $de[0] . '",' . $de[1] . "\n"; |
|
163 | + echo '"'.$de[0].'",'.$de[1]."\n"; |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | exit; |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | } |
238 | 238 | } |
239 | 239 | if ($type === 'get') { |
240 | - return Module::getModuleURL("statistics/showstats.php") . '?' . http_build_query($vars, '', '&'); |
|
240 | + return Module::getModuleURL("statistics/showstats.php").'?'.http_build_query($vars, '', '&'); |
|
241 | 241 | } |
242 | 242 | return $vars; |
243 | 243 | } |
@@ -57,6 +57,6 @@ |
||
57 | 57 | { |
58 | 58 | $month = ($from % 12) + 1; |
59 | 59 | $year = 2000 + intval(floor($from / 12)); |
60 | - return $year . '-' . $month; |
|
60 | + return $year.'-'.$month; |
|
61 | 61 | } |
62 | 62 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $as->requireAuth(); |
56 | 56 | |
57 | 57 | // User logged in with auth source. |
58 | - Logger::debug('Statistics auth - valid login with auth source [' . $authsource . ']'); |
|
58 | + Logger::debug('Statistics auth - valid login with auth source ['.$authsource.']'); |
|
59 | 59 | |
60 | 60 | // Retrieving attributes |
61 | 61 | $attributes = $as->getAttributes(); |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | // Check if userid is allowed access.. |
70 | 70 | if (in_array($attributes[$useridattr][0], $allowedusers, true)) { |
71 | 71 | Logger::debug( |
72 | - 'Statistics auth - User granted access by user ID [' . $attributes[$useridattr][0] . ']' |
|
72 | + 'Statistics auth - User granted access by user ID ['.$attributes[$useridattr][0].']' |
|
73 | 73 | ); |
74 | 74 | return; |
75 | 75 | } |
76 | 76 | Logger::debug( |
77 | - 'Statistics auth - User denied access by user ID [' . $attributes[$useridattr][0] . ']' |
|
77 | + 'Statistics auth - User denied access by user ID ['.$attributes[$useridattr][0].']' |
|
78 | 78 | ); |
79 | 79 | } else { |
80 | 80 | Logger::debug('Statistics auth - no allowedUsers list.'); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | try { |
18 | 18 | $statconfig = Configuration::getConfig('module_statistics.php'); |
19 | 19 | } catch (Exception $e) { |
20 | - $hookinfo['errors'][] = '[statistics] Could not get configuration: ' . $e->getMessage(); |
|
20 | + $hookinfo['errors'][] = '[statistics] Could not get configuration: '.$e->getMessage(); |
|
21 | 21 | return; |
22 | 22 | } |
23 | 23 | |
@@ -25,19 +25,19 @@ discard block |
||
25 | 25 | $inputfile = $statconfig->getValue('inputfile'); |
26 | 26 | |
27 | 27 | if (file_exists($statdir)) { |
28 | - $hookinfo['info'][] = '[statistics] Statistics dir [' . $statdir . '] exists'; |
|
28 | + $hookinfo['info'][] = '[statistics] Statistics dir ['.$statdir.'] exists'; |
|
29 | 29 | if (is_writable($statdir)) { |
30 | - $hookinfo['info'][] = '[statistics] Statistics dir [' . $statdir . '] is writable'; |
|
30 | + $hookinfo['info'][] = '[statistics] Statistics dir ['.$statdir.'] is writable'; |
|
31 | 31 | } else { |
32 | - $hookinfo['errors'][] = '[statistics] Statistics dir [' . $statdir . '] is not writable'; |
|
32 | + $hookinfo['errors'][] = '[statistics] Statistics dir ['.$statdir.'] is not writable'; |
|
33 | 33 | } |
34 | 34 | } else { |
35 | - $hookinfo['errors'][] = '[statistics] Statistics dir [' . $statdir . '] does not exist'; |
|
35 | + $hookinfo['errors'][] = '[statistics] Statistics dir ['.$statdir.'] does not exist'; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | if (file_exists($inputfile)) { |
39 | - $hookinfo['info'][] = '[statistics] Input file [' . $inputfile . '] exists'; |
|
39 | + $hookinfo['info'][] = '[statistics] Input file ['.$inputfile.'] exists'; |
|
40 | 40 | } else { |
41 | - $hookinfo['errors'][] = '[statistics] Input file [' . $inputfile . '] does not exist'; |
|
41 | + $hookinfo['errors'][] = '[statistics] Input file ['.$inputfile.'] does not exist'; |
|
42 | 42 | } |
43 | 43 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $aggregator->store($results); |
41 | 41 | } |
42 | 42 | } catch (Exception $e) { |
43 | - $message = 'Loganalyzer threw exception: ' . $e->getMessage(); |
|
43 | + $message = 'Loganalyzer threw exception: '.$e->getMessage(); |
|
44 | 44 | Logger::warning($message); |
45 | 45 | $croninfo['summary'][] = $message; |
46 | 46 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * Walk through file lists, and get available [rule][fileslot]... |
52 | 52 | */ |
53 | 53 | if (!is_dir($statdir)) { |
54 | - throw new Exception('Statisics output directory [' . $statdir . '] does not exist.'); |
|
54 | + throw new Exception('Statisics output directory ['.$statdir.'] does not exist.'); |
|
55 | 55 | } |
56 | 56 | $filelist = scandir($statdir); |
57 | 57 | $this->available = []; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | } |
67 | 67 | if (empty($this->available)) { |
68 | - throw new Exception('No aggregated statistics files found in [' . $statdir . ']'); |
|
68 | + throw new Exception('No aggregated statistics files found in ['.$statdir.']'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | foreach ($datasets as $dataset) { |
54 | 54 | $setstr[] = self::extEncode($dataset); |
55 | 55 | } |
56 | - return 'e:' . join(',', $setstr); |
|
56 | + return 'e:'.join(',', $setstr); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
@@ -94,31 +94,31 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function show(array $axis, array $axispos, array $datasets, array $maxes): string |
96 | 96 | { |
97 | - $labeld = '&chxt=x,y' . '&chxr=0,0,1|1,0,' . $maxes[0]; |
|
97 | + $labeld = '&chxt=x,y'.'&chxr=0,0,1|1,0,'.$maxes[0]; |
|
98 | 98 | if (count($datasets) > 1) { |
99 | 99 | if (count($datasets) !== count($maxes)) { |
100 | 100 | throw new \Exception('Incorrect number of max calculations for graph plotting.'); |
101 | 101 | } |
102 | - $labeld = '&chxt=x,y,r' . '&chxr=0,0,1|1,0,' . $maxes[0] . '|2,0,' . $maxes[1]; |
|
102 | + $labeld = '&chxt=x,y,r'.'&chxr=0,0,1|1,0,'.$maxes[0].'|2,0,'.$maxes[1]; |
|
103 | 103 | } |
104 | 104 | |
105 | - $url = 'https://chart.apis.google.com/chart?' . |
|
105 | + $url = 'https://chart.apis.google.com/chart?'. |
|
106 | 106 | // Dimension of graph. Default is 800x350 |
107 | - 'chs=' . $this->x . 'x' . $this->y . |
|
107 | + 'chs='.$this->x.'x'.$this->y. |
|
108 | 108 | |
109 | 109 | // Dateset values |
110 | - '&chd=' . $this->encodedata($datasets) . |
|
110 | + '&chd='.$this->encodedata($datasets). |
|
111 | 111 | |
112 | 112 | // Fill area... |
113 | - '&chco=ff5c00,cca600' . |
|
114 | - '&chls=1,1,0|1,6,3' . |
|
113 | + '&chco=ff5c00,cca600'. |
|
114 | + '&chls=1,1,0|1,6,3'. |
|
115 | 115 | |
116 | 116 | // chart type is linechart |
117 | - '&cht=lc' . |
|
118 | - $labeld . |
|
119 | - '&chxl=0:|' . $this->encodeaxis($axis) . #.$'|1:||top' . |
|
120 | - '&chxp=0,' . join(',', $axispos) . |
|
121 | - '&chg=' . (2400 / (count($datasets[0]) - 1)) . ',-1,3,3'; // lines |
|
117 | + '&cht=lc'. |
|
118 | + $labeld. |
|
119 | + '&chxl=0:|'.$this->encodeaxis($axis).#.$'|1:||top' . |
|
120 | + '&chxp=0,'.join(',', $axispos). |
|
121 | + '&chg='.(2400 / (count($datasets[0]) - 1)).',-1,3,3'; // lines |
|
122 | 122 | |
123 | 123 | return $url; |
124 | 124 | } |
@@ -131,18 +131,18 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function showPie(array $axis, array $datasets): string |
133 | 133 | { |
134 | - $url = 'https://chart.apis.google.com/chart?' . |
|
134 | + $url = 'https://chart.apis.google.com/chart?'. |
|
135 | 135 | |
136 | 136 | // Dimension of graph. Default is 800x350 |
137 | - 'chs=' . $this->x . 'x' . $this->y . |
|
137 | + 'chs='.$this->x.'x'.$this->y. |
|
138 | 138 | |
139 | 139 | // Dateset values. |
140 | - '&chd=' . $this->encodedata([$datasets]) . |
|
140 | + '&chd='.$this->encodedata([$datasets]). |
|
141 | 141 | |
142 | 142 | // chart type is linechart |
143 | - '&cht=p' . |
|
143 | + '&cht=p'. |
|
144 | 144 | |
145 | - '&chl=' . $this->encodeaxis($axis); |
|
145 | + '&chl='.$this->encodeaxis($axis); |
|
146 | 146 | |
147 | 147 | return $url; |
148 | 148 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | $timeresconfig = $timeresconfigs->getConfigItem($timeres); |
75 | 75 | if ($timeresconfig === null) { |
76 | - throw new Error\ConfigurationError('Missing \'timeres.' . $timeres . '\' in module configuration.'); |
|
76 | + throw new Error\ConfigurationError('Missing \'timeres.'.$timeres.'\' in module configuration.'); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | $this->timeresconfig = $timeresconfig; |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | 'Statistics\FieldPresentation' |
358 | 358 | ); |
359 | 359 | if (!class_exists($classname)) { |
360 | - throw new Exception('Could not find field presentation plugin [' . $classname . ']: No class found'); |
|
360 | + throw new Exception('Could not find field presentation plugin ['.$classname.']: No class found'); |
|
361 | 361 | } |
362 | 362 | $presentationHandler = new $classname($availdelimiters, $fieldpresConfig->getValue('config'), $t); |
363 | 363 | |
@@ -399,17 +399,17 @@ discard block |
||
399 | 399 | $rules = $this->ruleid; |
400 | 400 | foreach ($rules as $rule) { |
401 | 401 | // Get file and extract results. |
402 | - $resultFileName = $statdir . '/' . $rule . '-' . $this->timeres . '-' . $this->fileslot . '.stat'; |
|
402 | + $resultFileName = $statdir.'/'.$rule.'-'.$this->timeres.'-'.$this->fileslot.'.stat'; |
|
403 | 403 | if (!file_exists($resultFileName)) { |
404 | - throw new Exception('Aggregated statitics file [' . $resultFileName . '] not found.'); |
|
404 | + throw new Exception('Aggregated statitics file ['.$resultFileName.'] not found.'); |
|
405 | 405 | } |
406 | 406 | if (!is_readable($resultFileName)) { |
407 | - throw new Exception('Could not read statitics file [' . $resultFileName . ']. Bad file permissions?'); |
|
407 | + throw new Exception('Could not read statitics file ['.$resultFileName.']. Bad file permissions?'); |
|
408 | 408 | } |
409 | 409 | $resultfile = file_get_contents($resultFileName); |
410 | 410 | $newres = unserialize($resultfile); |
411 | 411 | if (empty($newres)) { |
412 | - throw new Exception('Aggregated statistics in file [' . $resultFileName . '] was empty.'); |
|
412 | + throw new Exception('Aggregated statistics in file ['.$resultFileName.'] was empty.'); |
|
413 | 413 | } |
414 | 414 | $resarray[] = $newres; |
415 | 415 | } |