@@ -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 |
@@ -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 |
@@ -27,9 +27,11 @@ |
||
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 | 32 | // check that the value can be casted to string |
32 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) { |
|
33 | + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) |
|
34 | + { |
|
33 | 35 | $replace['{' . $key . '}'] = $val; |
34 | 36 | } |
35 | 37 | } |
@@ -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 | } |
@@ -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 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | 25 | $res = $filter->filter_array($res); |
26 | 26 | return count($res); |
@@ -141,9 +141,12 @@ |
||
141 | 141 | { |
142 | 142 | $namespace = $this->db_name.'.'.$collectionName; |
143 | 143 | $dbWrite = new \MongoDB\Driver\BulkWrite(); |
144 | - try { |
|
144 | + try |
|
145 | + { |
|
145 | 146 | $dbWrite->update($criteria, $new_object, $options); |
146 | - } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) { |
|
147 | + } |
|
148 | + catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) |
|
149 | + { |
|
147 | 150 | if(isset($new_object['$set'][''])) |
148 | 151 | { |
149 | 152 | unset($new_object['$set']['']); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | for($i = 0; $i < $count; $i++) |
146 | 146 | { |
147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
148 | - { |
|
148 | + { |
|
149 | 149 | array_push($res, $this->children[$i]); |
150 | 150 | } |
151 | 151 | else |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | while($count >= 3) |
162 | 162 | { |
163 | 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 | 168 | $res = array_merge(array($var1 && $var2), $res); |
169 | 169 | } |
170 | - else if($res[1] === 'or') |
|
171 | - { |
|
170 | + else if($res[1] === 'or') |
|
171 | + { |
|
172 | 172 | $var1 = array_shift($res); |
173 | 173 | array_shift($res); |
174 | 174 | $var2 = array_shift($res); |
@@ -182,7 +182,7 @@ discard block |
||
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 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | { |
79 | 79 | if(isset($res['extended']) && isset($res['extended']['jpegphoto'])) |
80 | 80 | { |
81 | - $res['extended']['jpegphoto']=true; |
|
81 | + $res['extended']['jpegphoto'] = true; |
|
82 | 82 | } |
83 | 83 | FlipSession::setVar('AuthMethod', get_class($this->methods[$i])); |
84 | 84 | FlipSession::setVar('AuthData', $res); |