Completed
Branch develop (fa72bb)
by
unknown
26:08
created
htdocs/includes/restler/framework/Luracast/Restler/Format/PlistFormat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
          *
59 59
          * @var CFPropertyList
60 60
          */
61
-        $plist = new CFPropertyList ();
62
-        $td = new CFTypeDetector ();
61
+        $plist = new CFPropertyList();
62
+        $td = new CFTypeDetector();
63 63
         $guessedStructure = $td->toCFType(
64 64
             Obj::toArray($data)
65 65
         );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      */
82 82
     public function decode($data)
83 83
     {
84
-        $plist = new CFPropertyList ();
84
+        $plist = new CFPropertyList();
85 85
         $plist->parse($data);
86 86
 
87 87
         return $plist->toArray();
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Redirect.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,20 +31,20 @@
 block discarded – undo
31 31
         $url = ltrim($url, '/');
32 32
         /** @var $r Restler */
33 33
         $r = Scope::get('Restler');
34
-        $base = $r->getBaseUrl() . '/';
34
+        $base = $r->getBaseUrl().'/';
35 35
         if (0 !== strpos($url, 'http')) {
36
-            $url = $base . $url;
36
+            $url = $base.$url;
37 37
         }
38
-        if (!empty($flashData) || $base . $r->url !== $url || Util::getRequestMethod() != 'GET') {
38
+        if (!empty($flashData) || $base.$r->url !== $url || Util::getRequestMethod() != 'GET') {
39 39
             if ($r->responseFormat instanceof JsonFormat) {
40 40
                 return array('redirect' => $url);
41 41
             }
42 42
             if (!empty($params)) {
43
-                $url .= '?' . http_build_query($params);
43
+                $url .= '?'.http_build_query($params);
44 44
             }
45 45
             Flash::set($flashData);
46 46
             header(
47
-                "{$_SERVER['SERVER_PROTOCOL']} $status " .
47
+                "{$_SERVER['SERVER_PROTOCOL']} $status ".
48 48
                 (isset(RestException::$codes[$status]) ? RestException::$codes[$status] : '')
49 49
             );
50 50
             header("Location: $url");
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/HumanReadableCache.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -38,30 +38,30 @@  discard block
 block discarded – undo
38 38
     public function set($name, $data)
39 39
     {
40 40
         if (is_array($data)) {
41
-            $s = '$o = array();' . PHP_EOL . PHP_EOL;
41
+            $s = '$o = array();'.PHP_EOL.PHP_EOL;
42 42
             $s .= '// ** THIS IS AN AUTO GENERATED FILE.'
43 43
                 . ' DO NOT EDIT MANUALLY ** ';
44 44
             foreach ($data as $key => $value) {
45
-                $s .= PHP_EOL . PHP_EOL .
45
+                $s .= PHP_EOL.PHP_EOL.
46 46
                     "//==================== $key ===================="
47
-                    . PHP_EOL . PHP_EOL;
47
+                    . PHP_EOL.PHP_EOL;
48 48
                 if (is_array($value)) {
49
-                    $s .= '$o[\'' . $key . '\'] = array();';
49
+                    $s .= '$o[\''.$key.'\'] = array();';
50 50
                     foreach ($value as $ke => $va) {
51
-                        $s .= PHP_EOL . PHP_EOL . "//==== $key $ke ===="
52
-                            . PHP_EOL . PHP_EOL;
53
-                        $s .= '$o[\'' . $key . '\'][\'' . $ke . '\'] = ' .
51
+                        $s .= PHP_EOL.PHP_EOL."//==== $key $ke ===="
52
+                            . PHP_EOL.PHP_EOL;
53
+                        $s .= '$o[\''.$key.'\'][\''.$ke.'\'] = '.
54 54
                             str_replace('  ', '    ',
55
-                                var_export($va, true)) . ';';
55
+                                var_export($va, true)).';';
56 56
                     }
57 57
                 } else {
58
-                    $s .= '$o[\'' . $key . '\'] = '
59
-                        . var_export($value, true) . ';';
58
+                    $s .= '$o[\''.$key.'\'] = '
59
+                        . var_export($value, true).';';
60 60
                 }
61 61
             }
62
-            $s .= PHP_EOL . 'return $o;';
62
+            $s .= PHP_EOL.'return $o;';
63 63
         } else {
64
-            $s = 'return ' . var_export($data, true) . ';';
64
+            $s = 'return '.var_export($data, true).';';
65 65
         }
66 66
         $file = $this->_file($name);
67 67
         $r = @file_put_contents($file, "<?php $s");
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 
116 116
     private function _file($name)
117 117
     {
118
-        return self::$cacheDir . '/' . $name . '.php';
118
+        return self::$cacheDir.'/'.$name.'.php';
119 119
     }
120 120
 
121 121
     private function throwException()
122 122
     {
123 123
         throw new \Exception(
124 124
             'The cache directory `'
125
-            . self::$cacheDir . '` should exist with write permission.'
125
+            . self::$cacheDir.'` should exist with write permission.'
126 126
         );
127 127
     }
128 128
 }
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/Routes.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         try {
80 80
             $classMetadata = CommentParser::parse($class->getDocComment());
81 81
         } catch (Exception $e) {
82
-            throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
82
+            throw new RestException(500, "Error while parsing comments of `$className` class. ".$e->getMessage());
83 83
         }
84 84
         $classMetadata['scope'] = $scope = static::scope($class);
85 85
         $methods = $class->getMethods(ReflectionMethod::IS_PUBLIC +
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
             try {
96 96
                 $metadata = CommentParser::parse($doc) + $classMetadata;
97 97
             } catch (Exception $e) {
98
-                throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. " . $e->getMessage());
98
+                throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. ".$e->getMessage());
99 99
             }
100 100
             //@access should not be private
101 101
             if (isset($metadata['access'])
@@ -157,20 +157,20 @@  discard block
 block discarded – undo
157 157
                 }
158 158
                 $m ['default'] = $defaults [$position];
159 159
                 $m ['required'] = !$param->isOptional();
160
-                $contentType = Util::nestedValue($p,'type');
160
+                $contentType = Util::nestedValue($p, 'type');
161 161
                 if ($type == 'array' && $contentType && $qualified = Scope::resolve($contentType, $scope)) {
162 162
                     list($p['type'], $children, $modelName) = static::getTypeAndModel(
163 163
                         new ReflectionClass($qualified), $scope,
164
-                        $className . Text::title($methodUrl), $p
164
+                        $className.Text::title($methodUrl), $p
165 165
                     );
166 166
                 }
167 167
                 if ($type instanceof ReflectionClass) {
168 168
                     list($type, $children, $modelName) = static::getTypeAndModel($type, $scope,
169
-                        $className . Text::title($methodUrl), $p);
169
+                        $className.Text::title($methodUrl), $p);
170 170
                 } elseif ($type && is_string($type) && $qualified = Scope::resolve($type, $scope)) {
171 171
                     list($type, $children, $modelName)
172 172
                         = static::getTypeAndModel(new ReflectionClass($qualified), $scope,
173
-                        $className . Text::title($methodUrl), $p);
173
+                        $className.Text::title($methodUrl), $p);
174 174
                 }
175 175
                 if (isset($type)) {
176 176
                     $m['type'] = $type;
@@ -248,13 +248,13 @@  discard block
 block discarded – undo
248 248
             ) {
249 249
                 foreach ($matches as $match) {
250 250
                     $httpMethod = $match[1];
251
-                    $url = rtrim($resourcePath . $match[2], '/');
251
+                    $url = rtrim($resourcePath.$match[2], '/');
252 252
                     //deep copy the call, as it may change for each @url
253 253
                     $copy = unserialize(serialize($call));
254 254
                     foreach ($copy['metadata']['param'] as $i => $p) {
255 255
                         $inPath =
256
-                            strpos($url, '{' . $p['name'] . '}') ||
257
-                            strpos($url, ':' . $p['name']);
256
+                            strpos($url, '{'.$p['name'].'}') ||
257
+                            strpos($url, ':'.$p['name']);
258 258
                         if ($inPath) {
259 259
                             $copy['metadata']['param'][$i][$dataName]['from'] = 'path';
260 260
                         } elseif ($httpMethod == 'GET' || $httpMethod == 'DELETE') {
@@ -264,15 +264,15 @@  discard block
 block discarded – undo
264 264
                         }
265 265
                     }
266 266
                     $url = preg_replace_callback('/{[^}]+}|:[^\/]+/',
267
-                        function ($matches) use ($copy) {
267
+                        function($matches) use ($copy) {
268 268
                             $match = trim($matches[0], '{}:');
269 269
                             $index = $copy['arguments'][$match];
270
-                            return '{' .
270
+                            return '{'.
271 271
                             Routes::typeChar(isset(
272 272
                                 $copy['metadata']['param'][$index]['type'])
273 273
                                 ? $copy['metadata']['param'][$index]['type']
274 274
                                 : null)
275
-                            . $index . '}';
275
+                            . $index.'}';
276 276
                         }, $url);
277 277
                     static::addPath($url, $copy, $httpMethod, $version);
278 278
                 }
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
                     $methodUrl = '';
293 293
                 }
294 294
                 $url = empty($methodUrl) ? rtrim($resourcePath, '/')
295
-                    : $resourcePath . $methodUrl;
295
+                    : $resourcePath.$methodUrl;
296 296
                 for ($position = 0; $position < count($params); $position++) {
297 297
                     $from = $metadata['param'][$position][$dataName]['from'];
298 298
                     if ($from == 'body' && ($httpMethod == 'GET' ||
@@ -309,11 +309,11 @@  discard block
 block discarded – undo
309 309
                 foreach ($pathParams as $position) {
310 310
                     if (!empty($url))
311 311
                         $url .= '/';
312
-                    $url .= '{' .
312
+                    $url .= '{'.
313 313
                         static::typeChar(isset($call['metadata']['param'][$position]['type'])
314 314
                             ? $call['metadata']['param'][$position]['type']
315 315
                             : null)
316
-                        . $position . '}';
316
+                        . $position.'}';
317 317
                     if ($allowAmbiguity || $position == $lastPathParam) {
318 318
                         static::addPath($url, $call, $httpMethod, $version);
319 319
                     }
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
     {
344 344
         $call['url'] = preg_replace_callback(
345 345
             "/\{\S(\d+)\}/",
346
-            function ($matches) use ($call) {
347
-                return '{' .
348
-                $call['metadata']['param'][$matches[1]]['name'] . '}';
346
+            function($matches) use ($call) {
347
+                return '{'.
348
+                $call['metadata']['param'][$matches[1]]['name'].'}';
349 349
             },
350 350
             $path
351 351
         );
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
             return static::populate($p[$path][$httpMethod], $data);
391 391
         } elseif (isset($p['*'])) {
392 392
             //================== wildcard routes ========================
393
-            uksort($p['*'], function ($a, $b) {
393
+            uksort($p['*'], function($a, $b) {
394 394
                 return strlen($b) - strlen($a);
395 395
             });
396 396
             foreach ($p['*'] as $key => $value) {
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
         if (substr($path, -1) == '/')
411 411
             $path .= PHP_EOL;
412 412
         //if double slash is found fill in newline char;
413
-        $path = str_replace('//', '/' . PHP_EOL . '/', $path);
413
+        $path = str_replace('//', '/'.PHP_EOL.'/', $path);
414 414
         ksort($p);
415 415
         foreach ($p as $key => $value) {
416 416
             if (!isset($value[$httpMethod])) {
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
                     } else {
435 435
                         $status = 400;
436 436
                         $message = 'invalid value specified for `'
437
-                            . $details['name'] . '`';
437
+                            . $details['name'].'`';
438 438
                         $found = false;
439 439
                         break;
440 440
                     }
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
             }
453 453
         }
454 454
         if ($status == 405) {
455
-            header('Allow: ' . implode(', ', $methods));
455
+            header('Allow: '.implode(', ', $methods));
456 456
         }
457 457
         throw new RestException($status, $message);
458 458
     }
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
             $all = $all['*'] + $all;
467 467
             unset($all['*']);
468 468
         }
469
-        if(is_array($all)){
469
+        if (is_array($all)) {
470 470
             foreach ($all as $fullPath => $routes) {
471 471
                 foreach ($routes as $httpMethod => $route) {
472 472
                     if (in_array($httpMethod, $excludedHttpMethods)) {
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
                             continue 2;
481 481
                         }
482 482
                     }
483
-                    $hash = "$httpMethod " . $route['url'];
483
+                    $hash = "$httpMethod ".$route['url'];
484 484
                     if (!isset($filter[$hash])) {
485 485
                         $route['httpMethod'] = $httpMethod;
486 486
                         $map[$route['metadata']['resourcePath']][]
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
             $stage = end(Scope::get('Restler')->getEvents());
571 571
             if (empty($stage))
572 572
                 $stage = 'setup';
573
-            $r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
573
+            $r = Scope::get($r->className)->$modifier($r, $stage) ?: $r;
574 574
         }
575 575
         return $r;
576 576
     }
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
         }
616 616
         $p = 'property';
617 617
         $r = empty($c[$p]) ? array() : $c[$p];
618
-        $p .= '-' . ($forResponse ? 'read' : 'write');
618
+        $p .= '-'.($forResponse ? 'read' : 'write');
619 619
         if (!empty($c[$p])) {
620 620
             $r = array_merge($r, $c[$p]);
621 621
         }
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
      *
636 636
      * @access protected
637 637
      */
638
-    protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix='', array $rules=array())
638
+    protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix = '', array $rules = array())
639 639
     {
640 640
         $className = $class->getName();
641 641
         $dataName = CommentParser::$embeddedDataName;
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
             if ($magic_properties = static::parseMagic($class, empty($prefix))) {
648 648
                 foreach ($magic_properties as $prop) {
649 649
                     if (!isset($prop['name'])) {
650
-                        throw new Exception('@property comment is not properly defined in ' . $className . ' class');
650
+                        throw new Exception('@property comment is not properly defined in '.$className.' class');
651 651
                     }
652 652
                     if (!isset($prop[$dataName]['label'])) {
653 653
                         $prop[$dataName]['label'] = Text::title($prop['name']);
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
             }
704 704
         } catch (Exception $e) {
705 705
             if (Text::endsWith($e->getFile(), 'CommentParser.php')) {
706
-                throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
706
+                throw new RestException(500, "Error while parsing comments of `$className` class. ".$e->getMessage());
707 707
             }
708 708
             throw $e;
709 709
         }
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
     {
770 770
         $namespace = $class->getNamespaceName();
771 771
         $imports = array(
772
-            '*' => empty($namespace) ? '' : $namespace . '\\'
772
+            '*' => empty($namespace) ? '' : $namespace.'\\'
773 773
         );
774 774
         $file = file_get_contents($class->getFileName());
775 775
         $tokens = token_get_all($file);
Please login to merge, or discard this patch.
htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         static::$self = $this;
26 26
         if (!empty(static::$_waitList)) {
27 27
             foreach (static::$_waitList as $param) {
28
-                call_user_func_array(array($this,$param[0]), $param[1]);
28
+                call_user_func_array(array($this, $param[0]), $param[1]);
29 29
             }
30 30
         }
31 31
     }
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     public static function __callStatic($eventName, $params)
34 34
     {
35 35
         if (0 === strpos($eventName, 'on')) {
36
-            if(static::$self){
36
+            if (static::$self) {
37 37
                 return call_user_func_array(array(static::$self, $eventName), $params);
38 38
             }
39 39
             static::$_waitList[] = func_get_args();
Please login to merge, or discard this patch.
htdocs/includes/printipp/CupsPrintIPP.php 1 patch
Spacing   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 //
56 56
 // OPERATIONS
57 57
 //
58
-    public function cupsGetDefaults($attributes=array("all"))
58
+    public function cupsGetDefaults($attributes = array("all"))
59 59
     {
60 60
         //The CUPS-Get-Default operation returns the default printer URI and attributes
61 61
 
62
-        $this->jobs = array_merge($this->jobs,array(""));
63
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
62
+        $this->jobs = array_merge($this->jobs, array(""));
63
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
64 64
         $this->parsed = array();
65 65
         unset($this->printer_attributes);
66 66
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         self::_setOperationId();
78 78
 
79
-        for($i = 0 ; $i < count($attributes) ; $i++)
79
+        for ($i = 0; $i < count($attributes); $i++)
80 80
         {
81 81
             if ($i == 0)
82 82
             {
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
             }
96 96
         }
97 97
 
98
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
99
-                         . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
98
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
99
+                         . chr(0x40).chr(0x01) // operation:  cups vendor extension: get defaults
100 100
                          . $this->meta->operation_id // request-id
101 101
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
102 102
                          . $this->meta->charset
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
 
109 109
         self::_putDebug("Request: ".$this->output);
110 110
 
111
-        $post_values = array( "Content-Type" => "application/ipp",
111
+        $post_values = array("Content-Type" => "application/ipp",
112 112
                               "Data" => $this->output);
113 113
 
114
-        if (self::_sendHttp ($post_values,'/'))
114
+        if (self::_sendHttp($post_values, '/'))
115 115
         {
116 116
 
117
-            if(self::_parseServerOutput())
117
+            if (self::_parseServerOutput())
118 118
             {
119 119
                 self::_parsePrinterAttributes();
120 120
             }
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
                     $printer_type = $this->printer_attributes->printer_type->_value0;
128 128
                     $table = self::_interpretPrinterType($printer_type);
129 129
 
130
-                    for($i = 0 ; $i < count($table) ; $i++ )
130
+                    for ($i = 0; $i < count($table); $i++)
131 131
                     {
132 132
                         $index = '_value'.$i;
133 133
                         $this->printer_attributes->printer_type->$index = $table[$i];
@@ -137,22 +137,22 @@  discard block
 block discarded – undo
137 137
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
138 138
         {
139 139
 
140
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
140
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
141 141
             if ($this->serveroutput->status == "successfull-ok")
142 142
             {
143
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
143
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
144 144
             }
145 145
             else
146 146
             {
147
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
147
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
148 148
             }
149 149
 
150 150
             return $this->serveroutput->status;
151 151
         }
152 152
         else
153 153
         {
154
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
155
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
154
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
155
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
156 156
             }
157 157
     return false;
158 158
     }
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
     {
163 163
     //The CUPS-Get-Default operation returns the default printer URI and attributes
164 164
 
165
-        $this->jobs = array_merge($this->jobs,array(""));
166
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
165
+        $this->jobs = array_merge($this->jobs, array(""));
166
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
167 167
         $this->parsed = array();
168 168
         unset($this->printer_attributes);
169 169
 
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 
180 180
         self::_setOperationId();
181 181
 
182
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
183
-                         . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
182
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
183
+                         . chr(0x40).chr(0x08) // operation:  cups vendor extension: Accept-Jobs
184 184
                          . $this->meta->operation_id // request-id
185 185
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
186 186
                          . $this->meta->charset
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
 
197 197
         self::_putDebug("Request: ".$this->output);
198 198
 
199
-        $post_values = array( "Content-Type" => "application/ipp",
199
+        $post_values = array("Content-Type" => "application/ipp",
200 200
                               "Data" => $this->output);
201 201
 
202
-        if (self::_sendHttp ($post_values,'/admin/'))
202
+        if (self::_sendHttp($post_values, '/admin/'))
203 203
         {
204 204
 
205
-            if(self::_parseServerOutput())
205
+            if (self::_parseServerOutput())
206 206
             {
207 207
                 self::_parseAttributes();
208 208
             }
@@ -211,33 +211,33 @@  discard block
 block discarded – undo
211 211
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
212 212
         {
213 213
 
214
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
214
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
215 215
             if ($this->serveroutput->status == "successfull-ok")
216 216
             {
217
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
217
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
218 218
             }
219 219
             else
220 220
             {
221
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
221
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
222 222
             }
223 223
 
224 224
             return $this->serveroutput->status;
225 225
         }
226 226
         else
227 227
         {
228
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
229
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
228
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
229
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
230 230
             }
231 231
     return false;
232 232
     }
233 233
 
234 234
 
235
-    public function cupsRejectJobs($printer_uri,$printer_state_message)
235
+    public function cupsRejectJobs($printer_uri, $printer_state_message)
236 236
     {
237 237
     //The CUPS-Get-Default operation returns the default printer URI and attributes
238 238
 
239
-        $this->jobs = array_merge($this->jobs,array(""));
240
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
239
+        $this->jobs = array_merge($this->jobs, array(""));
240
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
241 241
         $this->parsed = array();
242 242
         unset($this->attributes);
243 243
 
@@ -264,8 +264,8 @@  discard block
 block discarded – undo
264 264
                      . $printer_state_message;
265 265
         }
266 266
 
267
-       $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
268
-                         . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
267
+       $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
268
+                         . chr(0x40).chr(0x09) // operation:  cups vendor extension: Reject-Jobs
269 269
                          . $this->meta->operation_id // request-id
270 270
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
271 271
                          . $this->meta->charset
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
282 282
 
283 283
         self::_putDebug("Request: ".$this->output);
284 284
 
285
-        $post_values = array( "Content-Type" => "application/ipp",
285
+        $post_values = array("Content-Type" => "application/ipp",
286 286
                               "Data" => $this->output);
287 287
 
288
-        if (self::_sendHttp ($post_values,'/admin/'))
288
+        if (self::_sendHttp($post_values, '/admin/'))
289 289
         {
290 290
 
291
-            if(self::_parseServerOutput())
291
+            if (self::_parseServerOutput())
292 292
             {
293 293
                 self::_parseAttributes();
294 294
             }
@@ -297,36 +297,36 @@  discard block
 block discarded – undo
297 297
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
298 298
         {
299 299
 
300
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
300
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
301 301
             if ($this->serveroutput->status == "successfull-ok")
302 302
             {
303
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
303
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
304 304
             }
305 305
             else
306 306
             {
307
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
307
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
308 308
             }
309 309
 
310 310
             return $this->serveroutput->status;
311 311
         }
312 312
         else
313 313
         {
314
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
315
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
314
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
315
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
316 316
         }
317 317
         return false;
318 318
     }
319 319
 
320 320
 
321
-    public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
321
+    public function getPrinters($printer_location = false, $printer_info = false, $attributes = array())
322 322
     {
323 323
         if (count($attributes) == 0)
324 324
         {
325 325
             true;
326 326
         }
327
-        $attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
328
-        $this->jobs = array_merge($this->jobs,array(""));
329
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
327
+        $attributes = array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
328
+        $this->jobs = array_merge($this->jobs, array(""));
329
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
330 330
 
331 331
         unset ($this->printers_attributes);
332 332
 
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
         self::_setOperationId();
344 344
 
345
-        $this->meta->attributes='';
345
+        $this->meta->attributes = '';
346 346
 
347 347
         if ($printer_location)
348 348
         {
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
                                     . $printer_info;
363 363
         }
364 364
 
365
-        for($i = 0 ; $i < count($attributes) ; $i++)
365
+        for ($i = 0; $i < count($attributes); $i++)
366 366
         {
367 367
             if ($i == 0)
368 368
             {
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
             }
382 382
         }
383 383
 
384
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
385
-                         . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
384
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
385
+                         . chr(0x40).chr(0x02) // operation:  cups vendor extension: get printers
386 386
                          . $this->meta->operation_id //           request-id
387 387
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
388 388
                          . $this->meta->charset
@@ -392,13 +392,13 @@  discard block
 block discarded – undo
392 392
 
393 393
         $this->output = $this->stringjob;
394 394
 
395
-        $post_values = array( "Content-Type" => "application/ipp",
395
+        $post_values = array("Content-Type" => "application/ipp",
396 396
                               "Data" => $this->output);
397 397
 
398
-        if (self::_sendHttp ($post_values,'/'))
398
+        if (self::_sendHttp($post_values, '/'))
399 399
         {
400 400
 
401
-            if(self::_parseServerOutput())
401
+            if (self::_parseServerOutput())
402 402
             {
403 403
                 $this->_getAvailablePrinters();
404 404
             }
@@ -407,27 +407,27 @@  discard block
 block discarded – undo
407 407
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
408 408
         {
409 409
 
410
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
410
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
411 411
             if ($this->serveroutput->status == "successfull-ok")
412 412
             {
413
-                self::_errorLog("getting printers: ".$this->serveroutput->status,3);
413
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 3);
414 414
             }
415 415
             else
416 416
             {
417
-                self::_errorLog("getting printers: ".$this->serveroutput->status,1);
417
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 1);
418 418
             }
419 419
             return $this->serveroutput->status;
420 420
         }
421 421
         else
422 422
         {
423
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
424
-            self::_errorLog("getting printers : OPERATION FAILED",1);
423
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
424
+            self::_errorLog("getting printers : OPERATION FAILED", 1);
425 425
         }
426 426
         return false;
427 427
     }
428 428
 
429 429
 
430
-    public function cupsGetPrinters ()
430
+    public function cupsGetPrinters()
431 431
     {
432 432
         // alias for getPrinters();
433 433
         self::getPrinters();
@@ -438,11 +438,11 @@  discard block
 block discarded – undo
438 438
     {
439 439
         // complete informations from parent with Cups-specific stuff
440 440
 
441
-        if(!$result = parent::getPrinterAttributes())
441
+        if (!$result = parent::getPrinterAttributes())
442 442
         {
443 443
             return FALSE;
444 444
         }
445
-        if(!isset($this->printer_attributes))
445
+        if (!isset($this->printer_attributes))
446 446
         {
447 447
             return FALSE;
448 448
         }
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
             $printer_type = $this->printer_attributes->printer_type->_value0;
453 453
             $table = self::_interpretPrinterType($printer_type);
454 454
 
455
-            for($i = 0 ; $i < count($table) ; $i++ )
455
+            for ($i = 0; $i < count($table); $i++)
456 456
             {
457 457
                 $index = '_value'.$i;
458 458
                 $this->printer_attributes->printer_type->$index = $table[$i];
@@ -465,14 +465,14 @@  discard block
 block discarded – undo
465 465
 //
466 466
 // SETUP
467 467
 //
468
-    protected function _initTags ()
468
+    protected function _initTags()
469 469
     {
470 470
         // override parent with specific cups attributes
471 471
 
472
-        $operation_tags = array ();
473
-        $this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
472
+        $operation_tags = array();
473
+        $this->operation_tags = array_merge($this->operation_tags, $operation_tags);
474 474
 
475
-        $job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
475
+        $job_tags = array("job-billing" => array("tag" => "textWithoutLanguage"),
476 476
                             "blackplot" => array("tag" => "boolean"),
477 477
                             "brightness" => array("tag" => "integer"),
478 478
                             "columns" => array("tag" => "integer"),
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
                             "gamma" => array("tag" => "integer"),
482 482
                             "hue" => array("tag" => "integer"),
483 483
                             "lpi" => array("tag" => "enum"),
484
-                            "mirror" => array("tag","boolean"),
484
+                            "mirror" => array("tag", "boolean"),
485 485
                             "natural-scaling" => array("tag" => "integer"),
486 486
                             "number-up-layout" => array("tag" => "keyword"),
487 487
                             "page-border" => array("tag" => "keyword"),
@@ -494,21 +494,21 @@  discard block
 block discarded – undo
494 494
                             "penwidth" => array("tag" => "integer"),
495 495
                             "position" => array("tag" => "keyword"),
496 496
                             "ppi" => array("tag" => "integer"),
497
-                            "prettyprint" => array("tag","boolean"),
497
+                            "prettyprint" => array("tag", "boolean"),
498 498
                             "saturation" => array("tag" => "integer"),
499 499
                             "scaling" => array("tag" => "integer"),
500
-                            "wrap" => array("tag","boolean"),
500
+                            "wrap" => array("tag", "boolean"),
501 501
 
502 502
                             );
503
-        $this->job_tags = array_merge ($this->job_tags, $job_tags);
503
+        $this->job_tags = array_merge($this->job_tags, $job_tags);
504 504
     }
505 505
 
506 506
     //
507 507
     // REQUEST BUILDING
508 508
     //
509
-    protected function _enumBuild ($tag,$value)
509
+    protected function _enumBuild($tag, $value)
510 510
     {
511
-        $value_built = parent::_enumBuild($tag,$value);
511
+        $value_built = parent::_enumBuild($tag, $value);
512 512
 
513 513
         switch ($tag)
514 514
         {
@@ -552,35 +552,35 @@  discard block
 block discarded – undo
552 552
     //
553 553
     // RESPONSE PARSING
554 554
     //
555
-    private function _getAvailablePrinters ()
555
+    private function _getAvailablePrinters()
556 556
     {
557 557
         $this->available_printers = array();
558 558
         $this->printer_map = array();
559 559
         $k = 0;
560 560
         $this->printers_attributes = new \stdClass();
561 561
 
562
-        for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
562
+        for ($i = 0; (array_key_exists($i, $this->serveroutput->response)); $i++)
563 563
         {
564 564
             if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
565 565
             {
566 566
                 $phpname = "_printer".$k;
567 567
                 $this->printers_attributes->$phpname = new \stdClass();
568
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
568
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
569 569
                 {
570 570
 
571 571
                     $value = $this->serveroutput->response[$i][$j]['value'];
572
-                    $name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
572
+                    $name = str_replace("-", "_", $this->serveroutput->response[$i][$j]['name']);
573 573
 
574 574
                     switch ($name)
575 575
                     {
576 576
                         case "printer_uri_supported":
577
-                            $this->available_printers = array_merge($this->available_printers,array($value));
577
+                            $this->available_printers = array_merge($this->available_printers, array($value));
578 578
                             break;
579 579
                         case "printer_type":
580 580
                             $table = self::_interpretPrinterType($value);
581 581
                             $this->printers_attributes->$phpname->$name = new \stdClass();
582 582
 
583
-                            for($l = 0 ; $l < count($table) ; $l++ )
583
+                            for ($l = 0; $l < count($table); $l++)
584 584
                             {
585 585
                                 $index = '_value'.$l;
586 586
                                 $this->printers_attributes->$phpname->$name->$index = $table[$l];
@@ -597,12 +597,12 @@  discard block
 block discarded – undo
597 597
                             break;
598 598
                     }
599 599
                 }
600
-                $k ++;
600
+                $k++;
601 601
             }
602 602
         }
603 603
     }
604 604
 
605
-    protected function _getEnumVendorExtensions ($value_parsed)
605
+    protected function _getEnumVendorExtensions($value_parsed)
606 606
     {
607 607
         switch ($value_parsed)
608 608
         {
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
                 $value = 'Get-Availables-Printers';
611 611
                 break;
612 612
             default:
613
-                $value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
613
+                $value = sprintf('Unknown(Cups extension for operations): 0x%x', $value_parsed);
614 614
                 break;
615 615
         }
616 616
 
@@ -619,16 +619,16 @@  discard block
 block discarded – undo
619 619
             return ($value);
620 620
         }
621 621
 
622
-        return sprintf('Unknown: 0x%x',$value_parsed);
622
+        return sprintf('Unknown: 0x%x', $value_parsed);
623 623
     }
624 624
 
625 625
 
626 626
     private function _interpretPrinterType($value)
627 627
     {
628 628
         $value_parsed = 0;
629
-        for ($i = strlen($value) ; $i > 0 ; $i --)
629
+        for ($i = strlen($value); $i > 0; $i--)
630 630
         {
631
-            $value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
631
+            $value_parsed += pow(256, ($i - 1)) * ord($value[strlen($value) - $i]);
632 632
         }
633 633
 
634 634
         $type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
@@ -636,115 +636,115 @@  discard block
 block discarded – undo
636 636
         $type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
637 637
         $type[16] = $type[17] = $type[18] = $type[19] = '';
638 638
 
639
-        if ($value_parsed %2 == 1)
639
+        if ($value_parsed % 2 == 1)
640 640
         {
641 641
             $type[0] = 'printer-class';
642 642
             $value_parsed -= 1;
643 643
         }
644 644
 
645
-        if ($value_parsed %4 == 2 )
645
+        if ($value_parsed % 4 == 2)
646 646
         {
647 647
             $type[1] = 'remote-destination';
648 648
             $value_parsed -= 2;
649 649
         }
650 650
 
651
-        if ($value_parsed %8 == 4 )
651
+        if ($value_parsed % 8 == 4)
652 652
         {
653 653
             $type[2] = 'print-black';
654 654
             $value_parsed -= 4;
655 655
         }
656 656
 
657
-        if ($value_parsed %16 == 8 )
657
+        if ($value_parsed % 16 == 8)
658 658
         {
659 659
             $type[3] = 'print-color';
660 660
             $value_parsed -= 8;
661 661
         }
662 662
 
663
-        if ($value_parsed %32 == 16)
663
+        if ($value_parsed % 32 == 16)
664 664
         {
665 665
             $type[4] = 'hardware-print-on-both-sides';
666 666
             $value_parsed -= 16;
667 667
         }
668 668
 
669
-        if ($value_parsed %64 == 32)
669
+        if ($value_parsed % 64 == 32)
670 670
         {
671 671
             $type[5] = 'hardware-staple-output';
672 672
             $value_parsed -= 32;
673 673
         }
674 674
 
675
-        if ($value_parsed %128 == 64)
675
+        if ($value_parsed % 128 == 64)
676 676
         {
677 677
             $type[6] = 'hardware-fast-copies';
678 678
             $value_parsed -= 64;
679 679
         }
680 680
 
681
-        if ($value_parsed %256 == 128)
681
+        if ($value_parsed % 256 == 128)
682 682
         {
683 683
             $type[7] = 'hardware-fast-copy-collation';
684 684
             $value_parsed -= 128;
685 685
         }
686 686
 
687
-        if ($value_parsed %512 == 256)
687
+        if ($value_parsed % 512 == 256)
688 688
         {
689 689
             $type[8] = 'punch-output';
690 690
             $value_parsed -= 256;
691 691
         }
692 692
 
693
-        if ($value_parsed %1024 == 512)
693
+        if ($value_parsed % 1024 == 512)
694 694
         {
695 695
             $type[9] = 'cover-output';
696 696
             $value_parsed -= 512;
697 697
         }
698 698
 
699
-        if ($value_parsed %2048 == 1024)
699
+        if ($value_parsed % 2048 == 1024)
700 700
         {
701 701
             $type[10] = 'bind-output';
702 702
             $value_parsed -= 1024;
703 703
         }
704 704
 
705
-        if ($value_parsed %4096 == 2048)
705
+        if ($value_parsed % 4096 == 2048)
706 706
         {
707 707
             $type[11] = 'sort-output';
708 708
             $value_parsed -= 2048;
709 709
         }
710 710
 
711
-        if ($value_parsed %8192 == 4096)
711
+        if ($value_parsed % 8192 == 4096)
712 712
         {
713 713
             $type[12] = 'handle-media-up-to-US-Legal-A4';
714 714
             $value_parsed -= 4096;
715 715
         }
716 716
 
717
-        if ($value_parsed %16384 == 8192)
717
+        if ($value_parsed % 16384 == 8192)
718 718
         {
719 719
             $type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
720 720
             $value_parsed -= 8192;
721 721
         }
722 722
 
723
-        if ($value_parsed %32768 == 16384)
723
+        if ($value_parsed % 32768 == 16384)
724 724
         {
725 725
             $type[14] = 'handle-media-larger-than-ISO_C-A2';
726 726
             $value_parsed -= 16384;
727 727
         }
728 728
 
729
-        if ($value_parsed %65536 == 32768)
729
+        if ($value_parsed % 65536 == 32768)
730 730
         {
731 731
             $type[15] = 'handle-user-defined-media-sizes';
732 732
             $value_parsed -= 32768;
733 733
         }
734 734
 
735
-        if ($value_parsed %131072 == 65536)
735
+        if ($value_parsed % 131072 == 65536)
736 736
         {
737 737
             $type[16] = 'implicit-server-generated-class';
738 738
             $value_parsed -= 65536;
739 739
         }
740 740
 
741
-        if ($value_parsed %262144 == 131072)
741
+        if ($value_parsed % 262144 == 131072)
742 742
         {
743 743
             $type[17] = 'network-default-printer';
744 744
             $value_parsed -= 131072;
745 745
         }
746 746
 
747
-        if ($value_parsed %524288 == 262144)
747
+        if ($value_parsed % 524288 == 262144)
748 748
         {
749 749
             $type[18] = 'fax-device';
750 750
             $value_parsed -= 262144;
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
     }
755 755
 
756 756
 
757
-    protected function _interpretEnum($attribute_name,$value)
757
+    protected function _interpretEnum($attribute_name, $value)
758 758
     {
759 759
         $value_parsed = self::_interpretInteger($value);
760 760
 
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
                 $value = $value_parsed;
766 766
                 break;
767 767
             default:
768
-                $value = parent::_interpretEnum($attribute_name,$value);
768
+                $value = parent::_interpretEnum($attribute_name, $value);
769 769
                 break;
770 770
         }
771 771
 
Please login to merge, or discard this patch.
htdocs/includes/printipp/http_class.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
102 102
 		E_USER_NOTICE => 'E_USER_NOTICE'
103 103
 	);
104 104
 	if (defined('E_STRICT')) {
105
-		$level_names[E_STRICT]='E_STRICT';
105
+		$level_names[E_STRICT] = 'E_STRICT';
106 106
 	}
107
-	$levels=array();
108
-	if (($value&E_ALL)==E_ALL) {
109
-		$levels[]='E_ALL';
110
-		$value&=~E_ALL;
107
+	$levels = array();
108
+	if (($value&E_ALL) == E_ALL) {
109
+		$levels[] = 'E_ALL';
110
+		$value &= ~E_ALL;
111 111
 	}
112 112
 	foreach ($level_names as $level=>$name) {
113
-		if (($value&$level)==$level) {
114
-			$levels[]=$name;
113
+		if (($value & $level) == $level) {
114
+			$levels[] = $name;
115 115
 		}
116 116
 	}
117 117
 	return implode(' | ', $levels);
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
127 127
 	// variables declaration
128 128
 	public $debug;
129 129
 	public $html_debug;
130
-	public $timeout = 30;  // time waiting for connection, seconds
130
+	public $timeout = 30; // time waiting for connection, seconds
131 131
 	public $data_timeout = 30; // time waiting for data, milliseconds
132 132
 	public $data_chunk_timeout = 1; // time waiting between data chunks, millisecond
133 133
 	public $force_multipart_form_post;
134 134
 	public $username;
135 135
 	public $password;
136
-	public $request_headers = array ();
136
+	public $request_headers = array();
137 137
 	public $request_body = "Not a useful information";
138 138
 	public $status;
139 139
 	public $window_size = 1024; // chunk size of data
@@ -142,11 +142,11 @@  discard block
 block discarded – undo
142 142
 	public $host;
143 143
 	private $default_port = 631;
144 144
 	private $headers;
145
-	private $reply_headers = array ();
146
-	private $reply_body = array ();
145
+	private $reply_headers = array();
146
+	private $reply_body = array();
147 147
 	private $connection;
148 148
 	private $arguments;
149
-	private $bodystream = array ();
149
+	private $bodystream = array();
150 150
 	private $last_limit;
151 151
 	private $connected;
152 152
 	private $nc = 1;
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 
167 167
 	public function GetRequestArguments($url, &$arguments)
168 168
 	{
169
-		$this->arguments = array ();
169
+		$this->arguments = array();
170 170
 		$this->arguments["URL"] = $arguments["URL"] = $url;
171 171
 		$this->arguments["RequestMethod"] = $arguments["RequestMethod"] = "POST";
172 172
 		$this->headers["Content-Length"] = 0;
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 			return $this->_HttpError($error, E_USER_WARNING);
231 231
 		}
232 232
 		$this->connected = true;
233
-		return array (true, "success");
233
+		return array(true, "success");
234 234
 	}
235 235
 
236 236
 	public function SendRequest($arguments)
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 		}
244 244
 		self::_ReadReply();
245 245
 		if (!preg_match('#http/1.1 401 unauthorized#', $this->status)) {
246
-			return array (true, "success");
246
+			return array(true, "success");
247 247
 		}
248 248
 		$headers = array_keys($this->reply_headers);
249 249
 		$error = _("need authentication but no mechanism provided");
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			return $this->_HttpError($error.": ".$result[1], E_USER_WARNING);
280 280
 		}
281 281
 		self::_ReadReply();
282
-		return array (true, "success");
282
+		return array(true, "success");
283 283
 	}
284 284
 
285 285
 	public function ReadReplyHeaders(&$headers)
@@ -314,13 +314,13 @@  discard block
 block discarded – undo
314 314
 		foreach ($backtrace as $trace) {
315 315
 			$trace .= sprintf("in [file: '%s'][function: '%s'][line: %s];\n", $trace['file'], $trace['function'], $trace['line']);
316 316
 		}
317
-		$msg = sprintf( '%s\n%s: [errno: %s]: %s',
317
+		$msg = sprintf('%s\n%s: [errno: %s]: %s',
318 318
 			$trace, error2string($level), $errno, $msg);
319 319
 		if ($this->with_exceptions) {
320 320
 			throw new httpException($msg, $errno);
321 321
 		} else {
322 322
 			trigger_error($msg, $level);
323
-			return array (false, $msg);
323
+			return array(false, $msg);
324 324
 		}
325 325
 	}
326 326
 
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 	private function _StreamRequest($arguments)
337 337
 	{
338 338
 		$this->status = false;
339
-		$this->reply_headers = array ();
339
+		$this->reply_headers = array();
340 340
 		$this->reply_body = "";
341 341
 		if (!$this->connected) {
342 342
 			return $this->_HttpError(_("not connected"), E_USER_WARNING);
@@ -413,17 +413,17 @@  discard block
 block discarded – undo
413 413
 				}
414 414
 			}
415 415
 		}
416
-		return array (true, "success");
416
+		return array(true, "success");
417 417
 	}
418 418
 
419 419
 	private function _ReadReply()
420 420
 	{
421 421
 		if (!$this->connected) {
422
-			return array (false, _("not connected"));
422
+			return array(false, _("not connected"));
423 423
 		}
424
-		$this->reply_headers = array ();
424
+		$this->reply_headers = array();
425 425
 		$this->reply_body = "";
426
-		$headers = array ();
426
+		$headers = array();
427 427
 		$body = "";
428 428
 		while (!feof($this->connection)) {
429 429
 			$line = fgets($this->connection, 1024);
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 
454 454
 	private function _ReadStream()
455 455
 	{
456
-		if (! array_key_exists("content-length", $this->reply_headers)) {
456
+		if (!array_key_exists("content-length", $this->reply_headers)) {
457 457
 			stream_set_blocking($this->connection, 0);
458 458
 			$this->reply_body = stream_get_contents($this->connection);
459 459
 			return true;
Please login to merge, or discard this patch.
htdocs/includes/printipp/PrintIPP.php 1 patch
Spacing   +257 added lines, -257 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 // OPERATIONS
53 53
     public function printJob()
54 54
     {
55
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
55
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
56 56
 
57 57
         if (!$this->_stringJob())
58 58
         {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
         if (is_readable($this->data))
63 63
         {
64
-            self::_putDebug( _("Printing a FILE\n"),3); 
64
+            self::_putDebug(_("Printing a FILE\n"), 3); 
65 65
 
66 66
             $this->output = $this->stringjob;
67 67
 
@@ -70,31 +70,31 @@  discard block
 block discarded – undo
70 70
                 $this->output .= chr(0x16);
71 71
             }
72 72
 
73
-            $post_values = array( "Content-Type" => "application/ipp",
73
+            $post_values = array("Content-Type" => "application/ipp",
74 74
                                   "Data" => $this->output,
75 75
                                   "File" => $this->data);
76 76
 
77 77
             if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
78 78
             {
79
-                $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
79
+                $post_values = array_merge($post_values, array("Filetype"=>"TEXT"));
80 80
             }
81 81
         }
82 82
         else
83 83
         {
84
-            self::_putDebug( _("Printing DATA\n"),3); 
84
+            self::_putDebug(_("Printing DATA\n"), 3); 
85 85
 
86 86
             $this->output = $this->stringjob;
87 87
             $this->output .= $this->datahead;    
88 88
             $this->output .= $this->data;
89 89
             $this->output .= $this->datatail;
90 90
             
91
-            $post_values = array( "Content-Type" => "application/ipp",
91
+            $post_values = array("Content-Type" => "application/ipp",
92 92
                                   "Data" => $this->output);
93 93
         }
94 94
 
95
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
95
+        if (self::_sendHttp($post_values, $this->paths['printers']))
96 96
         {
97
-            if(self::_parseServerOutput())
97
+            if (self::_parseServerOutput())
98 98
             {
99 99
                 $this->_getJobId();
100 100
                 $this->_getJobUri();
@@ -102,24 +102,24 @@  discard block
 block discarded – undo
102 102
             }
103 103
             else
104 104
             {
105
-                $this->jobs = array_merge($this->jobs,array(''));
106
-                $this->jobs_uri = array_merge($this->jobs_uri,array(''));
105
+                $this->jobs = array_merge($this->jobs, array(''));
106
+                $this->jobs_uri = array_merge($this->jobs_uri, array(''));
107 107
                 }
108 108
             }
109 109
 
110 110
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
111 111
         {
112
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
112
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
113 113
 
114 114
             if ($this->serveroutput->status == "successfull-ok")
115 115
             {
116
-              self::_errorLog(sprintf("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
116
+              self::_errorLog(sprintf("printing job %s: ", $this->last_job).$this->serveroutput->status, 3);
117 117
             }
118 118
             else
119 119
             {
120
-                $this->jobs = array_merge($this->jobs,array(""));
121
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
122
-                self::_errorLog(sprintf("printing job: ",$this->last_job) .$this->serveroutput->status,1);
120
+                $this->jobs = array_merge($this->jobs, array(""));
121
+                $this->jobs_uri = array_merge($this->jobs_uri, array(""));
122
+                self::_errorLog(sprintf("printing job: ", $this->last_job).$this->serveroutput->status, 1);
123 123
                 if ($this->with_exceptions)
124 124
                 {
125 125
                     throw new ippException(sprintf("job status: %s",
@@ -129,69 +129,69 @@  discard block
 block discarded – undo
129 129
             return $this->serveroutput->status; 
130 130
         }
131 131
 
132
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
133
-        $this->jobs = array_merge($this->jobs,array(""));
134
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
135
-        self::_errorLog("printing job : OPERATION FAILED",1);
132
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
133
+        $this->jobs = array_merge($this->jobs, array(""));
134
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
135
+        self::_errorLog("printing job : OPERATION FAILED", 1);
136 136
 
137 137
         return false;
138 138
     }
139 139
 
140
-    public function cancelJob ($job_uri)
140
+    public function cancelJob($job_uri)
141 141
     {
142
-        $this->jobs = array_merge($this->jobs,array(""));
143
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
142
+        $this->jobs = array_merge($this->jobs, array(""));
143
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
144 144
 
145
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
145
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
146 146
 
147 147
         if (!$this->_stringCancel($job_uri))
148 148
         {
149 149
             return FALSE;
150 150
         }
151 151
 
152
-        self::_putDebug( _("Cancelling Job $job_uri\n"),3); 
152
+        self::_putDebug(_("Cancelling Job $job_uri\n"), 3); 
153 153
 
154 154
         $this->output = $this->stringjob;
155 155
 
156
-        $post_values = array( "Content-Type"=>"application/ipp",
156
+        $post_values = array("Content-Type"=>"application/ipp",
157 157
                               "Data"=>$this->output);
158 158
 
159
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
159
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
160 160
         {
161 161
             self::_parseServerOutput();
162 162
         }
163 163
 
164 164
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
165 165
         {
166
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
166
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
167 167
 
168 168
             if ($this->serveroutput->status == "successfull-ok")
169 169
             {
170
-                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,3);
170
+                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status, 3);
171 171
             }
172 172
             else
173 173
             {
174
-                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
174
+                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status, 1);
175 175
             }
176 176
             return $this->serveroutput->status; 
177 177
         }
178 178
 
179
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
180
-        self::_errorLog("cancelling job : OPERATION FAILED",3);
179
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
180
+        self::_errorLog("cancelling job : OPERATION FAILED", 3);
181 181
 
182 182
         return false;
183 183
     }
184 184
 
185
-    public function validateJob ()
185
+    public function validateJob()
186 186
     {
187
-        $this->jobs = array_merge($this->jobs,array(""));
188
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
187
+        $this->jobs = array_merge($this->jobs, array(""));
188
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
189 189
 
190 190
         $this->serveroutput->response = '';
191 191
 
192
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
192
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
193 193
 
194
-        self::_putDebug( _("Validate Job\n"),2); 
194
+        self::_putDebug(_("Validate Job\n"), 2); 
195 195
 
196 196
         if (!isset($this->setup->charset))
197 197
         {
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
210 210
             unset($this->status[count($this->status) - 1]);
211 211
 
212
-            if (array_key_exists(0,$this->available_printers))
212
+            if (array_key_exists(0, $this->available_printers))
213 213
             {
214 214
                self::setPrinterURI($this->available_printers[0]);
215 215
             }
216 216
             else
217 217
             {
218
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
219
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
220
-                self::_errorLog(" Printer URI is not set, die",2);
218
+                trigger_error(_("_stringJob: Printer URI is not set: die"), E_USER_WARNING);
219
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
220
+                self::_errorLog(" Printer URI is not set, die", 2);
221 221
                 return FALSE;
222 222
                 }
223 223
             }
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         {
252 252
             if (is_readable($this->data))
253 253
             {
254
-                self::setJobName(basename($this->data),true);
254
+                self::setJobName(basename($this->data), true);
255 255
             }
256 256
             else
257 257
             {
@@ -288,12 +288,12 @@  discard block
 block discarded – undo
288 288
         $jobattributes = '';
289 289
         $operationattributes = '';
290 290
         $printerattributes = '';
291
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes);
291
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
292 292
 
293 293
         self::_setOperationId();
294 294
 
295
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
296
-                         . chr(0x00) . chr (0x04) // Validate-Job | operation-id
295
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
296
+                         . chr(0x00).chr(0x04) // Validate-Job | operation-id
297 297
                          . $this->meta->operation_id //           request-id
298 298
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
299 299
                          . $this->meta->charset
@@ -312,16 +312,16 @@  discard block
 block discarded – undo
312 312
                          . $jobattributes
313 313
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
314 314
 
315
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
315
+        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
316 316
 
317 317
         $this->output = $this->stringjob;
318 318
 
319
-        $post_values = array( "Content-Type"=>"application/ipp",
319
+        $post_values = array("Content-Type"=>"application/ipp",
320 320
                               "Data"=>$this->output);
321 321
 
322
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
322
+        if (self::_sendHttp($post_values, $this->paths['printers']))
323 323
         {
324
-            if(self::_parseServerOutput())
324
+            if (self::_parseServerOutput())
325 325
             {
326 326
                 self::_parseAttributes();
327 327
             }
@@ -329,33 +329,33 @@  discard block
 block discarded – undo
329 329
 
330 330
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
331 331
         {
332
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
332
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
333 333
 
334 334
             if ($this->serveroutput->status == "successfull-ok")
335 335
             {
336
-                self::_errorLog("validate job: ".$this->serveroutput->status,3);
336
+                self::_errorLog("validate job: ".$this->serveroutput->status, 3);
337 337
             }
338 338
             else
339 339
             {
340
-                self::_errorLog("validate job: ".$this->serveroutput->status,1);
340
+                self::_errorLog("validate job: ".$this->serveroutput->status, 1);
341 341
             }
342 342
             return $this->serveroutput->status; 
343 343
         }
344 344
 
345
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
346
-        self::_errorLog("validate job : OPERATION FAILED",3);
345
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
346
+        self::_errorLog("validate job : OPERATION FAILED", 3);
347 347
 
348 348
         return false;
349 349
     }
350 350
 
351 351
     public function getPrinterAttributes()
352 352
     {
353
-        $this->jobs = array_merge($this->jobs,array(""));
354
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
353
+        $this->jobs = array_merge($this->jobs, array(""));
354
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
355 355
 
356 356
         $jobattributes = '';
357 357
         $operationattributes = '';
358
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
358
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
359 359
         self::_setOperationId();
360 360
         $this->parsed = array();
361 361
         unset($this->printer_attributes);
@@ -367,15 +367,15 @@  discard block
 block discarded – undo
367 367
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
368 368
             unset($this->status[count($this->status) - 1]);
369 369
 
370
-            if (array_key_exists(0,$this->available_printers))
370
+            if (array_key_exists(0, $this->available_printers))
371 371
             {
372 372
                self::setPrinterURI($this->available_printers[0]);
373 373
             }
374 374
             else
375 375
             {
376
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
377
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
378
-                self::_errorLog(" Printer URI is not set, die",2);
376
+                trigger_error(_("_stringJob: Printer URI is not set: die"), E_USER_WARNING);
377
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
378
+                self::_errorLog(" Printer URI is not set, die", 2);
379 379
                 return FALSE;
380 380
                 }
381 381
             }
@@ -395,8 +395,8 @@  discard block
 block discarded – undo
395 395
             self::setUserName();
396 396
         }
397 397
 
398
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
399
-                         . chr(0x00) . chr (0x0b) // Print-URI | operation-id
398
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
399
+                         . chr(0x00).chr(0x0b) // Print-URI | operation-id
400 400
                          . $this->meta->operation_id //           request-id
401 401
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
402 402
                          . $this->meta->charset
@@ -408,14 +408,14 @@  discard block
 block discarded – undo
408 408
 
409 409
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
410 410
 
411
-        self::_putDebug(sprintf(_("Getting printer attributes of %s\n"),$this->printer_uri),2); 
411
+        self::_putDebug(sprintf(_("Getting printer attributes of %s\n"), $this->printer_uri), 2); 
412 412
 
413 413
         $this->output = $this->stringjob;
414 414
 
415
-        $post_values = array( "Content-Type"=>"application/ipp",
415
+        $post_values = array("Content-Type"=>"application/ipp",
416 416
                               "Data"=>$this->output);
417 417
 
418
-        if (self::_sendHttp ($post_values,$this->paths['root']))
418
+        if (self::_sendHttp($post_values, $this->paths['root']))
419 419
         {
420 420
             if (self::_parseServerOutput())
421 421
             {
@@ -427,35 +427,35 @@  discard block
 block discarded – undo
427 427
 
428 428
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
429 429
         {
430
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
430
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
431 431
 
432
-            if  ($this->serveroutput->status == "successfull-ok")
432
+            if ($this->serveroutput->status == "successfull-ok")
433 433
             {
434
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
435
-                                                                        $this->serveroutput->status),3);
434
+                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"), $this->printer_uri,
435
+                                                                        $this->serveroutput->status), 3);
436 436
             }
437 437
             else 
438 438
             {
439
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
440
-                                                                        $this->serveroutput->status),1);
439
+                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"), $this->printer_uri,
440
+                                                                        $this->serveroutput->status), 1);
441 441
             }
442 442
 
443 443
             return $this->serveroutput->status;
444 444
         }
445 445
 
446
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
446
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
447 447
         self::_errorLog(date("Y-m-d H:i:s : ")
448 448
             .basename($_SERVER['PHP_SELF'])
449 449
             .sprintf(_("getting printer's attributes of %s : OPERATION FAILED"),
450
-                $this->printer_uri),3);
450
+                $this->printer_uri), 3);
451 451
 
452 452
         return false;
453 453
     }
454 454
 
455
-    public function getJobs($my_jobs=true,$limit=0,$which_jobs="not-completed",$subset=false)
455
+    public function getJobs($my_jobs = true, $limit = 0, $which_jobs = "not-completed", $subset = false)
456 456
     {
457
-        $this->jobs = array_merge($this->jobs,array(""));
458
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
457
+        $this->jobs = array_merge($this->jobs, array(""));
458
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
459 459
 
460 460
         self::_setOperationId();
461 461
         $this->parsed = array();
@@ -468,15 +468,15 @@  discard block
 block discarded – undo
468 468
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
469 469
             unset($this->status[count($this->status) - 1]);
470 470
 
471
-            if (array_key_exists(0,$this->available_printers))
471
+            if (array_key_exists(0, $this->available_printers))
472 472
             {
473 473
                self::setPrinterURI($this->available_printers[0]);
474 474
             }
475 475
             else
476 476
             {
477
-                trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
478
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
479
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
477
+                trigger_error(_("getJobs: Printer URI is not set: die"), E_USER_WARNING);
478
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
479
+                self::_errorLog("getJobs: Printer URI is not set, die", 2);
480 480
                 return FALSE;
481 481
                 }
482 482
             }
@@ -536,8 +536,8 @@  discard block
 block discarded – undo
536 536
             $this->meta->my_jobs = '';
537 537
         }
538 538
 
539
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
540
-                         . chr(0x00) . chr (0x0A) // Get-Jobs | operation-id
539
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
540
+                         . chr(0x00).chr(0x0A) // Get-Jobs | operation-id
541 541
                          . $this->meta->operation_id //           request-id
542 542
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
543 543
                          . $this->meta->charset
@@ -584,14 +584,14 @@  discard block
 block discarded – undo
584 584
 
585 585
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
586 586
 
587
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
587
+        self::_putDebug(sprintf(_("getting jobs of %s\n"), $this->printer_uri), 2); 
588 588
 
589 589
         $this->output = $this->stringjob;
590 590
 
591
-        $post_values = array( "Content-Type"=>"application/ipp",
591
+        $post_values = array("Content-Type"=>"application/ipp",
592 592
                               "Data"=>$this->output);
593 593
 
594
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
594
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
595 595
         {
596 596
             if (self::_parseServerOutput())
597 597
             {
@@ -603,36 +603,36 @@  discard block
 block discarded – undo
603 603
 
604 604
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
605 605
         {
606
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
606
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
607 607
 
608 608
             if ($this->serveroutput->status == "successfull-ok")
609 609
             {
610
-                self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
611
-                            .$this->serveroutput->status,3);
610
+                self::_errorLog(sprintf(_("getting jobs of printer %s: "), $this->printer_uri)
611
+                            .$this->serveroutput->status, 3);
612 612
             }
613 613
             else
614 614
             {
615
-                 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
616
-                                             .$this->serveroutput->status,1);
615
+                 self::_errorLog(sprintf(_("getting jobs of printer %s: "), $this->printer_uri)
616
+                                             .$this->serveroutput->status, 1);
617 617
             }
618 618
 
619 619
             return $this->serveroutput->status;
620 620
         }
621 621
 
622
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
622
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
623 623
         self::_errorLog(date("Y-m-d H:i:s : ")
624 624
                         .basename($_SERVER['PHP_SELF'])
625 625
                         .sprintf(_("getting jobs of %s : OPERATION FAILED"),
626
-                                     $this->printer_uri),3);
626
+                                     $this->printer_uri), 3);
627 627
 
628 628
     return false;
629 629
     }
630 630
 
631 631
 
632
-    public function getJobAttributes($job_uri,$subset=false,$attributes_group="all")
632
+    public function getJobAttributes($job_uri, $subset = false, $attributes_group = "all")
633 633
     {
634
-        $this->jobs = array_merge($this->jobs,array(""));
635
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
634
+        $this->jobs = array_merge($this->jobs, array(""));
635
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
636 636
 
637 637
         if (!$job_uri)
638 638
         {
@@ -651,15 +651,15 @@  discard block
 block discarded – undo
651 651
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
652 652
             unset($this->status[count($this->status) - 1]);
653 653
 
654
-            if (array_key_exists(0,$this->available_printers))
654
+            if (array_key_exists(0, $this->available_printers))
655 655
             {
656 656
                self::setPrinterURI($this->available_printers[0]);
657 657
             }
658 658
             else
659 659
             {
660
-                trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
661
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
662
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
660
+                trigger_error(_("getJobs: Printer URI is not set: die"), E_USER_WARNING);
661
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
662
+                self::_errorLog("getJobs: Printer URI is not set, die", 2);
663 663
                 return FALSE;
664 664
             }
665 665
         }
@@ -685,8 +685,8 @@  discard block
 block discarded – undo
685 685
                              . self::_giveMeStringLength($job_uri)
686 686
                              . $job_uri;
687 687
 
688
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
689
-                         . chr(0x00) . chr (0x09) // Get-Job-Attributes | operation-id
688
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
689
+                         . chr(0x00).chr(0x09) // Get-Job-Attributes | operation-id
690 690
                          . $this->meta->operation_id //           request-id
691 691
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
692 692
                          . $this->meta->charset
@@ -717,9 +717,9 @@  discard block
 block discarded – undo
717 717
                          . self::_giveMeStringLength('job-state-reason')
718 718
                          . 'job-state-reason';
719 719
         }
720
-        elseif($attributes_group)
720
+        elseif ($attributes_group)
721 721
         {
722
-            switch($attributes_group)
722
+            switch ($attributes_group)
723 723
             {
724 724
                 case 'job-template':
725 725
                     break;
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
                 case 'all':
729 729
                     break;
730 730
                 default:
731
-                    trigger_error(_('not a valid attribute group: ').$attributes_group,E_USER_NOTICE);
731
+                    trigger_error(_('not a valid attribute group: ').$attributes_group, E_USER_NOTICE);
732 732
                     $attributes_group = '';
733 733
                     break;
734 734
             }
@@ -743,14 +743,14 @@  discard block
 block discarded – undo
743 743
 
744 744
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
745 745
 
746
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
746
+        self::_putDebug(sprintf(_("getting jobs of %s\n"), $this->printer_uri), 2); 
747 747
 
748 748
         $this->output = $this->stringjob;
749 749
 
750
-        $post_values = array( "Content-Type"=>"application/ipp",
750
+        $post_values = array("Content-Type"=>"application/ipp",
751 751
                               "Data"=>$this->output);
752 752
 
753
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
753
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
754 754
         {
755 755
             if (self::_parseServerOutput())
756 756
             {
@@ -762,27 +762,27 @@  discard block
 block discarded – undo
762 762
 
763 763
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
764 764
         {
765
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
765
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
766 766
 
767 767
             if ($this->serveroutput->status == "successfull-ok")
768 768
             {
769
-                self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
770
-                            .$this->serveroutput->status,3);
769
+                self::_errorLog(sprintf(_("getting job attributes for %s: "), $job_uri)
770
+                            .$this->serveroutput->status, 3);
771 771
             }
772 772
             else
773 773
             {
774
-                 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
775
-                                             .$this->serveroutput->status,1);
774
+                 self::_errorLog(sprintf(_("getting job attributes for %s: "), $job_uri)
775
+                                             .$this->serveroutput->status, 1);
776 776
             }
777 777
 
778 778
             return $this->serveroutput->status;
779 779
         }
780 780
 
781
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
781
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
782 782
         self::_errorLog(date("Y-m-d H:i:s : ")
783 783
                         .basename($_SERVER['PHP_SELF'])
784 784
                         .sprintf(_("getting jobs attributes of %s : OPERATION FAILED"),
785
-                                     $job_uri),3);
785
+                                     $job_uri), 3);
786 786
 
787 787
         return false;
788 788
     }
@@ -790,12 +790,12 @@  discard block
 block discarded – undo
790 790
     public function getPrinters()
791 791
     {
792 792
         // placeholder for vendor extension operation (getAvailablePrinters for CUPS)
793
-        $this->jobs = array_merge($this->jobs,array(''));
794
-        $this->jobs_uri = array_merge($this->jobs_uri,array(''));
795
-        $this->status = array_merge($this->status,array(''));    
793
+        $this->jobs = array_merge($this->jobs, array(''));
794
+        $this->jobs_uri = array_merge($this->jobs_uri, array(''));
795
+        $this->status = array_merge($this->status, array(''));    
796 796
     }
797 797
 
798
-    public function generateError ($error)
798
+    public function generateError($error)
799 799
     {
800 800
         switch ($error)
801 801
         {
@@ -807,31 +807,31 @@  discard block
 block discarded – undo
807 807
                 break;
808 808
         }
809 809
 
810
-        trigger_error(sprintf(_('Setting Error %s'),$error),E_USER_NOTICE);
810
+        trigger_error(sprintf(_('Setting Error %s'), $error), E_USER_NOTICE);
811 811
     }
812 812
     
813
-    public function resetError ($error)
813
+    public function resetError($error)
814 814
     {
815 815
         unset ($this->error_generation->$error);
816
-        trigger_error(sprintf(_('Reset Error %s'),$error),E_USER_NOTICE);
816
+        trigger_error(sprintf(_('Reset Error %s'), $error), E_USER_NOTICE);
817 817
     }
818 818
 
819 819
     // SETUP
820
-    protected function _setOperationId ()
820
+    protected function _setOperationId()
821 821
     {
822 822
             $prepend = '';
823 823
             $this->operation_id += 1;
824 824
             $this->meta->operation_id = self::_integerBuild($this->operation_id);
825
-            self::_putDebug( "operation id is: ".$this->operation_id."\n",2);
825
+            self::_putDebug("operation id is: ".$this->operation_id."\n", 2);
826 826
     }
827 827
     
828 828
     protected function _setJobId()
829 829
     {
830 830
 
831
-        $this->meta->jobid +=1;
831
+        $this->meta->jobid += 1;
832 832
         $prepend = '';
833 833
         $prepend_length = 4 - strlen($this->meta->jobid);
834
-        for ($i = 0; $i < $prepend_length ; $i++ )
834
+        for ($i = 0; $i < $prepend_length; $i++)
835 835
         {
836 836
             $prepend .= '0';
837 837
         }
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
     return $prepend.$this->meta->jobid;
840 840
     }
841 841
     
842
-    protected function _setJobUri ($job_uri)
842
+    protected function _setJobUri($job_uri)
843 843
     {
844 844
         $this->meta->job_uri = chr(0x45) // type uri
845 845
                              . chr(0x00).chr(0x07) // name-length
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
                              . self::_giveMeStringLength($job_uri)
849 849
                              . $job_uri;
850 850
         
851
-        self::_putDebug( "job-uri is: ".$job_uri."\n",2);
851
+        self::_putDebug("job-uri is: ".$job_uri."\n", 2);
852 852
     }
853 853
 
854 854
     // RESPONSE PARSING
@@ -859,9 +859,9 @@  discard block
 block discarded – undo
859 859
 
860 860
         $k = -1;
861 861
         $l = 0;
862
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
862
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
863 863
         {
864
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
864
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
865 865
             {
866 866
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
867 867
                 {
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
                 }
875 875
                 else
876 876
                 {
877
-                    $l ++;
877
+                    $l++;
878 878
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
879 879
                     }
880 880
             }
@@ -882,16 +882,16 @@  discard block
 block discarded – undo
882 882
         $this->serveroutput->response = array();
883 883
 
884 884
         $this->printer_attributes = new \stdClass();
885
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
885
+        for ($i = 0; $i < count($this->parsed); $i++)
886 886
         {
887 887
                     $name = $this->parsed[$i]['name'];
888
-                    $php_name = str_replace('-','_',$name);
888
+                    $php_name = str_replace('-', '_', $name);
889 889
                     $type = $this->parsed[$i]['type'];
890 890
                     $range = $this->parsed[$i]['range'];
891 891
                     $this->printer_attributes->$php_name = new \stdClass();
892 892
                     $this->printer_attributes->$php_name->_type = $type;
893 893
                     $this->printer_attributes->$php_name->_range = $range;
894
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
894
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
895 895
                     {
896 896
                         $value = $this->parsed[$i][$j];
897 897
                         $index = '_value'.$j;
@@ -909,14 +909,14 @@  discard block
 block discarded – undo
909 909
 
910 910
         $job = -1;
911 911
         $l = 0;
912
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
912
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
913 913
         {
914 914
             if ($this->serveroutput->response[$i]['attributes'] == "job-attributes")
915 915
             {
916
-                $job ++;
916
+                $job++;
917 917
             }
918 918
             $k = -1; 
919
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
919
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
920 920
             {
921 921
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
922 922
                 {
@@ -929,7 +929,7 @@  discard block
 block discarded – undo
929 929
                 }
930 930
                 else
931 931
                 {
932
-                    $l ++;
932
+                    $l++;
933 933
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
934 934
                 }
935 935
             }
@@ -937,20 +937,20 @@  discard block
 block discarded – undo
937 937
 
938 938
         $this->serveroutput->response = array();
939 939
         $this->jobs_attributes = new \stdClass();
940
-        for ($job_nbr = 0 ; $job_nbr <= $job ; $job_nbr ++)
940
+        for ($job_nbr = 0; $job_nbr <= $job; $job_nbr++)
941 941
         {
942 942
             $job_index = "job_".$job_nbr;
943 943
             $this->jobs_attributes->$job_index = new \stdClass();
944
-            for ($i = 0 ; $i < count($this->parsed[$job_nbr]) ; $i ++)
944
+            for ($i = 0; $i < count($this->parsed[$job_nbr]); $i++)
945 945
             {
946 946
                 $name = $this->parsed[$job_nbr][$i]['name'];
947
-                $php_name = str_replace('-','_',$name);
947
+                $php_name = str_replace('-', '_', $name);
948 948
                 $type = $this->parsed[$job_nbr][$i]['type'];
949 949
                 $range = $this->parsed[$job_nbr][$i]['range'];
950 950
                 $this->jobs_attributes->$job_index->$php_name = new \stdClass();
951 951
                 $this->jobs_attributes->$job_index->$php_name->_type = $type;
952 952
                 $this->jobs_attributes->$job_index->$php_name->_range = $range;
953
-                for ($j = 0 ; $j < (count($this->parsed[$job_nbr][$i]) - 3) ; $j ++)
953
+                for ($j = 0; $j < (count($this->parsed[$job_nbr][$i]) - 3); $j++)
954 954
                 {
955 955
                     # This causes incorrect parsing of integer job attributes.
956 956
                     # 2010-08-16
@@ -980,28 +980,28 @@  discard block
 block discarded – undo
980 980
             case "begCollection": //RFC3382 (BLIND CODE)
981 981
                 if ($this->end_collection)
982 982
                 {
983
-                    $this->index --;
983
+                    $this->index--;
984 984
                 }
985 985
                 $this->end_collection = false;
986 986
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
987
-                self::_putDebug( "tag is: begCollection\n");
988
-                self::_readAttributeName ($attributes_type,$j);
987
+                self::_putDebug("tag is: begCollection\n");
988
+                self::_readAttributeName($attributes_type, $j);
989 989
                 if (!$this->serveroutput->response[$attributes_type][$j]['name'])
990 990
                 { // it is a multi-valued collection
991
-                    $this->collection_depth ++;
992
-                    $this->index --;
993
-                    $this->collection_nbr[$this->collection_depth] ++;
991
+                    $this->collection_depth++;
992
+                    $this->index--;
993
+                    $this->collection_nbr[$this->collection_depth]++;
994 994
                 }
995 995
                 else
996 996
                 {
997
-                    $this->collection_depth ++;
997
+                    $this->collection_depth++;
998 998
                     if ($this->collection_depth == 0)
999 999
                     {
1000 1000
                         $this->collection = (object) 'collection';
1001 1001
                     }
1002
-                    if (array_key_exists($this->collection_depth,$this->collection_nbr))
1002
+                    if (array_key_exists($this->collection_depth, $this->collection_nbr))
1003 1003
                     {
1004
-                        $this->collection_nbr[$this->collection_depth] ++;
1004
+                        $this->collection_nbr[$this->collection_depth]++;
1005 1005
                     }
1006 1006
                     else
1007 1007
                     {
@@ -1009,22 +1009,22 @@  discard block
 block discarded – undo
1009 1009
                     }
1010 1010
                     unset($this->end_collection);
1011 1011
                 }
1012
-                self::_readValue ("begCollection",$attributes_type,$j);
1012
+                self::_readValue("begCollection", $attributes_type, $j);
1013 1013
                 break;
1014 1014
             case "endCollection": //RFC3382 (BLIND CODE)
1015 1015
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
1016
-                self::_putDebug( "tag is: endCollection\n");
1017
-                self::_readAttributeName ($attributes_type,$j,0);
1018
-                self::_readValue ('name',$attributes_type,$j,0);
1019
-                $this->collection_depth --;
1016
+                self::_putDebug("tag is: endCollection\n");
1017
+                self::_readAttributeName($attributes_type, $j, 0);
1018
+                self::_readValue('name', $attributes_type, $j, 0);
1019
+                $this->collection_depth--;
1020 1020
                 $this->collection_key[$this->collection_depth] = 0;
1021 1021
                 $this->end_collection = true;
1022 1022
                 break;
1023 1023
             case "memberAttrName": // RFC3382 (BLIND CODE)
1024 1024
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "memberAttrName";
1025
-                $this->index -- ;
1026
-                self::_putDebug( "tag is: memberAttrName\n");
1027
-                self::_readCollection ($attributes_type,$j);
1025
+                $this->index--;
1026
+                self::_putDebug("tag is: memberAttrName\n");
1027
+                self::_readCollection($attributes_type, $j);
1028 1028
                 break;
1029 1029
 
1030 1030
             default:
@@ -1032,8 +1032,8 @@  discard block
 block discarded – undo
1032 1032
                 $this->collection_key = array();
1033 1033
                 $this->collection_nbr = array();
1034 1034
                 $this->serveroutput->response[$attributes_type][$j]['type'] = $tag;
1035
-                self::_putDebug( "tag is: $tag\n");
1036
-                $attribute_name = self::_readAttributeName ($attributes_type,$j);
1035
+                self::_putDebug("tag is: $tag\n");
1036
+                $attribute_name = self::_readAttributeName($attributes_type, $j);
1037 1037
                 if (!$attribute_name)
1038 1038
                 {
1039 1039
                     $attribute_name = $this->attribute_name;
@@ -1042,9 +1042,9 @@  discard block
 block discarded – undo
1042 1042
                 {
1043 1043
                     $this->attribute_name = $attribute_name;
1044 1044
                 }
1045
-                $value = self::_readValue ($tag,$attributes_type,$j);
1045
+                $value = self::_readValue($tag, $attributes_type, $j);
1046 1046
                 $this->serveroutput->response[$attributes_type][$j]['value'] = 
1047
-                self::_interpretAttribute($attribute_name,$tag,$this->serveroutput->response[$attributes_type][$j]['value']);
1047
+                self::_interpretAttribute($attribute_name, $tag, $this->serveroutput->response[$attributes_type][$j]['value']);
1048 1048
                 break;
1049 1049
         }
1050 1050
         return;
@@ -1164,13 +1164,13 @@  discard block
 block discarded – undo
1164 1164
                 {
1165 1165
                     $tag = "new character string type";
1166 1166
                 }
1167
-                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
1167
+                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80)
1168 1168
                 {
1169 1169
                     $tag = "IETF reserved for future";
1170 1170
                 }
1171 1171
                 else
1172 1172
                 {
1173
-                    $tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
1173
+                    $tag = sprintf("UNKNOWN: 0x%x (%u)", $tag, $tag);
1174 1174
                 }
1175 1175
                 break;                                                            
1176 1176
         }
@@ -1178,14 +1178,14 @@  discard block
 block discarded – undo
1178 1178
         return $tag; 
1179 1179
     }
1180 1180
 
1181
-    protected function _readCollection($attributes_type,$j)
1181
+    protected function _readCollection($attributes_type, $j)
1182 1182
     {
1183
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
1183
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1184 1184
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1185 1185
 
1186 1186
         $this->_parsing->offset += 2;
1187 1187
 
1188
-        self::_putDebug( "Collection name_length ". $name_length ."\n");
1188
+        self::_putDebug("Collection name_length ".$name_length."\n");
1189 1189
 
1190 1190
         $name = '';
1191 1191
         for ($i = 0; $i < $name_length; $i++)
@@ -1200,11 +1200,11 @@  discard block
 block discarded – undo
1200 1200
 
1201 1201
         $collection_name = $name;
1202 1202
 
1203
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
1203
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1204 1204
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1205 1205
         $this->_parsing->offset += 2;
1206 1206
 
1207
-        self::_putDebug( "Attribute name_length ". $name_length ."\n");
1207
+        self::_putDebug("Attribute name_length ".$name_length."\n");
1208 1208
 
1209 1209
         $name = '';
1210 1210
         for ($i = 0; $i < $name_length; $i++)
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
         if ($attribute_name == "")
1222 1222
         {
1223 1223
             $attribute_name = $this->last_attribute_name;
1224
-            $this->collection_key[$this->collection_depth] ++;
1224
+            $this->collection_key[$this->collection_depth]++;
1225 1225
         }
1226 1226
         else
1227 1227
         {
@@ -1229,18 +1229,18 @@  discard block
 block discarded – undo
1229 1229
         }
1230 1230
         $this->last_attribute_name = $attribute_name;
1231 1231
 
1232
-        self::_putDebug( "Attribute name ".$name."\n");
1232
+        self::_putDebug("Attribute name ".$name."\n");
1233 1233
 
1234 1234
         $tag = self::_readTag(ord($this->serveroutput->body[$this->_parsing->offset]));
1235
-        $this->_parsing->offset ++;
1235
+        $this->_parsing->offset++;
1236 1236
 
1237 1237
         $type = $tag;
1238 1238
 
1239
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
1239
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1240 1240
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1241 1241
         $this->_parsing->offset += 2;
1242 1242
 
1243
-        self::_putDebug( "Collection2 name_length ". $name_length ."\n");
1243
+        self::_putDebug("Collection2 name_length ".$name_length."\n");
1244 1244
 
1245 1245
         $name = '';
1246 1246
         for ($i = 0; $i < $name_length; $i++)
@@ -1254,10 +1254,10 @@  discard block
 block discarded – undo
1254 1254
         }
1255 1255
 
1256 1256
         $collection_value = $name;
1257
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
1257
+        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1258 1258
                       +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1259 1259
 
1260
-        self::_putDebug( "Collection value_length ".$this->serveroutput->body[ $this->_parsing->offset]
1260
+        self::_putDebug("Collection value_length ".$this->serveroutput->body[$this->_parsing->offset]
1261 1261
                                        . $this->serveroutput->body[$this->_parsing->offset + 1]
1262 1262
                                        .": "
1263 1263
                                        . $value_length
@@ -1277,7 +1277,7 @@  discard block
 block discarded – undo
1277 1277
         }
1278 1278
 
1279 1279
         $object = &$this->collection;
1280
-        for ($i = 0 ; $i <= $this->collection_depth ; $i ++)
1280
+        for ($i = 0; $i <= $this->collection_depth; $i++)
1281 1281
         {
1282 1282
             $indice = "_indice".$this->collection_nbr[$i];
1283 1283
             if (!isset($object->$indice))
@@ -1291,10 +1291,10 @@  discard block
 block discarded – undo
1291 1291
         $col_name_key = "_collection_name".$this->collection_key[$this->collection_depth];
1292 1292
         $col_val_key = "_collection_value".$this->collection_key[$this->collection_depth];
1293 1293
 
1294
-        $attribute_value = self::_interpretAttribute($attribute_name,$tag,$value);
1295
-        $attribute_name = str_replace('-','_',$attribute_name);
1294
+        $attribute_value = self::_interpretAttribute($attribute_name, $tag, $value);
1295
+        $attribute_name = str_replace('-', '_', $attribute_name);
1296 1296
 
1297
-        self::_putDebug( sprintf("Value: %s\n",$value));
1297
+        self::_putDebug(sprintf("Value: %s\n", $value));
1298 1298
         $object->$attribute_name->_type = $type;
1299 1299
         $object->$attribute_name->$value_key = $attribute_value;
1300 1300
         $object->$attribute_name->$col_name_key = $collection_name;
@@ -1303,13 +1303,13 @@  discard block
 block discarded – undo
1303 1303
         $this->serveroutput->response[$attributes_type][$j]['value'] = $this->collection;
1304 1304
     }
1305 1305
 
1306
-    protected function _readAttributeName ($attributes_type,$j,$write=1)
1306
+    protected function _readAttributeName($attributes_type, $j, $write = 1)
1307 1307
     {
1308
-        $name_length = ord($this->serveroutput->body[ $this->_parsing->offset]) *  256
1308
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1309 1309
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1310 1310
         $this->_parsing->offset += 2;
1311 1311
 
1312
-        self::_putDebug( "name_length ". $name_length ."\n");
1312
+        self::_putDebug("name_length ".$name_length."\n");
1313 1313
 
1314 1314
         $name = '';
1315 1315
         for ($i = 0; $i < $name_length; $i++)
@@ -1322,22 +1322,22 @@  discard block
 block discarded – undo
1322 1322
             $this->_parsing->offset += 1;
1323 1323
         }
1324 1324
 
1325
-        if($write)
1325
+        if ($write)
1326 1326
         {
1327 1327
             $this->serveroutput->response[$attributes_type][$j]['name'] = $name;
1328 1328
         }
1329 1329
 
1330
-        self::_putDebug( "name " . $name . "\n");
1330
+        self::_putDebug("name ".$name."\n");
1331 1331
 
1332 1332
         return $name;   
1333 1333
     }
1334 1334
 
1335
-    protected function _readValue ($type,$attributes_type,$j,$write=1)
1335
+    protected function _readValue($type, $attributes_type, $j, $write = 1)
1336 1336
     {
1337
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
1337
+        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
1338 1338
                       +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1339 1339
         
1340
-        self::_putDebug( "value_length ".$this->serveroutput->body[ $this->_parsing->offset]
1340
+        self::_putDebug("value_length ".$this->serveroutput->body[$this->_parsing->offset]
1341 1341
                                        . $this->serveroutput->body[$this->_parsing->offset + 1]
1342 1342
                                        .": "
1343 1343
                                        . $value_length
@@ -1356,7 +1356,7 @@  discard block
 block discarded – undo
1356 1356
             $this->_parsing->offset += 1;
1357 1357
             }
1358 1358
 
1359
-        self::_putDebug( sprintf("Value: %s\n",$value));
1359
+        self::_putDebug(sprintf("Value: %s\n", $value));
1360 1360
 
1361 1361
         if ($write)
1362 1362
         {
@@ -1370,9 +1370,9 @@  discard block
 block discarded – undo
1370 1370
     {
1371 1371
         $k = -1;
1372 1372
         $l = 0;
1373
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
1373
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
1374 1374
         {
1375
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
1375
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
1376 1376
             {
1377 1377
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
1378 1378
                 {
@@ -1385,23 +1385,23 @@  discard block
 block discarded – undo
1385 1385
                 }
1386 1386
                 else
1387 1387
                 {
1388
-                    $l ++;
1388
+                    $l++;
1389 1389
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
1390 1390
                 }
1391 1391
             }
1392 1392
         }
1393 1393
         $this->serveroutput->response = array();
1394
-        $this->attributes  = new \stdClass();
1395
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
1394
+        $this->attributes = new \stdClass();
1395
+        for ($i = 0; $i < count($this->parsed); $i++)
1396 1396
         {
1397 1397
                     $name = $this->parsed[$i]['name'];
1398
-                    $php_name = str_replace('-','_',$name);
1398
+                    $php_name = str_replace('-', '_', $name);
1399 1399
                     $type = $this->parsed[$i]['type'];
1400 1400
                     $range = $this->parsed[$i]['range'];
1401 1401
                     $this->attributes->$php_name = new \stdClass();
1402 1402
                     $this->attributes->$php_name->_type = $type;
1403 1403
                     $this->attributes->$php_name->_range = $range;
1404
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
1404
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
1405 1405
                     {
1406 1406
                         $value = $this->parsed[$i][$j];
1407 1407
                         $index = '_value'.$j;
@@ -1418,9 +1418,9 @@  discard block
 block discarded – undo
1418 1418
         //    return false;
1419 1419
         $k = -1;
1420 1420
         $l = 0;
1421
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
1421
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
1422 1422
         {
1423
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
1423
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
1424 1424
             {
1425 1425
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
1426 1426
                 {
@@ -1433,7 +1433,7 @@  discard block
 block discarded – undo
1433 1433
                 }
1434 1434
                 else
1435 1435
                 {
1436
-                    $l ++;
1436
+                    $l++;
1437 1437
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
1438 1438
                 }
1439 1439
             }
@@ -1442,16 +1442,16 @@  discard block
 block discarded – undo
1442 1442
         $this->serveroutput->response = array();
1443 1443
 
1444 1444
         $this->job_attributes = new \stdClass();
1445
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
1445
+        for ($i = 0; $i < count($this->parsed); $i++)
1446 1446
         {
1447 1447
                     $name = $this->parsed[$i]['name'];
1448
-                    $php_name = str_replace('-','_',$name);
1448
+                    $php_name = str_replace('-', '_', $name);
1449 1449
                     $type = $this->parsed[$i]['type'];
1450 1450
                     $range = $this->parsed[$i]['range'];
1451 1451
                     $this->job_attributes->$php_name = new \stdClass();
1452 1452
                     $this->job_attributes->$php_name->_type = $type;
1453 1453
                     $this->job_attributes->$php_name->_range = $range;
1454
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
1454
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
1455 1455
                     {
1456 1456
                         $value = $this->parsed[$i][$j];
1457 1457
                         $index = '_value'.$j;
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
         $this->parsed = array();
1463 1463
     }
1464 1464
 
1465
-    protected function _interpretAttribute($attribute_name,$type,$value)
1465
+    protected function _interpretAttribute($attribute_name, $type, $value)
1466 1466
     {
1467 1467
         switch ($type)
1468 1468
         {
@@ -1487,12 +1487,12 @@  discard block
 block discarded – undo
1487 1487
                 $value = self::_interpretDateTime($value);
1488 1488
                 break;
1489 1489
             case 'enum':
1490
-                $value = $this->_interpretEnum($attribute_name,$value); // must be overwritten by children
1490
+                $value = $this->_interpretEnum($attribute_name, $value); // must be overwritten by children
1491 1491
                 break;
1492 1492
             case 'resolution':
1493 1493
                 $unit = $value[8];
1494
-                $value = self::_interpretRangeOfInteger(substr($value,0,8));
1495
-                switch($unit)
1494
+                $value = self::_interpretRangeOfInteger(substr($value, 0, 8));
1495
+                switch ($unit)
1496 1496
                 {
1497 1497
                     case chr(0x03):
1498 1498
                         $unit = "dpi";
@@ -1516,32 +1516,32 @@  discard block
 block discarded – undo
1516 1516
 
1517 1517
         $halfsize = strlen($value) / 2;
1518 1518
 
1519
-        $integer1 = self::_interpretInteger(substr($value,0,$halfsize));
1520
-        $integer2 = self::_interpretInteger(substr($value,$halfsize,$halfsize));
1519
+        $integer1 = self::_interpretInteger(substr($value, 0, $halfsize));
1520
+        $integer2 = self::_interpretInteger(substr($value, $halfsize, $halfsize));
1521 1521
 
1522
-        $value_parsed = sprintf('%s-%s',$integer1,$integer2);
1522
+        $value_parsed = sprintf('%s-%s', $integer1, $integer2);
1523 1523
 
1524 1524
         return $value_parsed;
1525 1525
     }
1526 1526
 
1527 1527
     protected function _interpretDateTime($date)
1528 1528
     {
1529
-        $year = self::_interpretInteger(substr($date,0,2));
1530
-        $month =  self::_interpretInteger(substr($date,2,1));
1531
-        $day =  self::_interpretInteger(substr($date,3,1));
1532
-        $hour =  self::_interpretInteger(substr($date,4,1));
1533
-        $minute =  self::_interpretInteger(substr($date,5,1));
1534
-        $second =  self::_interpretInteger(substr($date,6,1));
1535
-        $direction = substr($date,8,1);
1536
-        $hours_from_utc = self::_interpretInteger(substr($date,9,1));
1537
-        $minutes_from_utc = self::_interpretInteger(substr($date,10,1));
1538
-
1539
-        $date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s',$year,$month,$day,$hour,$minute,$second,$direction,$hours_from_utc,$minutes_from_utc);
1529
+        $year = self::_interpretInteger(substr($date, 0, 2));
1530
+        $month = self::_interpretInteger(substr($date, 2, 1));
1531
+        $day = self::_interpretInteger(substr($date, 3, 1));
1532
+        $hour = self::_interpretInteger(substr($date, 4, 1));
1533
+        $minute = self::_interpretInteger(substr($date, 5, 1));
1534
+        $second = self::_interpretInteger(substr($date, 6, 1));
1535
+        $direction = substr($date, 8, 1);
1536
+        $hours_from_utc = self::_interpretInteger(substr($date, 9, 1));
1537
+        $minutes_from_utc = self::_interpretInteger(substr($date, 10, 1));
1538
+
1539
+        $date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s', $year, $month, $day, $hour, $minute, $second, $direction, $hours_from_utc, $minutes_from_utc);
1540 1540
 
1541 1541
         return $date;
1542 1542
     }
1543 1543
 
1544
-    protected function _interpretEnum($attribute_name,$value)
1544
+    protected function _interpretEnum($attribute_name, $value)
1545 1545
     {
1546 1546
         $value_parsed = self::_interpretInteger($value);
1547 1547
 
@@ -1574,7 +1574,7 @@  discard block
 block discarded – undo
1574 1574
                 }
1575 1575
                 if ($value_parsed > 0x09)
1576 1576
                 {
1577
-                    $value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x',$value_parsed);
1577
+                    $value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x', $value_parsed);
1578 1578
                 }
1579 1579
                 break;
1580 1580
             case 'print-quality':
@@ -1608,16 +1608,16 @@  discard block
 block discarded – undo
1608 1608
                 }
1609 1609
                 if ($value_parsed > 0x05)
1610 1610
                 {
1611
-                    $value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x',$value_parsed);
1611
+                    $value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x', $value_parsed);
1612 1612
                 }
1613 1613
                 break;
1614 1614
 
1615 1615
             case 'operations-supported':
1616
-                switch($value_parsed)
1616
+                switch ($value_parsed)
1617 1617
                 {
1618 1618
                     case 0x0000:
1619 1619
                     case 0x0001:
1620
-                        $value = sprintf('Unknown(reserved) : %s',ord($value));
1620
+                        $value = sprintf('Unknown(reserved) : %s', ord($value));
1621 1621
                         break;
1622 1622
                     case 0x0002:
1623 1623
                         $value = 'Print-Job';
@@ -1701,19 +1701,19 @@  discard block
 block discarded – undo
1701 1701
                         $value = 'Get-Notifications';
1702 1702
                         break;
1703 1703
                     case 0x001D:
1704
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
1704
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
1705 1705
                         break;
1706 1706
                     case 0x001E:
1707
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
1707
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
1708 1708
                         break;
1709 1709
                     case 0x001F:
1710
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
1710
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
1711 1711
                         break;
1712 1712
                     case 0x0020:
1713
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
1713
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
1714 1714
                         break;
1715 1715
                     case 0x0021:
1716
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
1716
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
1717 1717
                         break;
1718 1718
                     case 0x0022: 
1719 1719
                         $value = 'Enable-Printer';
@@ -1748,22 +1748,22 @@  discard block
 block discarded – undo
1748 1748
                 }
1749 1749
                 if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
1750 1750
                 {
1751
-                    $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
1751
+                    $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x', $value_parsed);
1752 1752
                 }
1753 1753
                 elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
1754 1754
                 {
1755
-                    if (method_exists($this,'_getEnumVendorExtensions'))
1755
+                    if (method_exists($this, '_getEnumVendorExtensions'))
1756 1756
                     {
1757 1757
                         $value = $this->_getEnumVendorExtensions($value_parsed);
1758 1758
                     }
1759 1759
                     else
1760 1760
                     {
1761
-                        $value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
1761
+                        $value = sprintf('Unknown(Vendor extension for operations): 0x%x', $value_parsed);
1762 1762
                     }
1763 1763
                 }
1764 1764
                 elseif ($value_parsed > 0x8FFF)
1765 1765
                 {
1766
-                    $value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
1766
+                    $value = sprintf('Unknown operation (should not exists): 0x%x', $value_parsed);
1767 1767
                 }
1768 1768
 
1769 1769
                 break;
@@ -1832,7 +1832,7 @@  discard block
 block discarded – undo
1832 1832
                 }
1833 1833
                 if ($value_parsed > 31)
1834 1834
                 {
1835
-                    $value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x',$value_parsed);
1835
+                    $value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x', $value_parsed);
1836 1836
                 }
1837 1837
                 break;
1838 1838
 
@@ -1856,7 +1856,7 @@  discard block
 block discarded – undo
1856 1856
                 }
1857 1857
                 if ($value_parsed > 0x06)
1858 1858
                 {
1859
-                    $value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x',$value_parsed);
1859
+                    $value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x', $value_parsed);
1860 1860
                 }
1861 1861
                 break;
1862 1862
 
@@ -1866,24 +1866,24 @@  discard block
 block discarded – undo
1866 1866
         return $value;
1867 1867
     }
1868 1868
 
1869
-    protected function _getJobId ()
1869
+    protected function _getJobId()
1870 1870
     {
1871 1871
         if (!isset($this->serveroutput->response))
1872 1872
         {
1873
-            $this->jobs = array_merge($this->jobs,array('NO JOB'));
1873
+            $this->jobs = array_merge($this->jobs, array('NO JOB'));
1874 1874
         }
1875 1875
 
1876 1876
         $jobfinded = false;
1877
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
1877
+        for ($i = 0; (!$jobfinded && array_key_exists($i, $this->serveroutput->response)); $i++)
1878 1878
         {
1879 1879
             if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
1880 1880
             {
1881
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
1881
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
1882 1882
                 {
1883 1883
                     if ($this->serveroutput->response[$i][$j]['name'] == "job-id")
1884 1884
                     {
1885 1885
                         $this->last_job = $this->serveroutput->response[$i][$j]['value'];
1886
-                        $this->jobs = array_merge($this->jobs,array($this->serveroutput->response[$i][$j]['value']));
1886
+                        $this->jobs = array_merge($this->jobs, array($this->serveroutput->response[$i][$j]['value']));
1887 1887
                         return;
1888 1888
                     }
1889 1889
                 }
@@ -1891,7 +1891,7 @@  discard block
 block discarded – undo
1891 1891
         }
1892 1892
     }
1893 1893
 
1894
-    protected function _getJobUri ()
1894
+    protected function _getJobUri()
1895 1895
     {
1896 1896
         if (!isset($this->jobs_uri))
1897 1897
         {
@@ -1899,16 +1899,16 @@  discard block
 block discarded – undo
1899 1899
         }
1900 1900
 
1901 1901
         $jobfinded = false;
1902
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
1902
+        for ($i = 0; (!$jobfinded && array_key_exists($i, $this->serveroutput->response)); $i++)
1903 1903
         {
1904 1904
             if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
1905 1905
             {
1906
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
1906
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
1907 1907
                 {
1908 1908
                     if ($this->serveroutput->response[$i][$j]['name'] == "job-uri")
1909 1909
                     {
1910 1910
                         $this->last_job = $this->serveroutput->response[$i][$j]['value'];
1911
-                        $this->jobs_uri = array_merge($this->jobs_uri,array($this->last_job));
1911
+                        $this->jobs_uri = array_merge($this->jobs_uri, array($this->last_job));
1912 1912
                         return;
1913 1913
                     }
1914 1914
                 }
@@ -1917,18 +1917,18 @@  discard block
 block discarded – undo
1917 1917
         $this->last_job = '';
1918 1918
     }
1919 1919
 
1920
-    protected function _parseResponse ()
1920
+    protected function _parseResponse()
1921 1921
    {
1922 1922
         $j = -1;
1923 1923
         $this->index = 0;
1924
-        for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body) ; $i = $this->_parsing->offset)
1924
+        for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body); $i = $this->_parsing->offset)
1925 1925
         {
1926 1926
             $tag = ord($this->serveroutput->body[$this->_parsing->offset]);
1927 1927
 
1928 1928
             if ($tag > 0x0F)
1929 1929
             {
1930 1930
                 self::_readAttribute($j);
1931
-                $this->index ++;
1931
+                $this->index++;
1932 1932
                 continue;
1933 1933
             }
1934 1934
 
@@ -1947,14 +1947,14 @@  discard block
 block discarded – undo
1947 1947
                     $this->_parsing->offset += 1;
1948 1948
                     break;
1949 1949
                 case 0x03:
1950
-                    $j +=1;
1950
+                    $j += 1;
1951 1951
                     $this->serveroutput->response[$j]['attributes'] = "end-of-attributes";
1952
-                    self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
1952
+                    self::_putDebug("tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
1953 1953
                     if ($this->alert_on_end_tag === 1)
1954 1954
                     {
1955 1955
                         echo "END tag OK<br />";
1956 1956
                     }
1957
-                    $this->response_completed[(count($this->response_completed) -1)] = "completed";
1957
+                    $this->response_completed[(count($this->response_completed) - 1)] = "completed";
1958 1958
                     return;
1959 1959
                 case 0x04:
1960 1960
                     $j += 1;
@@ -1970,13 +1970,13 @@  discard block
 block discarded – undo
1970 1970
                     break;
1971 1971
                 default:
1972 1972
                     $j += 1;
1973
-                    $this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"),$tag,$tag);
1973
+                    $this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"), $tag, $tag);
1974 1974
                     $this->index = 0;
1975 1975
                     $this->_parsing->offset += 1;
1976 1976
                     break;
1977 1977
             }
1978 1978
 
1979
-            self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
1979
+            self::_putDebug("tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
1980 1980
         }
1981 1981
         return;
1982 1982
     }
@@ -2003,7 +2003,7 @@  discard block
 block discarded – undo
2003 2003
     */
2004 2004
 
2005 2005
     // REQUEST BUILDING
2006
-    protected function _stringCancel ($job_uri)
2006
+    protected function _stringCancel($job_uri)
2007 2007
     {
2008 2008
     
2009 2009
         if (!isset($this->setup->charset))
@@ -2036,8 +2036,8 @@  discard block
 block discarded – undo
2036 2036
             $this->error_generation->request_body_malformed = "";
2037 2037
         }
2038 2038
 
2039
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
2040
-                         . chr(0x00) . chr (0x08) // cancel-Job | operation-id
2039
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
2040
+                         . chr(0x00).chr(0x08) // cancel-Job | operation-id
2041 2041
                          . $this->meta->operation_id //           request-id
2042 2042
                          . $this->error_generation->request_body_malformed
2043 2043
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
@@ -2048,7 +2048,7 @@  discard block
 block discarded – undo
2048 2048
                          . $this->meta->message
2049 2049
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
2050 2050
                          
2051
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
2051
+        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
2052 2052
         return TRUE;
2053 2053
     }
2054 2054
 }
Please login to merge, or discard this patch.
htdocs/includes/printipp/BasicIPP.php 1 patch
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 
51 51
     public function getErrorFormatted()
52 52
     {
53
-        $return = sprintf("[ipp]: %s -- " . _(" file %s, line %s"),
54
-            $this->getMessage() , $this->getFile() , $this->getLine());
53
+        $return = sprintf("[ipp]: %s -- "._(" file %s, line %s"),
54
+            $this->getMessage(), $this->getFile(), $this->getLine());
55 55
         return $return;
56 56
     }
57 57
 
@@ -157,21 +157,21 @@  discard block
 block discarded – undo
157 157
     public function setPort($port = '631')
158 158
     {
159 159
         $this->port = $port;
160
-        self::_putDebug("Port is " . $this->port, 2);
160
+        self::_putDebug("Port is ".$this->port, 2);
161 161
     }
162 162
 
163 163
     public function setUnix($socket = '/var/run/cups/cups.sock')
164 164
     {
165 165
         $this->host = $socket;
166 166
         $this->unix = true;
167
-        self::_putDebug("Host is " . $this->host, 2);
167
+        self::_putDebug("Host is ".$this->host, 2);
168 168
     }
169 169
 
170 170
     public function setHost($host = 'localhost')
171 171
     {
172 172
         $this->host = $host;
173 173
         $this->unix = false;
174
-        self::_putDebug("Host is " . $this->host, 2);
174
+        self::_putDebug("Host is ".$this->host, 2);
175 175
     }
176 176
 
177 177
     public function setTimeout($timeout)
@@ -183,13 +183,13 @@  discard block
 block discarded – undo
183 183
     {
184 184
         $length = strlen($uri);
185 185
         $length = chr($length);
186
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
186
+        while (strlen($length) < 2) $length = chr(0x00).$length;
187 187
         $this->meta->printer_uri = chr(0x45) // uri type | value-tag
188
-            . chr(0x00) . chr(0x0B) // name-length
188
+            . chr(0x00).chr(0x0B) // name-length
189 189
             . "printer-uri" // printer-uri | name
190
-            . $length . $uri;
190
+            . $length.$uri;
191 191
         $this->printer_uri = $uri;
192
-        self::_putDebug(sprintf(_("Printer URI: %s") , $uri) , 2);
192
+        self::_putDebug(sprintf(_("Printer URI: %s"), $uri), 2);
193 193
         $this->setup->uri = 1;
194 194
     }
195 195
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                 $this->datatail = chr(0x0c);
222 222
             }
223 223
         }
224
-        self::_putDebug(_("Forcing data to be interpreted as RAW TEXT") , 2);
224
+        self::_putDebug(_("Forcing data to be interpreted as RAW TEXT"), 2);
225 225
     }
226 226
 
227 227
     public function unsetRawText()
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
         $this->setup->datatype = 'BINARY';
230 230
         $this->datahead = '';
231 231
         $this->datatail = '';
232
-        self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT") , 2);
232
+        self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT"), 2);
233 233
     }
234 234
 
235 235
     public function setBinary()
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
     public function setFormFeed()
241 241
     {
242
-        $this->datatail = "\r\n" . chr(0x0c);
242
+        $this->datatail = "\r\n".chr(0x0c);
243 243
         unset($this->setup->noFormFeed);
244 244
     }
245 245
 
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
254 254
         $charset = strtolower($charset);
255 255
         $this->charset = $charset;
256 256
         $this->meta->charset = chr(0x47) // charset type | value-tag
257
-            . chr(0x00) . chr(0x12) // name-length
257
+            . chr(0x00).chr(0x12) // name-length
258 258
             . "attributes-charset" // attributes-charset | name
259 259
             . self::_giveMeStringLength($charset) // value-length
260 260
             . $charset; // value
261
-        self::_putDebug(sprintf(_("Charset: %s") , $charset) , 2);
261
+        self::_putDebug(sprintf(_("Charset: %s"), $charset), 2);
262 262
         $this->setup->charset = 1;
263 263
     }
264 264
 
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
266 266
     {
267 267
         $language = strtolower($language);
268 268
         $this->meta->language = chr(0x48) // natural-language type | value-tag
269
-            . chr(0x00) . chr(0x1B) //  name-length
269
+            . chr(0x00).chr(0x1B) //  name-length
270 270
             . "attributes-natural-language" //attributes-natural-language
271 271
             . self::_giveMeStringLength($language) // value-length
272 272
             . $language; // value
273
-        self::_putDebug(sprintf(_("Language: %s") , $language) , 2);
273
+        self::_putDebug(sprintf(_("Language: %s"), $language), 2);
274 274
         $this->setup->language = 1;
275 275
     }
276 276
 
@@ -278,11 +278,11 @@  discard block
 block discarded – undo
278 278
     {
279 279
         self::setBinary();
280 280
         $length = chr(strlen($mime_media_type));
281
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
282
-        self::_putDebug(sprintf(_("mime type: %s") , $mime_media_type) , 2);
281
+        while (strlen($length) < 2) $length = chr(0x00).$length;
282
+        self::_putDebug(sprintf(_("mime type: %s"), $mime_media_type), 2);
283 283
         $this->meta->mime_media_type = chr(0x49) // document-format tag
284
-            . self::_giveMeStringLength('document-format') . 'document-format' //
285
-            . self::_giveMeStringLength($mime_media_type) . $mime_media_type; // value
284
+            . self::_giveMeStringLength('document-format').'document-format' //
285
+            . self::_giveMeStringLength($mime_media_type).$mime_media_type; // value
286 286
         $this->setup->mime_media_type = 1;
287 287
     }
288 288
 
@@ -303,11 +303,11 @@  discard block
 block discarded – undo
303 303
 
304 304
         $copies = self::_integerBuild($nbrcopies);
305 305
         $this->meta->copies = chr(0x21) // integer type | value-tag
306
-            . chr(0x00) . chr(0x06) //             name-length
306
+            . chr(0x00).chr(0x06) //             name-length
307 307
             . "copies" // copies    |             name
308 308
             . self::_giveMeStringLength($copies) // value-length
309 309
             . $copies;
310
-        self::_putDebug(sprintf(_("Copies: %s") , $nbrcopies) , 2);
310
+        self::_putDebug(sprintf(_("Copies: %s"), $nbrcopies), 2);
311 311
         $this->setup->copies = 1;
312 312
     }
313 313
 
@@ -320,12 +320,12 @@  discard block
 block discarded – undo
320 320
         $document_name = substr($document_name, 0, 1023);
321 321
         $length = strlen($document_name);
322 322
         $length = chr($length);
323
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
324
-        self::_putDebug(sprintf(_("document name: %s") , $document_name) , 2);
323
+        while (strlen($length) < 2) $length = chr(0x00).$length;
324
+        self::_putDebug(sprintf(_("document name: %s"), $document_name), 2);
325 325
         $this->meta->document_name = chr(0x41) // textWithoutLanguage tag
326
-            . chr(0x00) . chr(0x0d) // name-length
326
+            . chr(0x00).chr(0x0d) // name-length
327 327
             . "document-name" // mimeMediaType
328
-            . self::_giveMeStringLength($document_name) . $document_name; // value
328
+            . self::_giveMeStringLength($document_name).$document_name; // value
329 329
 
330 330
     }
331 331
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
             $this->meta->jobname = '';
338 338
             return true;
339 339
         }
340
-        $postpend = date('-H:i:s-') . $this->_setJobId();
340
+        $postpend = date('-H:i:s-').$this->_setJobId();
341 341
         if ($absolute) {
342 342
             $postpend = '';
343 343
         }
@@ -346,13 +346,13 @@  discard block
 block discarded – undo
346 346
             $jobname = $this->values->jobname;
347 347
         }
348 348
         $this->values->jobname = $jobname;
349
-        $jobname.= $postpend;
349
+        $jobname .= $postpend;
350 350
         $this->meta->jobname = chr(0x42) // nameWithoutLanguage type || value-tag
351
-            . chr(0x00) . chr(0x08) //  name-length
351
+            . chr(0x00).chr(0x08) //  name-length
352 352
             . "job-name" //  job-name || name
353 353
             . self::_giveMeStringLength($jobname) // value-length
354 354
             . $jobname; // value
355
-        self::_putDebug(sprintf(_("Job name: %s") , $jobname) , 2);
355
+        self::_putDebug(sprintf(_("Job name: %s"), $jobname), 2);
356 356
         $this->setup->jobname = 1;
357 357
     }
358 358
 
@@ -376,11 +376,11 @@  discard block
 block discarded – undo
376 376
         while (strlen($value_length) < 2) $value_length = chr(0x00) . $value_length;
377 377
         */
378 378
         $this->meta->username = chr(0x42) // keyword type || value-tag
379
-            . chr(0x00) . chr(0x14) // name-length
379
+            . chr(0x00).chr(0x14) // name-length
380 380
             . "requesting-user-name"
381 381
             . self::_giveMeStringLength($username) // value-length
382 382
             . $username;
383
-        self::_putDebug(sprintf(_("Username: %s") , $username) , 2);
383
+        self::_putDebug(sprintf(_("Username: %s"), $username), 2);
384 384
         $this->setup->username = 1;
385 385
     }
386 386
 
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
     {
394 394
         $this->password = $password;
395 395
         $this->username = $username;
396
-        self::_putDebug(_("Setting password") , 2);
396
+        self::_putDebug(_("Setting password"), 2);
397 397
         $this->setup->password = 1;
398 398
     }
399 399
 
@@ -421,11 +421,11 @@  discard block
 block discarded – undo
421 421
         }
422 422
 
423 423
         $this->meta->sides = chr(0x44) // keyword type | value-tag
424
-            . chr(0x00) . chr(0x05) //        name-length
424
+            . chr(0x00).chr(0x05) //        name-length
425 425
             . "sides" // sides |             name
426 426
             . self::_giveMeStringLength($sides) //               value-length
427 427
             . $sides; // one-sided |          value
428
-        self::_putDebug(sprintf(_("Sides value set to %s") , $sides) , 2);
428
+        self::_putDebug(sprintf(_("Sides value set to %s"), $sides), 2);
429 429
     }
430 430
 
431 431
     public function setFidelity()
@@ -434,11 +434,11 @@  discard block
 block discarded – undo
434 434
         // (eg, 2 sided print is not possible,
435 435
         // so print one sided) and DO NOT THE JOB.
436 436
         $this->meta->fidelity = chr(0x22) // boolean type  |  value-tag
437
-            . chr(0x00) . chr(0x16) //                  name-length
437
+            . chr(0x00).chr(0x16) //                  name-length
438 438
             . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
439
-            . chr(0x00) . chr(0x01) //  value-length
439
+            . chr(0x00).chr(0x01) //  value-length
440 440
             . chr(0x01); //  true | value
441
-        self::_putDebug(_("Fidelity attribute is set (paranoid mode)") , 3);
441
+        self::_putDebug(_("Fidelity attribute is set (paranoid mode)"), 3);
442 442
     }
443 443
 
444 444
     public function unsetFidelity()
@@ -447,11 +447,11 @@  discard block
 block discarded – undo
447 447
         // (eg, 2 sided print is not possible,
448 448
         // so print one sided) and DO THE JOB.
449 449
         $this->meta->fidelity = chr(0x22) //  boolean type | value-tag
450
-            . chr(0x00) . chr(0x16) //        name-length
450
+            . chr(0x00).chr(0x16) //        name-length
451 451
             . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
452
-            . chr(0x00) . chr(0x01) //               value-length
452
+            . chr(0x00).chr(0x01) //               value-length
453 453
             . chr(0x00); // false |                   value
454
-        self::_putDebug(_("Fidelity attribute is unset") , 2);
454
+        self::_putDebug(_("Fidelity attribute is unset"), 2);
455 455
     }
456 456
 
457 457
     public function setMessage($message = '')
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
                 . "message"
468 468
                 . self::_giveMeStringLength(substr($message, 0, 127))
469 469
                 . substr($message, 0, 127);
470
-        self::_putDebug(sprintf(_('Setting message to "%s"') , $message) , 2);
470
+        self::_putDebug(sprintf(_('Setting message to "%s"'), $message), 2);
471 471
     }
472 472
 
473 473
     public function setPageRanges($page_ranges)
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
         $first = true;
483 483
         #$page_ranges = split(' ', $page_ranges);
484 484
         $page_ranges = preg_split('# #', $page_ranges);
485
-        foreach($page_ranges as $page_range)
485
+        foreach ($page_ranges as $page_range)
486 486
         {
487 487
             $value = self::_rangeOfIntegerBuild($page_range);
488 488
             if ($first)
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
             }
521 521
             else
522 522
             {
523
-                foreach($values as $value)
523
+                foreach ($values as $value)
524 524
                 {
525 525
                     self::_setOperationAttribute($attribute, $value);
526 526
                 }
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
             }
535 535
             else
536 536
             {
537
-                foreach($values as $value)
537
+                foreach ($values as $value)
538 538
                 {
539 539
                     self::_setJobAttribute($attribute, $value);
540 540
                 }
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
             }
549 549
             else
550 550
             {
551
-                foreach($values as $value)
551
+                foreach ($values as $value)
552 552
                 {
553 553
                     self::_setPrinterAttribute($attribute, $value);
554 554
                 }
@@ -558,13 +558,13 @@  discard block
 block discarded – undo
558 558
         {
559 559
             trigger_error(
560 560
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
561
-                    $attribute) , E_USER_NOTICE);
561
+                    $attribute), E_USER_NOTICE);
562 562
             self::_putDebug(
563 563
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
564
-                    $attribute) , 3);
564
+                    $attribute), 3);
565 565
             self::_errorLog(
566 566
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
567
-                    $attribute) , 2);
567
+                    $attribute), 2);
568 568
             return FALSE;
569 569
         }
570 570
     }
@@ -599,13 +599,13 @@  discard block
 block discarded – undo
599 599
         {
600 600
             trigger_error(
601 601
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
602
-                    $attribute) , E_USER_NOTICE);
602
+                    $attribute), E_USER_NOTICE);
603 603
             self::_putDebug(
604 604
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
605
-                    $attribute) , 3);
605
+                    $attribute), 3);
606 606
             self::_errorLog(
607 607
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
608
-                    $attribute) , 2);
608
+                    $attribute), 2);
609 609
             return FALSE;
610 610
         }
611 611
         return true;
@@ -669,7 +669,7 @@  discard block
 block discarded – undo
669 669
         $debug = '';
670 670
         for ($i = 0; $i < $this->debug_count; $i++)
671 671
         {
672
-            $debug.= $this->debug[$i];
672
+            $debug .= $this->debug[$i];
673 673
         }
674 674
         $this->debug = array();
675 675
         $this->debug_count = 0;
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
             $this->output = $this->stringjob;
699 699
             if ($this->setup->datatype == "TEXT")
700 700
             {
701
-                $this->output.= chr(0x16);
701
+                $this->output .= chr(0x16);
702 702
             }
703 703
             $post_values = array(
704 704
                 "Content-Type" => "application/ipp",
@@ -775,13 +775,13 @@  discard block
 block discarded – undo
775 775
         */
776 776
         $this->response_completed[] = "no";
777 777
         unset($this->serverouptut);
778
-        self::_putDebug(_("Processing HTTP request") , 2);
778
+        self::_putDebug(_("Processing HTTP request"), 2);
779 779
         $this->serveroutput->headers = array();
780 780
         $this->serveroutput->body = "";
781 781
         $http = new http_class;
782 782
         if (!$this->unix) {
783 783
         	// DOL_LDR_CHANGE
784
-        	if (empty($this->host)) $this->host='127.0.0.1';
784
+        	if (empty($this->host)) $this->host = '127.0.0.1';
785 785
             $http->host = $this->host;
786 786
         }
787 787
         else {
@@ -798,12 +798,12 @@  discard block
 block discarded – undo
798 798
             $http->debug = 0;
799 799
             $http->html_debug = 0;
800 800
         }
801
-        $url = "http://" . $this->host;
801
+        $url = "http://".$this->host;
802 802
         if ($this->ssl) {
803
-            $url = "https://" . $this->host;
803
+            $url = "https://".$this->host;
804 804
         }
805 805
         if ($this->unix) {
806
-            $url = "unix://" . $this->host;
806
+            $url = "unix://".$this->host;
807 807
         }
808 808
         $http->port = $this->port;
809 809
         $http->timeout = $this->http_timeout;
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
             {
840 840
                 $success = $http->Open($arguments);
841 841
             }
842
-            catch(httpException $e)
842
+            catch (httpException $e)
843 843
             {
844 844
                 throw new ippException(
845 845
                     sprintf("http error: %s", $e->getMessage()),
@@ -857,19 +857,19 @@  discard block
 block discarded – undo
857 857
             {
858 858
                 self::_putDebug("H T T P    R E Q U E S T :");
859 859
                 self::_putDebug("Request headers:");
860
-                for (Reset($http->request_headers) , $header = 0; $header < count($http->request_headers); Next($http->request_headers) , $header++)
860
+                for (Reset($http->request_headers), $header = 0; $header < count($http->request_headers); Next($http->request_headers), $header++)
861 861
                 {
862 862
                     $header_name = Key($http->request_headers);
863 863
                     if (GetType($http->request_headers[$header_name]) == "array")
864 864
                     {
865 865
                         for ($header_value = 0; $header_value < count($http->request_headers[$header_name]); $header_value++)
866 866
                         {
867
-                            self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
867
+                            self::_putDebug($header_name.": ".$http->request_headers[$header_name][$header_value]);
868 868
                         }
869 869
                     }
870 870
                     else
871 871
                     {
872
-                        self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
872
+                        self::_putDebug($header_name.": ".$http->request_headers[$header_name]);
873 873
                     }
874 874
                 }
875 875
                 self::_putDebug("Request body:");
@@ -883,23 +883,23 @@  discard block
 block discarded – undo
883 883
                 $http->ReadReplyHeaders($headers);
884 884
                 self::_putDebug("H T T P    R E S P O N S E :");
885 885
                 self::_putDebug("Response headers:");
886
-                for (Reset($headers) , $header = 0; $header < count($headers); Next($headers) , $header++)
886
+                for (Reset($headers), $header = 0; $header < count($headers); Next($headers), $header++)
887 887
                 {
888 888
                     $header_name = Key($headers);
889 889
                     if (GetType($headers[$header_name]) == "array")
890 890
                     {
891 891
                         for ($header_value = 0; $header_value < count($headers[$header_name]); $header_value++)
892 892
                         {
893
-                            self::_putDebug($header_name . ": " . $headers[$header_name][$header_value]);
893
+                            self::_putDebug($header_name.": ".$headers[$header_name][$header_value]);
894 894
                             $this->serveroutput->headers[$i] =
895
-                                $header_name . ": "
895
+                                $header_name.": "
896 896
                                     . $headers[$header_name][$header_value];
897 897
                             $i++;
898 898
                         }
899 899
                     }
900 900
                     else
901 901
                     {
902
-                        self::_putDebug($header_name . ": " . $headers[$header_name]);
902
+                        self::_putDebug($header_name.": ".$headers[$header_name]);
903 903
                         $this->serveroutput->headers[$i] =
904 904
                             $header_name
905 905
                                 . ": "
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
                     }
918 918
 
919 919
                     self::_putDebug(htmlentities($body));
920
-                    $this->serveroutput->body.= $body;
920
+                    $this->serveroutput->body .= $body;
921 921
                 }
922 922
                 self::_putDebug("********* END RESPONSE BODY ********");
923 923
             }
@@ -933,57 +933,57 @@  discard block
 block discarded – undo
933 933
     {
934 934
         $this->tags_types = array(
935 935
             "unsupported" => array(
936
-                "tag" => chr(0x10) ,
936
+                "tag" => chr(0x10),
937 937
                 "build" => ""
938
-            ) ,
938
+            ),
939 939
             "reserved" => array(
940
-                "tag" => chr(0x11) ,
940
+                "tag" => chr(0x11),
941 941
                 "build" => ""
942
-            ) ,
942
+            ),
943 943
             "unknown" => array(
944
-                "tag" => chr(0x12) ,
944
+                "tag" => chr(0x12),
945 945
                 "build" => ""
946
-            ) ,
946
+            ),
947 947
             "no-value" => array(
948
-                "tag" => chr(0x13) ,
948
+                "tag" => chr(0x13),
949 949
                 "build" => "no_value"
950
-            ) ,
950
+            ),
951 951
             "integer" => array(
952
-                "tag" => chr(0x21) ,
952
+                "tag" => chr(0x21),
953 953
                 "build" => "integer"
954
-            ) ,
954
+            ),
955 955
             "boolean" => array(
956
-                "tag" => chr(0x22) ,
956
+                "tag" => chr(0x22),
957 957
                 "build" => "boolean"
958
-            ) ,
958
+            ),
959 959
             "enum" => array(
960
-                "tag" => chr(0x23) ,
960
+                "tag" => chr(0x23),
961 961
                 "build" => "enum"
962
-            ) ,
962
+            ),
963 963
             "octetString" => array(
964
-                "tag" => chr(0x30) ,
964
+                "tag" => chr(0x30),
965 965
                 "build" => "octet_string"
966
-            ) ,
966
+            ),
967 967
             "datetime" => array(
968
-                "tag" => chr(0x31) ,
968
+                "tag" => chr(0x31),
969 969
                 "build" => "datetime"
970
-            ) ,
970
+            ),
971 971
             "resolution" => array(
972
-                "tag" => chr(0x32) ,
972
+                "tag" => chr(0x32),
973 973
                 "build" => "resolution"
974
-            ) ,
974
+            ),
975 975
             "rangeOfInteger" => array(
976
-                "tag" => chr(0x33) ,
976
+                "tag" => chr(0x33),
977 977
                 "build" => "range_of_integers"
978
-            ) ,
978
+            ),
979 979
             "textWithLanguage" => array(
980
-                "tag" => chr(0x35) ,
980
+                "tag" => chr(0x35),
981 981
                 "build" => "string"
982
-            ) ,
982
+            ),
983 983
             "nameWithLanguage" => array(
984
-                "tag" => chr(0x36) ,
984
+                "tag" => chr(0x36),
985 985
                 "build" => "string"
986
-            ) ,
986
+            ),
987 987
             /*
988 988
             "text" => array ("tag" => chr(0x40),
989 989
             "build" => "string"),
@@ -991,96 +991,96 @@  discard block
 block discarded – undo
991 991
             "build" => "string"),
992 992
             */
993 993
             "textWithoutLanguage" => array(
994
-                "tag" => chr(0x41) ,
994
+                "tag" => chr(0x41),
995 995
                 "build" => "string"
996
-            ) ,
996
+            ),
997 997
             "nameWithoutLanguage" => array(
998
-                "tag" => chr(0x42) ,
998
+                "tag" => chr(0x42),
999 999
                 "buid" => "string"
1000
-            ) ,
1000
+            ),
1001 1001
             "keyword" => array(
1002
-                "tag" => chr(0x44) ,
1002
+                "tag" => chr(0x44),
1003 1003
                 "build" => "string"
1004
-            ) ,
1004
+            ),
1005 1005
             "uri" => array(
1006
-                "tag" => chr(0x45) ,
1006
+                "tag" => chr(0x45),
1007 1007
                 "build" => "string"
1008
-            ) ,
1008
+            ),
1009 1009
             "uriScheme" => array(
1010
-                "tag" => chr(0x46) ,
1010
+                "tag" => chr(0x46),
1011 1011
                 "build" => "string"
1012
-            ) ,
1012
+            ),
1013 1013
             "charset" => array(
1014
-                "tag" => chr(0x47) ,
1014
+                "tag" => chr(0x47),
1015 1015
                 "build" => "string"
1016
-            ) ,
1016
+            ),
1017 1017
             "naturalLanguage" => array(
1018
-                "tag" => chr(0x48) ,
1018
+                "tag" => chr(0x48),
1019 1019
                 "build" => "string"
1020
-            ) ,
1020
+            ),
1021 1021
             "mimeMediaType" => array(
1022
-                "tag" => chr(0x49) ,
1022
+                "tag" => chr(0x49),
1023 1023
                 "build" => "string"
1024
-            ) ,
1024
+            ),
1025 1025
             "extendedAttributes" => array(
1026
-                "tag" => chr(0x7F) ,
1026
+                "tag" => chr(0x7F),
1027 1027
                 "build" => "extended"
1028
-            ) ,
1028
+            ),
1029 1029
         );
1030 1030
         $this->operation_tags = array(
1031 1031
             "compression" => array(
1032 1032
                 "tag" => "keyword"
1033
-            ) ,
1033
+            ),
1034 1034
             "document-natural-language" => array(
1035 1035
                 "tag" => "naturalLanguage"
1036
-            ) ,
1036
+            ),
1037 1037
             "job-k-octets" => array(
1038 1038
                 "tag" => "integer"
1039
-            ) ,
1039
+            ),
1040 1040
             "job-impressions" => array(
1041 1041
                 "tag" => "integer"
1042
-            ) ,
1042
+            ),
1043 1043
             "job-media-sheets" => array(
1044 1044
                 "tag" => "integer"
1045
-            ) ,
1045
+            ),
1046 1046
         );
1047 1047
         $this->job_tags = array(
1048 1048
             "job-priority" => array(
1049 1049
                 "tag" => "integer"
1050
-            ) ,
1050
+            ),
1051 1051
             "job-hold-until" => array(
1052 1052
                 "tag" => "keyword"
1053
-            ) ,
1053
+            ),
1054 1054
             "job-sheets" => array(
1055 1055
                 "tag" => "keyword"
1056
-            ) , //banner page
1056
+            ), //banner page
1057 1057
             "multiple-document-handling" => array(
1058 1058
                 "tag" => "keyword"
1059
-            ) ,
1059
+            ),
1060 1060
             //"copies" => array("tag" => "integer"),
1061 1061
             "finishings" => array(
1062 1062
                 "tag" => "enum"
1063
-            ) ,
1063
+            ),
1064 1064
             //"page-ranges" => array("tag" => "rangeOfInteger"), // has its own function
1065 1065
             //"sides" => array("tag" => "keyword"), // has its own function
1066 1066
             "number-up" => array(
1067 1067
                 "tag" => "integer"
1068
-            ) ,
1068
+            ),
1069 1069
             "orientation-requested" => array(
1070 1070
                 "tag" => "enum"
1071
-            ) ,
1071
+            ),
1072 1072
             "media" => array(
1073 1073
                 "tag" => "keyword"
1074
-            ) ,
1074
+            ),
1075 1075
             "printer-resolution" => array(
1076 1076
                 "tag" => "resolution"
1077
-            ) ,
1077
+            ),
1078 1078
             "print-quality" => array(
1079 1079
                 "tag" => "enum"
1080
-            ) ,
1080
+            ),
1081 1081
             "job-message-from-operator" => array(
1082 1082
                 "tag" => "textWithoutLanguage"
1083
-            ) ,
1083
+            ),
1084 1084
         );
1085 1085
         $this->printer_tags = array(
1086 1086
             "requested-attributes" => array(
@@ -1095,30 +1095,30 @@  discard block
 block discarded – undo
1095 1095
     protected function _setOperationId()
1096 1096
     {
1097 1097
         $prepend = '';
1098
-        $this->operation_id+= 1;
1098
+        $this->operation_id += 1;
1099 1099
         $this->meta->operation_id = self::_integerBuild($this->operation_id);
1100
-        self::_putDebug("operation id is: " . $this->operation_id, 2);
1100
+        self::_putDebug("operation id is: ".$this->operation_id, 2);
1101 1101
     }
1102 1102
 
1103 1103
     protected function _setJobId()
1104 1104
     {
1105
-        $this->meta->jobid+= 1;
1105
+        $this->meta->jobid += 1;
1106 1106
         $prepend = '';
1107 1107
         $prepend_length = 4 - strlen($this->meta->jobid);
1108 1108
         for ($i = 0; $i < $prepend_length; $i++) {
1109
-            $prepend.= '0';
1109
+            $prepend .= '0';
1110 1110
         }
1111
-        return $prepend . $this->meta->jobid;
1111
+        return $prepend.$this->meta->jobid;
1112 1112
     }
1113 1113
 
1114 1114
     protected function _setJobUri($job_uri)
1115 1115
     {
1116 1116
         $this->meta->job_uri = chr(0x45) // type uri
1117
-            . chr(0x00) . chr(0x07) // name-length
1117
+            . chr(0x00).chr(0x07) // name-length
1118 1118
             . "job-uri"
1119 1119
             //. chr(0x00).chr(strlen($job_uri))
1120
-            . self::_giveMeStringLength($job_uri) . $job_uri;
1121
-        self::_putDebug("job-uri is: " . $job_uri, 2);
1120
+            . self::_giveMeStringLength($job_uri).$job_uri;
1121
+        self::_putDebug("job-uri is: ".$job_uri, 2);
1122 1122
     }
1123 1123
 
1124 1124
     //
@@ -1180,9 +1180,9 @@  discard block
 block discarded – undo
1180 1180
                 $errno = $strings[1];
1181 1181
                 $string = strtoupper(str_replace(' ', '_', $strings[2]));
1182 1182
                 trigger_error(
1183
-                    sprintf(_("server responds %s") , $server_response),
1183
+                    sprintf(_("server responds %s"), $server_response),
1184 1184
                     E_USER_WARNING);
1185
-                self::_errorLog("server responds " . $server_response, 1);
1185
+                self::_errorLog("server responds ".$server_response, 1);
1186 1186
                 $this->serveroutput->httpstatus =
1187 1187
                     strtoupper($strings[0])
1188 1188
                         . " "
@@ -1227,7 +1227,7 @@  discard block
 block discarded – undo
1227 1227
                 ord($this->serveroutput->body[$this->_parsing->offset]),
1228 1228
                 ord($this->serveroutput->body[$this->_parsing->offset + 1]),
1229 1229
                 $this->serveroutput->ipp_version));
1230
-        $this->_parsing->offset+= 2;
1230
+        $this->_parsing->offset += 2;
1231 1231
         return;
1232 1232
     }
1233 1233
 
@@ -1237,7 +1237,7 @@  discard block
 block discarded – undo
1237 1237
             (ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
1238 1238
             + ord($this->serveroutput->body[$this->_parsing->offset + 1]);
1239 1239
         $this->serveroutput->status = "NOT PARSED";
1240
-        $this->_parsing->offset+= 2;
1240
+        $this->_parsing->offset += 2;
1241 1241
         if (strlen($this->serveroutput->body) < $this->_parsing->offset)
1242 1242
         {
1243 1243
             return false;
@@ -1415,8 +1415,8 @@  discard block
 block discarded – undo
1415 1415
             self::_interpretInteger(
1416 1416
                 substr($this->serveroutput->body, $this->_parsing->offset, 4)
1417 1417
             );
1418
-        self::_putDebug("request-id " . $this->serveroutput->request_id, 2);
1419
-        $this->_parsing->offset+= 4;
1418
+        self::_putDebug("request-id ".$this->serveroutput->request_id, 2);
1419
+        $this->_parsing->offset += 4;
1420 1420
         return;
1421 1421
     }
1422 1422
 
@@ -1424,7 +1424,7 @@  discard block
 block discarded – undo
1424 1424
     {
1425 1425
         // they are _signed_ integers
1426 1426
         $value_parsed = 0;
1427
-        for ($i = strlen($value); $i > 0; $i --)
1427
+        for ($i = strlen($value); $i > 0; $i--)
1428 1428
         {
1429 1429
             $value_parsed +=
1430 1430
                 (
@@ -1470,7 +1470,7 @@  discard block
 block discarded – undo
1470 1470
                 trigger_error(
1471 1471
                     _("_stringJob: Printer URI is not set: die"),
1472 1472
                     E_USER_WARNING);
1473
-                self::_putDebug(_("_stringJob: Printer URI is not set: die") , 4);
1473
+                self::_putDebug(_("_stringJob: Printer URI is not set: die"), 4);
1474 1474
                 self::_errorLog(" Printer URI is not set, die", 2);
1475 1475
                 return FALSE;
1476 1476
             }
@@ -1512,8 +1512,8 @@  discard block
 block discarded – undo
1512 1512
         {
1513 1513
             $this->error_generation->request_body_malformed = "";
1514 1514
         }
1515
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
1516
-            . chr(0x00) . chr(0x02) // Print-Job | operation-id
1515
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
1516
+            . chr(0x00).chr(0x02) // Print-Job | operation-id
1517 1517
             . $this->meta->operation_id //           request-id
1518 1518
             . chr(0x01) // start operation-attributes | operation-attributes-tag
1519 1519
             . $this->meta->charset
@@ -1534,7 +1534,7 @@  discard block
 block discarded – undo
1534 1534
                     . $this->meta->page_ranges
1535 1535
                     . $jobattributes;
1536 1536
         }
1537
-        $this->stringjob.= chr(0x03); // end-of-attributes | end-of-attributes-tag
1537
+        $this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
1538 1538
         self::_putDebug(
1539 1539
             sprintf(_("String sent to the server is: %s"),
1540 1540
                 $this->stringjob)
@@ -1545,12 +1545,12 @@  discard block
 block discarded – undo
1545 1545
     protected function _buildValues(&$operationattributes, &$jobattributes, &$printerattributes)
1546 1546
     {
1547 1547
         $operationattributes = '';
1548
-        foreach($this->operation_tags as $key => $values)
1548
+        foreach ($this->operation_tags as $key => $values)
1549 1549
         {
1550 1550
             $item = 0;
1551 1551
             if (array_key_exists('value', $values))
1552 1552
             {
1553
-                foreach($values['value'] as $item_value)
1553
+                foreach ($values['value'] as $item_value)
1554 1554
                 {
1555 1555
                     if ($item == 0)
1556 1556
                     {
@@ -1574,12 +1574,12 @@  discard block
 block discarded – undo
1574 1574
             }
1575 1575
         }
1576 1576
         $jobattributes = '';
1577
-        foreach($this->job_tags as $key => $values)
1577
+        foreach ($this->job_tags as $key => $values)
1578 1578
         {
1579 1579
             $item = 0;
1580 1580
             if (array_key_exists('value', $values))
1581 1581
             {
1582
-                foreach($values['value'] as $item_value)
1582
+                foreach ($values['value'] as $item_value)
1583 1583
                 {
1584 1584
                     if ($item == 0)
1585 1585
                     {
@@ -1603,12 +1603,12 @@  discard block
 block discarded – undo
1603 1603
             }
1604 1604
         }
1605 1605
         $printerattributes = '';
1606
-        foreach($this->printer_tags as $key => $values)
1606
+        foreach ($this->printer_tags as $key => $values)
1607 1607
         {
1608 1608
             $item = 0;
1609 1609
             if (array_key_exists('value', $values))
1610 1610
             {
1611
-                foreach($values['value'] as $item_value)
1611
+                foreach ($values['value'] as $item_value)
1612 1612
                 {
1613 1613
                     if ($item == 0)
1614 1614
                     {
@@ -1640,9 +1640,9 @@  discard block
 block discarded – undo
1640 1640
     protected function _giveMeStringLength($string)
1641 1641
     {
1642 1642
         $length = strlen($string);
1643
-        if ($length > ((0xFF << 8) + 0xFF)  )
1643
+        if ($length > ((0xFF << 8) + 0xFF))
1644 1644
         {
1645
-            $errmsg = sprintf (
1645
+            $errmsg = sprintf(
1646 1646
                 _('max string length for an ipp meta-information = %d, while here %d'),
1647 1647
                 ((0xFF << 8) + 0xFF), $length);
1648 1648
 
@@ -1652,14 +1652,14 @@  discard block
 block discarded – undo
1652 1652
             }
1653 1653
             else
1654 1654
             {
1655
-                trigger_error ($errmsg, E_USER_ERROR);
1655
+                trigger_error($errmsg, E_USER_ERROR);
1656 1656
             }
1657 1657
         }
1658 1658
         $int1 = $length & 0xFF;
1659 1659
         $length -= $int1;
1660 1660
         $length = $length >> 8;
1661 1661
         $int2 = $length & 0xFF;
1662
-        return chr($int2) . chr($int1);
1662
+        return chr($int2).chr($int1);
1663 1663
     }
1664 1664
 
1665 1665
     protected function _enumBuild($tag, $value)
@@ -1790,7 +1790,7 @@  discard block
 block discarded – undo
1790 1790
         {
1791 1791
             $prepend .= chr(0);
1792 1792
         }
1793
-        return $prepend . $value;
1793
+        return $prepend.$value;
1794 1794
     }
1795 1795
 
1796 1796
     protected function _integerBuild($value)
@@ -1798,18 +1798,18 @@  discard block
 block discarded – undo
1798 1798
         if ($value >= 2147483647 || $value < - 2147483648)
1799 1799
         {
1800 1800
             trigger_error(
1801
-                _("Values must be between -2147483648 and 2147483647: assuming '0'") , E_USER_WARNING);
1802
-            return chr(0x00) . chr(0x00) . chr(0x00) . chr(0x00);
1801
+                _("Values must be between -2147483648 and 2147483647: assuming '0'"), E_USER_WARNING);
1802
+            return chr(0x00).chr(0x00).chr(0x00).chr(0x00);
1803 1803
         }
1804 1804
         $initial_value = $value;
1805 1805
         $int1 = $value & 0xFF;
1806 1806
         $value -= $int1;
1807 1807
         $value = $value >> 8;
1808 1808
         $int2 = $value & 0xFF;
1809
-        $value-= $int2;
1809
+        $value -= $int2;
1810 1810
         $value = $value >> 8;
1811 1811
         $int3 = $value & 0xFF;
1812
-        $value-= $int3;
1812
+        $value -= $int3;
1813 1813
         $value = $value >> 8;
1814 1814
         $int4 = $value & 0xFF; //64bits
1815 1815
         if ($initial_value < 0) {
@@ -1818,7 +1818,7 @@  discard block
 block discarded – undo
1818 1818
         else {
1819 1819
             $int4 = chr($int4);
1820 1820
         }
1821
-        $value = $int4 . chr($int3) . chr($int2) . chr($int1);
1821
+        $value = $int4.chr($int3).chr($int2).chr($int1);
1822 1822
         return $value;
1823 1823
     }
1824 1824
 
@@ -1829,7 +1829,7 @@  discard block
 block discarded – undo
1829 1829
         for ($i = 0; $i < 2; $i++) {
1830 1830
             $outvalue[$i] = self::_integerBuild($integers[$i]);
1831 1831
         }
1832
-        return $outvalue[0] . $outvalue[1];
1832
+        return $outvalue[0].$outvalue[1];
1833 1833
     }
1834 1834
 
1835 1835
     protected function _setJobAttribute($attribute, $value)
@@ -1877,14 +1877,14 @@  discard block
 block discarded – undo
1877 1877
                     "",
1878 1878
                     ":"
1879 1879
                 );
1880
-                $value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)) . $unit;
1880
+                $value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)).$unit;
1881 1881
                 $this->job_tags[$attribute]['value'][] = $value;
1882 1882
                 break;
1883 1883
 
1884 1884
             default:
1885
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
1886
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1887
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1885
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
1886
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1887
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1888 1888
                 return FALSE;
1889 1889
                 break;
1890 1890
         }
@@ -1907,9 +1907,9 @@  discard block
 block discarded – undo
1907 1907
                 break;
1908 1908
 
1909 1909
             default:
1910
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
1911
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1912
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1910
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
1911
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1912
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1913 1913
                 return FALSE;
1914 1914
                 break;
1915 1915
         }
@@ -1932,9 +1932,9 @@  discard block
 block discarded – undo
1932 1932
                 break;
1933 1933
 
1934 1934
             default:
1935
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
1936
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1937
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
1935
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
1936
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1937
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
1938 1938
                 return FALSE;
1939 1939
                 break;
1940 1940
         }
@@ -1969,7 +1969,7 @@  discard block
 block discarded – undo
1969 1969
             return;
1970 1970
         }
1971 1971
 
1972
-        $string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
1972
+        $string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']), $this->host, $this->port, $this->requesting_user, $string_to_log);
1973 1973
 
1974 1974
         if ($this->log_type == 0)
1975 1975
         {
@@ -1977,7 +1977,7 @@  discard block
 block discarded – undo
1977 1977
             return;
1978 1978
         }
1979 1979
 
1980
-        $string = sprintf("%s %s Host %s:%s user %s : %s\n", date('M d H:i:s') , basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
1980
+        $string = sprintf("%s %s Host %s:%s user %s : %s\n", date('M d H:i:s'), basename($_SERVER['PHP_SELF']), $this->host, $this->port, $this->requesting_user, $string_to_log);
1981 1981
         error_log($string, $this->log_type, $this->log_destination);
1982 1982
         return;
1983 1983
     }
Please login to merge, or discard this patch.