Dolibarr / dolibarr

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

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
         $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type;
         if(stripos($content_type, 'multipart') === 0) {
             $this->type = IMAP::MESSAGE_TYPE_MULTIPART;
-        }else{
+        } else{
             $this->type = IMAP::MESSAGE_TYPE_TEXT;
         }
     }

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

Braces +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
     protected function parse(){
         if ($this->header === null) {
             $body = $this->findHeaders();
-        }else{
+        } else{
             $body = $this->raw;
         }
 

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

Braces +12 added lines, -6 removed lines

@@ -80,13 +80,13 @@ 
             if($value === null) {
                 if(isset(self::$config[$part])) {
                     $value = self::$config[$part];
-                }else{
+                } else{
                     break;
                 }
-            }else{
+            } else{
                 if(isset($value[$part])) {
                     $value = $value[$part];
-                }else{
+                } else{
                     break;
                 }
             }
@@ -232,11 +232,15 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if(!is_array($base)) {
+        	$base = empty($base) ? array() : array($base);
+        }
 
         foreach($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if(!is_array($append)) {
+            	$append = array($append);
+            }
 
             foreach($append as $key => $value) {
 
@@ -248,7 +252,9 @@ 
                 if(is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
                 } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                    if(!in_array($value, $base)) {
+                    	$base[] = $value;
+                    }
                 } else {
                     $base[$key] = $value;
                 }

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

Braces +20 added lines, -16 removed lines

@@ -130,20 +130,20 @@ 
         if(isset($this->attributes[$name]) && $strict === false) {
             if ($this->attributize) {
                 $this->attributes[$name]->add($value, true);
-            }else{
+            } else{
                 if(isset($this->attributes[$name])) {
                     if (is_array($this->attributes[$name]) == false) {
                         $this->attributes[$name] = [$this->attributes[$name], $value];
-                    }else{
+                    } else{
                         $this->attributes[$name][] = $value;
                     }
-                }else{
+                } else{
                     $this->attributes[$name] = $value;
                 }
             }
-        }elseif($this->attributize == false){
+        } elseif($this->attributize == false){
             $this->attributes[$name] = $value;
-        }else{
+        } else{
             $this->attributes[$name] = new Attribute($name, $value);
         }
 
@@ -254,7 +254,7 @@ 
                 if ($prev_header !== null) {
                     $headers[$prev_header][] = $line;
                 }
-            }elseif (substr($line, 0, 1) === " ") {
+            } elseif (substr($line, 0, 1) === " ") {
                 $line = substr($line, 1);
                 $line = trim(rtrim($line));
                 if ($prev_header !== null) {
@@ -263,11 +263,11 @@ 
                     }
                     if (is_array($headers[$prev_header])) {
                         $headers[$prev_header][] = $line;
-                    }else{
+                    } else{
                         $headers[$prev_header] .= $line;
                     }
                 }
-            }else{
+            } else{
                 if (($pos = strpos($line, ":")) > 0) {
                     $key = trim(rtrim(strtolower(substr($line, 0, $pos))));
                     $key = str_replace("-", "_", $key);
@@ -275,7 +275,7 @@ 
                     $value = trim(rtrim(substr($line, $pos + 1)));
                     if (isset($headers[$key])) {
                         $headers[$key][]  = $value;
-                    }else{
+                    } else{
                         $headers[$key] = [$value];
                     }
                     $prev_header = $key;
@@ -284,7 +284,9 @@ 
         }
 
         foreach($headers as $key => $values) {
-            if (isset($imap_headers[$key])) continue;
+            if (isset($imap_headers[$key])) {
+            	continue;
+            }
             $value = null;
             switch($key){
                 case 'from':
@@ -421,9 +423,9 @@ 
                     return EncodingAliases::get($parameter->value, $this->fallback_encoding);
                 }
             }
-        }elseif (property_exists($structure, 'charset')) {
+        } elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset, $this->fallback_encoding);
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -470,9 +472,9 @@ 
                         }
                     }
                 }
-            }elseif($decoder === 'iconv' && $is_utf8_base) {
+            } elseif($decoder === 'iconv' && $is_utf8_base) {
                 $value = iconv_mime_decode($value);
-            }elseif($is_utf8_base){
+            } elseif($is_utf8_base){
                 $value = mb_decode_mimeheader($value);
             }
 
@@ -505,7 +507,9 @@ 
      * Try to extract the priority from a given raw header string
      */
     private function findPriority() {
-        if(($priority = $this->get("x_priority")) === null) return;
+        if(($priority = $this->get("x_priority")) === null) {
+        	return;
+        }
         switch((int)"$priority"){
             case IMAP::MESSAGE_PRIORITY_HIGHEST;
                 $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
@@ -652,7 +656,7 @@ 
         foreach ($this->attributes as $key => $value) {
             if (is_array($value)) {
                 $value = implode(", ", $value);
-            }else{
+            } else{
                 $value = (string)$value;
             }
             // Only parse strings and don't parse any attributes like the user-agent

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

Braces +17 added lines, -11 removed lines

@@ -300,7 +300,7 @@ 
         if(strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
             return $this->get($name);
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
@@ -506,7 +506,7 @@ 
             if ($this->getFlags()->get("seen") == null) {
                 $this->unsetFlag("Seen");
             }
-        }elseif ($this->getFlags()->get("seen") != null) {
+        } elseif ($this->getFlags()->get("seen") != null) {
             $this->setFlag("Seen");
         }
     }
@@ -550,7 +550,7 @@ 
     private function fetchPart(Part $part) {
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        } else{
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -575,7 +575,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            } else{
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -746,9 +746,9 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        } elseif (property_exists($structure, 'charset')){
             return EncodingAliases::get($structure->charset);
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -935,13 +935,15 @@ 
      * @throws MessageHeaderFetchingException
      */
     protected function fetchNewMail($folder, $next_uid, $event, $expunge){
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+        	$this->client->expunge();
+        }
 
         $this->client->openFolder($folder->path);
 
         if ($this->sequence === IMAP::ST_UID) {
             $sequence_id = $next_uid;
-        }else{
+        } else{
             $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
         }
 
@@ -964,7 +966,9 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->setFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+        	$this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -984,7 +988,9 @@ 
      */
     public function restore($expunge = true) {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+        	$this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -1412,7 +1418,7 @@ 
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        } else{
             $this->setMsgn($uid, $msglist);
         }
     }

htdocs/includes/php-iban/php-iban.php

Braces +50 added lines, -66 removed lines

@@ -32,8 +32,7 @@ 
   if(!iban_verify_checksum($iban)) { 
    return false;
   }
- }
- else {
+ } else {
   return false;
  }
 
@@ -489,8 +488,7 @@ 
  for($i=0;$i<strlen($incorrect_iban);$i++) {
   if(!isset($char_freqs[substr($incorrect_iban,$i,1)])) {
    $char_freqs[substr($incorrect_iban,$i,1)] = 1;
-  }
-  else {
+  } else {
    $char_freqs[substr($incorrect_iban,$i,1)]++;
   }
  }
@@ -693,20 +691,27 @@ 
   $w1 = $wi[($i_size1 - $i) % 10];
   $sigma += ($i1 * $w1) % 11; 
  }
- if($bModify) return str_replace('?', $hash_map[($sigma % 11)], $vString);
- else return $hash_map[($sigma % 11)];
-}
+ if($bModify) {
+ 	return str_replace('?', $hash_map[($sigma % 11)], $vString);
+ } else {
+ 	return $hash_map[($sigma % 11)];
+ }
+ }
 
 # ISO7064 MOD97-10 (Bosnia, etc.)
 # (Credit: Adapted from https://github.com/stvkoch/ISO7064-Mod-97-10/blob/master/ISO7064Mod97_10.php)
 function _iso7064_mod97_10($str) {
  $ai=1;
  $ch = ord($str[strlen($str)-1]) - 48;
- if($ch < 0 || $ch > 9) return false;
+ if($ch < 0 || $ch > 9) {
+ 	return false;
+ }
  $check=$ch;
  for($i=strlen($str)-2;$i>=0;$i--) {
   $ch = ord($str[$i]) - 48;
-  if ($ch < 0 || $ch > 9) return false;
+  if ($ch < 0 || $ch > 9) {
+  	return false;
+  }
   $ai=($ai*10)%97;
   $check+= ($ai * ((int)$ch));
  }
@@ -723,11 +728,9 @@ 
  $expected_nationalchecksum = $bban_less_checksum % 97;
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return ($nationalchecksum == $expected_nationalchecksum);
  }
 }
@@ -735,15 +738,21 @@ 
 # MOD11 helper function for the Spanish (ES) IBAN national checksum implementation
 #  (Credit: @dem3trio, code lifted from Spanish Wikipedia at https://es.wikipedia.org/wiki/C%C3%B3digo_cuenta_cliente)
 function _iban_nationalchecksum_implementation_es_mod11_helper($numero) {
- if(strlen($numero)!=10) return "?";
+ if(strlen($numero)!=10) {
+ 	return "?";
+ }
  $cifras = Array(1,2,4,8,5,10,9,7,3,6);
  $chequeo=0;
  for($i=0; $i<10; $i++) {
   $chequeo += substr($numero,$i,1) * $cifras[$i];
  }
  $chequeo = 11 - ($chequeo % 11);
- if ($chequeo == 11) $chequeo = 0;
- if ($chequeo == 10) $chequeo = 1;
+ if ($chequeo == 11) {
+ 	$chequeo = 0;
+ }
+ if ($chequeo == 10) {
+ 	$chequeo = 1;
+ }
  return $chequeo;
 }
 
@@ -762,11 +771,9 @@ 
  $expected_nationalchecksum .= _iban_nationalchecksum_implementation_es_mod11_helper($account_less_checksum);
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return ($nationalchecksum == $expected_nationalchecksum);
  }
 }
@@ -783,13 +790,11 @@ 
  for ($i=0; $i < strlen($bban); $i++) {
   if(is_numeric($bban[$i])) {
    $allNumbers .= $bban[$i];
-  }
-  else {
+  } else {
    $letter = strtoupper($bban[$i]);
    if(array_key_exists($letter, $conversion)) {
     $allNumbers .= $conversion[$letter];
-   }
-   else {
+   } else {
     return null;
    }
   }
@@ -874,11 +879,9 @@ 
  # return
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
  }
 }
@@ -909,15 +912,12 @@ 
  #  mod10 (ie. rounding at 10, such that 10 = 0, 11 = 1, etc.)
  $calculated_checksum = ($nationalchecksum + $remainder)%10;
  if($mode == 'find') {
-  if($remainder == 0) { return $nationalchecksum; }
-  else {
+  if($remainder == 0) { return $nationalchecksum; } else {
    return $calculated_checksum;
   }
- }
- elseif($mode == 'set') {
+ } elseif($mode == 'set') {
   return _iban_nationalchecksum_set($iban,$calculated_checksum);
- }
- elseif($mode == 'verify') {
+ } elseif($mode == 'verify') {
   if($remainder == 0) { return true; }
   return false;
  }
@@ -958,11 +958,9 @@ 
  # return
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
  }
 }
@@ -981,11 +979,9 @@ 
  # return
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
  }
 }
@@ -1005,11 +1001,9 @@ 
  # return
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
  }
 }
@@ -1068,14 +1062,12 @@ 
  $remainder = $checksum % 11;
  if($mode=='verify') {
   return ($remainder==0); # we return the result of mod11, if 0 it's good
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   if($remainder==0) {
    return $iban; # we return as expected if the checksum is ok
   }
   return ''; # we return unimplemented if the checksum is bad
- }
- elseif($mode=='find') {
+ } elseif($mode=='find') {
   return ''; # does not make sense for this 0-digit checksum
  }
 }
@@ -1090,11 +1082,9 @@ 
  $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return ($nationalchecksum == $expected_nationalchecksum);
  }
 }
@@ -1154,11 +1144,9 @@ 
  $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return ($nationalchecksum == $expected_nationalchecksum);
  }
 }
@@ -1173,11 +1161,9 @@ 
  $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return ($nationalchecksum == $expected_nationalchecksum);
  }
 }
@@ -1260,11 +1246,9 @@ 
  $expected_nationalchecksum = _italian($bban_less_checksum);
  if($mode=='find') {
   return $expected_nationalchecksum;
- }
- elseif($mode=='set') {
+ } elseif($mode=='set') {
   return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
- }
- elseif($mode=='verify') {
+ } elseif($mode=='verify') {
   return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
  }
 }

htdocs/includes/mobiledetect/mobiledetectlib/export/exportToJSON.php

Braces +1 added lines, -2 removed lines

@@ -61,7 +61,6 @@
 	function_exists('json_format') ? json_format($json) : json_encode($json)
 )) {
 	echo 'Done. Check '.realpath($fileName).' file.';
-}
-else {
+} else {
 	echo 'Failed to write '.realpath($fileName).' to disk.';
 }

htdocs/includes/tcpdi/tcpdi_parser.php

Braces +49 added lines, -27 removed lines

@@ -48,35 +48,51 @@ 
  */
 
 // include class for decoding filters
-if (defined('TCPDF_PATH')) require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
-else require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+if (defined('TCPDF_PATH')) {
+	require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
+} else {
+	require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+}
 
-if (!defined ('PDF_TYPE_NULL'))
+if (!defined ('PDF_TYPE_NULL')) {
     define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
+}
+if (!defined ('PDF_TYPE_NUMERIC')) {
     define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
+}
+if (!defined ('PDF_TYPE_TOKEN')) {
     define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
+}
+if (!defined ('PDF_TYPE_HEX')) {
     define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
+}
+if (!defined ('PDF_TYPE_STRING')) {
     define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
+}
+if (!defined ('PDF_TYPE_DICTIONARY')) {
     define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
+}
+if (!defined ('PDF_TYPE_ARRAY')) {
     define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
+}
+if (!defined ('PDF_TYPE_OBJDEC')) {
     define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
+}
+if (!defined ('PDF_TYPE_OBJREF')) {
     define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
+}
+if (!defined ('PDF_TYPE_OBJECT')) {
     define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
+}
+if (!defined ('PDF_TYPE_STREAM')) {
     define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
+}
+if (!defined ('PDF_TYPE_BOOLEAN')) {
     define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
+}
+if (!defined ('PDF_TYPE_REAL')) {
     define ('PDF_TYPE_REAL', 12);
+}
 
 /**
  * @class tcpdi_parser
@@ -245,8 +261,9 @@ 
      */
     public function getPDFVersion() {
         preg_match('/\d\.\d/', substr($this->pdfdata, 0, 16), $m);
-        if (isset($m[0]))
-            $this->pdfVersion = $m[0];
+        if (isset($m[0])) {
+                    $this->pdfVersion = $m[0];
+        }
         return $this->pdfVersion;
     }
 
@@ -1186,16 +1203,18 @@ 
     	// parent object.
         if (isset ($obj[1][1]['/Resources'])) {
     		$res = $obj[1][1]['/Resources'];
-    		if ($res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+    		if ($res[0] == PDF_TYPE_OBJECT) {
+    		                return $res[1];
+    		}
             return $res;
     	} else {
     		if (!isset ($obj[1][1]['/Parent'])) {
     			return false;
     		} else {
                 $res = $this->_getPageResources($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if ($res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
     		}
     	}
@@ -1295,8 +1314,9 @@ 
     public function getPageBox($page, $box_index, $k) {
         $page = $this->getObjectVal($page);
         $box = null;
-        if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
+        if (isset($page[1][1][$box_index])) {
+                    $box =& $page[1][1][$box_index];
+        }
 
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
             $tmp_box = $this->getObjectVal($box);
@@ -1364,16 +1384,18 @@ 
     	$obj = $this->getObjectVal($obj);
     	if (isset ($obj[1][1]['/Rotate'])) {
     		$res = $this->getObjectVal($obj[1][1]['/Rotate']);
-    		if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+    		if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+    		                return $res[1];
+    		}
             return $res;
     	} else {
     		if (!isset ($obj[1][1]['/Parent'])) {
     			return false;
     		} else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
     		}
     	}

htdocs/includes/tcpdi/fpdf_tpl.php

Braces +60 added lines, -40 removed lines

@@ -79,17 +79,22 @@ 
             return;
         }
         
-        if ($this->page <= 0)
-            $this->error("You have to add a page to fpdf first!");
+        if ($this->page <= 0) {
+                    $this->error("You have to add a page to fpdf first!");
+        }
 
-        if ($x == null)
-            $x = 0;
-        if ($y == null)
-            $y = 0;
-        if ($w == null)
-            $w = $this->w;
-        if ($h == null)
-            $h = $this->h;
+        if ($x == null) {
+                    $x = 0;
+        }
+        if ($y == null) {
+                    $y = 0;
+        }
+        if ($w == null) {
+                    $w = $this->w;
+        }
+        if ($h == null) {
+                    $h = $this->h;
+        }
 
         // Save settings
         $this->tpl++;
@@ -165,8 +170,9 @@ 
             $this->FontSize = $tpl['o_FontSize'];
             
             $fontkey = $this->FontFamily . $this->FontStyle;
-            if ($fontkey)
-                $this->CurrentFont =& $this->fonts[$fontkey];
+            if ($fontkey) {
+                            $this->CurrentFont =& $this->fonts[$fontkey];
+            }
             
             return $this->tpl;
         } else {
@@ -192,11 +198,13 @@ 
      * @retrun array The height and width of the template
      */
     function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
-        if ($this->page <= 0)
-            $this->error('You have to add a page first!');
+        if ($this->page <= 0) {
+                    $this->error('You have to add a page first!');
+        }
         
-        if (!isset($this->tpls[$tplidx]))
-            $this->error('Template does not exist!');
+        if (!isset($this->tpls[$tplidx])) {
+                    $this->error('Template does not exist!');
+        }
             
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
@@ -206,10 +214,12 @@ 
         $w = $tpl['w'];
         $h = $tpl['h'];
         
-        if ($_x == null)
-            $_x = 0;
-        if ($_y == null)
-            $_y = 0;
+        if ($_x == null) {
+                    $_x = 0;
+        }
+        if ($_y == null) {
+                    $_y = 0;
+        }
             
         $_x += $tpl['x'];
         $_y += $tpl['y'];
@@ -249,8 +259,9 @@ 
      * @return array The height and width of the template
      */
     function getTemplateSize($tplidx, $_w = 0, $_h = 0) {
-        if (!isset($this->tpls[$tplidx]))
-            return false;
+        if (!isset($this->tpls[$tplidx])) {
+                    return false;
+        }
 
         $tpl =& $this->tpls[$tplidx];
         $w = $tpl['w'];
@@ -261,10 +272,12 @@ 
             $_h = $h;
         }
 
-        if($_w == 0)
-            $_w = $_h * $w / $h;
-        if($_h == 0)
-            $_h = $_w * $h / $w;
+        if($_w == 0) {
+                    $_w = $_h * $w / $h;
+        }
+        if($_h == 0) {
+                    $_h = $_w * $h / $w;
+        }
             
         return array("w" => $_w, "h" => $_h);
     }
@@ -323,8 +336,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding pages in templates isn\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding pages in templates isn\'t possible!');
+        }
             
         parent::AddPage($orientation, $format);
     }
@@ -338,8 +352,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::Link'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Using links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Using links in templates aren\'t possible!');
+        }
             
         parent::Link($x, $y, $w, $h, $link);
     }
@@ -350,8 +365,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding links in templates aren\'t possible!');
+        }
         return parent::AddLink();
     }
     
@@ -361,8 +377,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Setting links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Setting links in templates aren\'t possible!');
+        }
         parent::SetLink($link, $y, $page);
     }
     
@@ -402,8 +419,9 @@ 
             $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 $this->_out('/Font <<');
-                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) {
+                                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                }
                 $this->_out('>>');
             }
             if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
@@ -411,12 +429,14 @@ 
             {
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                          $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['images'] as $image) {
+                                              $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    }
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) {
+                                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    }
                 }
                 $this->_out('>>');
             }