Completed
Branch develop (38d7e1)
by
unknown
18:32
created
htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -57,23 +57,26 @@  discard block
 block discarded – undo
57 57
         if (empty(static::$tree)) {
58 58
             /** @var Restler $restler */
59 59
             $restler = Scope::get('Restler');
60
-            if (static::$addExtension)
61
-                static::$extension = isset($restler->responseFormat)
60
+            if (static::$addExtension) {
61
+                            static::$extension = isset($restler->responseFormat)
62 62
                     ? '.' . $restler->responseFormat->getExtension()
63 63
                     : '.html';
64
+            }
64 65
             static::$url = $restler->getBaseUrl();
65
-            if (empty(static::$url))
66
-                static::$url = '';
66
+            if (empty(static::$url)) {
67
+                            static::$url = '';
68
+            }
67 69
             static::$activeTrail = $activeTrail = empty($activeTrail)
68 70
                 ? (empty($restler->url) || $restler->url == 'index'
69 71
                     ? static::$root
70 72
                     : $restler->url
71 73
                 )
72 74
                 : $activeTrail;
73
-            if (static::$addExtension)
74
-                static::$extension = isset($restler->responseFormat)
75
+            if (static::$addExtension) {
76
+                            static::$extension = isset($restler->responseFormat)
75 77
                     ? '.' . $restler->responseFormat->getExtension()
76 78
                     : '.html';
79
+            }
77 80
             static::addUrls(static::$prepends);
78 81
             $map = Routes::findAll(
79 82
                 static::$excludedPaths,
@@ -169,8 +172,9 @@  discard block
 block discarded – undo
169 172
         //remove / prefix and / suffixes and any extension
170 173
         $trail = strtok(trim($trail, '/'), '.');
171 174
         $parts = explode('/', $trail);
172
-        if (count($parts) == 1 && empty($parts[0]))
173
-            $parts = array(static::$root);
175
+        if (count($parts) == 1 && empty($parts[0])) {
176
+                    $parts = array(static::$root);
177
+        }
174 178
         if (isset($r['fragment'])) {
175 179
             $parts[] = $r['fragment'];
176 180
             if (is_null($label)) {
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php 1 patch
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public static function make($string, $data = null)
27 27
     {
28
-        if (!strlen($string))
29
-            return array();
28
+        if (!strlen($string)) {
29
+                    return array();
30
+        }
30 31
 
31 32
         $implicitTag =
32 33
             function () use (& $tag) {
@@ -66,8 +67,8 @@  discard block
 block discarded – undo
66 67
                 & $tokens, & $tag
67 68
             ) {
68 69
                 $digits = 0;
69
-                if ($delimiter == null)
70
-                    $delimiter = array(
70
+                if ($delimiter == null) {
71
+                                    $delimiter = array(
71 72
                         '.' => true,
72 73
                         '#' => true,
73 74
                         '*' => true,
@@ -78,6 +79,7 @@  discard block
 block discarded – undo
78 79
                         ']' => true,
79 80
                         '=' => true,
80 81
                     );
82
+                }
81 83
                 while (!empty($tokens) &&
82 84
                     !isset($delimiter[$t = array_shift($tokens)])) {
83 85
                     while ('$' === $t) {
@@ -126,8 +128,9 @@  discard block
 block discarded – undo
126 128
                         $text .= $t;
127 129
                     }
128 130
                 }
129
-                if (isset($t))
130
-                    array_unshift($tokens, $t);
131
+                if (isset($t)) {
132
+                                    array_unshift($tokens, $t);
133
+                }
131 134
                 return $text;
132 135
             };
133 136
 
@@ -137,8 +140,9 @@  discard block
 block discarded – undo
137 140
                 $a = $parseText(
138 141
                     '', $round, $total, $data
139 142
                 );
140
-                if (is_null($a))
141
-                    return;
143
+                if (is_null($a)) {
144
+                                    return;
145
+                }
142 146
                 if ('=' == ($v = array_shift($tokens))) {
143 147
                     //value
144 148
                     if ('"' == ($v = array_shift($tokens))) {
@@ -266,11 +270,13 @@  discard block
 block discarded – undo
266 270
                                 break;
267 271
                             }
268 272
                             $tag = $tag->parent;
269
-                            if ($tag->parent)
270
-                                $tag = $tag->parent;
273
+                            if ($tag->parent) {
274
+                                                            $tag = $tag->parent;
275
+                            }
271 276
                             while ('^' == ($t = array_shift($tokens))) {
272
-                                if ($tag->parent)
273
-                                    $tag = $tag->parent;
277
+                                if ($tag->parent) {
278
+                                                                    $tag = $tag->parent;
279
+                                }
274 280
                             }
275 281
                             $child = new T($t);
276 282
                             $tag[] = $child;
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Filter/RateLimit.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,7 +78,9 @@  discard block
 block discarded – undo
78 78
     {
79 79
         if (static::$authenticatedUsagePerUnit
80 80
             == static::$usagePerUnit
81
-        ) return $this->check();
81
+        ) {
82
+        	return $this->check();
83
+        }
82 84
         return null;
83 85
     }
84 86
 
@@ -90,11 +92,12 @@  discard block
 block discarded – undo
90 92
 
91 93
     private static function validate($unit)
92 94
     {
93
-        if (!isset(static::$units[$unit]))
94
-            throw new \InvalidArgumentException(
95
+        if (!isset(static::$units[$unit])) {
96
+                    throw new \InvalidArgumentException(
95 97
                 'Rate Limit time unit should be '
96 98
                 . implode('|', array_keys(static::$units)) . '.'
97 99
             );
100
+        }
98 101
     }
99 102
 
100 103
     private function check($isAuthenticated = false)
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Format/CsvFormat.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -106,8 +106,9 @@  discard block
 block discarded – undo
106 106
 
107 107
         static::$haveHeaders ? $keys = $row : $decoded[] = $row;
108 108
 
109
-        while (($row = static::getRow(array_shift($lines), $keys)) !== FALSE)
110
-            $decoded [] = $row;
109
+        while (($row = static::getRow(array_shift($lines), $keys)) !== FALSE) {
110
+                    $decoded [] = $row;
111
+        }
111 112
 
112 113
         $char = Obj::$separatorChar;
113 114
         Obj::$separatorChar = false;
@@ -130,11 +131,13 @@  discard block
 block discarded – undo
130 131
 
131 132
         $row = array();
132 133
         foreach ($line as $key => $value) {
133
-            if (is_numeric($value))
134
-                $value = floatval($value);
134
+            if (is_numeric($value)) {
135
+                            $value = floatval($value);
136
+            }
135 137
             if ($keys) {
136
-                if (isset($keys [$key]))
137
-                    $row [$keys [$key]] = $value;
138
+                if (isset($keys [$key])) {
139
+                                    $row [$keys [$key]] = $value;
140
+                }
138 141
             } else {
139 142
                 $row [$key] = $value;
140 143
             }
@@ -169,8 +172,9 @@  discard block
 block discarded – undo
169 172
 
170 173
         static::$haveHeaders ? $keys = $row : $decoded[] = $row;
171 174
 
172
-        while (($row = static::getRow(stream_get_line($stream, 0, PHP_EOL), $keys)) !== FALSE)
173
-            $decoded [] = $row;
175
+        while (($row = static::getRow(stream_get_line($stream, 0, PHP_EOL), $keys)) !== FALSE) {
176
+                    $decoded [] = $row;
177
+        }
174 178
 
175 179
         $char = Obj::$separatorChar;
176 180
         Obj::$separatorChar = false;
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Format/UploadFormat.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -118,8 +118,9 @@  discard block
 block discarded – undo
118 118
                     foreach ($file as $property => $value) {
119 119
                         $innerFile[$property] = $value[$i];
120 120
                     }
121
-                    if ($innerFile['name'])
122
-                        static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
121
+                    if ($innerFile['name']) {
122
+                                            static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
123
+                    }
123 124
 
124 125
                     if (isset($innerFile['exception'])) {
125 126
                         $file['error'][$i] = $innerFile['error'];
@@ -128,8 +129,9 @@  discard block
 block discarded – undo
128 129
                     }
129 130
                 }
130 131
             } else {
131
-                if ($file['name'])
132
-                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
132
+                if ($file['name']) {
133
+                                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
134
+                }
133 135
                 if (isset($innerFile['exception'])) {
134 136
                     break;
135 137
                 }
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Routes.php 1 patch
Braces   +45 added lines, -26 removed lines patch added patch discarded remove patch
@@ -124,9 +124,10 @@  discard block
 block discarded – undo
124 124
                 $metadata['param'] = array();
125 125
             }
126 126
             if (isset($metadata['return']['type'])) {
127
-                if ($qualified = Scope::resolve($metadata['return']['type'], $scope))
128
-                    list($metadata['return']['type'], $metadata['return']['children']) =
127
+                if ($qualified = Scope::resolve($metadata['return']['type'], $scope)) {
128
+                                    list($metadata['return']['type'], $metadata['return']['children']) =
129 129
                         static::getTypeAndModel(new ReflectionClass($qualified), $scope);
130
+                }
130 131
             } else {
131 132
                 //assume return type is array
132 133
                 $metadata['return']['type'] = 'array';
@@ -147,8 +148,9 @@  discard block
 block discarded – undo
147 148
                     $m[$dataName] = array();
148 149
                 }
149 150
                 $p = &$m[$dataName];
150
-                if (empty($m['label']))
151
-                    $m['label'] = Text::title($m['name']);
151
+                if (empty($m['label'])) {
152
+                                    $m['label'] = Text::title($m['name']);
153
+                }
152 154
                 if (is_null($type) && isset($m['type'])) {
153 155
                     $type = $m['type'];
154 156
                 }
@@ -307,8 +309,9 @@  discard block
 block discarded – undo
307 309
                 }
308 310
                 $lastPathParam = end($pathParams);
309 311
                 foreach ($pathParams as $position) {
310
-                    if (!empty($url))
311
-                        $url .= '/';
312
+                    if (!empty($url)) {
313
+                                            $url .= '/';
314
+                    }
312 315
                     $url .= '{' .
313 316
                         static::typeChar(isset($call['metadata']['param'][$position]['type'])
314 317
                             ? $call['metadata']['param'][$position]['type']
@@ -356,8 +359,9 @@  discard block
 block discarded – undo
356 359
         } else {
357 360
             static::$routes["v$version"][$path][$httpMethod] = $call;
358 361
             //create an alias with index if the method name is index
359
-            if ($call['methodName'] == 'index')
360
-                static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
362
+            if ($call['methodName'] == 'index') {
363
+                            static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
364
+            }
361 365
         }
362 366
     }
363 367
 
@@ -407,8 +411,9 @@  discard block
 block discarded – undo
407 411
         }
408 412
         //================== dynamic routes =============================
409 413
         //add newline char if trailing slash is found
410
-        if (substr($path, -1) == '/')
411
-            $path .= PHP_EOL;
414
+        if (substr($path, -1) == '/') {
415
+                    $path .= PHP_EOL;
416
+        }
412 417
         //if double slash is found fill in newline char;
413 418
         $path = str_replace('//', '/' . PHP_EOL . '/', $path);
414 419
         ksort($p);
@@ -474,8 +479,9 @@  discard block
 block discarded – undo
474 479
                     }
475 480
                     foreach ($excludedPaths as $exclude) {
476 481
                         if (empty($exclude)) {
477
-                            if ($fullPath == $exclude || $fullPath == 'index')
478
-                                continue 2;
482
+                            if ($fullPath == $exclude || $fullPath == 'index') {
483
+                                                            continue 2;
484
+                            }
479 485
                         } elseif (Text::beginsWith($fullPath, $exclude)) {
480 486
                             continue 2;
481 487
                         }
@@ -495,13 +501,15 @@  discard block
 block discarded – undo
495 501
 
496 502
     public static function verifyAccess($route)
497 503
     {
498
-        if ($route['accessLevel'] < 2)
499
-            return true;
504
+        if ($route['accessLevel'] < 2) {
505
+                    return true;
506
+        }
500 507
         /** @var Restler $r */
501 508
         $r = Scope::get('Restler');
502 509
         $authenticated = $r->_authenticated;
503
-        if (!$authenticated && $route['accessLevel'] > 1)
504
-            return false;
510
+        if (!$authenticated && $route['accessLevel'] > 1) {
511
+                    return false;
512
+        }
505 513
         if (
506 514
             $authenticated &&
507 515
             Defaults::$accessControlFunction &&
@@ -568,8 +576,9 @@  discard block
 block discarded – undo
568 576
         $modifier = "_modify_{$r->methodName}_api";
569 577
         if (method_exists($r->className, $modifier)) {
570 578
             $stage = end(Scope::get('Restler')->getEvents());
571
-            if (empty($stage))
572
-                $stage = 'setup';
579
+            if (empty($stage)) {
580
+                            $stage = 'setup';
581
+            }
573 582
             $r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
574 583
         }
575 584
         return $r;
@@ -758,10 +767,18 @@  discard block
 block discarded – undo
758 767
 
759 768
     public static function type($var)
760 769
     {
761
-        if (is_object($var)) return get_class($var);
762
-        if (is_array($var)) return 'array';
763
-        if (is_bool($var)) return 'boolean';
764
-        if (is_numeric($var)) return is_float($var) ? 'float' : 'int';
770
+        if (is_object($var)) {
771
+        	return get_class($var);
772
+        }
773
+        if (is_array($var)) {
774
+        	return 'array';
775
+        }
776
+        if (is_bool($var)) {
777
+        	return 'boolean';
778
+        }
779
+        if (is_numeric($var)) {
780
+        	return is_float($var) ? 'float' : 'int';
781
+        }
765 782
         return 'string';
766 783
     }
767 784
 
@@ -782,8 +799,9 @@  discard block
 block discarded – undo
782 799
                 if ($reading && ',' == $token) {
783 800
                     //===== STOP =====//
784 801
                     $reading = false;
785
-                    if (!empty($namespace))
786
-                        $imports[$alias] = trim($namespace, '\\');
802
+                    if (!empty($namespace)) {
803
+                                            $imports[$alias] = trim($namespace, '\\');
804
+                    }
787 805
                     //===== START =====//
788 806
                     $reading = true;
789 807
                     $namespace = '';
@@ -791,8 +809,9 @@  discard block
 block discarded – undo
791 809
                 } else {
792 810
                     //===== STOP =====//
793 811
                     $reading = false;
794
-                    if (!empty($namespace))
795
-                        $imports[$alias] = trim($namespace, '\\');
812
+                    if (!empty($namespace)) {
813
+                                            $imports[$alias] = trim($namespace, '\\');
814
+                    }
796 815
                 }
797 816
             } elseif (T_USE == $token[0]) {
798 817
                 //===== START =====//
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,8 +44,9 @@  discard block
 block discarded – undo
44 44
     public function __call($eventName, $params)
45 45
     {
46 46
         if (0 === strpos($eventName, 'on')) {
47
-            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
48
-                $this->listeners[$eventName] = array();
47
+            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName])) {
48
+                            $this->listeners[$eventName] = array();
49
+            }
49 50
             $this->listeners[$eventName][] = $params[0];
50 51
         }
51 52
         return $this;
@@ -89,9 +90,10 @@  discard block
 block discarded – undo
89 90
         $this->events[] = $eventName;
90 91
         $params = func_get_args();
91 92
         $eventName = 'on'.ucfirst(array_shift($params));
92
-        if (isset($this->listeners[$eventName]))
93
-            foreach ($this->listeners[$eventName] as $callback)
93
+        if (isset($this->listeners[$eventName])) {
94
+                    foreach ($this->listeners[$eventName] as $callback)
94 95
                 call_user_func_array($callback, $params);
96
+        }
95 97
     }
96 98
 
97 99
 }
Please login to merge, or discard this patch.
htdocs/includes/printipp/CupsPrintIPP.php 1 patch
Braces   +13 added lines, -22 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@  discard block
 block discarded – undo
85 85
                                         . 'requested-attributes'
86 86
                                         . self::_giveMeStringLength($attributes[0])
87 87
                                         . $attributes[0];
88
-            }
89
-            else
88
+            } else
90 89
             {
91 90
                 $this->meta->attributes .= chr(0x44) // Keyword
92 91
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -141,15 +140,13 @@  discard block
 block discarded – undo
141 140
             if ($this->serveroutput->status == "successfull-ok")
142 141
             {
143 142
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
144
-            }
145
-            else
143
+            } else
146 144
             {
147 145
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
148 146
             }
149 147
 
150 148
             return $this->serveroutput->status;
151
-        }
152
-        else
149
+        } else
153 150
         {
154 151
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
155 152
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -215,15 +212,13 @@  discard block
 block discarded – undo
215 212
             if ($this->serveroutput->status == "successfull-ok")
216 213
             {
217 214
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
218
-            }
219
-            else
215
+            } else
220 216
             {
221 217
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
222 218
             }
223 219
 
224 220
             return $this->serveroutput->status;
225
-        }
226
-        else
221
+        } else
227 222
         {
228 223
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
229 224
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -301,15 +296,13 @@  discard block
 block discarded – undo
301 296
             if ($this->serveroutput->status == "successfull-ok")
302 297
             {
303 298
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
304
-            }
305
-            else
299
+            } else
306 300
             {
307 301
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
308 302
             }
309 303
 
310 304
             return $this->serveroutput->status;
311
-        }
312
-        else
305
+        } else
313 306
         {
314 307
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
315 308
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -371,8 +364,7 @@  discard block
 block discarded – undo
371 364
                                         . 'requested-attributes'
372 365
                                         . self::_giveMeStringLength($attributes[0])
373 366
                                         . $attributes[0];
374
-            }
375
-            else
367
+            } else
376 368
             {
377 369
                 $this->meta->attributes .= chr(0x44) // Keyword
378 370
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -411,14 +403,12 @@  discard block
 block discarded – undo
411 403
             if ($this->serveroutput->status == "successfull-ok")
412 404
             {
413 405
                 self::_errorLog("getting printers: ".$this->serveroutput->status,3);
414
-            }
415
-            else
406
+            } else
416 407
             {
417 408
                 self::_errorLog("getting printers: ".$this->serveroutput->status,1);
418 409
             }
419 410
             return $this->serveroutput->status;
420
-        }
421
-        else
411
+        } else
422 412
         {
423 413
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
424 414
             self::_errorLog("getting printers : OPERATION FAILED",1);
@@ -544,8 +534,9 @@  discard block
 block discarded – undo
544 534
             }
545 535
 
546 536
         $prepend = '';
547
-        while ((strlen($value_built) + strlen($prepend)) < 4)
548
-            $prepend .= chr(0);
537
+        while ((strlen($value_built) + strlen($prepend)) < 4) {
538
+                    $prepend .= chr(0);
539
+        }
549 540
         return $prepend.$value_built;
550 541
     }
551 542
 
Please login to merge, or discard this patch.
htdocs/includes/printipp/http_class.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -478,8 +478,9 @@
 block discarded – undo
478 478
 		}
479 479
 		$nc = sprintf('%x', $this->nc);
480 480
 		$prepend = "";
481
-		while ((strlen($nc) + strlen($prepend)) < 8)
482
-			$prependi .= "0";
481
+		while ((strlen($nc) + strlen($prepend)) < 8) {
482
+					$prependi .= "0";
483
+		}
483 484
 		$nc = $prepend.$nc;
484 485
 		$cnonce = "printipp";
485 486
 		$username = $this->user;
Please login to merge, or discard this patch.