@@ -195,7 +195,8 @@ |
||
| 195 | 195 | $user = \Auth::user(); |
| 196 | 196 | if (!is_null($user) && $user->isAdmin()) { |
| 197 | 197 | return false; |
| 198 | - } else { |
|
| 198 | + } |
|
| 199 | + else { |
|
| 199 | 200 | return 'auth'; |
| 200 | 201 | } |
| 201 | 202 | } |
@@ -145,7 +145,8 @@ discard block |
||
| 145 | 145 | $query = null; |
| 146 | 146 | if (count($tables) == 1) { |
| 147 | 147 | $query = DB::table($tables[0])->select('device_id')->distinct(); |
| 148 | - } else { |
|
| 148 | + } |
|
| 149 | + else { |
|
| 149 | 150 | $query = DB::table('devices')->select('devices.device_id')->distinct(); |
| 150 | 151 | |
| 151 | 152 | foreach ($tables as $table) { |
@@ -185,7 +186,8 @@ discard block |
||
| 185 | 186 | if (str_contains($pattern, 'macros.')) { |
| 186 | 187 | if (++$x < 30) { |
| 187 | 188 | $pattern = self::applyGroupMacros($pattern, $x); |
| 188 | - } else { |
|
| 189 | + } |
|
| 190 | + else { |
|
| 189 | 191 | return false; |
| 190 | 192 | } |
| 191 | 193 | } |
@@ -249,7 +251,8 @@ discard block |
||
| 249 | 251 | if (starts_with($cur, '%')) { |
| 250 | 252 | // table and column or macro |
| 251 | 253 | $out .= substr($cur, 1).' '; |
| 252 | - } elseif (substr($cur, -1) == '~') { |
|
| 254 | + } |
|
| 255 | + elseif (substr($cur, -1) == '~') { |
|
| 253 | 256 | // like operator |
| 254 | 257 | $content = $parts[++$i]; // grab the content so we can format it |
| 255 | 258 | |
@@ -260,14 +263,18 @@ discard block |
||
| 260 | 263 | |
| 261 | 264 | $out .= "LIKE('".$this->convertRegexToLike($content)."') "; |
| 262 | 265 | |
| 263 | - } elseif ($cur == '&&') { |
|
| 266 | + } |
|
| 267 | + elseif ($cur == '&&') { |
|
| 264 | 268 | $out .= 'AND '; |
| 265 | - } elseif ($cur == '||') { |
|
| 269 | + } |
|
| 270 | + elseif ($cur == '||') { |
|
| 266 | 271 | $out .= 'OR '; |
| 267 | - } elseif (in_array($cur, $ops)) { |
|
| 272 | + } |
|
| 273 | + elseif (in_array($cur, $ops)) { |
|
| 268 | 274 | // pass-through operators |
| 269 | 275 | $out .= $cur.' '; |
| 270 | - } else { |
|
| 276 | + } |
|
| 277 | + else { |
|
| 271 | 278 | // user supplied input |
| 272 | 279 | $out .= "'".trim($cur, '"\'')."' "; // TODO: remove trim, only needed with invalid input |
| 273 | 280 | } |
@@ -300,7 +307,8 @@ discard block |
||
| 300 | 307 | // add ends appropriately |
| 301 | 308 | if ($startAnchor && !$endAnchor) { |
| 302 | 309 | $pattern .= '%'; |
| 303 | - } elseif (!$startAnchor && $endAnchor) { |
|
| 310 | + } |
|
| 311 | + elseif (!$startAnchor && $endAnchor) { |
|
| 304 | 312 | $pattern = '%'.$pattern; |
| 305 | 313 | } |
| 306 | 314 | |