@@ -27,7 +27,9 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | if ($path != "") { |
| 30 | - if ($path[0] == "/") $path = substr($path, 1); |
|
| 30 | + if ($path[0] == "/") { |
|
| 31 | + $path = substr($path, 1); |
|
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $pathAr = explode("/", $path); |
| 33 | 35 | |
@@ -44,7 +46,9 @@ discard block |
||
| 44 | 46 | } |
| 45 | 47 | } |
| 46 | 48 | $this->_jsonObject = $newjsonObject; |
| 47 | - } else $this->_jsonObject = $jsonObject; |
|
| 49 | + } else { |
|
| 50 | + $this->_jsonObject = $jsonObject; |
|
| 51 | + } |
|
| 48 | 52 | |
| 49 | 53 | $this->_current = 0; |
| 50 | 54 | } |
@@ -33,7 +33,9 @@ |
||
| 33 | 33 | if (($buffer !== false) && (trim($buffer) != "")) { |
| 34 | 34 | $this->_current++; |
| 35 | 35 | $this->_currentBuffer = $buffer; |
| 36 | - } else $this->readNextLine(); |
|
| 36 | + } else { |
|
| 37 | + $this->readNextLine(); |
|
| 38 | + } |
|
| 37 | 39 | } |
| 38 | 40 | } |
| 39 | 41 | |
@@ -142,37 +142,37 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | $result = ""; |
| 144 | 144 | switch ($relation) { |
| 145 | - case Relation::EQUAL: |
|
| 146 | - $result = $field . "=" . $value; |
|
| 147 | - break; |
|
| 145 | + case Relation::EQUAL: |
|
| 146 | + $result = $field . "=" . $value; |
|
| 147 | + break; |
|
| 148 | 148 | |
| 149 | - case Relation::GREATER_THAN: |
|
| 150 | - $result = $field . ">" . $value; |
|
| 151 | - break; |
|
| 149 | + case Relation::GREATER_THAN: |
|
| 150 | + $result = $field . ">" . $value; |
|
| 151 | + break; |
|
| 152 | 152 | |
| 153 | - case Relation::LESS_THAN: |
|
| 154 | - $result = $field . "<" . $value; |
|
| 155 | - break; |
|
| 153 | + case Relation::LESS_THAN: |
|
| 154 | + $result = $field . "<" . $value; |
|
| 155 | + break; |
|
| 156 | 156 | |
| 157 | - case Relation::GREATER_OR_EQUAL_THAN: |
|
| 158 | - $result = $field . ">=" . $value; |
|
| 159 | - break; |
|
| 157 | + case Relation::GREATER_OR_EQUAL_THAN: |
|
| 158 | + $result = $field . ">=" . $value; |
|
| 159 | + break; |
|
| 160 | 160 | |
| 161 | - case Relation::LESS_OR_EQUAL_THAN: |
|
| 162 | - $result = $field . "<=" . $value; |
|
| 163 | - break; |
|
| 161 | + case Relation::LESS_OR_EQUAL_THAN: |
|
| 162 | + $result = $field . "<=" . $value; |
|
| 163 | + break; |
|
| 164 | 164 | |
| 165 | - case Relation::NOT_EQUAL: |
|
| 166 | - $result = $field . "!=" . $value; |
|
| 167 | - break; |
|
| 165 | + case Relation::NOT_EQUAL: |
|
| 166 | + $result = $field . "!=" . $value; |
|
| 167 | + break; |
|
| 168 | 168 | |
| 169 | - case Relation::STARTS_WITH: |
|
| 170 | - $result = " starts-with($field, $value) "; |
|
| 171 | - break; |
|
| 169 | + case Relation::STARTS_WITH: |
|
| 170 | + $result = " starts-with($field, $value) "; |
|
| 171 | + break; |
|
| 172 | 172 | |
| 173 | - case Relation::CONTAINS: |
|
| 174 | - $result = " contains($field, $value) "; |
|
| 175 | - break; |
|
| 173 | + case Relation::CONTAINS: |
|
| 174 | + $result = " contains($field, $value) "; |
|
| 175 | + break; |
|
| 176 | 176 | |
| 177 | 177 | } |
| 178 | 178 | return $result; |
@@ -201,40 +201,40 @@ discard block |
||
| 201 | 201 | $field = " $name "; |
| 202 | 202 | $valueparam = " [[" . $paramName . "]] "; |
| 203 | 203 | switch ($relation) { |
| 204 | - case Relation::EQUAL: { |
|
| 205 | - $result = $field . "=" . $valueparam; |
|
| 206 | - break; |
|
| 207 | - } |
|
| 208 | - case Relation::GREATER_THAN: { |
|
| 209 | - $result = $field . ">" . $valueparam; |
|
| 210 | - break; |
|
| 211 | - } |
|
| 212 | - case Relation::LESS_THAN: { |
|
| 213 | - $result = $field . "<" . $valueparam; |
|
| 214 | - break; |
|
| 215 | - } |
|
| 216 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 217 | - $result = $field . ">=" . $valueparam; |
|
| 218 | - break; |
|
| 219 | - } |
|
| 220 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
| 221 | - $result = $field . "<=" . $valueparam; |
|
| 222 | - break; |
|
| 223 | - } |
|
| 224 | - case Relation::NOT_EQUAL: { |
|
| 225 | - $result = $field . "!=" . $valueparam; |
|
| 226 | - break; |
|
| 227 | - } |
|
| 228 | - case Relation::STARTS_WITH: { |
|
| 229 | - $param[$paramName] = $value . "%"; |
|
| 230 | - $result = $field . " like " . $valueparam; |
|
| 231 | - break; |
|
| 232 | - } |
|
| 233 | - case Relation::CONTAINS: { |
|
| 234 | - $param[$paramName] = "%" . $value . "%"; |
|
| 235 | - $result = $field . " like " . $valueparam; |
|
| 236 | - break; |
|
| 237 | - } |
|
| 204 | + case Relation::EQUAL: { |
|
| 205 | + $result = $field . "=" . $valueparam; |
|
| 206 | + break; |
|
| 207 | + } |
|
| 208 | + case Relation::GREATER_THAN: { |
|
| 209 | + $result = $field . ">" . $valueparam; |
|
| 210 | + break; |
|
| 211 | + } |
|
| 212 | + case Relation::LESS_THAN: { |
|
| 213 | + $result = $field . "<" . $valueparam; |
|
| 214 | + break; |
|
| 215 | + } |
|
| 216 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 217 | + $result = $field . ">=" . $valueparam; |
|
| 218 | + break; |
|
| 219 | + } |
|
| 220 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
| 221 | + $result = $field . "<=" . $valueparam; |
|
| 222 | + break; |
|
| 223 | + } |
|
| 224 | + case Relation::NOT_EQUAL: { |
|
| 225 | + $result = $field . "!=" . $valueparam; |
|
| 226 | + break; |
|
| 227 | + } |
|
| 228 | + case Relation::STARTS_WITH: { |
|
| 229 | + $param[$paramName] = $value . "%"; |
|
| 230 | + $result = $field . " like " . $valueparam; |
|
| 231 | + break; |
|
| 232 | + } |
|
| 233 | + case Relation::CONTAINS: { |
|
| 234 | + $param[$paramName] = "%" . $value . "%"; |
|
| 235 | + $result = $field . " like " . $valueparam; |
|
| 236 | + break; |
|
| 237 | + } |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | return $result; |
@@ -269,38 +269,38 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | foreach ($field as $valueparam) { |
| 271 | 271 | switch ($relation) { |
| 272 | - case Relation::EQUAL: { |
|
| 273 | - $result[$pos] &= ($valueparam == $value); |
|
| 274 | - break; |
|
| 275 | - } |
|
| 276 | - case Relation::GREATER_THAN: { |
|
| 277 | - $result[$pos] &= ($valueparam > $value); |
|
| 278 | - break; |
|
| 279 | - } |
|
| 280 | - case Relation::LESS_THAN: { |
|
| 281 | - $result[$pos] &= ($valueparam < $value); |
|
| 282 | - break; |
|
| 283 | - } |
|
| 284 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 285 | - $result[$pos] &= ($valueparam >= $value); |
|
| 286 | - break; |
|
| 287 | - } |
|
| 288 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
| 289 | - $result[$pos] &= ($valueparam <= $value); |
|
| 290 | - break; |
|
| 291 | - } |
|
| 292 | - case Relation::NOT_EQUAL: { |
|
| 293 | - $result[$pos] &= ($valueparam != $value); |
|
| 294 | - break; |
|
| 295 | - } |
|
| 296 | - case Relation::STARTS_WITH: { |
|
| 297 | - $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
| 298 | - break; |
|
| 299 | - } |
|
| 300 | - case Relation::CONTAINS: { |
|
| 301 | - $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
| 302 | - break; |
|
| 303 | - } |
|
| 272 | + case Relation::EQUAL: { |
|
| 273 | + $result[$pos] &= ($valueparam == $value); |
|
| 274 | + break; |
|
| 275 | + } |
|
| 276 | + case Relation::GREATER_THAN: { |
|
| 277 | + $result[$pos] &= ($valueparam > $value); |
|
| 278 | + break; |
|
| 279 | + } |
|
| 280 | + case Relation::LESS_THAN: { |
|
| 281 | + $result[$pos] &= ($valueparam < $value); |
|
| 282 | + break; |
|
| 283 | + } |
|
| 284 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 285 | + $result[$pos] &= ($valueparam >= $value); |
|
| 286 | + break; |
|
| 287 | + } |
|
| 288 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
| 289 | + $result[$pos] &= ($valueparam <= $value); |
|
| 290 | + break; |
|
| 291 | + } |
|
| 292 | + case Relation::NOT_EQUAL: { |
|
| 293 | + $result[$pos] &= ($valueparam != $value); |
|
| 294 | + break; |
|
| 295 | + } |
|
| 296 | + case Relation::STARTS_WITH: { |
|
| 297 | + $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
| 298 | + break; |
|
| 299 | + } |
|
| 300 | + case Relation::CONTAINS: { |
|
| 301 | + $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
| 302 | + break; |
|
| 303 | + } |
|
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | 306 | } |
@@ -265,7 +265,9 @@ |
||
| 265 | 265 | |
| 266 | 266 | $field = $singleRow->getField($name); |
| 267 | 267 | |
| 268 | - if (!is_array($field)) $field = array($field); |
|
| 268 | + if (!is_array($field)) { |
|
| 269 | + $field = array($field); |
|
| 270 | + } |
|
| 269 | 271 | |
| 270 | 272 | foreach ($field as $valueparam) { |
| 271 | 273 | switch ($relation) { |
@@ -23,27 +23,27 @@ |
||
| 23 | 23 | |
| 24 | 24 | $lastError = json_last_error(); |
| 25 | 25 | switch ($lastError) { |
| 26 | - case JSON_ERROR_NONE: |
|
| 27 | - $lastErrorDesc = 'No errors'; |
|
| 28 | - break; |
|
| 29 | - case JSON_ERROR_DEPTH: |
|
| 30 | - $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
| 31 | - break; |
|
| 32 | - case JSON_ERROR_STATE_MISMATCH: |
|
| 33 | - $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
| 34 | - break; |
|
| 35 | - case JSON_ERROR_CTRL_CHAR: |
|
| 36 | - $lastErrorDesc = 'Unexpected control character found'; |
|
| 37 | - break; |
|
| 38 | - case JSON_ERROR_SYNTAX: |
|
| 39 | - $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
| 40 | - break; |
|
| 41 | - case JSON_ERROR_UTF8: |
|
| 42 | - $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
| 43 | - break; |
|
| 44 | - default: |
|
| 45 | - $lastErrorDesc = 'Unknown error'; |
|
| 46 | - break; |
|
| 26 | + case JSON_ERROR_NONE: |
|
| 27 | + $lastErrorDesc = 'No errors'; |
|
| 28 | + break; |
|
| 29 | + case JSON_ERROR_DEPTH: |
|
| 30 | + $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
| 31 | + break; |
|
| 32 | + case JSON_ERROR_STATE_MISMATCH: |
|
| 33 | + $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
| 34 | + break; |
|
| 35 | + case JSON_ERROR_CTRL_CHAR: |
|
| 36 | + $lastErrorDesc = 'Unexpected control character found'; |
|
| 37 | + break; |
|
| 38 | + case JSON_ERROR_SYNTAX: |
|
| 39 | + $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
| 40 | + break; |
|
| 41 | + case JSON_ERROR_UTF8: |
|
| 42 | + $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
| 43 | + break; |
|
| 44 | + default: |
|
| 45 | + $lastErrorDesc = 'Unknown error'; |
|
| 46 | + break; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | if ($lastError != JSON_ERROR_NONE) { |