@@ -14,8 +14,8 @@ |
||
14 | 14 | /** |
15 | 15 | * This cron script recompiles the Browscap cache |
16 | 16 | */ |
17 | -ini_set('memory_limit','-1'); // turn off memory limit for this script |
|
18 | -set_time_limit(120); // change to 2 minutes for this script |
|
17 | +ini_set('memory_limit', '-1'); // turn off memory limit for this script |
|
18 | +set_time_limit(120); // change to 2 minutes for this script |
|
19 | 19 | |
20 | 20 | require('vendor/autoload.php'); |
21 | 21 |
@@ -35,20 +35,20 @@ |
||
35 | 35 | { |
36 | 36 | if(isset($this->labeleduri)) |
37 | 37 | { |
38 | - //Have multiple emails |
|
39 | - if($propName === 'mail') |
|
40 | - { |
|
41 | - return $this->getFieldSingleValue('labeleduri'); |
|
42 | - } |
|
43 | - if($propName === 'allMail') |
|
44 | - { |
|
45 | - $tmp = $this->getField('mail'); |
|
46 | - if(isset($tmp['count'])) |
|
47 | - { |
|
48 | - unset($tmp['count']); |
|
49 | - } |
|
50 | - return $tmp; |
|
51 | - } |
|
38 | + //Have multiple emails |
|
39 | + if($propName === 'mail') |
|
40 | + { |
|
41 | + return $this->getFieldSingleValue('labeleduri'); |
|
42 | + } |
|
43 | + if($propName === 'allMail') |
|
44 | + { |
|
45 | + $tmp = $this->getField('mail'); |
|
46 | + if(isset($tmp['count'])) |
|
47 | + { |
|
48 | + unset($tmp['count']); |
|
49 | + } |
|
50 | + return $tmp; |
|
51 | + } |
|
52 | 52 | } |
53 | 53 | $tmp = $this->getValueWithDefault($propName); |
54 | 54 | if($tmp !== false) |
@@ -72,7 +72,7 @@ |
||
72 | 72 | public function getDataSetData($dataSetName) |
73 | 73 | { |
74 | 74 | if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName])) |
75 | - { |
|
75 | + { |
|
76 | 76 | return false; |
77 | 77 | } |
78 | 78 | return \FlipsideSettings::$dataset[$dataSetName]; |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | \Psr\Log\LogLevel::WARNING, |
13 | 13 | \Psr\Log\LogLevel::NOTICE); |
14 | 14 | |
15 | - public function __construct($params=false) |
|
15 | + public function __construct($params = false) |
|
16 | 16 | { |
17 | 17 | if(isset($params['defaultLogLevels'])) |
18 | 18 | { |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | { |
28 | 28 | // build a replacement array with braces around the context keys |
29 | 29 | $replace = array(); |
30 | - foreach ($context as $key => $val) { |
|
30 | + foreach($context as $key => $val) { |
|
31 | 31 | // check that the value can be casted to string |
32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | - $replace['{' . $key . '}'] = $val; |
|
32 | + if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | + $replace['{'.$key.'}'] = $val; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 |
@@ -3,7 +3,7 @@ |
||
3 | 3 | |
4 | 4 | class PHPLog extends LogService |
5 | 5 | { |
6 | - public function __construct($params=false) |
|
6 | + public function __construct($params = false) |
|
7 | 7 | { |
8 | 8 | parent::__construct($params); |
9 | 9 | } |
@@ -48,7 +48,7 @@ |
||
48 | 48 | $objCount = count($res); |
49 | 49 | for($i = 0; $i < $objCount; $i++) |
50 | 50 | { |
51 | - $res[$i] = new $this->className($res[$i]); |
|
51 | + $res[$i] = new $this->className($res[$i]); |
|
52 | 52 | } |
53 | 53 | return $res; |
54 | 54 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return $this->dataTable->create($data); |
35 | 35 | } |
36 | 36 | |
37 | - public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false, $returnObj=false) |
|
37 | + public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false, $returnObj = false) |
|
38 | 38 | { |
39 | 39 | $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params); |
40 | 40 | if($res === false) |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | return $this->dataTable->delete($filter); |
68 | 68 | } |
69 | 69 | |
70 | - public function count($filter=false) |
|
70 | + public function count($filter = false) |
|
71 | 71 | { |
72 | 72 | return $this->dataTable->count($filter); |
73 | 73 | } |
@@ -9,33 +9,33 @@ |
||
9 | 9 | public function __construct($file) |
10 | 10 | { |
11 | 11 | $this->data = array_map('str_getcsv', file($file)); |
12 | - $titles = array_shift($this->data); |
|
13 | - $count = count($this->data); |
|
14 | - for($i = 0; $i < $count; $i++) |
|
15 | - { |
|
12 | + $titles = array_shift($this->data); |
|
13 | + $count = count($this->data); |
|
14 | + for($i = 0; $i < $count; $i++) |
|
15 | + { |
|
16 | 16 | $this->data[$i] = array_combine($titles, $this->data[$i]); |
17 | - } |
|
17 | + } |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | - $res = $filter->filter_array($res); |
|
26 | - return count($res); |
|
27 | - } |
|
28 | - return count($this->data); |
|
25 | + $res = $filter->filter_array($res); |
|
26 | + return count($res); |
|
27 | + } |
|
28 | + return count($this->data); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
32 | 32 | { |
33 | 33 | $res = $this->data; |
34 | - if($filter !== false) |
|
35 | - { |
|
34 | + if($filter !== false) |
|
35 | + { |
|
36 | 36 | $res = $filter->filter_array($res); |
37 | - } |
|
38 | - return $res; |
|
37 | + } |
|
38 | + return $res; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function create($data) |
@@ -248,7 +248,7 @@ |
||
248 | 248 | if($stmt === false) |
249 | 249 | { |
250 | 250 | if (php_sapi_name() !== "cli") { |
251 | - error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
|
251 | + error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
|
252 | 252 | } |
253 | 253 | return false; |
254 | 254 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | $stmt = $this->pdo->query($sql); |
248 | 248 | if($stmt === false) |
249 | 249 | { |
250 | - if (php_sapi_name() !== "cli") { |
|
250 | + if(php_sapi_name() !== "cli") { |
|
251 | 251 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
252 | 252 | } |
253 | 253 | return false; |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
297 | 297 | if($this->pdo->exec($sql) === false) |
298 | 298 | { |
299 | - if (php_sapi_name() !== "cli") { |
|
299 | + if(php_sapi_name() !== "cli") { |
|
300 | 300 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
301 | 301 | } |
302 | 302 | return false; |
@@ -142,47 +142,47 @@ |
||
142 | 142 | { |
143 | 143 | $res = array(); |
144 | 144 | $count = count($this->children); |
145 | - for($i = 0; $i < $count; $i++) |
|
146 | - { |
|
145 | + for($i = 0; $i < $count; $i++) |
|
146 | + { |
|
147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
148 | - { |
|
148 | + { |
|
149 | 149 | array_push($res, $this->children[$i]); |
150 | - } |
|
151 | - else |
|
152 | - { |
|
150 | + } |
|
151 | + else |
|
152 | + { |
|
153 | 153 | $tmp = $this->children[$i]->php_compare($element); |
154 | - array_push($res, $tmp); |
|
155 | - } |
|
156 | - } |
|
157 | - if($count === 1) |
|
158 | - { |
|
154 | + array_push($res, $tmp); |
|
155 | + } |
|
156 | + } |
|
157 | + if($count === 1) |
|
158 | + { |
|
159 | 159 | return $res[0]; |
160 | - } |
|
161 | - while($count >= 3) |
|
162 | - { |
|
163 | - if($res[1] === 'and') |
|
160 | + } |
|
161 | + while($count >= 3) |
|
162 | + { |
|
163 | + if($res[1] === 'and') |
|
164 | 164 | { |
165 | 165 | $var1 = array_shift($res); |
166 | 166 | array_shift($res); |
167 | 167 | $var2 = array_shift($res); |
168 | - $res = array_merge(array($var1 && $var2), $res); |
|
168 | + $res = array_merge(array($var1 && $var2), $res); |
|
169 | 169 | } |
170 | - else if($res[1] === 'or') |
|
170 | + else if($res[1] === 'or') |
|
171 | 171 | { |
172 | 172 | $var1 = array_shift($res); |
173 | 173 | array_shift($res); |
174 | 174 | $var2 = array_shift($res); |
175 | 175 | $res = array_merge(array($var1 || $var2), $res); |
176 | - } |
|
177 | - $count = count($res); |
|
178 | - } |
|
176 | + } |
|
177 | + $count = count($res); |
|
178 | + } |
|
179 | 179 | return $res[0]; |
180 | 180 | } |
181 | 181 | |
182 | 182 | public function filter_array(&$array) |
183 | 183 | { |
184 | 184 | if(is_array($array)) |
185 | - { |
|
185 | + { |
|
186 | 186 | $res = array_filter($array, array($this, 'filterElement')); |
187 | 187 | return array_values($res); |
188 | 188 | } |