Dolibarr / dolibarr

htdocs/includes/printipp/CupsPrintIPP.php

Spacing +103 added lines, -103 removed lines

@@ -55,12 +55,12 @@ 
 //
 // OPERATIONS
 //
-    public function cupsGetDefaults($attributes=array("all"))
+    public function cupsGetDefaults($attributes = array("all"))
     {
         //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $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(""));
         $this->parsed = array();
         unset($this->printer_attributes);
 
@@ -76,7 +76,7 @@ 
 
         self::_setOperationId();
 
-        for($i = 0 ; $i < count($attributes) ; $i++)
+        for ($i = 0; $i < count($attributes); $i++)
         {
             if ($i == 0)
             {
@@ -95,8 +95,8 @@ 
             }
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x01) // operation:  cups vendor extension: get defaults
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -108,13 +108,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/'))
+        if (self::_sendHttp($post_values, '/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parsePrinterAttributes();
             }
@@ -127,7 +127,7 @@ 
                     $printer_type = $this->printer_attributes->printer_type->_value0;
                     $table = self::_interpretPrinterType($printer_type);
 
-                    for($i = 0 ; $i < count($table) ; $i++ )
+                    for ($i = 0; $i < count($table); $i++)
                     {
                         $index = '_value'.$i;
                         $this->printer_attributes->printer_type->$index = $table[$i];
@@ -137,22 +137,22 @@ 
         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("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
             }
     return false;
     }
@@ -162,8 +162,8 @@ 
     {
     //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $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(""));
         $this->parsed = array();
         unset($this->printer_attributes);
 
@@ -179,8 +179,8 @@ 
 
         self::_setOperationId();
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x08) // operation:  cups vendor extension: Accept-Jobs
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -196,13 +196,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/admin/'))
+        if (self::_sendHttp($post_values, '/admin/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parseAttributes();
             }
@@ -211,33 +211,33 @@ 
         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("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
             }
     return false;
     }
 
 
-    public function cupsRejectJobs($printer_uri,$printer_state_message)
+    public function cupsRejectJobs($printer_uri, $printer_state_message)
     {
     //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $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(""));
         $this->parsed = array();
         unset($this->attributes);
 
@@ -264,8 +264,8 @@ 
                      . $printer_state_message;
         }
 
-       $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
+       $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x09) // operation:  cups vendor extension: Reject-Jobs
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -282,13 +282,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/admin/'))
+        if (self::_sendHttp($post_values, '/admin/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parseAttributes();
             }
@@ -297,36 +297,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("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
         }
         return false;
     }
 
 
-    public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
+    public function getPrinters($printer_location = false, $printer_info = false, $attributes = array())
     {
         if (count($attributes) == 0)
         {
             true;
         }
-        $attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $attributes = array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
 
         unset ($this->printers_attributes);
 
@@ -342,7 +342,7 @@ 
 
         self::_setOperationId();
 
-        $this->meta->attributes='';
+        $this->meta->attributes = '';
 
         if ($printer_location)
         {
@@ -362,7 +362,7 @@ 
                                     . $printer_info;
         }
 
-        for($i = 0 ; $i < count($attributes) ; $i++)
+        for ($i = 0; $i < count($attributes); $i++)
         {
             if ($i == 0)
             {
@@ -381,8 +381,8 @@ 
             }
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x02) // operation:  cups vendor extension: get printers
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -392,13 +392,13 @@ 
 
         $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,'/'))
+        if (self::_sendHttp($post_values, '/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_getAvailablePrinters();
             }
@@ -407,27 +407,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("getting printers: ".$this->serveroutput->status,3);
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,1);
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 1);
             }
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting printers : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting printers : OPERATION FAILED", 1);
         }
         return false;
     }
 
 
-    public function cupsGetPrinters ()
+    public function cupsGetPrinters()
     {
         // alias for getPrinters();
         self::getPrinters();
@@ -438,11 +438,11 @@ 
     {
         // complete informations from parent with Cups-specific stuff
 
-        if(!$result = parent::getPrinterAttributes())
+        if (!$result = parent::getPrinterAttributes())
         {
             return FALSE;
         }
-        if(!isset($this->printer_attributes))
+        if (!isset($this->printer_attributes))
         {
             return FALSE;
         }
@@ -452,7 +452,7 @@ 
             $printer_type = $this->printer_attributes->printer_type->_value0;
             $table = self::_interpretPrinterType($printer_type);
 
-            for($i = 0 ; $i < count($table) ; $i++ )
+            for ($i = 0; $i < count($table); $i++)
             {
                 $index = '_value'.$i;
                 $this->printer_attributes->printer_type->$index = $table[$i];
@@ -465,14 +465,14 @@ 
 //
 // SETUP
 //
-    protected function _initTags ()
+    protected function _initTags()
     {
         // override parent with specific cups attributes
 
-        $operation_tags = array ();
-        $this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
+        $operation_tags = array();
+        $this->operation_tags = array_merge($this->operation_tags, $operation_tags);
 
-        $job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
+        $job_tags = array("job-billing" => array("tag" => "textWithoutLanguage"),
                             "blackplot" => array("tag" => "boolean"),
                             "brightness" => array("tag" => "integer"),
                             "columns" => array("tag" => "integer"),
@@ -481,7 +481,7 @@ 
                             "gamma" => array("tag" => "integer"),
                             "hue" => array("tag" => "integer"),
                             "lpi" => array("tag" => "enum"),
-                            "mirror" => array("tag","boolean"),
+                            "mirror" => array("tag", "boolean"),
                             "natural-scaling" => array("tag" => "integer"),
                             "number-up-layout" => array("tag" => "keyword"),
                             "page-border" => array("tag" => "keyword"),
@@ -494,21 +494,21 @@ 
                             "penwidth" => array("tag" => "integer"),
                             "position" => array("tag" => "keyword"),
                             "ppi" => array("tag" => "integer"),
-                            "prettyprint" => array("tag","boolean"),
+                            "prettyprint" => array("tag", "boolean"),
                             "saturation" => array("tag" => "integer"),
                             "scaling" => array("tag" => "integer"),
-                            "wrap" => array("tag","boolean"),
+                            "wrap" => array("tag", "boolean"),
 
                             );
-        $this->job_tags = array_merge ($this->job_tags, $job_tags);
+        $this->job_tags = array_merge($this->job_tags, $job_tags);
     }
 
     //
     // REQUEST BUILDING
     //
-    protected function _enumBuild ($tag,$value)
+    protected function _enumBuild($tag, $value)
     {
-        $value_built = parent::_enumBuild($tag,$value);
+        $value_built = parent::_enumBuild($tag, $value);
 
         switch ($tag)
         {
@@ -552,35 +552,35 @@ 
     //
     // RESPONSE PARSING
     //
-    private function _getAvailablePrinters ()
+    private function _getAvailablePrinters()
     {
         $this->available_printers = array();
         $this->printer_map = array();
         $k = 0;
         $this->printers_attributes = new \stdClass();
 
-        for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+        for ($i = 0; (array_key_exists($i, $this->serveroutput->response)); $i++)
         {
             if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
             {
                 $phpname = "_printer".$k;
                 $this->printers_attributes->$phpname = new \stdClass();
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
                 {
 
                     $value = $this->serveroutput->response[$i][$j]['value'];
-                    $name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
+                    $name = str_replace("-", "_", $this->serveroutput->response[$i][$j]['name']);
 
                     switch ($name)
                     {
                         case "printer_uri_supported":
-                            $this->available_printers = array_merge($this->available_printers,array($value));
+                            $this->available_printers = array_merge($this->available_printers, array($value));
                             break;
                         case "printer_type":
                             $table = self::_interpretPrinterType($value);
                             $this->printers_attributes->$phpname->$name = new \stdClass();
 
-                            for($l = 0 ; $l < count($table) ; $l++ )
+                            for ($l = 0; $l < count($table); $l++)
                             {
                                 $index = '_value'.$l;
                                 $this->printers_attributes->$phpname->$name->$index = $table[$l];
@@ -597,12 +597,12 @@ 
                             break;
                     }
                 }
-                $k ++;
+                $k++;
             }
         }
     }
 
-    protected function _getEnumVendorExtensions ($value_parsed)
+    protected function _getEnumVendorExtensions($value_parsed)
     {
         switch ($value_parsed)
         {
@@ -610,7 +610,7 @@ 
                 $value = 'Get-Availables-Printers';
                 break;
             default:
-                $value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
+                $value = sprintf('Unknown(Cups extension for operations): 0x%x', $value_parsed);
                 break;
         }
 
@@ -619,16 +619,16 @@ 
             return ($value);
         }
 
-        return sprintf('Unknown: 0x%x',$value_parsed);
+        return sprintf('Unknown: 0x%x', $value_parsed);
     }
 
 
     private function _interpretPrinterType($value)
     {
         $value_parsed = 0;
-        for ($i = strlen($value) ; $i > 0 ; $i --)
+        for ($i = strlen($value); $i > 0; $i--)
         {
-            $value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
+            $value_parsed += pow(256, ($i - 1)) * ord($value[strlen($value) - $i]);
         }
 
         $type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
@@ -636,115 +636,115 @@ 
         $type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
         $type[16] = $type[17] = $type[18] = $type[19] = '';
 
-        if ($value_parsed %2 == 1)
+        if ($value_parsed % 2 == 1)
         {
             $type[0] = 'printer-class';
             $value_parsed -= 1;
         }
 
-        if ($value_parsed %4 == 2 )
+        if ($value_parsed % 4 == 2)
         {
             $type[1] = 'remote-destination';
             $value_parsed -= 2;
         }
 
-        if ($value_parsed %8 == 4 )
+        if ($value_parsed % 8 == 4)
         {
             $type[2] = 'print-black';
             $value_parsed -= 4;
         }
 
-        if ($value_parsed %16 == 8 )
+        if ($value_parsed % 16 == 8)
         {
             $type[3] = 'print-color';
             $value_parsed -= 8;
         }
 
-        if ($value_parsed %32 == 16)
+        if ($value_parsed % 32 == 16)
         {
             $type[4] = 'hardware-print-on-both-sides';
             $value_parsed -= 16;
         }
 
-        if ($value_parsed %64 == 32)
+        if ($value_parsed % 64 == 32)
         {
             $type[5] = 'hardware-staple-output';
             $value_parsed -= 32;
         }
 
-        if ($value_parsed %128 == 64)
+        if ($value_parsed % 128 == 64)
         {
             $type[6] = 'hardware-fast-copies';
             $value_parsed -= 64;
         }
 
-        if ($value_parsed %256 == 128)
+        if ($value_parsed % 256 == 128)
         {
             $type[7] = 'hardware-fast-copy-collation';
             $value_parsed -= 128;
         }
 
-        if ($value_parsed %512 == 256)
+        if ($value_parsed % 512 == 256)
         {
             $type[8] = 'punch-output';
             $value_parsed -= 256;
         }
 
-        if ($value_parsed %1024 == 512)
+        if ($value_parsed % 1024 == 512)
         {
             $type[9] = 'cover-output';
             $value_parsed -= 512;
         }
 
-        if ($value_parsed %2048 == 1024)
+        if ($value_parsed % 2048 == 1024)
         {
             $type[10] = 'bind-output';
             $value_parsed -= 1024;
         }
 
-        if ($value_parsed %4096 == 2048)
+        if ($value_parsed % 4096 == 2048)
         {
             $type[11] = 'sort-output';
             $value_parsed -= 2048;
         }
 
-        if ($value_parsed %8192 == 4096)
+        if ($value_parsed % 8192 == 4096)
         {
             $type[12] = 'handle-media-up-to-US-Legal-A4';
             $value_parsed -= 4096;
         }
 
-        if ($value_parsed %16384 == 8192)
+        if ($value_parsed % 16384 == 8192)
         {
             $type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
             $value_parsed -= 8192;
         }
 
-        if ($value_parsed %32768 == 16384)
+        if ($value_parsed % 32768 == 16384)
         {
             $type[14] = 'handle-media-larger-than-ISO_C-A2';
             $value_parsed -= 16384;
         }
 
-        if ($value_parsed %65536 == 32768)
+        if ($value_parsed % 65536 == 32768)
         {
             $type[15] = 'handle-user-defined-media-sizes';
             $value_parsed -= 32768;
         }
 
-        if ($value_parsed %131072 == 65536)
+        if ($value_parsed % 131072 == 65536)
         {
             $type[16] = 'implicit-server-generated-class';
             $value_parsed -= 65536;
         }
 
-        if ($value_parsed %262144 == 131072)
+        if ($value_parsed % 262144 == 131072)
         {
             $type[17] = 'network-default-printer';
             $value_parsed -= 131072;
         }
 
-        if ($value_parsed %524288 == 262144)
+        if ($value_parsed % 524288 == 262144)
         {
             $type[18] = 'fax-device';
             $value_parsed -= 262144;
@@ -754,7 +754,7 @@ 
     }
 
 
-    protected function _interpretEnum($attribute_name,$value)
+    protected function _interpretEnum($attribute_name, $value)
     {
         $value_parsed = self::_interpretInteger($value);
 
@@ -765,7 +765,7 @@ 
                 $value = $value_parsed;
                 break;
             default:
-                $value = parent::_interpretEnum($attribute_name,$value);
+                $value = parent::_interpretEnum($attribute_name, $value);
                 break;
         }
 

htdocs/includes/printipp/http_class.php

Spacing +24 added lines, -24 removed lines

@@ -102,16 +102,16 @@ 
 		E_USER_NOTICE => 'E_USER_NOTICE'
 	);
 	if (defined('E_STRICT')) {
-		$level_names[E_STRICT]='E_STRICT';
+		$level_names[E_STRICT] = 'E_STRICT';
 	}
-	$levels=array();
-	if (($value&E_ALL)==E_ALL) {
-		$levels[]='E_ALL';
-		$value&=~E_ALL;
+	$levels = array();
+	if (($value&E_ALL) == E_ALL) {
+		$levels[] = 'E_ALL';
+		$value &= ~E_ALL;
 	}
 	foreach ($level_names as $level=>$name) {
-		if (($value&$level)==$level) {
-			$levels[]=$name;
+		if (($value & $level) == $level) {
+			$levels[] = $name;
 		}
 	}
 	return implode(' | ', $levels);
@@ -127,13 +127,13 @@ 
 	// variables declaration
 	public $debug;
 	public $html_debug;
-	public $timeout = 30;  // time waiting for connection, seconds
+	public $timeout = 30; // time waiting for connection, seconds
 	public $data_timeout = 30; // time waiting for data, milliseconds
 	public $data_chunk_timeout = 1; // time waiting between data chunks, millisecond
 	public $force_multipart_form_post;
 	public $username;
 	public $password;
-	public $request_headers = array ();
+	public $request_headers = array();
 	public $request_body = "Not a useful information";
 	public $status;
 	public $window_size = 1024; // chunk size of data
@@ -142,11 +142,11 @@ 
 	public $host;
 	private $default_port = 631;
 	private $headers;
-	private $reply_headers = array ();
-	private $reply_body = array ();
+	private $reply_headers = array();
+	private $reply_body = array();
 	private $connection;
 	private $arguments;
-	private $bodystream = array ();
+	private $bodystream = array();
 	private $last_limit;
 	private $connected;
 	private $nc = 1;
@@ -166,7 +166,7 @@ 
 
 	public function GetRequestArguments($url, &$arguments)
 	{
-		$this->arguments = array ();
+		$this->arguments = array();
 		$this->arguments["URL"] = $arguments["URL"] = $url;
 		$this->arguments["RequestMethod"] = $arguments["RequestMethod"] = "POST";
 		$this->headers["Content-Length"] = 0;
@@ -230,7 +230,7 @@ 
 			return $this->_HttpError($error, E_USER_WARNING);
 		}
 		$this->connected = true;
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	public function SendRequest($arguments)
@@ -243,7 +243,7 @@ 
 		}
 		self::_ReadReply();
 		if (!preg_match('#http/1.1 401 unauthorized#', $this->status)) {
-			return array (true, "success");
+			return array(true, "success");
 		}
 		$headers = array_keys($this->reply_headers);
 		$error = _("need authentication but no mechanism provided");
@@ -279,7 +279,7 @@ 
 			return $this->_HttpError($error.": ".$result[1], E_USER_WARNING);
 		}
 		self::_ReadReply();
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	public function ReadReplyHeaders(&$headers)
@@ -314,13 +314,13 @@ 
 		foreach ($backtrace as $trace) {
 			$trace .= sprintf("in [file: '%s'][function: '%s'][line: %s];\n", $trace['file'], $trace['function'], $trace['line']);
 		}
-		$msg = sprintf( '%s\n%s: [errno: %s]: %s',
+		$msg = sprintf('%s\n%s: [errno: %s]: %s',
 			$trace, error2string($level), $errno, $msg);
 		if ($this->with_exceptions) {
 			throw new httpException($msg, $errno);
 		} else {
 			trigger_error($msg, $level);
-			return array (false, $msg);
+			return array(false, $msg);
 		}
 	}
 
@@ -336,7 +336,7 @@ 
 	private function _StreamRequest($arguments)
 	{
 		$this->status = false;
-		$this->reply_headers = array ();
+		$this->reply_headers = array();
 		$this->reply_body = "";
 		if (!$this->connected) {
 			return $this->_HttpError(_("not connected"), E_USER_WARNING);
@@ -413,17 +413,17 @@ 
 				}
 			}
 		}
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	private function _ReadReply()
 	{
 		if (!$this->connected) {
-			return array (false, _("not connected"));
+			return array(false, _("not connected"));
 		}
-		$this->reply_headers = array ();
+		$this->reply_headers = array();
 		$this->reply_body = "";
-		$headers = array ();
+		$headers = array();
 		$body = "";
 		while (!feof($this->connection)) {
 			$line = fgets($this->connection, 1024);
@@ -453,7 +453,7 @@ 
 
 	private function _ReadStream()
 	{
-		if (! array_key_exists("content-length", $this->reply_headers)) {
+		if (!array_key_exists("content-length", $this->reply_headers)) {
 			stream_set_blocking($this->connection, 0);
 			$this->reply_body = stream_get_contents($this->connection);
 			return true;

htdocs/includes/printipp/PrintIPP.php

Spacing +257 added lines, -257 removed lines

@@ -52,7 +52,7 @@ 
 // OPERATIONS
     public function printJob()
     {
-        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->_stringJob())
         {
@@ -61,7 +61,7 @@ 
 
         if (is_readable($this->data))
         {
-            self::_putDebug( _("Printing a FILE\n"),3); 
+            self::_putDebug(_("Printing a FILE\n"), 3); 
 
             $this->output = $this->stringjob;
 
@@ -70,31 +70,31 @@ 
                 $this->output .= chr(0x16);
             }
 
-            $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( _("Printing DATA\n"),3); 
+            self::_putDebug(_("Printing DATA\n"), 3); 
 
             $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->_getJobUri();
@@ -102,24 +102,24 @@ 
             }
             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("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
+              self::_errorLog(sprintf("printing 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("printing job: ",$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 job: ", $this->last_job).$this->serveroutput->status, 1);
                 if ($this->with_exceptions)
                 {
                     throw new ippException(sprintf("job status: %s",
@@ -129,69 +129,69 @@ 
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        self::_errorLog("printing job : OPERATION FAILED",1);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
+        self::_errorLog("printing job : OPERATION FAILED", 1);
 
         return false;
     }
 
-    public function cancelJob ($job_uri)
+    public function cancelJob($job_uri)
     {
-        $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::_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->_stringCancel($job_uri))
         {
             return FALSE;
         }
 
-        self::_putDebug( _("Cancelling Job $job_uri\n"),3); 
+        self::_putDebug(_("Cancelling Job $job_uri\n"), 3); 
 
         $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();
         }
 
         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("cancelling job $job_uri: ".$this->serveroutput->status,3);
+                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
+                self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status, 1);
             }
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("cancelling job : OPERATION FAILED",3);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        self::_errorLog("cancelling job : OPERATION FAILED", 3);
 
         return false;
     }
 
-    public function validateJob ()
+    public function validateJob()
     {
-        $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(""));
 
         $this->serveroutput->response = '';
 
-        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')));
 
-        self::_putDebug( _("Validate Job\n"),2); 
+        self::_putDebug(_("Validate Job\n"), 2); 
 
         if (!isset($this->setup->charset))
         {
@@ -209,15 +209,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"),3);
-                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"), 3);
+                self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -251,7 +251,7 @@ 
         {
             if (is_readable($this->data))
             {
-                self::setJobName(basename($this->data),true);
+                self::setJobName(basename($this->data), true);
             }
             else
             {
@@ -288,12 +288,12 @@ 
         $jobattributes = '';
         $operationattributes = '';
         $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 (0x04) // Validate-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x04) // Validate-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -312,16 +312,16 @@ 
                          . $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));
 
         $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())
             {
                 self::_parseAttributes();
             }
@@ -329,33 +329,33 @@ 
 
         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("validate job: ".$this->serveroutput->status,3);
+                self::_errorLog("validate job: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("validate job: ".$this->serveroutput->status,1);
+                self::_errorLog("validate job: ".$this->serveroutput->status, 1);
             }
             return $this->serveroutput->status; 
         }
 
-        $this->status = array_merge($this->status,array("OPERATION FAILED"));
-        self::_errorLog("validate job : OPERATION FAILED",3);
+        $this->status = array_merge($this->status, array("OPERATION FAILED"));
+        self::_errorLog("validate job : OPERATION FAILED", 3);
 
         return false;
     }
 
     public function getPrinterAttributes()
     {
-        $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(""));
 
         $jobattributes = '';
         $operationattributes = '';
-        self::_buildValues($operationattributes,$jobattributes,$printerattributes);
+        self::_buildValues($operationattributes, $jobattributes, $printerattributes);
         self::_setOperationId();
         $this->parsed = array();
         unset($this->printer_attributes);
@@ -367,15 +367,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"),3);
-                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"), 3);
+                self::_errorLog(" Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -395,8 +395,8 @@ 
             self::setUserName();
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0b) // Print-URI | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x0b) // Print-URI | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -408,14 +408,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("Getting printer attributes of %s\n"),$this->printer_uri),2); 
+        self::_putDebug(sprintf(_("Getting printer attributes of %s\n"), $this->printer_uri), 2); 
 
         $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['root']))
+        if (self::_sendHttp($post_values, $this->paths['root']))
         {
             if (self::_parseServerOutput())
             {
@@ -427,35 +427,35 @@ 
 
         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")
+            if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
-                                                                        $this->serveroutput->status),3);
+                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"), $this->printer_uri,
+                                                                        $this->serveroutput->status), 3);
             }
             else 
             {
-                self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
-                                                                        $this->serveroutput->status),1);
+                self::_errorLog(sprintf(_("getting printer attributes of %s: %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(_("getting printer's attributes of %s : OPERATION FAILED"),
-                $this->printer_uri),3);
+                $this->printer_uri), 3);
 
         return false;
     }
 
-    public function getJobs($my_jobs=true,$limit=0,$which_jobs="not-completed",$subset=false)
+    public function getJobs($my_jobs = true, $limit = 0, $which_jobs = "not-completed", $subset = false)
     {
-        $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();
@@ -468,15 +468,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(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
+                trigger_error(_("getJobs: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
+                self::_errorLog("getJobs: Printer URI is not set, die", 2);
                 return FALSE;
                 }
             }
@@ -536,8 +536,8 @@ 
             $this->meta->my_jobs = '';
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x0A) // Get-Jobs | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x0A) // Get-Jobs | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -584,14 +584,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
+        self::_putDebug(sprintf(_("getting jobs of %s\n"), $this->printer_uri), 2); 
 
         $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']))
         {
             if (self::_parseServerOutput())
             {
@@ -603,36 +603,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(_("getting jobs of printer %s: "),$this->printer_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("getting jobs of printer %s: "), $this->printer_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("getting jobs of 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(_("getting jobs of %s : OPERATION FAILED"),
-                                     $this->printer_uri),3);
+                                     $this->printer_uri), 3);
 
     return false;
     }
 
 
-    public function getJobAttributes($job_uri,$subset=false,$attributes_group="all")
+    public function getJobAttributes($job_uri, $subset = false, $attributes_group = "all")
     {
-        $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 (!$job_uri)
         {
@@ -651,15 +651,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(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
-                self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
-                self::_errorLog("getJobs: Printer URI is not set, die",2);
+                trigger_error(_("getJobs: Printer URI is not set: die"), E_USER_WARNING);
+                self::_putDebug(_("_stringJob: Printer URI is not set: die\n"), 3);
+                self::_errorLog("getJobs: Printer URI is not set, die", 2);
                 return FALSE;
             }
         }
@@ -685,8 +685,8 @@ 
                              . self::_giveMeStringLength($job_uri)
                              . $job_uri;
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x09) // Get-Job-Attributes | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x09) // Get-Job-Attributes | operation-id
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -717,9 +717,9 @@ 
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
         }
-        elseif($attributes_group)
+        elseif ($attributes_group)
         {
-            switch($attributes_group)
+            switch ($attributes_group)
             {
                 case 'job-template':
                     break;
@@ -728,7 +728,7 @@ 
                 case 'all':
                     break;
                 default:
-                    trigger_error(_('not a valid attribute group: ').$attributes_group,E_USER_NOTICE);
+                    trigger_error(_('not a valid attribute group: ').$attributes_group, E_USER_NOTICE);
                     $attributes_group = '';
                     break;
             }
@@ -743,14 +743,14 @@ 
 
         self::_putDebug(sprintf(_("String sent to the server is:\n%s\n"), $this->stringjob));
 
-        self::_putDebug(sprintf(_("getting jobs of %s\n"),$this->printer_uri),2); 
+        self::_putDebug(sprintf(_("getting jobs of %s\n"), $this->printer_uri), 2); 
 
         $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']))
         {
             if (self::_parseServerOutput())
             {
@@ -762,27 +762,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(_("getting job attributes for %s: "),$job_uri)
-                            .$this->serveroutput->status,3);
+                self::_errorLog(sprintf(_("getting job attributes for %s: "), $job_uri)
+                            .$this->serveroutput->status, 3);
             }
             else
             {
-                 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
-                                             .$this->serveroutput->status,1);
+                 self::_errorLog(sprintf(_("getting job attributes for %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(_("getting jobs attributes of %s : OPERATION FAILED"),
-                                     $job_uri),3);
+                                     $job_uri), 3);
 
         return false;
     }
@@ -790,12 +790,12 @@ 
     public function getPrinters()
     {
         // placeholder for vendor extension operation (getAvailablePrinters for CUPS)
-        $this->jobs = array_merge($this->jobs,array(''));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(''));
-        $this->status = array_merge($this->status,array(''));    
+        $this->jobs = array_merge($this->jobs, array(''));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(''));
+        $this->status = array_merge($this->status, array(''));    
     }
 
-    public function generateError ($error)
+    public function generateError($error)
     {
         switch ($error)
         {
@@ -807,31 +807,31 @@ 
                 break;
         }
 
-        trigger_error(sprintf(_('Setting Error %s'),$error),E_USER_NOTICE);
+        trigger_error(sprintf(_('Setting Error %s'), $error), E_USER_NOTICE);
     }
     
-    public function resetError ($error)
+    public function resetError($error)
     {
         unset ($this->error_generation->$error);
-        trigger_error(sprintf(_('Reset Error %s'),$error),E_USER_NOTICE);
+        trigger_error(sprintf(_('Reset Error %s'), $error), E_USER_NOTICE);
     }
 
     // SETUP
-    protected function _setOperationId ()
+    protected function _setOperationId()
     {
             $prepend = '';
             $this->operation_id += 1;
             $this->meta->operation_id = self::_integerBuild($this->operation_id);
-            self::_putDebug( "operation id is: ".$this->operation_id."\n",2);
+            self::_putDebug("operation id is: ".$this->operation_id."\n", 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++ )
+        for ($i = 0; $i < $prepend_length; $i++)
         {
             $prepend .= '0';
         }
@@ -839,7 +839,7 @@ 
     return $prepend.$this->meta->jobid;
     }
     
-    protected function _setJobUri ($job_uri)
+    protected function _setJobUri($job_uri)
     {
         $this->meta->job_uri = chr(0x45) // type uri
                              . chr(0x00).chr(0x07) // name-length
@@ -848,7 +848,7 @@ 
                              . self::_giveMeStringLength($job_uri)
                              . $job_uri;
         
-        self::_putDebug( "job-uri is: ".$job_uri."\n",2);
+        self::_putDebug("job-uri is: ".$job_uri."\n", 2);
     }
 
     // RESPONSE PARSING
@@ -859,9 +859,9 @@ 
 
         $k = -1;
         $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
         {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
             {
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
                 {
@@ -874,7 +874,7 @@ 
                 }
                 else
                 {
-                    $l ++;
+                    $l++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
                     }
             }
@@ -882,16 +882,16 @@ 
         $this->serveroutput->response = array();
 
         $this->printer_attributes = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+        for ($i = 0; $i < count($this->parsed); $i++)
         {
                     $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
+                    $php_name = str_replace('-', '_', $name);
                     $type = $this->parsed[$i]['type'];
                     $range = $this->parsed[$i]['range'];
                     $this->printer_attributes->$php_name = new \stdClass();
                     $this->printer_attributes->$php_name->_type = $type;
                     $this->printer_attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
                     {
                         $value = $this->parsed[$i][$j];
                         $index = '_value'.$j;
@@ -909,14 +909,14 @@ 
 
         $job = -1;
         $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
         {
             if ($this->serveroutput->response[$i]['attributes'] == "job-attributes")
             {
-                $job ++;
+                $job++;
             }
             $k = -1; 
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
             {
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
                 {
@@ -929,7 +929,7 @@ 
                 }
                 else
                 {
-                    $l ++;
+                    $l++;
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
                 }
             }
@@ -937,20 +937,20 @@ 
 
         $this->serveroutput->response = array();
         $this->jobs_attributes = new \stdClass();
-        for ($job_nbr = 0 ; $job_nbr <= $job ; $job_nbr ++)
+        for ($job_nbr = 0; $job_nbr <= $job; $job_nbr++)
         {
             $job_index = "job_".$job_nbr;
             $this->jobs_attributes->$job_index = new \stdClass();
-            for ($i = 0 ; $i < count($this->parsed[$job_nbr]) ; $i ++)
+            for ($i = 0; $i < count($this->parsed[$job_nbr]); $i++)
             {
                 $name = $this->parsed[$job_nbr][$i]['name'];
-                $php_name = str_replace('-','_',$name);
+                $php_name = str_replace('-', '_', $name);
                 $type = $this->parsed[$job_nbr][$i]['type'];
                 $range = $this->parsed[$job_nbr][$i]['range'];
                 $this->jobs_attributes->$job_index->$php_name = new \stdClass();
                 $this->jobs_attributes->$job_index->$php_name->_type = $type;
                 $this->jobs_attributes->$job_index->$php_name->_range = $range;
-                for ($j = 0 ; $j < (count($this->parsed[$job_nbr][$i]) - 3) ; $j ++)
+                for ($j = 0; $j < (count($this->parsed[$job_nbr][$i]) - 3); $j++)
                 {
                     # This causes incorrect parsing of integer job attributes.
                     # 2010-08-16
@@ -980,28 +980,28 @@ 
             case "begCollection": //RFC3382 (BLIND CODE)
                 if ($this->end_collection)
                 {
-                    $this->index --;
+                    $this->index--;
                 }
                 $this->end_collection = false;
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
-                self::_putDebug( "tag is: begCollection\n");
-                self::_readAttributeName ($attributes_type,$j);
+                self::_putDebug("tag is: begCollection\n");
+                self::_readAttributeName($attributes_type, $j);
                 if (!$this->serveroutput->response[$attributes_type][$j]['name'])
                 { // it is a multi-valued collection
-                    $this->collection_depth ++;
-                    $this->index --;
-                    $this->collection_nbr[$this->collection_depth] ++;
+                    $this->collection_depth++;
+                    $this->index--;
+                    $this->collection_nbr[$this->collection_depth]++;
                 }
                 else
                 {
-                    $this->collection_depth ++;
+                    $this->collection_depth++;
                     if ($this->collection_depth == 0)
                     {
                         $this->collection = (object) 'collection';
                     }
-                    if (array_key_exists($this->collection_depth,$this->collection_nbr))
+                    if (array_key_exists($this->collection_depth, $this->collection_nbr))
                     {
-                        $this->collection_nbr[$this->collection_depth] ++;
+                        $this->collection_nbr[$this->collection_depth]++;
                     }
                     else
                     {
@@ -1009,22 +1009,22 @@ 
                     }
                     unset($this->end_collection);
                 }
-                self::_readValue ("begCollection",$attributes_type,$j);
+                self::_readValue("begCollection", $attributes_type, $j);
                 break;
             case "endCollection": //RFC3382 (BLIND CODE)
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "collection";
-                self::_putDebug( "tag is: endCollection\n");
-                self::_readAttributeName ($attributes_type,$j,0);
-                self::_readValue ('name',$attributes_type,$j,0);
-                $this->collection_depth --;
+                self::_putDebug("tag is: endCollection\n");
+                self::_readAttributeName($attributes_type, $j, 0);
+                self::_readValue('name', $attributes_type, $j, 0);
+                $this->collection_depth--;
                 $this->collection_key[$this->collection_depth] = 0;
                 $this->end_collection = true;
                 break;
             case "memberAttrName": // RFC3382 (BLIND CODE)
                 $this->serveroutput->response[$attributes_type][$j]['type'] = "memberAttrName";
-                $this->index -- ;
-                self::_putDebug( "tag is: memberAttrName\n");
-                self::_readCollection ($attributes_type,$j);
+                $this->index--;
+                self::_putDebug("tag is: memberAttrName\n");
+                self::_readCollection($attributes_type, $j);
                 break;
 
             default:
@@ -1032,8 +1032,8 @@ 
                 $this->collection_key = array();
                 $this->collection_nbr = array();
                 $this->serveroutput->response[$attributes_type][$j]['type'] = $tag;
-                self::_putDebug( "tag is: $tag\n");
-                $attribute_name = self::_readAttributeName ($attributes_type,$j);
+                self::_putDebug("tag is: $tag\n");
+                $attribute_name = self::_readAttributeName($attributes_type, $j);
                 if (!$attribute_name)
                 {
                     $attribute_name = $this->attribute_name;
@@ -1042,9 +1042,9 @@ 
                 {
                     $this->attribute_name = $attribute_name;
                 }
-                $value = self::_readValue ($tag,$attributes_type,$j);
+                $value = self::_readValue($tag, $attributes_type, $j);
                 $this->serveroutput->response[$attributes_type][$j]['value'] = 
-                self::_interpretAttribute($attribute_name,$tag,$this->serveroutput->response[$attributes_type][$j]['value']);
+                self::_interpretAttribute($attribute_name, $tag, $this->serveroutput->response[$attributes_type][$j]['value']);
                 break;
         }
         return;
@@ -1164,13 +1164,13 @@ 
                 {
                     $tag = "new character string type";
                 }
-                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
+                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80)
                 {
                     $tag = "IETF reserved for future";
                 }
                 else
                 {
-                    $tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
+                    $tag = sprintf("UNKNOWN: 0x%x (%u)", $tag, $tag);
                 }
                 break;                                                            
         }
@@ -1178,14 +1178,14 @@ 
         return $tag; 
     }
 
-    protected function _readCollection($attributes_type,$j)
+    protected function _readCollection($attributes_type, $j)
     {
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
 
         $this->_parsing->offset += 2;
 
-        self::_putDebug( "Collection name_length ". $name_length ."\n");
+        self::_putDebug("Collection name_length ".$name_length."\n");
 
         $name = '';
         for ($i = 0; $i < $name_length; $i++)
@@ -1200,11 +1200,11 @@ 
 
         $collection_name = $name;
 
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         $this->_parsing->offset += 2;
 
-        self::_putDebug( "Attribute name_length ". $name_length ."\n");
+        self::_putDebug("Attribute name_length ".$name_length."\n");
 
         $name = '';
         for ($i = 0; $i < $name_length; $i++)
@@ -1221,7 +1221,7 @@ 
         if ($attribute_name == "")
         {
             $attribute_name = $this->last_attribute_name;
-            $this->collection_key[$this->collection_depth] ++;
+            $this->collection_key[$this->collection_depth]++;
         }
         else
         {
@@ -1229,18 +1229,18 @@ 
         }
         $this->last_attribute_name = $attribute_name;
 
-        self::_putDebug( "Attribute name ".$name."\n");
+        self::_putDebug("Attribute name ".$name."\n");
 
         $tag = self::_readTag(ord($this->serveroutput->body[$this->_parsing->offset]));
-        $this->_parsing->offset ++;
+        $this->_parsing->offset++;
 
         $type = $tag;
 
-        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         $this->_parsing->offset += 2;
 
-        self::_putDebug( "Collection2 name_length ". $name_length ."\n");
+        self::_putDebug("Collection2 name_length ".$name_length."\n");
 
         $name = '';
         for ($i = 0; $i < $name_length; $i++)
@@ -1254,10 +1254,10 @@ 
         }
 
         $collection_value = $name;
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                       +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
 
-        self::_putDebug( "Collection value_length ".$this->serveroutput->body[ $this->_parsing->offset]
+        self::_putDebug("Collection value_length ".$this->serveroutput->body[$this->_parsing->offset]
                                        . $this->serveroutput->body[$this->_parsing->offset + 1]
                                        .": "
                                        . $value_length
@@ -1277,7 +1277,7 @@ 
         }
 
         $object = &$this->collection;
-        for ($i = 0 ; $i <= $this->collection_depth ; $i ++)
+        for ($i = 0; $i <= $this->collection_depth; $i++)
         {
             $indice = "_indice".$this->collection_nbr[$i];
             if (!isset($object->$indice))
@@ -1291,10 +1291,10 @@ 
         $col_name_key = "_collection_name".$this->collection_key[$this->collection_depth];
         $col_val_key = "_collection_value".$this->collection_key[$this->collection_depth];
 
-        $attribute_value = self::_interpretAttribute($attribute_name,$tag,$value);
-        $attribute_name = str_replace('-','_',$attribute_name);
+        $attribute_value = self::_interpretAttribute($attribute_name, $tag, $value);
+        $attribute_name = str_replace('-', '_', $attribute_name);
 
-        self::_putDebug( sprintf("Value: %s\n",$value));
+        self::_putDebug(sprintf("Value: %s\n", $value));
         $object->$attribute_name->_type = $type;
         $object->$attribute_name->$value_key = $attribute_value;
         $object->$attribute_name->$col_name_key = $collection_name;
@@ -1303,13 +1303,13 @@ 
         $this->serveroutput->response[$attributes_type][$j]['value'] = $this->collection;
     }
 
-    protected function _readAttributeName ($attributes_type,$j,$write=1)
+    protected function _readAttributeName($attributes_type, $j, $write = 1)
     {
-        $name_length = ord($this->serveroutput->body[ $this->_parsing->offset]) *  256
+        $name_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                      +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         $this->_parsing->offset += 2;
 
-        self::_putDebug( "name_length ". $name_length ."\n");
+        self::_putDebug("name_length ".$name_length."\n");
 
         $name = '';
         for ($i = 0; $i < $name_length; $i++)
@@ -1322,22 +1322,22 @@ 
             $this->_parsing->offset += 1;
         }
 
-        if($write)
+        if ($write)
         {
             $this->serveroutput->response[$attributes_type][$j]['name'] = $name;
         }
 
-        self::_putDebug( "name " . $name . "\n");
+        self::_putDebug("name ".$name."\n");
 
         return $name;   
     }
 
-    protected function _readValue ($type,$attributes_type,$j,$write=1)
+    protected function _readValue($type, $attributes_type, $j, $write = 1)
     {
-        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) *  256
+        $value_length = ord($this->serveroutput->body[$this->_parsing->offset]) * 256
                       +  ord($this->serveroutput->body[$this->_parsing->offset + 1]);
         
-        self::_putDebug( "value_length ".$this->serveroutput->body[ $this->_parsing->offset]
+        self::_putDebug("value_length ".$this->serveroutput->body[$this->_parsing->offset]
                                        . $this->serveroutput->body[$this->_parsing->offset + 1]
                                        .": "
                                        . $value_length
@@ -1356,7 +1356,7 @@ 
             $this->_parsing->offset += 1;
             }
 
-        self::_putDebug( sprintf("Value: %s\n",$value));
+        self::_putDebug(sprintf("Value: %s\n", $value));
 
         if ($write)
         {
@@ -1370,9 +1370,9 @@ 
     {
         $k = -1;
         $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
         {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
             {
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
                 {
@@ -1385,23 +1385,23 @@ 
                 }
                 else
                 {
-                    $l ++;
+                    $l++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
                 }
             }
         }
         $this->serveroutput->response = array();
-        $this->attributes  = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+        $this->attributes = new \stdClass();
+        for ($i = 0; $i < count($this->parsed); $i++)
         {
                     $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
+                    $php_name = str_replace('-', '_', $name);
                     $type = $this->parsed[$i]['type'];
                     $range = $this->parsed[$i]['range'];
                     $this->attributes->$php_name = new \stdClass();
                     $this->attributes->$php_name->_type = $type;
                     $this->attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
                     {
                         $value = $this->parsed[$i][$j];
                         $index = '_value'.$j;
@@ -1418,9 +1418,9 @@ 
         //    return false;
         $k = -1;
         $l = 0;
-        for ($i = 0 ; $i < count($this->serveroutput->response) ; $i++)
+        for ($i = 0; $i < count($this->serveroutput->response); $i++)
         {
-            for ($j = 0 ; $j < (count($this->serveroutput->response[$i]) - 1) ; $j ++)
+            for ($j = 0; $j < (count($this->serveroutput->response[$i]) - 1); $j++)
             {
                 if (!empty($this->serveroutput->response[$i][$j]['name']))
                 {
@@ -1433,7 +1433,7 @@ 
                 }
                 else
                 {
-                    $l ++;
+                    $l++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
                 }
             }
@@ -1442,16 +1442,16 @@ 
         $this->serveroutput->response = array();
 
         $this->job_attributes = new \stdClass();
-        for ($i = 0 ; $i < count($this->parsed) ; $i ++)
+        for ($i = 0; $i < count($this->parsed); $i++)
         {
                     $name = $this->parsed[$i]['name'];
-                    $php_name = str_replace('-','_',$name);
+                    $php_name = str_replace('-', '_', $name);
                     $type = $this->parsed[$i]['type'];
                     $range = $this->parsed[$i]['range'];
                     $this->job_attributes->$php_name = new \stdClass();
                     $this->job_attributes->$php_name->_type = $type;
                     $this->job_attributes->$php_name->_range = $range;
-                    for ($j = 0 ; $j < (count($this->parsed[$i]) - 3) ; $j ++)
+                    for ($j = 0; $j < (count($this->parsed[$i]) - 3); $j++)
                     {
                         $value = $this->parsed[$i][$j];
                         $index = '_value'.$j;
@@ -1462,7 +1462,7 @@ 
         $this->parsed = array();
     }
 
-    protected function _interpretAttribute($attribute_name,$type,$value)
+    protected function _interpretAttribute($attribute_name, $type, $value)
     {
         switch ($type)
         {
@@ -1487,12 +1487,12 @@ 
                 $value = self::_interpretDateTime($value);
                 break;
             case 'enum':
-                $value = $this->_interpretEnum($attribute_name,$value); // must be overwritten by children
+                $value = $this->_interpretEnum($attribute_name, $value); // must be overwritten by children
                 break;
             case 'resolution':
                 $unit = $value[8];
-                $value = self::_interpretRangeOfInteger(substr($value,0,8));
-                switch($unit)
+                $value = self::_interpretRangeOfInteger(substr($value, 0, 8));
+                switch ($unit)
                 {
                     case chr(0x03):
                         $unit = "dpi";
@@ -1516,32 +1516,32 @@ 
 
         $halfsize = strlen($value) / 2;
 
-        $integer1 = self::_interpretInteger(substr($value,0,$halfsize));
-        $integer2 = self::_interpretInteger(substr($value,$halfsize,$halfsize));
+        $integer1 = self::_interpretInteger(substr($value, 0, $halfsize));
+        $integer2 = self::_interpretInteger(substr($value, $halfsize, $halfsize));
 
-        $value_parsed = sprintf('%s-%s',$integer1,$integer2);
+        $value_parsed = sprintf('%s-%s', $integer1, $integer2);
 
         return $value_parsed;
     }
 
     protected function _interpretDateTime($date)
     {
-        $year = self::_interpretInteger(substr($date,0,2));
-        $month =  self::_interpretInteger(substr($date,2,1));
-        $day =  self::_interpretInteger(substr($date,3,1));
-        $hour =  self::_interpretInteger(substr($date,4,1));
-        $minute =  self::_interpretInteger(substr($date,5,1));
-        $second =  self::_interpretInteger(substr($date,6,1));
-        $direction = substr($date,8,1);
-        $hours_from_utc = self::_interpretInteger(substr($date,9,1));
-        $minutes_from_utc = self::_interpretInteger(substr($date,10,1));
-
-        $date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s',$year,$month,$day,$hour,$minute,$second,$direction,$hours_from_utc,$minutes_from_utc);
+        $year = self::_interpretInteger(substr($date, 0, 2));
+        $month = self::_interpretInteger(substr($date, 2, 1));
+        $day = self::_interpretInteger(substr($date, 3, 1));
+        $hour = self::_interpretInteger(substr($date, 4, 1));
+        $minute = self::_interpretInteger(substr($date, 5, 1));
+        $second = self::_interpretInteger(substr($date, 6, 1));
+        $direction = substr($date, 8, 1);
+        $hours_from_utc = self::_interpretInteger(substr($date, 9, 1));
+        $minutes_from_utc = self::_interpretInteger(substr($date, 10, 1));
+
+        $date = sprintf('%s-%s-%s %s:%s:%s %s%s:%s', $year, $month, $day, $hour, $minute, $second, $direction, $hours_from_utc, $minutes_from_utc);
 
         return $date;
     }
 
-    protected function _interpretEnum($attribute_name,$value)
+    protected function _interpretEnum($attribute_name, $value)
     {
         $value_parsed = self::_interpretInteger($value);
 
@@ -1574,7 +1574,7 @@ 
                 }
                 if ($value_parsed > 0x09)
                 {
-                    $value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown(IETF standards track "job-state" reserved): 0x%x', $value_parsed);
                 }
                 break;
             case 'print-quality':
@@ -1608,16 +1608,16 @@ 
                 }
                 if ($value_parsed > 0x05)
                 {
-                    $value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown(IETF standards track "printer-state" reserved): 0x%x', $value_parsed);
                 }
                 break;
 
             case 'operations-supported':
-                switch($value_parsed)
+                switch ($value_parsed)
                 {
                     case 0x0000:
                     case 0x0001:
-                        $value = sprintf('Unknown(reserved) : %s',ord($value));
+                        $value = sprintf('Unknown(reserved) : %s', ord($value));
                         break;
                     case 0x0002:
                         $value = 'Print-Job';
@@ -1701,19 +1701,19 @@ 
                         $value = 'Get-Notifications';
                         break;
                     case 0x001D:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
                         break;
                     case 0x001E:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
                         break;
                     case 0x001F:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
                         break;
                     case 0x0020:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
                         break;
                     case 0x0021:
-                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x',ord($value));
+                        $value = sprintf('Unknown (reserved IETF "operations"): 0x%x', ord($value));
                         break;
                     case 0x0022: 
                         $value = 'Enable-Printer';
@@ -1748,22 +1748,22 @@ 
                 }
                 if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
                 {
-                    $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x', $value_parsed);
                 }
                 elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
                 {
-                    if (method_exists($this,'_getEnumVendorExtensions'))
+                    if (method_exists($this, '_getEnumVendorExtensions'))
                     {
                         $value = $this->_getEnumVendorExtensions($value_parsed);
                     }
                     else
                     {
-                        $value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
+                        $value = sprintf('Unknown(Vendor extension for operations): 0x%x', $value_parsed);
                     }
                 }
                 elseif ($value_parsed > 0x8FFF)
                 {
-                    $value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown operation (should not exists): 0x%x', $value_parsed);
                 }
 
                 break;
@@ -1832,7 +1832,7 @@ 
                 }
                 if ($value_parsed > 31)
                 {
-                    $value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown(IETF standards track "finishing" reserved): 0x%x', $value_parsed);
                 }
                 break;
 
@@ -1856,7 +1856,7 @@ 
                 }
                 if ($value_parsed > 0x06)
                 {
-                    $value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x',$value_parsed);
+                    $value = sprintf('Unknown(IETF standards track "orientation" reserved): 0x%x', $value_parsed);
                 }
                 break;
 
@@ -1866,24 +1866,24 @@ 
         return $value;
     }
 
-    protected function _getJobId ()
+    protected function _getJobId()
     {
         if (!isset($this->serveroutput->response))
         {
-            $this->jobs = array_merge($this->jobs,array('NO JOB'));
+            $this->jobs = array_merge($this->jobs, array('NO JOB'));
         }
 
         $jobfinded = false;
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+        for ($i = 0; (!$jobfinded && array_key_exists($i, $this->serveroutput->response)); $i++)
         {
             if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
             {
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
                 {
                     if ($this->serveroutput->response[$i][$j]['name'] == "job-id")
                     {
                         $this->last_job = $this->serveroutput->response[$i][$j]['value'];
-                        $this->jobs = array_merge($this->jobs,array($this->serveroutput->response[$i][$j]['value']));
+                        $this->jobs = array_merge($this->jobs, array($this->serveroutput->response[$i][$j]['value']));
                         return;
                     }
                 }
@@ -1891,7 +1891,7 @@ 
         }
     }
 
-    protected function _getJobUri ()
+    protected function _getJobUri()
     {
         if (!isset($this->jobs_uri))
         {
@@ -1899,16 +1899,16 @@ 
         }
 
         $jobfinded = false;
-        for ($i = 0 ; (!$jobfinded && array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+        for ($i = 0; (!$jobfinded && array_key_exists($i, $this->serveroutput->response)); $i++)
         {
             if (($this->serveroutput->response[$i]['attributes']) == "job-attributes")
             {
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
                 {
                     if ($this->serveroutput->response[$i][$j]['name'] == "job-uri")
                     {
                         $this->last_job = $this->serveroutput->response[$i][$j]['value'];
-                        $this->jobs_uri = array_merge($this->jobs_uri,array($this->last_job));
+                        $this->jobs_uri = array_merge($this->jobs_uri, array($this->last_job));
                         return;
                     }
                 }
@@ -1917,18 +1917,18 @@ 
         $this->last_job = '';
     }
 
-    protected function _parseResponse ()
+    protected function _parseResponse()
    {
         $j = -1;
         $this->index = 0;
-        for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body) ; $i = $this->_parsing->offset)
+        for ($i = $this->_parsing->offset; $i < strlen($this->serveroutput->body); $i = $this->_parsing->offset)
         {
             $tag = ord($this->serveroutput->body[$this->_parsing->offset]);
 
             if ($tag > 0x0F)
             {
                 self::_readAttribute($j);
-                $this->index ++;
+                $this->index++;
                 continue;
             }
 
@@ -1947,14 +1947,14 @@ 
                     $this->_parsing->offset += 1;
                     break;
                 case 0x03:
-                    $j +=1;
+                    $j += 1;
                     $this->serveroutput->response[$j]['attributes'] = "end-of-attributes";
-                    self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
+                    self::_putDebug("tag is: ".$this->serveroutput->response[$j]['attributes']."\n");
                     if ($this->alert_on_end_tag === 1)
                     {
                         echo "END tag OK<br />";
                     }
-                    $this->response_completed[(count($this->response_completed) -1)] = "completed";
+                    $this->response_completed[(count($this->response_completed) - 1)] = "completed";
                     return;
                 case 0x04:
                     $j += 1;
@@ -1970,13 +1970,13 @@ 
                     break;
                 default:
                     $j += 1;
-                    $this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"),$tag,$tag);
+                    $this->serveroutput->response[$j]['attributes'] = sprintf(_("0x%x (%u) : attributes tag Unknown (reserved for future versions of IPP"), $tag, $tag);
                     $this->index = 0;
                     $this->_parsing->offset += 1;
                     break;
             }
 
-            self::_putDebug( "tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
+            self::_putDebug("tag is: ".$this->serveroutput->response[$j]['attributes']."\n\n\n");
         }
         return;
     }
@@ -2003,7 +2003,7 @@ 
     */
 
     // REQUEST BUILDING
-    protected function _stringCancel ($job_uri)
+    protected function _stringCancel($job_uri)
     {
     
         if (!isset($this->setup->charset))
@@ -2036,8 +2036,8 @@ 
             $this->error_generation->request_body_malformed = "";
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // 1.1  | version-number
-                         . chr(0x00) . chr (0x08) // cancel-Job | operation-id
+        $this->stringjob = chr(0x01).chr(0x01) // 1.1  | version-number
+                         . chr(0x00).chr(0x08) // cancel-Job | operation-id
                          . $this->meta->operation_id //           request-id
                          . $this->error_generation->request_body_malformed
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
@@ -2048,7 +2048,7 @@ 
                          . $this->meta->message
                          . 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;
     }
 }

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);
             });