Dolibarr / dolibarr

htdocs/includes/restler/framework/Luracast/Restler/EventDispatcher.php

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
     public function __call($eventName, $params)
     {
         if (0 === strpos($eventName, 'on')) {
-            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
-                $this->listeners[$eventName] = array();
+            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName])) {
+                            $this->listeners[$eventName] = array();
+            }
             $this->listeners[$eventName][] = $params[0];
         }
         return $this;
@@ -89,9 +90,10 @@ 
         $this->events[] = $eventName;
         $params = func_get_args();
         $eventName = 'on'.ucfirst(array_shift($params));
-        if (isset($this->listeners[$eventName]))
-            foreach ($this->listeners[$eventName] as $callback)
+        if (isset($this->listeners[$eventName])) {
+                    foreach ($this->listeners[$eventName] as $callback)
                 call_user_func_array($callback, $params);
+        }
     }
 
 }

htdocs/includes/printipp/CupsPrintIPP.php

Braces +13 added lines, -22 removed lines

@@ -85,8 +85,7 @@ 
                                         . 'requested-attributes'
                                         . self::_giveMeStringLength($attributes[0])
                                         . $attributes[0];
-            }
-            else
+            } else
             {
                 $this->meta->attributes .= chr(0x44) // Keyword
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -141,15 +140,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -215,15 +212,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -301,15 +296,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -371,8 +364,7 @@ 
                                         . 'requested-attributes'
                                         . self::_giveMeStringLength($attributes[0])
                                         . $attributes[0];
-            }
-            else
+            } else
             {
                 $this->meta->attributes .= chr(0x44) // Keyword
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -411,14 +403,12 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting printers: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting printers: ".$this->serveroutput->status,1);
             }
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting printers : OPERATION FAILED",1);
@@ -544,8 +534,9 @@ 
             }
 
         $prepend = '';
-        while ((strlen($value_built) + strlen($prepend)) < 4)
-            $prepend .= chr(0);
+        while ((strlen($value_built) + strlen($prepend)) < 4) {
+                    $prepend .= chr(0);
+        }
         return $prepend.$value_built;
     }
 

htdocs/includes/printipp/http_class.php

Braces +3 added lines, -2 removed lines

@@ -478,8 +478,9 @@
 		}
 		$nc = sprintf('%x', $this->nc);
 		$prepend = "";
-		while ((strlen($nc) + strlen($prepend)) < 8)
-			$prependi .= "0";
+		while ((strlen($nc) + strlen($prepend)) < 8) {
+					$prependi .= "0";
+		}
 		$nc = $prepend.$nc;
 		$cnonce = "printipp";
 		$username = $this->user;

htdocs/includes/printipp/PrintIPP.php

Braces +35 added lines, -70 removed lines

@@ -78,8 +78,7 @@ 
             {
                 $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
             }
-        }
-        else
+        } else
         {
             self::_putDebug( _("Printing DATA\n"),3); 
 
@@ -99,8 +98,7 @@ 
                 $this->_getJobId();
                 $this->_getJobUri();
                 $this->_parseJobAttributes();
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(''));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(''));
@@ -114,8 +112,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
               self::_errorLog(sprintf("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(""));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(""));
@@ -168,8 +165,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
             }
@@ -212,8 +208,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -252,8 +247,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data),true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -334,8 +328,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("validate job: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("validate job: ".$this->serveroutput->status,1);
             }
@@ -370,8 +363,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -433,8 +425,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
                                                                         $this->serveroutput->status),3);
-            }
-            else 
+            } else 
             {
                 self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
                                                                         $this->serveroutput->status),1);
@@ -471,8 +462,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -504,8 +494,7 @@ 
                                . 'limit'
                                . self::_giveMeStringLength($limit)
                                . $limit;
-        }
-        else
+        } else
         {
             $this->meta->limit = '';
         }
@@ -517,8 +506,7 @@ 
                                         . 'which-jobs'
                                         . self::_giveMeStringLength($which_jobs)
                                         . $which_jobs;
-        }
-        else
+        } else
         {
             $this->meta->which_jobs = "";
         }
@@ -530,8 +518,7 @@ 
                                  . 'my-jobs'
                                  . self::_giveMeStringLength(chr(0x01))
                                  . chr(0x01);
-        }
-        else
+        } else
         {
             $this->meta->my_jobs = '';
         }
@@ -570,8 +557,7 @@ 
                          . ''
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
-        }
-        else
+        } else
         { # cups 1.4.4 doesn't return much of anything without this
             $this->stringjob .=
                           chr(0x44) // keyword
@@ -609,8 +595,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -654,8 +639,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -716,8 +700,7 @@ 
                          . ''
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
-        }
-        elseif($attributes_group)
+        } elseif($attributes_group)
         {
             switch($attributes_group)
             {
@@ -768,8 +751,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
                                              .$this->serveroutput->status,1);
@@ -871,8 +853,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -926,8 +907,7 @@ 
                     $this->parsed[$job][$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$job][$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -991,8 +971,7 @@ 
                     $this->collection_depth ++;
                     $this->index --;
                     $this->collection_nbr[$this->collection_depth] ++;
-                }
-                else
+                } else
                 {
                     $this->collection_depth ++;
                     if ($this->collection_depth == 0)
@@ -1002,8 +981,7 @@ 
                     if (array_key_exists($this->collection_depth,$this->collection_nbr))
                     {
                         $this->collection_nbr[$this->collection_depth] ++;
-                    }
-                    else
+                    } else
                     {
                         $this->collection_nbr[$this->collection_depth] = 0;
                     }
@@ -1037,8 +1015,7 @@ 
                 if (!$attribute_name)
                 {
                     $attribute_name = $this->attribute_name;
-                }
-                else
+                } else
                 {
                     $this->attribute_name = $attribute_name;
                 }
@@ -1151,24 +1128,19 @@ 
                 if ($tag >= 0x14 && $tag < 0x15 && $tag > 0x17 && $tag <= 0x1f) 
                 {
                     $tag = "out-of-band";
-                }
-                elseif (0x24 <= $tag && $tag <= 0x2f) 
+                } elseif (0x24 <= $tag && $tag <= 0x2f) 
                 {
                     $tag = "new integer type";
-                }
-                elseif (0x38 <= $tag && $tag <= 0x3F) 
+                } elseif (0x38 <= $tag && $tag <= 0x3F) 
                 {
                     $tag = "new octet-stream type";
-                }
-                elseif (0x4B <= $tag && $tag <= 0x5F) 
+                } elseif (0x4B <= $tag && $tag <= 0x5F) 
                 {
                     $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
+                } else
                 {
                     $tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
                 }
@@ -1222,8 +1194,7 @@ 
         {
             $attribute_name = $this->last_attribute_name;
             $this->collection_key[$this->collection_depth] ++;
-        }
-        else
+        } else
         {
             $this->collection_key[$this->collection_depth] = 0;
         }
@@ -1382,8 +1353,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -1430,8 +1400,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -1477,8 +1446,7 @@ 
                 if ($value == 0x00)
                 {
                     $value = 'false';
-                }
-                else
+                } else
                 {
                     $value = 'true';
                 }
@@ -1749,19 +1717,16 @@ 
                 if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
                 {
                     $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
-                }
-                elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
+                } elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
                 {
                     if (method_exists($this,'_getEnumVendorExtensions'))
                     {
                         $value = $this->_getEnumVendorExtensions($value_parsed);
-                    }
-                    else
+                    } else
                     {
                         $value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
                     }
-                }
-                elseif ($value_parsed > 0x8FFF)
+                } elseif ($value_parsed > 0x8FFF)
                 {
                     $value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
                 }

htdocs/includes/printipp/BasicIPP.php

Braces +44 added lines, -63 removed lines

@@ -183,7 +183,9 @@ 
     {
         $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
             . "printer-uri" // printer-uri | name
@@ -209,9 +211,10 @@ 
         {
             //It's a filename.  Open and stream.
             $data = fopen($this->data, "rb");
-            while (!feof($data)) $output = fread($data, 8192);
-        }
-        else
+            while (!feof($data)) {
+            	$output = fread($data, 8192);
+            }
+        } else
         {
             $output = $this->data;
         }
@@ -278,7 +281,9 @@ 
     {
         self::setBinary();
         $length = chr(strlen($mime_media_type));
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        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' //
@@ -320,7 +325,9 @@ 
         $document_name = substr($document_name, 0, 1023);
         $length = strlen($document_name);
         $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        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
@@ -493,8 +500,7 @@ 
                     . 'page-ranges'
                     . self::_giveMeStringLength($value)
                     . $value;
-            }
-            else
+            } else
             {
                 $this->meta->page_ranges .=
                 $this->tags_types['rangeOfInteger']['tag']
@@ -517,44 +523,38 @@ 
             if (!is_array($values))
             {
                 self::_setOperationAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setOperationAttribute($attribute, $value);
                 }
             }
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
+        } elseif (in_array($attribute, $job_attributes_tags))
         {
             if (!is_array($values))
             {
                 self::_setJobAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setJobAttribute($attribute, $value);
                 }
             }
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
+        } elseif (in_array($attribute, $printer_attributes_tags))
         {
             if (!is_array($values))
             {
                 self::_setPrinterAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setPrinterAttribute($attribute, $value);
                 }
             }
-        }
-        else
+        } else
         {
             trigger_error(
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
@@ -580,22 +580,19 @@ 
                 $this->operation_tags[$attribute]['value'],
                 $this->operation_tags[$attribute]['systag']
             );
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
+        } elseif (in_array($attribute, $job_attributes_tags))
         {
             unset(
                 $this->job_tags[$attribute]['value'],
                 $this->job_tags[$attribute]['systag']
             );
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
+        } elseif (in_array($attribute, $printer_attributes_tags))
         {
             unset(
                 $this->printer_tags[$attribute]['value'],
                 $this->printer_tags[$attribute]['systag']
             );
-        }
-        else
+        } else
         {
             trigger_error(
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
@@ -714,8 +711,7 @@ 
                     )
                 );
             }
-        }
-        else
+        } else
         {
             self::_putDebug(_("Printing DATA"));
             $this->output =
@@ -743,8 +739,7 @@ 
                     sprintf("printing job %s: ", $this->last_job)
                         . $this->serveroutput->status,
                     3);
-            }
-            else
+            } else
             {
                 self::_errorLog(
                     sprintf("printing job: ", $this->last_job)
@@ -781,10 +776,11 @@ 
         $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 {
+        } else {
             $http->host = "localhost";
         }
         $http->with_exceptions = $this->with_exceptions;
@@ -792,8 +788,7 @@ 
         {
             $http->debug = 1;
             $http->html_debug = 0;
-        }
-        else
+        } else
         {
             $http->debug = 0;
             $http->html_debug = 0;
@@ -838,15 +833,13 @@ 
             try
             {
                 $success = $http->Open($arguments);
-            }
-            catch(httpException $e)
+            } catch(httpException $e)
             {
                 throw new ippException(
                     sprintf("http error: %s", $e->getMessage()),
                         $e->getErrno());
             }
-        }
-        else
+        } else
         {
         	$success = $http->Open($arguments);
         }
@@ -866,8 +859,7 @@ 
                         {
                             self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
                     }
@@ -896,8 +888,7 @@ 
                                     . $headers[$header_name][$header_value];
                             $i++;
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $headers[$header_name]);
                         $this->serveroutput->headers[$i] =
@@ -1245,20 +1236,16 @@ 
         if ($status_code < 0x00FF)
         {
             $this->serveroutput->status = "successfull";
-        }
-        elseif ($status_code < 0x01FF)
+        } elseif ($status_code < 0x01FF)
         {
             $this->serveroutput->status = "informational";
-        }
-        elseif ($status_code < 0x02FF)
+        } elseif ($status_code < 0x02FF)
         {
             $this->serveroutput->status = "redirection";
-        }
-        elseif ($status_code < 0x04FF)
+        } elseif ($status_code < 0x04FF)
         {
             $this->serveroutput->status = "client-error";
-        }
-        elseif ($status_code < 0x05FF)
+        } elseif ($status_code < 0x05FF)
         {
             $this->serveroutput->status = "server-error";
         }
@@ -1464,8 +1451,7 @@ 
             if (array_key_exists(0, $this->available_printers))
             {
                 self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(
                     _("_stringJob: Printer URI is not set: die"),
@@ -1560,8 +1546,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $operationattributes .=
                             $values['systag']
@@ -1589,8 +1574,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $jobattributes .=
                             $values['systag']
@@ -1618,8 +1602,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $printerattributes .=
                             $values['systag']
@@ -1649,8 +1632,7 @@ 
             if ($this->with_exceptions)
             {
                 throw new ippException($errmsg);
-            }
-            else
+            } else
             {
                 trigger_error ($errmsg, E_USER_ERROR);
             }
@@ -1814,8 +1796,7 @@ 
         $int4 = $value & 0xFF; //64bits
         if ($initial_value < 0) {
             $int4 = chr($int4) | chr(0x80);
-        }
-        else {
+        } else {
             $int4 = chr($int4);
         }
         $value = $int4 . chr($int3) . chr($int2) . chr($int1);

htdocs/includes/printipp/ExtendedPrintIPP.php

Braces +28 added lines, -56 removed lines

@@ -93,8 +93,7 @@ 
             {
                 self::_errorLog(sprintf("printing uri %s, job %s: ",$uri,$this->last_job)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(""));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(""));
@@ -130,8 +129,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("purgeJobs: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("purgeJobs: Printer URI is not set: die\n"));
@@ -193,8 +191,7 @@ 
             {
                 self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("purging jobs of %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -228,8 +225,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("createJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("createJob: Printer URI is not set: die\n"));
@@ -278,8 +274,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data),true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -341,8 +336,7 @@ 
                 $this->_getJobId();
                 $this->_getJobUri();
                 $this->_parseJobAttributes();
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(''));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(''));
@@ -357,8 +351,7 @@ 
             {
                 self::_errorLog(sprintf(_("Create job: job %s"),$this->last_job)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
 
                 $this->jobs = array_merge($this->jobs,array(""));
@@ -407,8 +400,7 @@ 
             {
                 $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
             }
-        }
-        else
+        } else
         {
             self::_putDebug( _("sending DATA as document\n")); 
 
@@ -430,8 +422,7 @@ 
                 //$this->_getPrinterUri();
                 $this->_getJobUri();
                 $this->_parseJobAttributes();
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array($job));
                 $this->jobs_uri = array_merge($this->jobs_uri,array($job));
@@ -445,8 +436,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog(sprintf("sending document, job %s: %s",$job,$this->serveroutput->status),3);
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(""));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(""));
@@ -488,8 +478,7 @@ 
                 //$this->_getPrinterUri();
                 $this->_getJobUri();
                 $this->_parseJobAttributes();
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array($job));
                 $this->jobs_uri = array_merge($this->jobs_uri,array($job));
@@ -505,8 +494,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog(sprintf("sending uri %s, job %s: %s",$uri,$job,$this->serveroutput->status),3);
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(""));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(""));
@@ -543,8 +531,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("pausePrinter: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("pausePrinter: Printer URI is not set: die\n"));
@@ -606,8 +593,7 @@ 
             {
                 self::_errorLog(sprintf(_("Pause printer %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("pause printer %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -645,8 +631,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("resumePrinter: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("resumePrinter: Printer URI is not set: die\n"));
@@ -703,8 +688,7 @@ 
             {
                 self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("resume printer %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -758,8 +742,7 @@ 
         if (in_array($until,$until_strings))
         {
             true;
-        }
-        else 
+        } else 
         {
             $until = 'indefinite';
         }
@@ -805,8 +788,7 @@ 
             {
                 self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("hold job %s until %s: "),$job_uri,$until)
                                              .$this->serveroutput->status,1);
@@ -889,8 +871,7 @@ 
             {
                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("release job %s: "),$job_uri)
                                              .$this->serveroutput->status,1);
@@ -980,8 +961,7 @@ 
             {
                 self::_errorLog(sprintf(_("release job %s: "),$job_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("release job %s: "),$job_uri)
                                              .$this->serveroutput->status,1);
@@ -1099,8 +1079,7 @@ 
             {
                 self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("set job attributes for job %s: "),$job_uri)
                                              .$this->serveroutput->status,1);
@@ -1245,8 +1224,7 @@ 
             {
                 self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("set printer attributes for printer %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -1301,8 +1279,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringUri: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringUri: Printer URI is not set: die\n"));
@@ -1347,8 +1324,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data),true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -1423,8 +1399,7 @@ 
         if ($is_last == false)
         {
             $is_last = chr(0x00);
-        }
-        else
+        } else
         {
             $is_last = chr(0x01);
         }
@@ -1448,8 +1423,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));
@@ -1549,8 +1523,7 @@ 
         if ($is_last == false)
         {
             $is_last = chr(0x00);
-        }
-        else
+        } else
         {
             $is_last = chr(0x01);
         }
@@ -1574,8 +1547,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            } 
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"));

htdocs/includes/webklex/php-imap/src/Client.php

Braces +15 added lines, -13 removed lines

@@ -207,7 +207,7 @@ 
         $value = $this->default_account_config[$key];
         if(isset($config[$key])) {
             $value = $config[$key];
-        }elseif(isset($default_config[$key])) {
+        } elseif(isset($default_config[$key])) {
             $value = $default_config[$key];
         }
         $this->$key = $value;
@@ -239,39 +239,39 @@ 
             if(isset($config['masks']['message'])) {
                 if(class_exists($config['masks']['message'])) {
                     $this->default_message_mask = $config['masks']['message'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']);
                 }
-            }else{
+            } else{
                 if(class_exists($default_config['message'])) {
                     $this->default_message_mask = $default_config['message'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
                 }
             }
             if(isset($config['masks']['attachment'])) {
                 if(class_exists($config['masks']['attachment'])) {
                     $this->default_attachment_mask = $config['masks']['attachment'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']);
                 }
-            }else{
+            } else{
                 if(class_exists($default_config['attachment'])) {
                     $this->default_attachment_mask = $default_config['attachment'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
                 }
             }
-        }else{
+        } else{
             if(class_exists($default_config['message'])) {
                 $this->default_message_mask = $default_config['message'];
-            }else{
+            } else{
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
             }
 
             if(class_exists($default_config['attachment'])) {
                 $this->default_attachment_mask = $default_config['attachment'];
-            }else{
+            } else{
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
             }
         }
@@ -335,7 +335,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($this->timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed - no imap function", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -476,7 +476,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -514,7 +514,9 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if($expunge) {
+        	$this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {

htdocs/includes/webklex/php-imap/src/Folder.php

Braces +7 added lines, -3 removed lines

@@ -232,7 +232,9 @@ 
     public function move($new_name, $expunge = true) {
         $this->client->checkConnection();
         $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+        	$this->client->expunge();
+        }
 
         $folder = $this->client->getFolder($new_name);
         $event = $this->getEvent("folder", "moved");
@@ -310,7 +312,9 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->client->getConnection()->deleteFolder($this->path);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+        	$this->client->expunge();
+        }
 
         $event = $this->getEvent("folder", "deleted");
         $event::dispatch($this);
@@ -384,7 +388,7 @@ 
 
                     $connection->idle();
                 }
-            }catch (Exceptions\RuntimeException $e) {
+            } catch (Exceptions\RuntimeException $e) {
                 if(strpos($e->getMessage(), "connection closed") === false) {
                     throw $e;
                 }

htdocs/includes/webklex/php-imap/src/Connection/Protocols/LegacyProtocol.php

Braces +2 added lines, -2 removed lines

@@ -323,7 +323,7 @@ 
                 $name = $this->decodeFolderName($item->name);
                 $result[$name] = ['delimiter' => $item->delimiter, 'flags' => []];
             }
-        }else{
+        } else{
             throw new RuntimeException(\imap_last_error());
         }
 
@@ -347,7 +347,7 @@ 
 
         if ($mode == "+"){
             $status = \imap_setflag_full($this->stream, $from, $flag, $uid ? IMAP::FT_UID : IMAP::NIL);
-        }else{
+        } else{
             $status = \imap_clearflag_full($this->stream, $from, $flag, $uid ? IMAP::FT_UID : IMAP::NIL);
         }