@@ -9,7 +9,8 @@ discard block |
||
9 | 9 | * @license http://www.apache.org/licenses/ Apache 2.0 License |
10 | 10 | */ |
11 | 11 | |
12 | -spl_autoload_register(function ($class) { |
|
12 | +spl_autoload_register(function ($class) |
|
13 | +{ |
|
13 | 14 | |
14 | 15 | // project-specific namespace prefix |
15 | 16 | $prefix = 'Flipside\\'; |
@@ -19,7 +20,8 @@ discard block |
||
19 | 20 | |
20 | 21 | // does the class use the namespace prefix? |
21 | 22 | $len = strlen($prefix); |
22 | - if (strncmp($prefix, $class, $len) !== 0) { |
|
23 | + if (strncmp($prefix, $class, $len) !== 0) |
|
24 | + { |
|
23 | 25 | // no, move to the next registered autoloader |
24 | 26 | return; |
25 | 27 | } |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
34 | 36 | |
35 | 37 | // if the file exists, require it |
36 | - if (file_exists($file)) { |
|
38 | + if (file_exists($file)) |
|
39 | + { |
|
37 | 40 | require $file; |
38 | 41 | } |
39 | 42 | }); |
@@ -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]; |
@@ -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 | } |
@@ -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); |
@@ -247,7 +247,8 @@ 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 | 252 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
252 | 253 | } |
253 | 254 | return false; |
@@ -296,7 +297,8 @@ discard block |
||
296 | 297 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
297 | 298 | if($this->pdo->exec($sql) === false) |
298 | 299 | { |
299 | - if (php_sapi_name() !== "cli") { |
|
300 | + if (php_sapi_name() !== "cli") |
|
301 | + { |
|
300 | 302 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
301 | 303 | } |
302 | 304 | return false; |
@@ -140,9 +140,9 @@ |
||
140 | 140 | $case = true; |
141 | 141 | } |
142 | 142 | if($case) |
143 | - { |
|
143 | + { |
|
144 | 144 | if(class_exists('MongoRegex')) |
145 | - { |
|
145 | + { |
|
146 | 146 | return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); |
147 | 147 | } |
148 | 148 | else |
@@ -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 | } |
@@ -16,7 +16,8 @@ |
||
16 | 16 | { |
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | - if (php_sapi_name() !== "cli") { |
|
19 | + if (php_sapi_name() !== "cli") |
|
20 | + { |
|
20 | 21 | error_log($exception->__toString()); |
21 | 22 | } |
22 | 23 | return $response |