Dolibarr / dolibarr

htdocs/includes/printipp/BasicIPP.php

Spacing +176 added lines, -176 removed lines

@@ -50,8 +50,8 @@ 
 
     public function getErrorFormatted()
     {
-        $return = sprintf("[ipp]: %s -- " . _(" file %s, line %s"),
-            $this->getMessage() , $this->getFile() , $this->getLine());
+        $return = sprintf("[ipp]: %s -- "._(" file %s, line %s"),
+            $this->getMessage(), $this->getFile(), $this->getLine());
         return $return;
     }
 
@@ -157,21 +157,21 @@ 
     public function setPort($port = '631')
     {
         $this->port = $port;
-        self::_putDebug("Port is " . $this->port, 2);
+        self::_putDebug("Port is ".$this->port, 2);
     }
 
     public function setUnix($socket = '/var/run/cups/cups.sock')
     {
         $this->host = $socket;
         $this->unix = true;
-        self::_putDebug("Host is " . $this->host, 2);
+        self::_putDebug("Host is ".$this->host, 2);
     }
 
     public function setHost($host = 'localhost')
     {
         $this->host = $host;
         $this->unix = false;
-        self::_putDebug("Host is " . $this->host, 2);
+        self::_putDebug("Host is ".$this->host, 2);
     }
 
     public function setTimeout($timeout)
@@ -183,13 +183,13 @@ 
     {
         $length = strlen($uri);
         $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        while (strlen($length) < 2) $length = chr(0x00).$length;
         $this->meta->printer_uri = chr(0x45) // uri type | value-tag
-            . chr(0x00) . chr(0x0B) // name-length
+            . chr(0x00).chr(0x0B) // name-length
             . "printer-uri" // printer-uri | name
-            . $length . $uri;
+            . $length.$uri;
         $this->printer_uri = $uri;
-        self::_putDebug(sprintf(_("Printer URI: %s") , $uri) , 2);
+        self::_putDebug(sprintf(_("Printer URI: %s"), $uri), 2);
         $this->setup->uri = 1;
     }
 
@@ -221,7 +221,7 @@ 
                 $this->datatail = chr(0x0c);
             }
         }
-        self::_putDebug(_("Forcing data to be interpreted as RAW TEXT") , 2);
+        self::_putDebug(_("Forcing data to be interpreted as RAW TEXT"), 2);
     }
 
     public function unsetRawText()
@@ -229,7 +229,7 @@ 
         $this->setup->datatype = 'BINARY';
         $this->datahead = '';
         $this->datatail = '';
-        self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT") , 2);
+        self::_putDebug(_("Unset forcing data to be interpreted as RAW TEXT"), 2);
     }
 
     public function setBinary()
@@ -239,7 +239,7 @@ 
 
     public function setFormFeed()
     {
-        $this->datatail = "\r\n" . chr(0x0c);
+        $this->datatail = "\r\n".chr(0x0c);
         unset($this->setup->noFormFeed);
     }
 
@@ -254,11 +254,11 @@ 
         $charset = strtolower($charset);
         $this->charset = $charset;
         $this->meta->charset = chr(0x47) // charset type | value-tag
-            . chr(0x00) . chr(0x12) // name-length
+            . chr(0x00).chr(0x12) // name-length
             . "attributes-charset" // attributes-charset | name
             . self::_giveMeStringLength($charset) // value-length
             . $charset; // value
-        self::_putDebug(sprintf(_("Charset: %s") , $charset) , 2);
+        self::_putDebug(sprintf(_("Charset: %s"), $charset), 2);
         $this->setup->charset = 1;
     }
 
@@ -266,11 +266,11 @@ 
     {
         $language = strtolower($language);
         $this->meta->language = chr(0x48) // natural-language type | value-tag
-            . chr(0x00) . chr(0x1B) //  name-length
+            . chr(0x00).chr(0x1B) //  name-length
             . "attributes-natural-language" //attributes-natural-language
             . self::_giveMeStringLength($language) // value-length
             . $language; // value
-        self::_putDebug(sprintf(_("Language: %s") , $language) , 2);
+        self::_putDebug(sprintf(_("Language: %s"), $language), 2);
         $this->setup->language = 1;
     }
 
@@ -278,11 +278,11 @@ 
     {
         self::setBinary();
         $length = chr(strlen($mime_media_type));
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
-        self::_putDebug(sprintf(_("mime type: %s") , $mime_media_type) , 2);
+        while (strlen($length) < 2) $length = chr(0x00).$length;
+        self::_putDebug(sprintf(_("mime type: %s"), $mime_media_type), 2);
         $this->meta->mime_media_type = chr(0x49) // document-format tag
-            . self::_giveMeStringLength('document-format') . 'document-format' //
-            . self::_giveMeStringLength($mime_media_type) . $mime_media_type; // value
+            . self::_giveMeStringLength('document-format').'document-format' //
+            . self::_giveMeStringLength($mime_media_type).$mime_media_type; // value
         $this->setup->mime_media_type = 1;
     }
 
@@ -303,11 +303,11 @@ 
 
         $copies = self::_integerBuild($nbrcopies);
         $this->meta->copies = chr(0x21) // integer type | value-tag
-            . chr(0x00) . chr(0x06) //             name-length
+            . chr(0x00).chr(0x06) //             name-length
             . "copies" // copies    |             name
             . self::_giveMeStringLength($copies) // value-length
             . $copies;
-        self::_putDebug(sprintf(_("Copies: %s") , $nbrcopies) , 2);
+        self::_putDebug(sprintf(_("Copies: %s"), $nbrcopies), 2);
         $this->setup->copies = 1;
     }
 
@@ -320,12 +320,12 @@ 
         $document_name = substr($document_name, 0, 1023);
         $length = strlen($document_name);
         $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
-        self::_putDebug(sprintf(_("document name: %s") , $document_name) , 2);
+        while (strlen($length) < 2) $length = chr(0x00).$length;
+        self::_putDebug(sprintf(_("document name: %s"), $document_name), 2);
         $this->meta->document_name = chr(0x41) // textWithoutLanguage tag
-            . chr(0x00) . chr(0x0d) // name-length
+            . chr(0x00).chr(0x0d) // name-length
             . "document-name" // mimeMediaType
-            . self::_giveMeStringLength($document_name) . $document_name; // value
+            . self::_giveMeStringLength($document_name).$document_name; // value
 
     }
 
@@ -337,7 +337,7 @@ 
             $this->meta->jobname = '';
             return true;
         }
-        $postpend = date('-H:i:s-') . $this->_setJobId();
+        $postpend = date('-H:i:s-').$this->_setJobId();
         if ($absolute) {
             $postpend = '';
         }
@@ -346,13 +346,13 @@ 
             $jobname = $this->values->jobname;
         }
         $this->values->jobname = $jobname;
-        $jobname.= $postpend;
+        $jobname .= $postpend;
         $this->meta->jobname = chr(0x42) // nameWithoutLanguage type || value-tag
-            . chr(0x00) . chr(0x08) //  name-length
+            . chr(0x00).chr(0x08) //  name-length
             . "job-name" //  job-name || name
             . self::_giveMeStringLength($jobname) // value-length
             . $jobname; // value
-        self::_putDebug(sprintf(_("Job name: %s") , $jobname) , 2);
+        self::_putDebug(sprintf(_("Job name: %s"), $jobname), 2);
         $this->setup->jobname = 1;
     }
 
@@ -376,11 +376,11 @@ 
         while (strlen($value_length) < 2) $value_length = chr(0x00) . $value_length;
         */
         $this->meta->username = chr(0x42) // keyword type || value-tag
-            . chr(0x00) . chr(0x14) // name-length
+            . chr(0x00).chr(0x14) // name-length
             . "requesting-user-name"
             . self::_giveMeStringLength($username) // value-length
             . $username;
-        self::_putDebug(sprintf(_("Username: %s") , $username) , 2);
+        self::_putDebug(sprintf(_("Username: %s"), $username), 2);
         $this->setup->username = 1;
     }
 
@@ -393,7 +393,7 @@ 
     {
         $this->password = $password;
         $this->username = $username;
-        self::_putDebug(_("Setting password") , 2);
+        self::_putDebug(_("Setting password"), 2);
         $this->setup->password = 1;
     }
 
@@ -421,11 +421,11 @@ 
         }
 
         $this->meta->sides = chr(0x44) // keyword type | value-tag
-            . chr(0x00) . chr(0x05) //        name-length
+            . chr(0x00).chr(0x05) //        name-length
             . "sides" // sides |             name
             . self::_giveMeStringLength($sides) //               value-length
             . $sides; // one-sided |          value
-        self::_putDebug(sprintf(_("Sides value set to %s") , $sides) , 2);
+        self::_putDebug(sprintf(_("Sides value set to %s"), $sides), 2);
     }
 
     public function setFidelity()
@@ -434,11 +434,11 @@ 
         // (eg, 2 sided print is not possible,
         // so print one sided) and DO NOT THE JOB.
         $this->meta->fidelity = chr(0x22) // boolean type  |  value-tag
-            . chr(0x00) . chr(0x16) //                  name-length
+            . chr(0x00).chr(0x16) //                  name-length
             . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
-            . chr(0x00) . chr(0x01) //  value-length
+            . chr(0x00).chr(0x01) //  value-length
             . chr(0x01); //  true | value
-        self::_putDebug(_("Fidelity attribute is set (paranoid mode)") , 3);
+        self::_putDebug(_("Fidelity attribute is set (paranoid mode)"), 3);
     }
 
     public function unsetFidelity()
@@ -447,11 +447,11 @@ 
         // (eg, 2 sided print is not possible,
         // so print one sided) and DO THE JOB.
         $this->meta->fidelity = chr(0x22) //  boolean type | value-tag
-            . chr(0x00) . chr(0x16) //        name-length
+            . chr(0x00).chr(0x16) //        name-length
             . "ipp-attribute-fidelity" // ipp-attribute-fidelity | name
-            . chr(0x00) . chr(0x01) //               value-length
+            . chr(0x00).chr(0x01) //               value-length
             . chr(0x00); // false |                   value
-        self::_putDebug(_("Fidelity attribute is unset") , 2);
+        self::_putDebug(_("Fidelity attribute is unset"), 2);
     }
 
     public function setMessage($message = '')
@@ -467,7 +467,7 @@ 
                 . "message"
                 . self::_giveMeStringLength(substr($message, 0, 127))
                 . substr($message, 0, 127);
-        self::_putDebug(sprintf(_('Setting message to "%s"') , $message) , 2);
+        self::_putDebug(sprintf(_('Setting message to "%s"'), $message), 2);
     }
 
     public function setPageRanges($page_ranges)
@@ -482,7 +482,7 @@ 
         $first = true;
         #$page_ranges = split(' ', $page_ranges);
         $page_ranges = preg_split('# #', $page_ranges);
-        foreach($page_ranges as $page_range)
+        foreach ($page_ranges as $page_range)
         {
             $value = self::_rangeOfIntegerBuild($page_range);
             if ($first)
@@ -520,7 +520,7 @@ 
             }
             else
             {
-                foreach($values as $value)
+                foreach ($values as $value)
                 {
                     self::_setOperationAttribute($attribute, $value);
                 }
@@ -534,7 +534,7 @@ 
             }
             else
             {
-                foreach($values as $value)
+                foreach ($values as $value)
                 {
                     self::_setJobAttribute($attribute, $value);
                 }
@@ -548,7 +548,7 @@ 
             }
             else
             {
-                foreach($values as $value)
+                foreach ($values as $value)
                 {
                     self::_setPrinterAttribute($attribute, $value);
                 }
@@ -558,13 +558,13 @@ 
         {
             trigger_error(
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , E_USER_NOTICE);
+                    $attribute), E_USER_NOTICE);
             self::_putDebug(
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 3);
+                    $attribute), 3);
             self::_errorLog(
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 2);
+                    $attribute), 2);
             return FALSE;
         }
     }
@@ -599,13 +599,13 @@ 
         {
             trigger_error(
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , E_USER_NOTICE);
+                    $attribute), E_USER_NOTICE);
             self::_putDebug(
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 3);
+                    $attribute), 3);
             self::_errorLog(
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
-                    $attribute) , 2);
+                    $attribute), 2);
             return FALSE;
         }
         return true;
@@ -669,7 +669,7 @@ 
         $debug = '';
         for ($i = 0; $i < $this->debug_count; $i++)
         {
-            $debug.= $this->debug[$i];
+            $debug .= $this->debug[$i];
         }
         $this->debug = array();
         $this->debug_count = 0;
@@ -698,7 +698,7 @@ 
             $this->output = $this->stringjob;
             if ($this->setup->datatype == "TEXT")
             {
-                $this->output.= chr(0x16);
+                $this->output .= chr(0x16);
             }
             $post_values = array(
                 "Content-Type" => "application/ipp",
@@ -775,13 +775,13 @@ 
         */
         $this->response_completed[] = "no";
         unset($this->serverouptut);
-        self::_putDebug(_("Processing HTTP request") , 2);
+        self::_putDebug(_("Processing HTTP request"), 2);
         $this->serveroutput->headers = array();
         $this->serveroutput->body = "";
         $http = new http_class;
         if (!$this->unix) {
         	// DOL_LDR_CHANGE
-        	if (empty($this->host)) $this->host='127.0.0.1';
+        	if (empty($this->host)) $this->host = '127.0.0.1';
             $http->host = $this->host;
         }
         else {
@@ -798,12 +798,12 @@ 
             $http->debug = 0;
             $http->html_debug = 0;
         }
-        $url = "http://" . $this->host;
+        $url = "http://".$this->host;
         if ($this->ssl) {
-            $url = "https://" . $this->host;
+            $url = "https://".$this->host;
         }
         if ($this->unix) {
-            $url = "unix://" . $this->host;
+            $url = "unix://".$this->host;
         }
         $http->port = $this->port;
         $http->timeout = $this->http_timeout;
@@ -839,7 +839,7 @@ 
             {
                 $success = $http->Open($arguments);
             }
-            catch(httpException $e)
+            catch (httpException $e)
             {
                 throw new ippException(
                     sprintf("http error: %s", $e->getMessage()),
@@ -857,19 +857,19 @@ 
             {
                 self::_putDebug("H T T P    R E Q U E S T :");
                 self::_putDebug("Request headers:");
-                for (Reset($http->request_headers) , $header = 0; $header < count($http->request_headers); Next($http->request_headers) , $header++)
+                for (Reset($http->request_headers), $header = 0; $header < count($http->request_headers); Next($http->request_headers), $header++)
                 {
                     $header_name = Key($http->request_headers);
                     if (GetType($http->request_headers[$header_name]) == "array")
                     {
                         for ($header_value = 0; $header_value < count($http->request_headers[$header_name]); $header_value++)
                         {
-                            self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
+                            self::_putDebug($header_name.": ".$http->request_headers[$header_name][$header_value]);
                         }
                     }
                     else
                     {
-                        self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
+                        self::_putDebug($header_name.": ".$http->request_headers[$header_name]);
                     }
                 }
                 self::_putDebug("Request body:");
@@ -883,23 +883,23 @@ 
                 $http->ReadReplyHeaders($headers);
                 self::_putDebug("H T T P    R E S P O N S E :");
                 self::_putDebug("Response headers:");
-                for (Reset($headers) , $header = 0; $header < count($headers); Next($headers) , $header++)
+                for (Reset($headers), $header = 0; $header < count($headers); Next($headers), $header++)
                 {
                     $header_name = Key($headers);
                     if (GetType($headers[$header_name]) == "array")
                     {
                         for ($header_value = 0; $header_value < count($headers[$header_name]); $header_value++)
                         {
-                            self::_putDebug($header_name . ": " . $headers[$header_name][$header_value]);
+                            self::_putDebug($header_name.": ".$headers[$header_name][$header_value]);
                             $this->serveroutput->headers[$i] =
-                                $header_name . ": "
+                                $header_name.": "
                                     . $headers[$header_name][$header_value];
                             $i++;
                         }
                     }
                     else
                     {
-                        self::_putDebug($header_name . ": " . $headers[$header_name]);
+                        self::_putDebug($header_name.": ".$headers[$header_name]);
                         $this->serveroutput->headers[$i] =
                             $header_name
                                 . ": "
@@ -917,7 +917,7 @@ 
                     }
 
                     self::_putDebug(htmlentities($body));
-                    $this->serveroutput->body.= $body;
+                    $this->serveroutput->body .= $body;
                 }
                 self::_putDebug("********* END RESPONSE BODY ********");
             }
@@ -933,57 +933,57 @@ 
     {
         $this->tags_types = array(
             "unsupported" => array(
-                "tag" => chr(0x10) ,
+                "tag" => chr(0x10),
                 "build" => ""
-            ) ,
+            ),
             "reserved" => array(
-                "tag" => chr(0x11) ,
+                "tag" => chr(0x11),
                 "build" => ""
-            ) ,
+            ),
             "unknown" => array(
-                "tag" => chr(0x12) ,
+                "tag" => chr(0x12),
                 "build" => ""
-            ) ,
+            ),
             "no-value" => array(
-                "tag" => chr(0x13) ,
+                "tag" => chr(0x13),
                 "build" => "no_value"
-            ) ,
+            ),
             "integer" => array(
-                "tag" => chr(0x21) ,
+                "tag" => chr(0x21),
                 "build" => "integer"
-            ) ,
+            ),
             "boolean" => array(
-                "tag" => chr(0x22) ,
+                "tag" => chr(0x22),
                 "build" => "boolean"
-            ) ,
+            ),
             "enum" => array(
-                "tag" => chr(0x23) ,
+                "tag" => chr(0x23),
                 "build" => "enum"
-            ) ,
+            ),
             "octetString" => array(
-                "tag" => chr(0x30) ,
+                "tag" => chr(0x30),
                 "build" => "octet_string"
-            ) ,
+            ),
             "datetime" => array(
-                "tag" => chr(0x31) ,
+                "tag" => chr(0x31),
                 "build" => "datetime"
-            ) ,
+            ),
             "resolution" => array(
-                "tag" => chr(0x32) ,
+                "tag" => chr(0x32),
                 "build" => "resolution"
-            ) ,
+            ),
             "rangeOfInteger" => array(
-                "tag" => chr(0x33) ,
+                "tag" => chr(0x33),
                 "build" => "range_of_integers"
-            ) ,
+            ),
             "textWithLanguage" => array(
-                "tag" => chr(0x35) ,
+                "tag" => chr(0x35),
                 "build" => "string"
-            ) ,
+            ),
             "nameWithLanguage" => array(
-                "tag" => chr(0x36) ,
+                "tag" => chr(0x36),
                 "build" => "string"
-            ) ,
+            ),
             /*
             "text" => array ("tag" => chr(0x40),
             "build" => "string"),
@@ -991,96 +991,96 @@ 
             "build" => "string"),
             */
             "textWithoutLanguage" => array(
-                "tag" => chr(0x41) ,
+                "tag" => chr(0x41),
                 "build" => "string"
-            ) ,
+            ),
             "nameWithoutLanguage" => array(
-                "tag" => chr(0x42) ,
+                "tag" => chr(0x42),
                 "buid" => "string"
-            ) ,
+            ),
             "keyword" => array(
-                "tag" => chr(0x44) ,
+                "tag" => chr(0x44),
                 "build" => "string"
-            ) ,
+            ),
             "uri" => array(
-                "tag" => chr(0x45) ,
+                "tag" => chr(0x45),
                 "build" => "string"
-            ) ,
+            ),
             "uriScheme" => array(
-                "tag" => chr(0x46) ,
+                "tag" => chr(0x46),
                 "build" => "string"
-            ) ,
+            ),
             "charset" => array(
-                "tag" => chr(0x47) ,
+                "tag" => chr(0x47),
                 "build" => "string"
-            ) ,
+            ),
             "naturalLanguage" => array(
-                "tag" => chr(0x48) ,
+                "tag" => chr(0x48),
                 "build" => "string"
-            ) ,
+            ),
             "mimeMediaType" => array(
-                "tag" => chr(0x49) ,
+                "tag" => chr(0x49),
                 "build" => "string"
-            ) ,
+            ),
             "extendedAttributes" => array(
-                "tag" => chr(0x7F) ,
+                "tag" => chr(0x7F),
                 "build" => "extended"
-            ) ,
+            ),
         );
         $this->operation_tags = array(
             "compression" => array(
                 "tag" => "keyword"
-            ) ,
+            ),
             "document-natural-language" => array(
                 "tag" => "naturalLanguage"
-            ) ,
+            ),
             "job-k-octets" => array(
                 "tag" => "integer"
-            ) ,
+            ),
             "job-impressions" => array(
                 "tag" => "integer"
-            ) ,
+            ),
             "job-media-sheets" => array(
                 "tag" => "integer"
-            ) ,
+            ),
         );
         $this->job_tags = array(
             "job-priority" => array(
                 "tag" => "integer"
-            ) ,
+            ),
             "job-hold-until" => array(
                 "tag" => "keyword"
-            ) ,
+            ),
             "job-sheets" => array(
                 "tag" => "keyword"
-            ) , //banner page
+            ), //banner page
             "multiple-document-handling" => array(
                 "tag" => "keyword"
-            ) ,
+            ),
             //"copies" => array("tag" => "integer"),
             "finishings" => array(
                 "tag" => "enum"
-            ) ,
+            ),
             //"page-ranges" => array("tag" => "rangeOfInteger"), // has its own function
             //"sides" => array("tag" => "keyword"), // has its own function
             "number-up" => array(
                 "tag" => "integer"
-            ) ,
+            ),
             "orientation-requested" => array(
                 "tag" => "enum"
-            ) ,
+            ),
             "media" => array(
                 "tag" => "keyword"
-            ) ,
+            ),
             "printer-resolution" => array(
                 "tag" => "resolution"
-            ) ,
+            ),
             "print-quality" => array(
                 "tag" => "enum"
-            ) ,
+            ),
             "job-message-from-operator" => array(
                 "tag" => "textWithoutLanguage"
-            ) ,
+            ),
         );
         $this->printer_tags = array(
             "requested-attributes" => array(
@@ -1095,30 +1095,30 @@ 
     protected function _setOperationId()
     {
         $prepend = '';
-        $this->operation_id+= 1;
+        $this->operation_id += 1;
         $this->meta->operation_id = self::_integerBuild($this->operation_id);
-        self::_putDebug("operation id is: " . $this->operation_id, 2);
+        self::_putDebug("operation id is: ".$this->operation_id, 2);
     }
 
     protected function _setJobId()
     {
-        $this->meta->jobid+= 1;
+        $this->meta->jobid += 1;
         $prepend = '';
         $prepend_length = 4 - strlen($this->meta->jobid);
         for ($i = 0; $i < $prepend_length; $i++) {
-            $prepend.= '0';
+            $prepend .= '0';
         }
-        return $prepend . $this->meta->jobid;
+        return $prepend.$this->meta->jobid;
     }
 
     protected function _setJobUri($job_uri)
     {
         $this->meta->job_uri = chr(0x45) // type uri
-            . chr(0x00) . chr(0x07) // name-length
+            . chr(0x00).chr(0x07) // name-length
             . "job-uri"
             //. chr(0x00).chr(strlen($job_uri))
-            . self::_giveMeStringLength($job_uri) . $job_uri;
-        self::_putDebug("job-uri is: " . $job_uri, 2);
+            . self::_giveMeStringLength($job_uri).$job_uri;
+        self::_putDebug("job-uri is: ".$job_uri, 2);
     }
 
     //
@@ -1180,9 +1180,9 @@ 
                 $errno = $strings[1];
                 $string = strtoupper(str_replace(' ', '_', $strings[2]));
                 trigger_error(
-                    sprintf(_("server responds %s") , $server_response),
+                    sprintf(_("server responds %s"), $server_response),
                     E_USER_WARNING);
-                self::_errorLog("server responds " . $server_response, 1);
+                self::_errorLog("server responds ".$server_response, 1);
                 $this->serveroutput->httpstatus =
                     strtoupper($strings[0])
                         . " "
@@ -1227,7 +1227,7 @@ 
                 ord($this->serveroutput->body[$this->_parsing->offset]),
                 ord($this->serveroutput->body[$this->_parsing->offset + 1]),
                 $this->serveroutput->ipp_version));
-        $this->_parsing->offset+= 2;
+        $this->_parsing->offset += 2;
         return;
     }
 
@@ -1237,7 +1237,7 @@ 
             (ord($this->serveroutput->body[$this->_parsing->offset]) * 256)
             + ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         $this->serveroutput->status = "NOT PARSED";
-        $this->_parsing->offset+= 2;
+        $this->_parsing->offset += 2;
         if (strlen($this->serveroutput->body) < $this->_parsing->offset)
         {
             return false;
@@ -1415,8 +1415,8 @@ 
             self::_interpretInteger(
                 substr($this->serveroutput->body, $this->_parsing->offset, 4)
             );
-        self::_putDebug("request-id " . $this->serveroutput->request_id, 2);
-        $this->_parsing->offset+= 4;
+        self::_putDebug("request-id ".$this->serveroutput->request_id, 2);
+        $this->_parsing->offset += 4;
         return;
     }
 
@@ -1424,7 +1424,7 @@ 
     {
         // they are _signed_ integers
         $value_parsed = 0;
-        for ($i = strlen($value); $i > 0; $i --)
+        for ($i = strlen($value); $i > 0; $i--)
         {
             $value_parsed +=
                 (
@@ -1470,7 +1470,7 @@ 
                 trigger_error(
                     _("_stringJob: Printer URI is not set: die"),
                     E_USER_WARNING);
-                self::_putDebug(_("_stringJob: Printer URI is not set: die") , 4);
+                self::_putDebug(_("_stringJob: Printer URI is not set: die"), 4);
                 self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
             }
@@ -1512,8 +1512,8 @@ 
         {
             $this->error_generation->request_body_malformed = "";
         }
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-            . chr(0x00) . chr(0x02) // Print-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+            . chr(0x00).chr(0x02) // Print-Job | operation-id
             . $this->meta->operation_id //           request-id
             . chr(0x01) // start operation-attributes | operation-attributes-tag
             . $this->meta->charset
@@ -1534,7 +1534,7 @@ 
                     . $this->meta->page_ranges
                     . $jobattributes;
         }
-        $this->stringjob.= chr(0x03); // end-of-attributes | end-of-attributes-tag
+        $this->stringjob .= chr(0x03); // end-of-attributes | end-of-attributes-tag
         self::_putDebug(
             sprintf(_("String sent to the server is: %s"),
                 $this->stringjob)
@@ -1545,12 +1545,12 @@ 
     protected function _buildValues(&$operationattributes, &$jobattributes, &$printerattributes)
     {
         $operationattributes = '';
-        foreach($this->operation_tags as $key => $values)
+        foreach ($this->operation_tags as $key => $values)
         {
             $item = 0;
             if (array_key_exists('value', $values))
             {
-                foreach($values['value'] as $item_value)
+                foreach ($values['value'] as $item_value)
                 {
                     if ($item == 0)
                     {
@@ -1574,12 +1574,12 @@ 
             }
         }
         $jobattributes = '';
-        foreach($this->job_tags as $key => $values)
+        foreach ($this->job_tags as $key => $values)
         {
             $item = 0;
             if (array_key_exists('value', $values))
             {
-                foreach($values['value'] as $item_value)
+                foreach ($values['value'] as $item_value)
                 {
                     if ($item == 0)
                     {
@@ -1603,12 +1603,12 @@ 
             }
         }
         $printerattributes = '';
-        foreach($this->printer_tags as $key => $values)
+        foreach ($this->printer_tags as $key => $values)
         {
             $item = 0;
             if (array_key_exists('value', $values))
             {
-                foreach($values['value'] as $item_value)
+                foreach ($values['value'] as $item_value)
                 {
                     if ($item == 0)
                     {
@@ -1640,9 +1640,9 @@ 
     protected function _giveMeStringLength($string)
     {
         $length = strlen($string);
-        if ($length > ((0xFF << 8) + 0xFF)  )
+        if ($length > ((0xFF << 8) + 0xFF))
         {
-            $errmsg = sprintf (
+            $errmsg = sprintf(
                 _('max string length for an ipp meta-information = %d, while here %d'),
                 ((0xFF << 8) + 0xFF), $length);
 
@@ -1652,14 +1652,14 @@ 
             }
             else
             {
-                trigger_error ($errmsg, E_USER_ERROR);
+                trigger_error($errmsg, E_USER_ERROR);
             }
         }
         $int1 = $length & 0xFF;
         $length -= $int1;
         $length = $length >> 8;
         $int2 = $length & 0xFF;
-        return chr($int2) . chr($int1);
+        return chr($int2).chr($int1);
     }
 
     protected function _enumBuild($tag, $value)
@@ -1790,7 +1790,7 @@ 
         {
             $prepend .= chr(0);
         }
-        return $prepend . $value;
+        return $prepend.$value;
     }
 
     protected function _integerBuild($value)
@@ -1798,18 +1798,18 @@ 
         if ($value >= 2147483647 || $value < - 2147483648)
         {
             trigger_error(
-                _("Values must be between -2147483648 and 2147483647: assuming '0'") , E_USER_WARNING);
-            return chr(0x00) . chr(0x00) . chr(0x00) . chr(0x00);
+                _("Values must be between -2147483648 and 2147483647: assuming '0'"), E_USER_WARNING);
+            return chr(0x00).chr(0x00).chr(0x00).chr(0x00);
         }
         $initial_value = $value;
         $int1 = $value & 0xFF;
         $value -= $int1;
         $value = $value >> 8;
         $int2 = $value & 0xFF;
-        $value-= $int2;
+        $value -= $int2;
         $value = $value >> 8;
         $int3 = $value & 0xFF;
-        $value-= $int3;
+        $value -= $int3;
         $value = $value >> 8;
         $int4 = $value & 0xFF; //64bits
         if ($initial_value < 0) {
@@ -1818,7 +1818,7 @@ 
         else {
             $int4 = chr($int4);
         }
-        $value = $int4 . chr($int3) . chr($int2) . chr($int1);
+        $value = $int4.chr($int3).chr($int2).chr($int1);
         return $value;
     }
 
@@ -1829,7 +1829,7 @@ 
         for ($i = 0; $i < 2; $i++) {
             $outvalue[$i] = self::_integerBuild($integers[$i]);
         }
-        return $outvalue[0] . $outvalue[1];
+        return $outvalue[0].$outvalue[1];
     }
 
     protected function _setJobAttribute($attribute, $value)
@@ -1877,14 +1877,14 @@ 
                     "",
                     ":"
                 );
-                $value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)) . $unit;
+                $value = self::_rangeOfIntegerBuild(preg_replace($search, $replace, $value)).$unit;
                 $this->job_tags[$attribute]['value'][] = $value;
                 break;
 
             default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
                 return FALSE;
                 break;
         }
@@ -1907,9 +1907,9 @@ 
                 break;
 
             default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
                 return FALSE;
                 break;
         }
@@ -1932,9 +1932,9 @@ 
                 break;
 
             default:
-                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , E_USER_NOTICE);
-                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
-                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute') , $attribute) , 2);
+                trigger_error(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), E_USER_NOTICE);
+                self::_putDebug(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
+                self::_errorLog(sprintf(_('SetAttribute: Tag "%s": cannot set attribute'), $attribute), 2);
                 return FALSE;
                 break;
         }
@@ -1969,7 +1969,7 @@ 
             return;
         }
 
-        $string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']) , $this->host, $this->port, $this->requesting_user, $string_to_log);
+        $string = sprintf('%s : %s:%s user %s : %s', basename($_SERVER['PHP_SELF']), $this->host, $this->port, $this->requesting_user, $string_to_log);
 
         if ($this->log_type == 0)
         {
@@ -1977,7 +1977,7 @@ 
             return;
         }
 
-        $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);
+        $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);
         error_log($string, $this->log_type, $this->log_destination);
         return;
     }

htdocs/includes/printipp/ExtendedPrintIPP.php

Spacing +254 added lines, -254 removed lines

@@ -52,10 +52,10 @@ 
 
 
     // OPERATIONS
-    public function printURI ($uri)
+    public function printURI($uri)
     {
 
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
 
         if (!empty($uri))
         {
@@ -63,19 +63,19 @@ 
             $this->setup->uri = 1;
         }
 
-        if(!$this->_stringUri())
+        if (!$this->_stringUri())
         {
             return FALSE;
         }
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
+        if (self::_sendHttp($post_values, $this->paths['printers']))
         {
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_parseJobAttributes();
                 $this->_getJobId();
@@ -88,24 +88,24 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf("printing uri %s, job %s: ",$uri,$this->last_job)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf("printing uri %s, job %s: ", $uri, $this->last_job)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("printing uri %s: ",$uri,$this->last_job)
-                            .$this->serveroutput->status,1);
+                $this->jobs = array_merge($this->jobs, array(""));
+                $this->jobs_uri = array_merge($this->jobs_uri, array(""));
+                self::_errorLog(sprintf("printing uri %s: ", $uri, $this->last_job)
+                            .$this->serveroutput->status, 1);
             }
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("printing uri $uri : OPERATION FAILED",1);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        self::_errorLog("printing uri $uri : OPERATION FAILED", 1);
 
         return false;
     }
@@ -113,8 +113,8 @@ 
 
     public function purgeJobs()
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -127,15 +127,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("purgeJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("purgeJobs: Printer URI is not set: die\n"));
-                self::_errorLog("purgeJobs: Printer URI is not set, die",2);
+                trigger_error(_("purgeJobs: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("purgeJobs: Printer URI is not set: die\n"));
+                self::_errorLog("purgeJobs: Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -155,8 +155,8 @@ 
             self::setUserName();
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x12) // purge-Jobs | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x12) // purge-Jobs | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -172,14 +172,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("purging jobs of %s\n"),$this->printer_uri)); 
+        self::_putDebug(sprintf(_("purging jobs of %s\n"), $this->printer_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
+        if (self::_sendHttp($post_values, $this->paths['admin']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
@@ -187,27 +187,27 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("purging jobs of %s: "), $this->printer_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("purging jobs of %s: "), $this->printer_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("purging jobs of %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
+                                     $this->printer_uri), 3);
 
         return false;
     }
@@ -225,15 +225,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("createJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("createJob: Printer URI is not set: die\n"));
-                self::_errorLog("createJob: Printer URI is not set, die",2);
+                trigger_error(_("createJob: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("createJob: Printer URI is not set: die\n"));
+                self::_errorLog("createJob: Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -277,7 +277,7 @@ 
         {
             if (is_readable($this->data))
             {
-                self::setJobName(basename($this->data),true);
+                self::setJobName(basename($this->data), true);
             }
             else
             {
@@ -302,10 +302,10 @@ 
         $jobattributes = '';
         $operationattributes = '';
         $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x05) // Create-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x05) // Create-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -323,20 +323,20 @@ 
                          . $jobattributes
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
 
-        unset ($this->meta->copies,$this->meta->sides,$this->meta->page_ranges);
+        unset ($this->meta->copies, $this->meta->sides, $this->meta->page_ranges);
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("creating job %s, printer %s\n"),$this->last_job,$this->printer_uri)); 
+        self::_putDebug(sprintf(_("creating job %s, printer %s\n"), $this->last_job, $this->printer_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
+        if (self::_sendHttp($post_values, $this->paths['printers']))
         {
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_getJobId();
                 $this->_getJobUri();
@@ -344,53 +344,53 @@ 
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array(''));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(''));
+                $this->jobs = array_merge($this->jobs, array(''));
+                $this->jobs_uri = array_merge($this->jobs_uri, array(''));
             }
         }
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("Create job: job %s"),$this->last_job)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("Create job: job %s"), $this->last_job)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
 
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf(_("Create-Job: %s"),$this->serveroutput->status),1);
+                $this->jobs = array_merge($this->jobs, array(""));
+                $this->jobs_uri = array_merge($this->jobs_uri, array(""));
+                self::_errorLog(sprintf(_("Create-Job: %s"), $this->serveroutput->status), 1);
                 }                             
             return $this->serveroutput->status; 
             }    
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("Creating job on %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
+                                     $this->printer_uri), 3);
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
         return false;
     }
 
-    public function sendDocument($job,$is_last=false)
+    public function sendDocument($job, $is_last = false)
     {
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
 
-        if (!$this->_stringDocument($job,$is_last))
+        if (!$this->_stringDocument($job, $is_last))
         {
             return FALSE;
         }
 
         if (is_readable($this->data))
         {
-            self::_putDebug( _("sending Document\n")); 
+            self::_putDebug(_("sending Document\n")); 
 
             $this->output = $this->stringjob;
 
@@ -399,32 +399,32 @@ 
                 $this->output .= chr(0x16);
             } // ASCII "SYN"
 
-            $post_values = array( "Content-Type" => "application/ipp",
+            $post_values = array("Content-Type" => "application/ipp",
                                   "Data" => $this->output,
                                   "File" => $this->data);
 
             if ($this->setup->datatype == "TEXT" && !isset($this->setup->noFormFeed))
             {
-                $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
+                $post_values = array_merge($post_values, array("Filetype"=>"TEXT"));
             }
         }
         else
         {
-            self::_putDebug( _("sending DATA as document\n")); 
+            self::_putDebug(_("sending DATA as document\n")); 
 
             $this->output = $this->stringjob;
             $this->output .= $this->datahead;    
             $this->output .= $this->data;
             $this->output .= $this->datatail;
 
-            $post_values = array( "Content-Type" => "application/ipp",
+            $post_values = array("Content-Type" => "application/ipp",
                                   "Data" => $this->output);
         }
 
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
+        if (self::_sendHttp($post_values, $this->paths['printers']))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_getJobId();
                 //$this->_getPrinterUri();
@@ -433,56 +433,56 @@ 
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array($job));
-                $this->jobs_uri = array_merge($this->jobs_uri,array($job));
+                $this->jobs = array_merge($this->jobs, array($job));
+                $this->jobs_uri = array_merge($this->jobs_uri, array($job));
                 }
             }
         
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),3);
+                self::_errorLog(sprintf("sending document, job %s: %s", $job, $this->serveroutput->status), 3);
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),1);
+                $this->jobs = array_merge($this->jobs, array(""));
+                $this->jobs_uri = array_merge($this->jobs_uri, array(""));
+                self::_errorLog(sprintf("sending document, job %s: %s", $job, $this->serveroutput->status), 1);
             }
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array($job));
-        $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-        self::_errorLog(sprintf("sending document, job %s : OPERATION FAILED",$job),1);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        $this->jobs = array_merge($this->jobs, array($job));
+        $this->jobs_uri = array_merge($this->jobs_uri, array($job));
+        self::_errorLog(sprintf("sending document, job %s : OPERATION FAILED", $job), 1);
 
         return false;
     }
 
 
-    public function sendURI ($uri,$job,$is_last=false)
+    public function sendURI($uri, $job, $is_last = false)
     {
-        self::_putDebug( sprintf("*************************\nDate: %s\n*************************\n\n",date('Y-m-d H:i:s')));
+        self::_putDebug(sprintf("*************************\nDate: %s\n*************************\n\n", date('Y-m-d H:i:s')));
 
-        if (!$this->_stringSendUri($uri,$job,$is_last))
+        if (!$this->_stringSendUri($uri, $job, $is_last))
         {
             return FALSE;
         }
 
-            self::_putDebug( _("sending URI $uri\n")); 
+            self::_putDebug(_("sending URI $uri\n")); 
 
             $this->output = $this->stringjob;
 
-            $post_values = array( "Content-Type" => "application/ipp",
+            $post_values = array("Content-Type" => "application/ipp",
                                   "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
+        if (self::_sendHttp($post_values, $this->paths['printers']))
         {
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_getJobId();
                 //$this->_getPrinterUri();
@@ -491,8 +491,8 @@ 
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array($job));
-                $this->jobs_uri = array_merge($this->jobs_uri,array($job));
+                $this->jobs = array_merge($this->jobs, array($job));
+                $this->jobs_uri = array_merge($this->jobs_uri, array($job));
                 }
             }
 
@@ -500,25 +500,25 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf("sending uri %s, job %s: %s",$uri,$job,$this->serveroutput->status),3);
+                self::_errorLog(sprintf("sending uri %s, job %s: %s", $uri, $job, $this->serveroutput->status), 3);
             }
             else
             {
-                $this->jobs = array_merge($this->jobs,array(""));
-                $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-                self::_errorLog(sprintf("sending uri, job %s: %s",$uri,$job,$this->serveroutput->status),1);
+                $this->jobs = array_merge($this->jobs, array(""));
+                $this->jobs_uri = array_merge($this->jobs_uri, array(""));
+                self::_errorLog(sprintf("sending uri, job %s: %s", $uri, $job, $this->serveroutput->status), 1);
             }
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array($job));
-        $this->jobs_uri = array_merge($this->jobs_uri,array($job));
-        self::_errorLog(sprintf("sending uri %s, job %s : OPERATION FAILED",$uri,$job),1);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        $this->jobs = array_merge($this->jobs, array($job));
+        $this->jobs_uri = array_merge($this->jobs_uri, array($job));
+        self::_errorLog(sprintf("sending uri %s, job %s : OPERATION FAILED", $uri, $job), 1);
 
         return false;
     }
@@ -526,8 +526,8 @@ 
 
     public function pausePrinter()
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -540,15 +540,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("pausePrinter: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("pausePrinter: Printer URI is not set: die\n"));
-                self::_errorLog("pausePrinter: Printer URI is not set, die",2);
+                trigger_error(_("pausePrinter: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("pausePrinter: Printer URI is not set: die\n"));
+                self::_errorLog("pausePrinter: Printer URI is not set, die", 2);
                 return FALSE;
             }
         }
@@ -568,8 +568,8 @@ 
             self::setUserName();
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x10) // Pause-Printer | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x10) // Pause-Printer | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -585,14 +585,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("pause printer %s\n"),$this->printer_uri)); 
+        self::_putDebug(sprintf(_("pause printer %s\n"), $this->printer_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
+        if (self::_sendHttp($post_values, $this->paths['admin']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
@@ -600,27 +600,27 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("Pause printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("Pause printer %s: "), $this->printer_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("pause printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("pause printer %s: "), $this->printer_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("pause printer %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
+                                     $this->printer_uri), 3);
 
         return false;
     }
@@ -628,8 +628,8 @@ 
 
     public function resumePrinter()
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -642,15 +642,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("resumePrinter: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("resumePrinter: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
+                trigger_error(_("resumePrinter: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("resumePrinter: Printer URI is not set: die\n"));
+                self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
             }
         }
@@ -670,8 +670,8 @@ 
             self::setUserName();
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x11) // suse-Printer | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x11) // suse-Printer | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -682,14 +682,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("resume printer %s\n"),$this->printer_uri)); 
+        self::_putDebug(sprintf(_("resume printer %s\n"), $this->printer_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['admin']))
+        if (self::_sendHttp($post_values, $this->paths['admin']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
@@ -697,36 +697,36 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("resume printer %s: "), $this->printer_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("resume printer %s: "), $this->printer_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("resume printer %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
+                                     $this->printer_uri), 3);
 
         return false;
     }
 
 
-    public function holdJob ($job_uri,$until='indefinite')
+    public function holdJob($job_uri, $until = 'indefinite')
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(trim($job_uri)));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -754,8 +754,8 @@ 
 
         self::_setJobUri($job_uri);
         
-        $until_strings = array('no-hold','day-time','evening','night','weekend','second-shift','third-shift');
-        if (in_array($until,$until_strings))
+        $until_strings = array('no-hold', 'day-time', 'evening', 'night', 'weekend', 'second-shift', 'third-shift');
+        if (in_array($until, $until_strings))
         {
             true;
         }
@@ -770,8 +770,8 @@ 
                                     . self::_giveMeStringLength($until)
                                     . $until;
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0C) // Hold-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x0C) // Hold-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -784,14 +784,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("hold job %s until %s\n"),$job_uri,$until)); 
+        self::_putDebug(sprintf(_("hold job %s until %s\n"), $job_uri, $until)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
@@ -799,36 +799,36 @@ 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
             
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("hold job %s until %s: "), $job_uri, $until)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("hold job %s until %s: "), $job_uri, $until)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("hold job %s until %s : OPERATION FAILED"),
-                                     $job_uri,$until),3);
+                                     $job_uri, $until), 3);
 
         return false;
     }
     
 
-    public function releaseJob ($job_uri)
+    public function releaseJob($job_uri)
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(trim($job_uri)));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -856,8 +856,8 @@ 
 
         self::_setJobUri($job_uri);
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0D) // Hold-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x0D) // Hold-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -869,50 +869,50 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
+        self::_putDebug(sprintf(_("release job %s\n"), $job_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
         }
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("release job %s: "), $job_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("release job %s: "), $job_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("release job %s: OPERATION FAILED"),
-                                     $job_uri),3);
+                                     $job_uri), 3);
 
         return false;
     }
 
 
-    public function restartJob ($job_uri)
+    public function restartJob($job_uri)
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(trim($job_uri)));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -943,10 +943,10 @@ 
         $jobattributes = '';
         $operationattributes = '';
         $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes); 
  
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0E) // Hold-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x0E) // Hold-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -959,14 +959,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("release job %s\n"),$job_uri)); 
+        self::_putDebug(sprintf(_("release job %s\n"), $job_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
@@ -974,36 +974,36 @@ 
 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("release job %s: "), $job_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("release job %s: "), $job_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("release job %s: OPERATION FAILED"),
-                                     $job_uri),3);
+                                     $job_uri), 3);
 
         return false;
     }
 
 
-    public function setJobAttributes ($job_uri,$deleted_attributes=array())
+    public function setJobAttributes($job_uri, $deleted_attributes = array())
     {
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(trim($job_uri)));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(trim($job_uri)));
 
         self::_setOperationId();
         $this->parsed = array();
@@ -1049,10 +1049,10 @@ 
         $operationattributes = '';
         $jobattributes = '';
         $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes); 
 
         $this->meta->deleted_attributes = "";
-        for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
+        for ($i = 0; $i < count($deleted_attributes); $i++)
         {
             $this->meta->deleted_attributes .= chr(0x16) // out-of-band value
                 . self::_giveMeStringLength($deleted_attributes[$i])
@@ -1060,8 +1060,8 @@ 
                 . chr(0x0).chr(0x0);
         } // value-length = 0;
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x14) // Set-Job-Attributes | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x14) // Set-Job-Attributes | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -1079,48 +1079,48 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("set job attributes for job %s\n"),$job_uri)); 
+        self::_putDebug(sprintf(_("set job attributes for job %s\n"), $job_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['jobs']))
+        if (self::_sendHttp($post_values, $this->paths['jobs']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
         }
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("set job attributes for job %s: "), $job_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("set job attributes for job %s: "), $job_uri)
+                                             .$this->serveroutput->status, 1);
             }
             $this->last_job = $job_uri;
             $this->jobs_uri[count($this->jobs_uri) - 1] = $job_uri;
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("set job attributes for job %s: OPERATION FAILED"),
-                                     $job_uri),3);
+                                     $job_uri), 3);
 
         return false;
     }
 
 
-    public function setPrinterAttributes ($document_format='',$deleted_attributes=array())
+    public function setPrinterAttributes($document_format = '', $deleted_attributes = array())
     {
         /* $document_format (RFC 3380)
          If the client includes this attribute, the Printer MUST change
@@ -1140,8 +1140,8 @@ 
          they vary by document-format.
          */
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
         unset ($this->attributes);
 
         self::_setOperationId();
@@ -1194,10 +1194,10 @@ 
         $operationattributes = '';
         $jobattributes = '';
         $printerattributes = '';
-        self::_buildValues ($operationattributes,$jobattributes,$printerattributes); 
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes); 
 
         $this->meta->deleted_attributes = "";
-        for ($i = 0 ; $i < count($deleted_attributes) ; $i++)
+        for ($i = 0; $i < count($deleted_attributes); $i++)
         {
                 $this->meta->deleted_attributes .= chr(0x16) // out-of-band "deleted" value
                                                 . self::_giveMeStringLength($deleted_attributes[$i])
@@ -1205,8 +1205,8 @@ 
                                                 . chr(0x0).chr(0x0);
         } // value-length = 0;
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x13) // Set-Printer-Attributes | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x13) // Set-Printer-Attributes | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -1225,47 +1225,47 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("set printer attributes for job %s\n"),$this->printer_uri)); 
+        self::_putDebug(sprintf(_("set printer attributes for job %s\n"), $this->printer_uri)); 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type"=>"application/ipp",
+        $post_values = array("Content-Type"=>"application/ipp",
                               "Data"=>$this->output);
 
-        if (self::_sendHttp ($post_values,$this->paths['printers']))
+        if (self::_sendHttp($post_values, $this->paths['printers']))
         {
             self::_parseServerOutput();
             self::_parseAttributes();
         }
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
 
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("set printer attributes for printer %s: "), $this->printer_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("set printer attributes for printer %s: "), $this->printer_uri)
+                                             .$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
         self::_errorLog(date("Y-m-d H:i:s : ")
                         .basename($_SERVER['PHP_SELF'])
                         .sprintf(_("set printer attributes for printer %s: OPERATION FAILED"),
-                                     $this->printer_uri),1);
+                                     $this->printer_uri), 1);
 
         return false;
     }
 
     // REQUEST BUILDING
-    protected function _setDocumentUri ()
+    protected function _setDocumentUri()
     {
         $this->meta->document_uri = chr(0x45) // type uri
                                 . chr(0x00).chr(0x0c) // name-length
@@ -1273,20 +1273,20 @@ 
                                 . self::_giveMeStringLength($this->document_uri)
                                 . $this->document_uri;
 
-        self::_putDebug( "document uri is: ".$this->document_uri."\n");
+        self::_putDebug("document uri is: ".$this->document_uri."\n");
         $this->setup->document_uri = 1;
     }
 
 
-    protected function _stringUri ()
+    protected function _stringUri()
     {
         self::_setDocumentUri();
 
         if (!isset($this->setup->document_uri))
         {
-            trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
-            self::_errorLog("Document URI is not set, die",2);
+            trigger_error(_("_stringUri: Document URI is not set: die"), E_USER_WARNING);
+            self::_putDebug(_("_stringUri: Document URI is not set: die\n"));
+            self::_errorLog("Document URI is not set, die", 2);
             return FALSE;
         }
         unset ($this->setup->document_uri);
@@ -1298,15 +1298,15 @@ 
             unset($this->jobs_uri[count($this->jobs) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
-                self::_errorLog("_stringUri: Printer URI is not set, die",2);
+                trigger_error(_("_stringUri: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("_stringUri: Printer URI is not set: die\n"));
+                self::_errorLog("_stringUri: Printer URI is not set, die", 2);
                 return FALSE;
             }
         }
@@ -1321,9 +1321,9 @@ 
         }
         if (!isset($this->setup->uri))
         {
-            trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
-            self::_errorLog("Printer URI is not set, die",2);
+            trigger_error(_("_stringUri: Printer URI is not set: die"), E_USER_WARNING);
+            self::_putDebug(_("_stringUri: Printer URI is not set: die\n"));
+            self::_errorLog("Printer URI is not set, die", 2);
             return FALSE;
         }
         if (!isset($this->setup->copies))
@@ -1346,7 +1346,7 @@ 
         {
             if (is_readable($this->data))
             {
-                self::setJobName(basename($this->data),true);
+                self::setJobName(basename($this->data), true);
             }
             else
             {
@@ -1383,7 +1383,7 @@ 
         $jobattributes = '';
         $operationattributes = '';
         $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
 
         self::_setOperationId();
 
@@ -1392,8 +1392,8 @@ 
             $this->error_generation->request_body_malformed = "";
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x03) // Print-URI | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x03) // Print-URI | operation-id
                          . $this->meta->operation_id //           request-id
                          . $this->error_generation->request_body_malformed
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
@@ -1413,12 +1413,12 @@ 
                          . $jobattributes
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
 
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
         return TRUE;
     }
 
 
-    protected function _stringDocument ($job,$is_last)
+    protected function _stringDocument($job, $is_last)
     {
         if ($is_last == false)
         {
@@ -1445,15 +1445,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             }
             else
             {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
+                trigger_error(_("_stringJob: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"));
+                self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -1500,12 +1500,12 @@ 
         $operationattributes = '';
         $jobattributes = '';
         $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
 
         self::_setOperationId();
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x06) // Send-Document | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x06) // Send-Document | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -1527,21 +1527,21 @@ 
                          . $is_last
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
 
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
         return TRUE;
     }
 
 
-    protected function _stringSendUri ($uri,$job,$is_last)
+    protected function _stringSendUri($uri, $job, $is_last)
     {
         $this->document_uri = $uri;
         self::_setDocumentUri();
 
         if (!isset($this->setup->document_uri))
         {
-            trigger_error(_("_stringUri: Document URI is not set: die"),E_USER_WARNING);
-            self::_putDebug( _("_stringUri: Document URI is not set: die\n"));
-            self::_errorLog("Document URI is not set, die",2);
+            trigger_error(_("_stringUri: Document URI is not set: die"), E_USER_WARNING);
+            self::_putDebug(_("_stringUri: Document URI is not set: die\n"));
+            self::_errorLog("Document URI is not set, die", 2);
             return FALSE;
         }
         unset ($this->setup->document_uri);
@@ -1571,15 +1571,15 @@ 
             unset($this->jobs_uri[count($this->jobs_uri) - 1]);
             unset($this->status[count($this->status) - 1]);
 
-            if (array_key_exists(0,$this->available_printers))
+            if (array_key_exists(0, $this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
             } 
             else
             {
-                trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
-                self::_errorLog(" Printer URI is not set, die",2);
+                trigger_error(_("_stringJob: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"));
+                self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -1623,12 +1623,12 @@ 
         $operationattributes = '';
         $jobattributes = '';
         $printerattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
 
         self::_setOperationId();
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x07) // Send-Uri | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x07) // Send-Uri | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -1650,7 +1650,7 @@ 
                          . $is_last
                          . chr(0x03); // end-of-attributes | end-of-attributes-tag
 
-        self::_putDebug( sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
+        self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
         return TRUE;
     }
 }
\ No newline at end of file

htdocs/includes/nusoap/lib/Mail/mimePart.php

Spacing +75 added lines, -75 removed lines

@@ -183,7 +183,7 @@ 
                 break;
 
             case 'cid':
-                $headers['Content-ID'] = '<' . $value . '>';
+                $headers['Content-ID'] = '<'.$value.'>';
                 break;
 
             case 'location':
@@ -214,7 +214,7 @@ 
             if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
                 $headers['Content-Type'] .= '; ';
             } else {
-                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
+                $headers['Content-Type'] .= ';'.$this->_eol.' ';
             }
             $headers['Content-Type'] .= $charset;
 
@@ -231,7 +231,7 @@ 
 
 
         if (!empty($params['filename'])) {
-            $headers['Content-Type'] .= ';' . $this->_eol;
+            $headers['Content-Type'] .= ';'.$this->_eol;
             $headers['Content-Type'] .= $this->_buildHeaderParam(
                 'name', $params['filename'], $h_charset, $h_language, $h_encoding
             );
@@ -241,7 +241,7 @@ 
         if (!empty($params['disposition'])) {
             $headers['Content-Disposition'] = $params['disposition'];
             if (!empty($params['filename'])) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol;
+                $headers['Content-Disposition'] .= ';'.$this->_eol;
                 $headers['Content-Disposition'] .= $this->_buildHeaderParam(
                     'filename', $params['filename'], $h_charset, $h_language,
                     !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
@@ -251,7 +251,7 @@ 
             // add attachment size
             $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
             if ($size) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
+                $headers['Content-Disposition'] .= ';'.$this->_eol.' size='.$size;
             }
         }
 
@@ -269,7 +269,7 @@ 
                 $header = $items[0];
                 $param  = $items[1];
                 if (isset($headers[$header])) {
-                    $headers[$header] .= ';' . $this->_eol;
+                    $headers[$header] .= ';'.$this->_eol;
                 }
                 $headers[$header] .= $this->_buildHeaderParam(
                     $param, $value, $h_charset, $h_language, $h_encoding
@@ -300,12 +300,12 @@ 
      *         an indexed array. On error returns PEAR error object.
      * @access public
      */
-    function encode($boundary=null)
+    function encode($boundary = null)
     {
-        $encoded =& $this->_encoded;
+        $encoded = & $this->_encoded;
 
         if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $boundary = $boundary ? $boundary : '=_'.md5(rand().microtime());
             $eol = $this->_eol;
 
             $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
@@ -313,18 +313,18 @@ 
             $encoded['body'] = ''; 
 
             for ($i = 0; $i < count($this->_subparts); $i++) {
-                $encoded['body'] .= '--' . $boundary . $eol;
+                $encoded['body'] .= '--'.$boundary.$eol;
                 $tmp = $this->_subparts[$i]->encode();
                 if ($this->_isError($tmp)) {
                     return $tmp;
                 }
                 foreach ($tmp['headers'] as $key => $value) {
-                    $encoded['body'] .= $key . ': ' . $value . $eol;
+                    $encoded['body'] .= $key.': '.$value.$eol;
                 }
-                $encoded['body'] .= $eol . $tmp['body'] . $eol;
+                $encoded['body'] .= $eol.$tmp['body'].$eol;
             }
 
-            $encoded['body'] .= '--' . $boundary . '--' . $eol;
+            $encoded['body'] .= '--'.$boundary.'--'.$eol;
 
         } else if ($this->_body) {
             $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
@@ -347,7 +347,7 @@ 
         }
 
         // Add headers to $encoded
-        $encoded['headers'] =& $this->_headers;
+        $encoded['headers'] = & $this->_headers;
 
         return $encoded;
     }
@@ -365,15 +365,15 @@ 
      * @access public
      * @since 1.6.0
      */
-    function encodeToFile($filename, $boundary=null, $skip_head=false)
+    function encodeToFile($filename, $boundary = null, $skip_head = false)
     {
         if (file_exists($filename) && !is_writable($filename)) {
-            $err = $this->_raiseError('File is not writeable: ' . $filename);
+            $err = $this->_raiseError('File is not writeable: '.$filename);
             return $err;
         }
 
         if (!($fh = fopen($filename, 'ab'))) {
-            $err = $this->_raiseError('Unable to open file: ' . $filename);
+            $err = $this->_raiseError('Unable to open file: '.$filename);
             return $err;
         }
 
@@ -403,18 +403,18 @@ 
      * @return array True on sucess or PEAR error object
      * @access private
      */
-    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
+    function _encodePartToFile($fh, $boundary = null, $skip_head = false)
     {
         $eol = $this->_eol;
 
         if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $boundary = $boundary ? $boundary : '=_'.md5(rand().microtime());
             $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
         }
 
         if (!$skip_head) {
             foreach ($this->_headers as $key => $value) {
-                fwrite($fh, $key . ': ' . $value . $eol);
+                fwrite($fh, $key.': '.$value.$eol);
             }
             $f_eol = $eol;
         } else {
@@ -423,7 +423,7 @@ 
 
         if (count($this->_subparts)) {
             for ($i = 0; $i < count($this->_subparts); $i++) {
-                fwrite($fh, $f_eol . '--' . $boundary . $eol);
+                fwrite($fh, $f_eol.'--'.$boundary.$eol);
                 $res = $this->_subparts[$i]->_encodePartToFile($fh);
                 if ($this->_isError($res)) {
                     return $res;
@@ -431,10 +431,10 @@ 
                 $f_eol = $eol;
             }
 
-            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
+            fwrite($fh, $eol.'--'.$boundary.'--'.$eol);
 
         } else if ($this->_body) {
-            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
+            fwrite($fh, $f_eol.$this->_getEncodedData($this->_body, $this->_encoding));
         } else if ($this->_body_file) {
             fwrite($fh, $f_eol);
             $res = $this->_getEncodedDataFromFile(
@@ -508,15 +508,15 @@ 
      * @return string Encoded data or PEAR error object
      * @access private
      */
-    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
+    function _getEncodedDataFromFile($filename, $encoding, $fh = null)
     {
         if (!is_readable($filename)) {
-            $err = $this->_raiseError('Unable to read file: ' . $filename);
+            $err = $this->_raiseError('Unable to read file: '.$filename);
             return $err;
         }
 
         if (!($fd = fopen($filename, 'rb'))) {
-            $err = $this->_raiseError('Could not open file: ' . $filename);
+            $err = $this->_raiseError('Could not open file: '.$filename);
             return $err;
         }
 
@@ -585,7 +585,7 @@ 
      *
      * @access private
      */
-    function _quotedPrintableEncode($input , $line_max = 76)
+    function _quotedPrintableEncode($input, $line_max = 76)
     {
         $eol = $this->_eol;
         /*
@@ -618,7 +618,7 @@ 
                 } elseif ($dec == 9 && isset($line[$i])) {
                     ; // Do nothing if a TAB is not on eol
                 } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
-                    $char = $escape . sprintf('%02X', $dec);
+                    $char = $escape.sprintf('%02X', $dec);
                 } elseif (($dec == 46) && (($newline == '')
                     || ((strlen($newline) + strlen("=2E")) >= $line_max))
                 ) {
@@ -634,12 +634,12 @@ 
                 // EOL is not counted
                 if ((strlen($newline) + strlen($char)) >= $line_max) {
                     // soft line break; " =\r\n" is okay
-                    $output  .= $newline . $escape . $eol;
+                    $output  .= $newline.$escape.$eol;
                     $newline  = '';
                 }
                 $newline .= $char;
             } // end of for
-            $output .= $newline . $eol;
+            $output .= $newline.$eol;
             unset($lines[$idx]);
         }
         // Don't want last crlf
@@ -662,8 +662,8 @@ 
      *
      * @access private
      */
-    function _buildHeaderParam($name, $value, $charset=null, $language=null,
-        $encoding=null, $maxLength=75
+    function _buildHeaderParam($name, $value, $charset = null, $language = null,
+        $encoding = null, $maxLength = 75
     ) {
         // RFC 2045:
         // value needs encoding if contains non-ASCII chars or is longer than 78 chars
@@ -720,7 +720,7 @@ 
             $headCount++;
         }
 
-        $headers = implode(';' . $this->_eol, $headers);
+        $headers = implode(';'.$this->_eol, $headers);
         return $headers;
     }
 
@@ -737,7 +737,7 @@ 
      * @access private
      */
     function _buildRFC2047Param($name, $value, $charset,
-        $encoding='quoted-printable', $maxLength=76
+        $encoding = 'quoted-printable', $maxLength = 76
     ) {
         // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
         // parameter of a MIME Content-Type or Content-Disposition field",
@@ -746,11 +746,11 @@ 
 
         if ($encoding == 'base64') {
             $value = base64_encode($value);
-            $prefix = '=?' . $charset . '?B?';
+            $prefix = '=?'.$charset.'?B?';
             $suffix = '?=';
 
             // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $add_len = strlen($prefix.$suffix) + strlen($name) + 6;
             $len = $add_len + strlen($value);
 
             while ($len > $maxLength) { 
@@ -759,20 +759,20 @@ 
                 $_quote = substr($value, 0, $real_len);
                 $value = substr($value, $real_len);
 
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $quoted .= $prefix.$_quote.$suffix.$this->_eol.' ';
+                $add_len = strlen($prefix.$suffix) + 4; // 2 x SPACE, '"', ';'
                 $len = strlen($value) + $add_len;
             }
-            $quoted .= $prefix . $value . $suffix;
+            $quoted .= $prefix.$value.$suffix;
 
         } else {
             // quoted-printable
             $value = $this->encodeQP($value);
-            $prefix = '=?' . $charset . '?Q?';
+            $prefix = '=?'.$charset.'?Q?';
             $suffix = '?=';
 
             // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $add_len = strlen($prefix.$suffix) + strlen($name) + 6;
             $len = $add_len + strlen($value);
 
             while ($len > $maxLength) {
@@ -782,13 +782,13 @@ 
                     $_quote = $matches[1];
                 }
 
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+                $quoted .= $prefix.$_quote.$suffix.$this->_eol.' ';
                 $value = substr($value, strlen($_quote));
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $add_len = strlen($prefix.$suffix) + 4; // 2 x SPACE, '"', ';'
                 $len = strlen($value) + $add_len;
             }
 
-            $quoted .= $prefix . $value . $suffix;
+            $quoted .= $prefix.$value.$suffix;
         }
 
         return " {$name}=\"{$quoted}\"";
@@ -807,8 +807,8 @@ 
      * @access public
      * @since 1.6.1
      */
-    function encodeHeader($name, $value, $charset='ISO-8859-1',
-        $encoding='quoted-printable', $eol="\r\n"
+    function encodeHeader($name, $value, $charset = 'ISO-8859-1',
+        $encoding = 'quoted-printable', $eol = "\r\n"
     ) {
         // Structured headers
         $comma_headers = array(
@@ -843,25 +843,25 @@ 
             $value = '';
 
             foreach ($parts as $part) {
-                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
+                $part = preg_replace('/\r?\n[\s\t]*/', $eol.' ', $part);
                 $part = trim($part);
 
                 if (!$part) {
                     continue;
                 }
                 if ($value) {
-                    $value .= $separator == ',' ? $separator . ' ' : ' ';
+                    $value .= $separator == ',' ? $separator.' ' : ' ';
                 } else {
-                    $value = $name . ': ';
+                    $value = $name.': ';
                 }
 
                 // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
+                if (preg_match('/^<'.$email_regexp.'>$/', $part)) {
                     $value .= $part;
-                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
+                } else if (preg_match('/^'.$email_regexp.'$/', $part)) {
                     // address without brackets and without name
                     $value .= $part;
-                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
+                } else if (preg_match('/<*'.$email_regexp.'>*$/', $part, $matches)) {
                     // address with name (handle name)
                     $address = $matches[0];
                     $word = str_replace($address, '', $part);
@@ -870,7 +870,7 @@ 
                     if ($word) {
                         // non-ASCII: require encoding
                         if (preg_match('#([^\s\x21-\x7E]){1}#', $word)) {
-                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
+                            if ($word[0] == '"' && $word[strlen($word) - 1] == '"') {
                                 // de-quote quoted-string, encoding changes
                                 // string to atom
                                 $search = array("\\\"", "\\\\");
@@ -887,7 +887,7 @@ 
                             $word = Mail_mimePart::encodeHeaderValue(
                                 $word, $charset, $encoding, $last_len, $eol
                             );
-                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
+                        } else if (($word[0] != '"' || $word[strlen($word) - 1] != '"')
                             && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $word)
                         ) {
                             // ASCII: quote string if needed
@@ -901,7 +901,7 @@ 
                 }
 
                 // RFC2822 recommends 78 characters limit, use 76 from RFC2047
-                $value = wordwrap($value, 76, $eol . ' ');
+                $value = wordwrap($value, 76, $eol.' ');
             }
 
             // remove header name prefix (there could be EOL too)
@@ -912,7 +912,7 @@ 
             // Unstructured header
             // non-ASCII: require encoding
             if (preg_match('#([^\s\x21-\x7E]){1}#', $value)) {
-                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
+                if ($value[0] == '"' && $value[strlen($value) - 1] == '"') {
                     // de-quote quoted-string, encoding changes
                     // string to atom
                     $search = array("\\\"", "\\\\");
@@ -925,11 +925,11 @@ 
                 );
             } else if (strlen($name.': '.$value) > 78) {
                 // ASCII: check if header line isn't too long and use folding
-                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
-                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
+                $value = preg_replace('/\r?\n[\s\t]*/', $eol.' ', $value);
+                $tmp = wordwrap($name.': '.$value, 78, $eol.' ');
                 $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
                 // hard limit 998 (RFC2822)
-                $value = wordwrap($value, 998, $eol . ' ', true);
+                $value = wordwrap($value, 998, $eol.' ', true);
             }
         }
 
@@ -950,9 +950,9 @@ 
         $result = array();
         $strlen = strlen($string);
 
-        for ($q=$p=$i=0; $i < $strlen; $i++) {
+        for ($q = $p = $i = 0; $i < $strlen; $i++) {
             if ($string[$i] == "\""
-                && (empty($string[$i-1]) || $string[$i-1] != "\\")
+                && (empty($string[$i - 1]) || $string[$i - 1] != "\\")
             ) {
                 $q = $q ? false : true;
             } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
@@ -978,7 +978,7 @@ 
      * @access public
      * @since 1.6.1
      */
-    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    function encodeHeaderValue($value, $charset, $encoding, $prefix_len = 0, $eol = "\r\n")
     {
         // #17311: Use multibyte aware method (requires mbstring extension)
         if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
@@ -989,9 +989,9 @@ 
         // determine the maximum length of such strings.
         // 75 is the value specified in the RFC.
         $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        $prefix = '=?' . $charset . '?' . $encoding .'?';
+        $prefix = '=?'.$charset.'?'.$encoding.'?';
         $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
+        $maxLength = 75 - strlen($prefix.$suffix);
         $maxLength1stLine = $maxLength - $prefix_len;
 
         if ($encoding == 'B') {
@@ -1014,9 +1014,9 @@ 
                 // RFC 2047 specifies that any split header should
                 // be separated by a CRLF SPACE.
                 if ($output) {
-                    $output .= $eol . ' ';
+                    $output .= $eol.' ';
                 }
-                $output .= $prefix . $part . $suffix;
+                $output .= $prefix.$part.$suffix;
             }
             $value = $output;
         } else {
@@ -1056,13 +1056,13 @@ 
                     // RFC 2047 specifies that any split header should
                     // be separated by a CRLF SPACE
                     if ($output) {
-                        $output .= $eol . ' ';
+                        $output .= $eol.' ';
                     }
-                    $output .= $prefix . $part . $suffix;
+                    $output .= $prefix.$part.$suffix;
                 }
                 $value = $output;
             } else {
-                $value = $prefix . $value . $suffix;
+                $value = $prefix.$value.$suffix;
             }
         }
 
@@ -1108,7 +1108,7 @@ 
      * @access public
      * @since 1.8.0
      */
-    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    function encodeMB($str, $charset, $encoding, $prefix_len = 0, $eol = "\r\n")
     {
         if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
             return;
@@ -1116,9 +1116,9 @@ 
 
         $encoding = $encoding == 'base64' ? 'B' : 'Q';
         // 75 is the value specified in the RFC
-        $prefix = '=?' . $charset . '?'.$encoding.'?';
+        $prefix = '=?'.$charset.'?'.$encoding.'?';
         $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
+        $maxLength = 75 - strlen($prefix.$suffix);
 
         // A multi-octet character may not be split across adjacent encoded-words
         // So, we'll loop over each character
@@ -1132,9 +1132,9 @@ 
             $start = 0;
             $prev  = '';
 
-            for ($i=1; $i<=$length; $i++) {
+            for ($i = 1; $i <= $length; $i++) {
                 // See #17311
-                $chunk = mb_substr($str, $start, $i-$start, $charset);
+                $chunk = mb_substr($str, $start, $i - $start, $charset);
                 $chunk = base64_encode($chunk);
                 $chunk_len = strlen($chunk);
 
@@ -1163,7 +1163,7 @@ 
             // see encodeQP()
             $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
 
-            for ($i=0; $i<=$length; $i++) {
+            for ($i = 0; $i <= $length; $i++) {
                 $char = mb_substr($str, $i, 1, $charset);
                 // RFC recommends underline (instead of =20) in place of the space
                 // that's one of the reasons why we're not using iconv_mime_encode()

htdocs/includes/nusoap/lib/Mail/mime.php

Spacing +42 added lines, -42 removed lines

@@ -324,7 +324,7 @@ 
      * @access public
      */
     function addHTMLImage($file,
-        $c_type='application/octet-stream',
+        $c_type = 'application/octet-stream',
         $name = '',
         $isfile = true,
         $content_id = null
@@ -465,13 +465,13 @@ 
     {
         // Check state of file and raise an error properly
         if (!file_exists($file_name)) {
-            return $this->_raiseError('File not found: ' . $file_name);
+            return $this->_raiseError('File not found: '.$file_name);
         }
         if (!is_file($file_name)) {
-            return $this->_raiseError('Not a regular file: ' . $file_name);
+            return $this->_raiseError('Not a regular file: '.$file_name);
         }
         if (!is_readable($file_name)) {
-            return $this->_raiseError('File is not readable: ' . $file_name);
+            return $this->_raiseError('File is not readable: '.$file_name);
         }
 
         // Temporarily reset magic_quotes_runtime and read file contents
@@ -720,7 +720,7 @@ 
             return $body;
         }
 
-        return $this->txtHeaders($headers, $overwrite) . $separation . $body;
+        return $this->txtHeaders($headers, $overwrite).$separation.$body;
     }
 
     /**
@@ -758,7 +758,7 @@ 
     {
         // Check state of file and raise an error properly
         if (file_exists($filename) && !is_writable($filename)) {
-            return $this->_raiseError('File is not writable: ' . $filename);
+            return $this->_raiseError('File is not writable: '.$filename);
         }
 
         // Temporarily reset magic_quotes_runtime and read file contents
@@ -767,13 +767,13 @@ 
         }
 
         if (!($fh = fopen($filename, 'ab'))) {
-            return $this->_raiseError('Unable to open file: ' . $filename);
+            return $this->_raiseError('Unable to open file: '.$filename);
         }
 
         // Write message headers into file (skipping Content-* headers)
         $head = $this->txtHeaders($headers, $overwrite, true);
         if (fwrite($fh, $head) === false) {
-            return $this->_raiseError('Error writing to file: ' . $filename);
+            return $this->_raiseError('Error writing to file: '.$filename);
         }
 
         fclose($fh);
@@ -803,7 +803,7 @@ 
     {
         // Check state of file and raise an error properly
         if (file_exists($filename) && !is_writable($filename)) {
-            return $this->_raiseError('File is not writable: ' . $filename);
+            return $this->_raiseError('File is not writable: '.$filename);
         }
 
         // Temporarily reset magic_quotes_runtime and read file contents
@@ -812,7 +812,7 @@ 
         }
 
         if (!($fh = fopen($filename, 'ab'))) {
-            return $this->_raiseError('Unable to open file: ' . $filename);
+            return $this->_raiseError('Unable to open file: '.$filename);
         }
 
         // Write the rest of the message into file
@@ -853,7 +853,7 @@ 
             foreach ($this->_html_images as $i => $img) {
                 $cid = $this->_html_images[$i]['cid']; 
                 if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
-                    $this->_html_images[$i]['cid'] = $cid . $domainID;
+                    $this->_html_images[$i]['cid'] = $cid.$domainID;
                 }
             }
         }
@@ -861,14 +861,14 @@ 
         if (count($this->_html_images) && isset($this->_htmlbody)) {
             foreach ($this->_html_images as $key => $value) {
                 $regex   = array();
-                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\3#';
-                $regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\1\s*\)#';
+                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)'.
+                            preg_quote($value['name'], '#').'\3#';
+                $regex[] = '#(?i)url(?-i)\(\s*(["\']?)'.
+                            preg_quote($value['name'], '#').'\1\s*\)#';
 
                 $rep   = array();
-                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
-                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
+                $rep[] = '\1\2=\3cid:'.$value['cid'].'\3';
+                $rep[] = 'url(\1cid:'.$value['cid'].'\1)';
 
                 $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
                 $this->_html_images[$key]['name']
@@ -886,18 +886,18 @@ 
 
         switch (true) {
         case $text && !$attachments:
-            $message =& $this->_addTextPart($null, $this->_txtbody);
+            $message = & $this->_addTextPart($null, $this->_txtbody);
             break;
 
         case !$text && !$html && $attachments:
-            $message =& $this->_addMixedPart();
+            $message = & $this->_addMixedPart();
             for ($i = 0; $i < count($this->_parts); $i++) {
                 $this->_addAttachmentPart($message, $this->_parts[$i]);
             }
             break;
 
         case $text && $attachments:
-            $message =& $this->_addMixedPart();
+            $message = & $this->_addMixedPart();
             $this->_addTextPart($message, $this->_txtbody);
             for ($i = 0; $i < count($this->_parts); $i++) {
                 $this->_addAttachmentPart($message, $this->_parts[$i]);
@@ -906,11 +906,11 @@ 
 
         case $html && !$attachments && !$html_images:
             if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
+                $message = & $this->_addAlternativePart($null);
                 $this->_addTextPart($message, $this->_txtbody);
                 $this->_addHtmlPart($message);
             } else {
-                $message =& $this->_addHtmlPart($null);
+                $message = & $this->_addHtmlPart($null);
             }
             break;
 
@@ -921,10 +921,10 @@ 
             //       * html
             //       * image...
             if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
+                $message = & $this->_addAlternativePart($null);
                 $this->_addTextPart($message, $this->_txtbody);
 
-                $ht =& $this->_addRelatedPart($message);
+                $ht = & $this->_addRelatedPart($message);
                 $this->_addHtmlPart($ht);
                 for ($i = 0; $i < count($this->_html_images); $i++) {
                     $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
@@ -933,7 +933,7 @@ 
                 // * Content-Type: multipart/related;
                 //    * html
                 //    * image...
-                $message =& $this->_addRelatedPart($null);
+                $message = & $this->_addRelatedPart($null);
                 $this->_addHtmlPart($message);
                 for ($i = 0; $i < count($this->_html_images); $i++) {
                     $this->_addHtmlImagePart($message, $this->_html_images[$i]);
@@ -961,9 +961,9 @@ 
             break;
 
         case $html && $attachments && !$html_images:
-            $message =& $this->_addMixedPart();
+            $message = & $this->_addMixedPart();
             if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
+                $alt = & $this->_addAlternativePart($message);
                 $this->_addTextPart($alt, $this->_txtbody);
                 $this->_addHtmlPart($alt);
             } else {
@@ -975,13 +975,13 @@ 
             break;
 
         case $html && $attachments && $html_images:
-            $message =& $this->_addMixedPart();
+            $message = & $this->_addMixedPart();
             if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
+                $alt = & $this->_addAlternativePart($message);
                 $this->_addTextPart($alt, $this->_txtbody);
-                $rel =& $this->_addRelatedPart($alt);
+                $rel = & $this->_addRelatedPart($alt);
             } else {
-                $rel =& $this->_addRelatedPart($message);
+                $rel = & $this->_addRelatedPart($message);
             }
             $this->_addHtmlPart($rel);
             for ($i = 0; $i < count($this->_html_images); $i++) {
@@ -1105,10 +1105,10 @@ 
         foreach ($headers as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $value) {
-                    $ret .= "$key: $value" . $eol;
+                    $ret .= "$key: $value".$eol;
                 }
             } else {
-                $ret .= "$key: $val" . $eol;
+                $ret .= "$key: $val".$eol;
             }
         }
 
@@ -1154,7 +1154,7 @@ 
         // add required boundary parameter if not defined
         if (preg_match('/^multipart\//i', $type)) {
             if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
+                $this->_build_params['boundary'] = '=_'.md5(rand().microtime());
             }
 
             $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
@@ -1260,7 +1260,7 @@ 
     {
         $input = array("To" => $recipients);
         $retval = $this->_encodeHeaders($input);
-        return $retval["To"] ;
+        return $retval["To"];
     }
 
     /**
@@ -1344,10 +1344,10 @@ 
      */
     function _contentHeaders()
     {
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
+        $attachments = count($this->_parts) ? true : false;
+        $html_images = count($this->_html_images) ? true : false;
+        $html        = strlen($this->_htmlbody) ? true : false;
+        $text        = (!$html && strlen($this->_txtbody)) ? true : false;
         $headers     = array();
 
         // See get()
@@ -1387,7 +1387,7 @@ 
 
         if ($headers['Content-Type'] == 'text/plain') {
             // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['text_charset'];
+            $charset = 'charset='.$this->_build_params['text_charset'];
             // place charset parameter in the same line, if possible
             // 26 = strlen("Content-Type: text/plain; ")
             $headers['Content-Type']
@@ -1396,7 +1396,7 @@ 
                 = $this->_build_params['text_encoding'];
         } else if ($headers['Content-Type'] == 'text/html') {
             // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['html_charset'];
+            $charset = 'charset='.$this->_build_params['html_charset'];
             // place charset parameter in the same line, if possible
             $headers['Content-Type']
                 .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
@@ -1411,7 +1411,7 @@ 
             ) {
                 $boundary = $m[1];
             } else {
-                $boundary = '=_' . md5(rand() . microtime());
+                $boundary = '=_'.md5(rand().microtime());
             }
 
             $this->_build_params['boundary'] = $boundary;

htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/lazy/Carbon/TranslatorStrongType.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
         private function getPrivateProperty($instance, string $field)
         {
-            return (function (string $field) {
+            return (function(string $field) {
                 return $this->$field;
             })->call($instance, $field);
         }

htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/Factory.php

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
         $settings = $this->settings;
 
         if ($settings && isset($settings['timezone'])) {
-            $tzParameters = array_filter($method->getParameters(), function ($parameter) {
+            $tzParameters = array_filter($method->getParameters(), function($parameter) {
                 return \in_array($parameter->getName(), ['tz', 'timezone'], true);
             });
 

htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php

Spacing +6 added lines, -7 removed lines

@@ -606,7 +606,7 @@ 
         $date = new static();
 
         if (static::hasMacro($method)) {
-            return static::bindMacroContext(null, function () use (&$method, &$parameters, &$date) {
+            return static::bindMacroContext(null, function() use (&$method, &$parameters, &$date) {
                 return $date->callMacro($method, $parameters);
             });
         }
@@ -931,8 +931,7 @@ 
 
         return $this->setOptions(
             $state ?
-            $this->options | $options :
-            $this->options & ~$options
+            $this->options | $options : $this->options & ~$options
         );
     }
 
@@ -1144,7 +1143,7 @@ 
 
         $this->filters = array_values(array_filter(
             $this->filters,
-            function ($tuple) use ($key, $filter) {
+            function($tuple) use ($key, $filter) {
                 return $tuple[$key] !== $filter;
             }
         ));
@@ -1664,7 +1663,7 @@ 
     public function __call($method, $parameters)
     {
         if (static::hasMacro($method)) {
-            return static::bindMacroContext($this, function () use (&$method, &$parameters) {
+            return static::bindMacroContext($this, function() use (&$method, &$parameters) {
                 return $this->callMacro($method, $parameters);
             });
         }
@@ -1914,7 +1913,7 @@ 
      *
      * @param callable $callback
      */
-    public function forEach(callable $callback)
+    public function forEach (callable $callback)
     {
         foreach ($this as $date) {
             $callback($date);
@@ -2368,7 +2367,7 @@ 
             return [$method, array_shift($parameters)];
         }
 
-        return [function ($date) use ($method, $parameters) {
+        return [function($date) use ($method, $parameters) {
             return ([$date, $method])(...$parameters);
         }, $method];
     }

htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php

Spacing +17 added lines, -19 removed lines

@@ -656,7 +656,7 @@ 
             $interval->localStrictModeEnabled = true;
 
             $result = static::hasMacro($method)
-                ? static::bindMacroContext(null, function () use (&$method, &$parameters, &$interval) {
+                ? static::bindMacroContext(null, function() use (&$method, &$parameters, &$interval) {
                     return $interval->callMacro($method, $parameters);
                 })
                 : $interval->$method(...$parameters);
@@ -746,9 +746,7 @@ 
             }
 
             switch ($unit === 'µs' ? 'µs' : strtolower($unit)) {
-                case 'millennia':
-                case 'millennium':
-                    $years += $intValue * CarbonInterface::YEARS_PER_MILLENNIUM;
+                case 'millennia' : case 'millennium' : $years += $intValue * CarbonInterface::YEARS_PER_MILLENNIUM;
 
                     break;
 
@@ -1343,7 +1341,7 @@ 
     public function __call($method, $parameters)
     {
         if (static::hasMacro($method)) {
-            return static::bindMacroContext($this, function () use (&$method, &$parameters) {
+            return static::bindMacroContext($this, function() use (&$method, &$parameters) {
                 return $this->callMacro($method, $parameters);
             });
         }
@@ -1410,7 +1408,7 @@ 
         $minimumUnit = 's';
         $skip = [];
         extract($this->getForHumansInitialVariables($syntax, $short));
-        $skip = array_filter((array) $skip, static function ($value) {
+        $skip = array_filter((array) $skip, static function($value) {
             return \is_string($value) && $value !== '';
         });
 
@@ -1447,7 +1445,7 @@ 
                 $optionalSpace = '';
             }
 
-            $join = function ($list) use ($default, $last) {
+            $join = function($list) use ($default, $last) {
                 if (\count($list) < 2) {
                     return implode('', $list);
                 }
@@ -1464,7 +1462,7 @@ 
             }
 
             $glue = $join;
-            $join = function ($list) use ($glue) {
+            $join = function($list) use ($glue) {
                 return implode($glue, $list);
             };
         }
@@ -1623,7 +1621,7 @@ 
         /** @var \Symfony\Component\Translation\Translator $translator */
         $translator = $this->getLocalTranslator();
 
-        $handleDeclensions = function ($unit, $count, $index = 0, $parts = 1) use ($interpolations, $transId, $translator, $altNumbers, $absolute, &$declensionMode) {
+        $handleDeclensions = function($unit, $count, $index = 0, $parts = 1) use ($interpolations, $transId, $translator, $altNumbers, $absolute, &$declensionMode) {
             if (!$absolute) {
                 $declensionMode = $declensionMode ?? $this->translate($transId.'_mode');
 
@@ -1673,14 +1671,14 @@ 
         }
 
         $diffIntervalArray = [
-            ['value' => $intervalValues->years,             'unit' => 'year',        'unitShort' => 'y'],
-            ['value' => $intervalValues->months,            'unit' => 'month',       'unitShort' => 'm'],
-            ['value' => $intervalValues->weeks,             'unit' => 'week',        'unitShort' => 'w'],
-            ['value' => $intervalValues->daysExcludeWeeks,  'unit' => 'day',         'unitShort' => 'd'],
-            ['value' => $intervalValues->hours,             'unit' => 'hour',        'unitShort' => 'h'],
-            ['value' => $intervalValues->minutes,           'unit' => 'minute',      'unitShort' => 'min'],
-            ['value' => $intervalValues->seconds,           'unit' => 'second',      'unitShort' => 's'],
-            ['value' => $intervalValues->milliseconds,      'unit' => 'millisecond', 'unitShort' => 'ms'],
+            ['value' => $intervalValues->years, 'unit' => 'year', 'unitShort' => 'y'],
+            ['value' => $intervalValues->months, 'unit' => 'month', 'unitShort' => 'm'],
+            ['value' => $intervalValues->weeks, 'unit' => 'week', 'unitShort' => 'w'],
+            ['value' => $intervalValues->daysExcludeWeeks, 'unit' => 'day', 'unitShort' => 'd'],
+            ['value' => $intervalValues->hours, 'unit' => 'hour', 'unitShort' => 'h'],
+            ['value' => $intervalValues->minutes, 'unit' => 'minute', 'unitShort' => 'min'],
+            ['value' => $intervalValues->seconds, 'unit' => 'second', 'unitShort' => 's'],
+            ['value' => $intervalValues->milliseconds, 'unit' => 'millisecond', 'unitShort' => 'ms'],
             ['value' => $intervalValues->microExcludeMilli, 'unit' => 'microsecond', 'unitShort' => 'µs'],
         ];
 
@@ -1699,7 +1697,7 @@ 
             }
         }
 
-        $transChoice = function ($short, $unitData, $index, $parts) use ($absolute, $handleDeclensions, $translator, $aUnit, $altNumbers, $interpolations) {
+        $transChoice = function($short, $unitData, $index, $parts) use ($absolute, $handleDeclensions, $translator, $aUnit, $altNumbers, $interpolations) {
             $count = $unitData['value'];
 
             if ($short) {
@@ -2233,7 +2231,7 @@ 
 
     private function invertCascade(array $values)
     {
-        return $this->set(array_map(function ($value) {
+        return $this->set(array_map(function($value) {
             return -$value;
         }, $values))->doCascade(true)->invert();
     }

htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/AbstractTranslator.php

Spacing +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
     {
         $search = rtrim(strtr($directory, '\\', '/'), '/');
 
-        return $this->setDirectories(array_filter($this->getDirectories(), function ($item) use ($search) {
+        return $this->setDirectories(array_filter($this->getDirectories(), function($item) use ($search) {
             return rtrim(strtr($item, '\\', '/'), '/') !== $search;
         }));
     }
@@ -307,7 +307,7 @@ 
      */
     public function setLocale($locale)
     {
-        $locale = preg_replace_callback('/[-_]([a-z]{2,}|\d{2,})/', function ($matches) {
+        $locale = preg_replace_callback('/[-_]([a-z]{2,}|\d{2,})/', function($matches) {
             // _2-letters or YUE is a region, _3+-letters is a variant
             $upper = strtoupper($matches[1]);
 
@@ -333,11 +333,11 @@ 
 
             $completeLocaleChunks = preg_split('/[_.-]+/', $completeLocale);
 
-            $getScore = function ($language) use ($completeLocaleChunks) {
+            $getScore = function($language) use ($completeLocaleChunks) {
                 return self::compareChunkLists($completeLocaleChunks, preg_split('/[_.-]+/', $language));
             };
 
-            usort($locales, function ($first, $second) use ($getScore) {
+            usort($locales, function($first, $second) use ($getScore) {
                 return $getScore($second) <=> $getScore($first);
             });