phpmyadmin / shapefile

src/ShapeFile.lib.php

Braces +30 added lines, -10 removed lines

@@ -29,7 +29,9 @@ 
  *
  */
   function loadData($type, $data) {
-    if (!$data) return $data;
+    if (!$data) {
+       return $data;
+    }
     $tmp = unpack($type, $data);
     return current($tmp);
   }
@@ -104,7 +106,9 @@ 
     }
 
     function saveToFile($FileName = NULL) {
-      if ($FileName != NULL) $this->FileName = $FileName;
+      if ($FileName != NULL) {
+         $this->FileName = $FileName;
+      }
 
       if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
         $this->_saveHeaders();
@@ -562,10 +566,18 @@ 
         case 3:
         case 5:
           //Adds a new point to the selected part
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
+          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) {
+             $this->SHPData["xmin"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) {
+             $this->SHPData["ymin"] = $point["y"];
+          }
+          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) {
+             $this->SHPData["xmax"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) {
+             $this->SHPData["ymax"] = $point["y"];
+          }
 
           $this->SHPData["parts"][$partIndex]["points"][] = $point;
 
@@ -574,10 +586,18 @@ 
         break;
         case 8:
           //Adds a new point
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
+          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) {
+             $this->SHPData["xmin"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) {
+             $this->SHPData["ymin"] = $point["y"];
+          }
+          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) {
+             $this->SHPData["xmax"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) {
+             $this->SHPData["ymax"] = $point["y"];
+          }
 
           $this->SHPData["points"][] = $point;
           $this->SHPData["numpoints"]++;