alxarafe / alixar

public/htdocs/includes/geoPHP/lib/adapters/GeoHash.class.php

Braces +53 added lines, -11 removed lines

@@ -98,7 +98,9 @@ 
      */
     public function write(Geometry $geometry, $precision = null)
     {
-        if ($geometry->isEmpty()) return '';
+        if ($geometry->isEmpty()) {
+            return '';
+        }
 
         if ($geometry->geometryType() === 'Point') {
             return $this->encodePoint($geometry, $precision);
@@ -197,19 +199,59 @@ 
         for ($i = 0,$c = strlen($hash);$i < $c;$i++) {
             $v = strpos($this->table, $hash[$i]);
             if (1 & $i) {
-                if (16 & $v)$minlat = ($minlat + $maxlat) / 2; else $maxlat = ($minlat + $maxlat) / 2;
-                if (8 & $v) $minlon = ($minlon + $maxlon) / 2; else $maxlon = ($minlon + $maxlon) / 2;
-                if (4 & $v) $minlat = ($minlat + $maxlat) / 2; else $maxlat = ($minlat + $maxlat) / 2;
-                if (2 & $v) $minlon = ($minlon + $maxlon) / 2; else $maxlon = ($minlon + $maxlon) / 2;
-                if (1 & $v) $minlat = ($minlat + $maxlat) / 2; else $maxlat = ($minlat + $maxlat) / 2;
+                if (16 & $v) {
+                    $minlat = ($minlat + $maxlat) / 2;
+                } else {
+                    $maxlat = ($minlat + $maxlat) / 2;
+                }
+                if (8 & $v) {
+                    $minlon = ($minlon + $maxlon) / 2;
+                } else {
+                    $maxlon = ($minlon + $maxlon) / 2;
+                }
+                if (4 & $v) {
+                    $minlat = ($minlat + $maxlat) / 2;
+                } else {
+                    $maxlat = ($minlat + $maxlat) / 2;
+                }
+                if (2 & $v) {
+                    $minlon = ($minlon + $maxlon) / 2;
+                } else {
+                    $maxlon = ($minlon + $maxlon) / 2;
+                }
+                if (1 & $v) {
+                    $minlat = ($minlat + $maxlat) / 2;
+                } else {
+                    $maxlat = ($minlat + $maxlat) / 2;
+                }
                 $latE /= 8;
                 $lonE /= 4;
             } else {
-                if (16 & $v)$minlon = ($minlon + $maxlon) / 2; else $maxlon = ($minlon + $maxlon) / 2;
-                if (8 & $v) $minlat = ($minlat + $maxlat) / 2; else $maxlat = ($minlat + $maxlat) / 2;
-                if (4 & $v) $minlon = ($minlon + $maxlon) / 2; else $maxlon = ($minlon + $maxlon) / 2;
-                if (2 & $v) $minlat = ($minlat + $maxlat) / 2; else $maxlat = ($minlat + $maxlat) / 2;
-                if (1 & $v) $minlon = ($minlon + $maxlon) / 2; else $maxlon = ($minlon + $maxlon) / 2;
+                if (16 & $v) {
+                    $minlon = ($minlon + $maxlon) / 2;
+                } else {
+                    $maxlon = ($minlon + $maxlon) / 2;
+                }
+                if (8 & $v) {
+                    $minlat = ($minlat + $maxlat) / 2;
+                } else {
+                    $maxlat = ($minlat + $maxlat) / 2;
+                }
+                if (4 & $v) {
+                    $minlon = ($minlon + $maxlon) / 2;
+                } else {
+                    $maxlon = ($minlon + $maxlon) / 2;
+                }
+                if (2 & $v) {
+                    $minlat = ($minlat + $maxlat) / 2;
+                } else {
+                    $maxlat = ($minlat + $maxlat) / 2;
+                }
+                if (1 & $v) {
+                    $minlon = ($minlon + $maxlon) / 2;
+                } else {
+                    $maxlon = ($minlon + $maxlon) / 2;
+                }
                 $latE /= 4;
                 $lonE /= 8;
             }

public/htdocs/includes/geoPHP/geoPHP.inc.php

Braces +38 added lines, -13 removed lines

@@ -54,7 +54,9 @@ 
         if (!$type) {
             // If the user is trying to load a Geometry from a Geometry... Just pass it back
             if (is_object($data)) {
-                if ($data instanceof Geometry) return $data;
+                if ($data instanceof Geometry) {
+                    return $data;
+                }
             }
 
             $detected = geoPHP::detectFormat($data);
@@ -124,7 +126,9 @@ 
     static function geosInstalled($force = null)
     {
         static $geos_installed = null;
-        if ($force !== null) $geos_installed = $force;
+        if ($force !== null) {
+            $geos_installed = $force;
+        }
         if ($geos_installed !== null) {
             return $geos_installed;
         }
@@ -154,8 +158,12 @@ 
     {
         // If it's an array of one, then just parse the one
         if (is_array($geometry)) {
-            if (empty($geometry)) return false;
-            if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));
+            if (empty($geometry)) {
+                return false;
+            }
+            if (count($geometry) == 1) {
+                return geoPHP::geometryReduce(array_shift($geometry));
+            }
         }
 
         // If the geometry cannot even theoretically be reduced more, then pass it back
@@ -233,7 +241,9 @@ 
         $bytes = unpack("c*", fread($mem, 11));
 
         // If bytes is empty, then we were passed empty input
-        if (empty($bytes)) return false;
+        if (empty($bytes)) {
+            return false;
+        }
 
         // First char is a tab, space or carriage-return. trim it and try again
         if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {
@@ -244,8 +254,11 @@ 
         // Detect WKB or EWKB -- first byte is 1 (little endian indicator)
         if ($bytes[1] == 1) {
             // If SRID byte is TRUE (1), it's EWKB
-            if ($bytes[5]) return 'ewkb';
-            else return 'wkb';
+            if ($bytes[5]) {
+                return 'ewkb';
+            } else {
+                return 'wkb';
+            }
         }
 
         // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)
@@ -278,12 +291,24 @@ 
         if ($bytes[1] == 60) {
             // grab the first 256 characters
             $string = substr($input, 0, 256);
-            if (strpos($string, '<kml') !== false)        return 'kml';
-            if (strpos($string, '<coordinate') !== false) return 'kml';
-            if (strpos($string, '<gpx') !== false)        return 'gpx';
-            if (strpos($string, '<georss') !== false)     return 'georss';
-            if (strpos($string, '<rss') !== false)        return 'georss';
-            if (strpos($string, '<feed') !== false)       return 'georss';
+            if (strpos($string, '<kml') !== false) {
+                return 'kml';
+            }
+            if (strpos($string, '<coordinate') !== false) {
+                return 'kml';
+            }
+            if (strpos($string, '<gpx') !== false) {
+                return 'gpx';
+            }
+            if (strpos($string, '<georss') !== false) {
+                return 'georss';
+            }
+            if (strpos($string, '<rss') !== false) {
+                return 'georss';
+            }
+            if (strpos($string, '<feed') !== false) {
+                return 'georss';
+            }
         }
 
         // We need an 8 byte string for geohash and unpacked WKB / WKT

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

Braces +50 added lines, -66 removed lines

@@ -35,8 +35,7 @@ 
         if(!iban_verify_checksum($iban)) { 
          return false;
               }
- }
- else {
+ } else {
         return false;
  }
 
@@ -547,8 +546,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)]++;
               }
  }
@@ -766,9 +764,12 @@ 
         $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)
@@ -776,11 +777,15 @@ 
 {
  $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));
  }
@@ -799,11 +804,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);
  }
 }
@@ -812,15 +815,21 @@ 
 // (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;
 }
 
@@ -841,11 +850,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);
  }
 }
@@ -863,13 +870,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;
          }
               }
@@ -966,11 +971,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);
  }
 }
@@ -1004,15 +1007,12 @@ 
  $calculated_checksum = ($nationalchecksum + $remainder) % 10;
  if($mode == 'find') {
         if($remainder == 0) { return $nationalchecksum; 
-            }
-        else {
+            } 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;
@@ -1059,11 +1059,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);
  }
 }
@@ -1084,11 +1082,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);
  }
 }
@@ -1110,11 +1106,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);
  }
 }
@@ -1180,14 +1174,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
  }
 }
@@ -1204,11 +1196,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);
  }
 }
@@ -1273,11 +1263,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);
  }
 }
@@ -1294,11 +1282,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);
  }
 }
@@ -1388,11 +1374,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);
  }
 }

public/htdocs/includes/printipp/BasicIPP.php

Braces +44 added lines, -63 removed lines

@@ -184,7 +184,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
@@ -210,9 +212,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;
         }
@@ -279,7 +282,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' //
@@ -321,7 +326,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(
@@ -583,22 +583,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(
@@ -720,8 +717,7 @@ 
                     )
                 );
             }
-        }
-        else
+        } else
         {
             self::_putDebug(_("Printing DATA"));
             $this->output =
@@ -749,8 +745,7 @@ 
                     sprintf("printing job %s: ", $this->last_job)
                         . $this->serveroutput->status,
                     3);
-            }
-            else
+            } else
             {
                 self::_errorLog(
                     sprintf("printing job: ", $this->last_job)
@@ -787,10 +782,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;
@@ -798,8 +794,7 @@ 
         {
             $http->debug = 1;
             $http->html_debug = 0;
-        }
-        else
+        } else
         {
             $http->debug = 0;
             $http->html_debug = 0;
@@ -845,15 +840,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);
         }
@@ -873,8 +866,7 @@ 
                         {
                             self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
                     }
@@ -903,8 +895,7 @@ 
                                     . $headers[$header_name][$header_value];
                             $i++;
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $headers[$header_name]);
                         $this->serveroutput->headers[$i] =
@@ -1254,20 +1245,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";
         }
@@ -1473,8 +1460,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"),
@@ -1570,8 +1556,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $operationattributes .=
                             $values['systag']
@@ -1599,8 +1584,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $jobattributes .=
                             $values['systag']
@@ -1628,8 +1612,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $printerattributes .=
                             $values['systag']
@@ -1659,8 +1642,7 @@ 
             if ($this->with_exceptions)
             {
                 throw new ippException($errmsg);
-            }
-            else
+            } else
             {
                 trigger_error($errmsg, E_USER_ERROR);
             }
@@ -1824,8 +1806,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);

public/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);
@@ -229,8 +226,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"));
@@ -279,8 +275,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data), true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -342,8 +337,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(''));
@@ -358,8 +352,7 @@ 
             {
                 self::_errorLog(sprintf(_("Create job: 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(""));
@@ -408,8 +401,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);
@@ -646,8 +632,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"));
@@ -704,8 +689,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);
@@ -760,8 +744,7 @@ 
         if (in_array($until, $until_strings))
         {
             true;
-        }
-        else 
+        } else 
         {
             $until = 'indefinite';
         }
@@ -806,8 +789,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);
@@ -891,8 +873,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);
@@ -983,8 +964,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);
@@ -1103,8 +1083,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);
@@ -1250,8 +1229,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);
@@ -1307,8 +1285,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"));
@@ -1353,8 +1330,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data), true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -1429,8 +1405,7 @@ 
         if ($is_last == false)
         {
             $is_last = chr(0x00);
-        }
-        else
+        } else
         {
             $is_last = chr(0x01);
         }
@@ -1454,8 +1429,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"));
@@ -1555,8 +1529,7 @@ 
         if ($is_last == false)
         {
             $is_last = chr(0x00);
-        }
-        else
+        } else
         {
             $is_last = chr(0x01);
         }
@@ -1580,8 +1553,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"));

public/htdocs/includes/printipp/http_class.php

Braces +3 added lines, -2 removed lines

@@ -483,8 +483,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;

public/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
@@ -139,15 +138,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);
@@ -211,15 +208,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);
@@ -295,15 +290,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);
@@ -365,8 +358,7 @@ 
                                         . 'requested-attributes'
                                         . self::_giveMeStringLength($attributes[0])
                                         . $attributes[0];
-            }
-            else
+            } else
             {
                 $this->meta->attributes .= chr(0x44) // Keyword
                                         . chr(0x0) . chr(0x0) // zero-length name
@@ -403,14 +395,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);
@@ -536,8 +526,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;
     }
 

public/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(""));
@@ -169,8 +166,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);
             }
@@ -213,8 +209,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);
@@ -253,8 +248,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data), true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -335,8 +329,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);
             }
@@ -371,8 +364,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);
@@ -435,8 +427,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,
@@ -475,8 +466,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);
@@ -508,8 +498,7 @@ 
                                . 'limit'
                                . self::_giveMeStringLength($limit)
                                . $limit;
-        }
-        else
+        } else
         {
             $this->meta->limit = '';
         }
@@ -521,8 +510,7 @@ 
                                         . 'which-jobs'
                                         . self::_giveMeStringLength($which_jobs)
                                         . $which_jobs;
-        }
-        else
+        } else
         {
             $this->meta->which_jobs = "";
         }
@@ -534,8 +522,7 @@ 
                                  . 'my-jobs'
                                  . self::_giveMeStringLength(chr(0x01))
                                  . chr(0x01);
-        }
-        else
+        } else
         {
             $this->meta->my_jobs = '';
         }
@@ -574,8 +561,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
@@ -613,8 +599,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);
@@ -659,8 +644,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);
@@ -721,8 +705,7 @@ 
                          . ''
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
-        }
-        elseif($attributes_group)
+        } elseif($attributes_group)
         {
             switch($attributes_group)
             {
@@ -773,8 +756,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);
@@ -877,8 +859,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'];
@@ -932,8 +913,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'];
@@ -997,8 +977,7 @@ 
                     $this->collection_depth++;
                     $this->index--;
                     $this->collection_nbr[$this->collection_depth]++;
-                }
-                else
+                } else
                 {
                     $this->collection_depth++;
                     if ($this->collection_depth == 0)
@@ -1008,8 +987,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;
                     }
@@ -1043,8 +1021,7 @@ 
                 if (!$attribute_name)
                 {
                     $attribute_name = $this->attribute_name;
-                }
-                else
+                } else
                 {
                     $this->attribute_name = $attribute_name;
                 }
@@ -1157,24 +1134,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);
                 }
@@ -1228,8 +1200,7 @@ 
         {
             $attribute_name = $this->last_attribute_name;
             $this->collection_key[$this->collection_depth]++;
-        }
-        else
+        } else
         {
             $this->collection_key[$this->collection_depth] = 0;
         }
@@ -1388,8 +1359,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'];
@@ -1436,8 +1406,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'];
@@ -1483,8 +1452,7 @@ 
                 if ($value == 0x00)
                 {
                     $value = 'false';
-                }
-                else
+                } else
                 {
                     $value = 'true';
                 }
@@ -1755,19 +1723,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);
                 }

public/htdocs/product/class/api_products.class.php

Braces +15 added lines, -5 removed lines

@@ -467,13 +467,23 @@
                 if ($this->product->multiprices_base_type[$key] != $oldproduct->multiprices_base_type[$key]) {
                     $pricemodified = true;
                 } else {
-                    if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) $pricemodified = true;
+                    if ($this->product->multiprices_tva_tx[$key] != $oldproduct->multiprices_tva_tx[$key]) {
+                        $pricemodified = true;
+                    }
                     if ($this->product->multiprices_base_type[$key] == 'TTC') {
-                        if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) $pricemodified = true;
-                        if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) $pricemodified = true;
+                        if ($this->product->multiprices_ttc[$key] != $oldproduct->multiprices_ttc[$key]) {
+                            $pricemodified = true;
+                        }
+                        if ($this->product->multiprices_min_ttc[$key] != $oldproduct->multiprices_min_ttc[$key]) {
+                            $pricemodified = true;
+                        }
                     } else {
-                        if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) $pricemodified = true;
-                        if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) $pricemodified = true;
+                        if ($this->product->multiprices[$key] != $oldproduct->multiprices[$key]) {
+                            $pricemodified = true;
+                        }
+                        if ($this->product->multiprices_min[$key] != $oldproduct->multiprices[$key]) {
+                            $pricemodified = true;
+                        }
                     }
                 }
                 if ($pricemodified && $result > 0) {