Dolibarr / dolibarr

htdocs/includes/geoPHP/lib/adapters/WKB.class.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 		}
 
 		if (empty($wkb)) {
-			throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));
+			throw new Exception('Cannot read empty WKB geometry. Found '.gettype($wkb));
 		}
 
 		$mem = fopen('php://memory', 'r+');
@@ -88,7 +88,7 @@ 
 
 	function getPoint(&$mem)
 	{
-		$point_coords = unpack("d*", fread($mem, $this->dimension*8));
+		$point_coords = unpack("d*", fread($mem, $this->dimension * 8));
 		if (!empty($point_coords)) {
 			return new Point($point_coords[1], $point_coords[2]);
 		} else {
@@ -105,14 +105,14 @@ 
 		if (!$line_length[1]) return new LineString();
 
 		// Read the nubmer of points x2 (each point is two coords) into decimal-floats
-		$line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));
+		$line_coords = unpack('d*', fread($mem, $line_length[1] * $this->dimension * 8));
 
 		// We have our coords, build up the linestring
 		$components = array();
 		$i = 1;
 		$num_coords = count($line_coords);
 		while ($i <= $num_coords) {
-			$components[] = new Point($line_coords[$i], $line_coords[$i+1]);
+			$components[] = new Point($line_coords[$i], $line_coords[$i + 1]);
 			$i += 2;
 		}
 		return new LineString($components);

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 		$line_length = unpack('L', fread($mem, 4));
 
 		// Return an empty linestring if there is no line-length
-		if (!$line_length[1]) return new LineString();
+		if (!$line_length[1]) {
+			return new LineString();
+		}
 
 		// Read the nubmer of points x2 (each point is two coords) into decimal-floats
 		$line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));

htdocs/includes/geoPHP/lib/adapters/GoogleGeocode.class.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 		}
 
 		$url = "http://maps.googleapis.com/maps/api/geocode/json";
-		$url .= '?address='. urlencode($address);
+		$url .= '?address='.urlencode($address);
 		$url .= $bounds_string;
 		$url .= '&sensor=false';
 		$this->result = json_decode(@file_get_contents($url));
@@ -129,7 +129,7 @@ 
 
 	private function getPolygon($delta = 0)
 	{
-		$points = array (
+		$points = array(
 		$this->getTopLeft($delta),
 		$this->getTopRight($delta),
 		$this->getBottomRight($delta),

Braces +13 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 	 */
 	public function read($address, $return_type = 'point', $bounds = false, $return_multiple = false)
 	{
-		if (is_array($address)) $address = join(',', $address);
+		if (is_array($address)) {
+			$address = join(',', $address);
+		}
 
 		if (gettype($bounds) == 'object') {
 			$bounds = $bounds->getBBox();
@@ -74,8 +76,11 @@ 
 				}
 			}
 		} else {
-			if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-			else throw new Exception('Unknown error in Google Geocoder');
+			if ($this->result->status) {
+				throw new Exception('Error in Google Geocoder: '.$this->result->status);
+			} else {
+				throw new Exception('Unknown error in Google Geocoder');
+			}
 			return false;
 		}
 	}
@@ -114,8 +119,11 @@ 
 				return $this->result->results;
 			}
 		} else {
-			if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
-			else throw new Exception('Unknown error in Google Reverse Geocoder');
+			if ($this->result->status) {
+				throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
+			} else {
+				throw new Exception('Unknown error in Google Reverse Geocoder');
+			}
 			return false;
 		}
 	}

htdocs/includes/geoPHP/lib/adapters/KML.class.php

Spacing +10 added lines, -10 removed lines

@@ -61,14 +61,14 @@ 
 		$xmlobj = new DOMDocument();
 		@$xmlobj->loadXML($text);
 		if ($xmlobj === false) {
-			throw new Exception("Invalid KML: ". $text);
+			throw new Exception("Invalid KML: ".$text);
 		}
 
 		$this->xmlobj = $xmlobj;
 		try {
 			$geom = $this->geomFromXML();
 		} catch (InvalidText $e) {
-			throw new Exception("Cannot Read Geometry From KML: ". $text);
+			throw new Exception("Cannot Read Geometry From KML: ".$text);
 		} catch (Exception $e) {
 			throw $e;
 		}
@@ -237,21 +237,21 @@ 
 			$type = $geom->getGeomType();
 		}
 
-		$str = '<'.$this->nss . $type .'>';
+		$str = '<'.$this->nss.$type.'>';
 
 		if (!$geom->isEmpty()) {
 			$str .= '<'.$this->nss.'coordinates>';
-			$i=0;
+			$i = 0;
 			foreach ($geom->getComponents() as $comp) {
 				if ($i != 0) $str .= ' ';
-				$str .= $comp->getX() .','. $comp->getY();
+				$str .= $comp->getX().','.$comp->getY();
 				$i++;
 			}
 
 			$str .= '</'.$this->nss.'coordinates>';
 		}
 
-		$str .= '</'. $this->nss . $type .'>';
+		$str .= '</'.$this->nss.$type.'>';
 
 		return $str;
 	}
@@ -261,13 +261,13 @@ 
 		$components = $geom->getComponents();
 		$str = '';
 		if (!empty($components)) {
-			$str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';
+			$str = '<'.$this->nss.'outerBoundaryIs>'.$this->linestringToKML($components[0], 'LinearRing').'</'.$this->nss.'outerBoundaryIs>';
 			foreach (array_slice($components, 1) as $comp) {
-				$str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';
+				$str .= '<'.$this->nss.'innerBoundaryIs>'.$this->linestringToKML($comp).'</'.$this->nss.'innerBoundaryIs>';
 			}
 		}
 
-		return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';
+		return '<'.$this->nss.'Polygon>'.$str.'</'.$this->nss.'Polygon>';
 	}
 
 	public function collectionToKML($geom)
@@ -279,6 +279,6 @@ 
 			$str .= $sub_adapter->write($comp);
 		}
 
-		return $str .'</'.$this->nss.'MultiGeometry>';
+		return $str.'</'.$this->nss.'MultiGeometry>';
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -243,7 +243,9 @@
 			$str .= '<'.$this->nss.'coordinates>';
 			$i=0;
 			foreach ($geom->getComponents() as $comp) {
-				if ($i != 0) $str .= ' ';
+				if ($i != 0) {
+					$str .= ' ';
+				}
 				$str .= $comp->getX() .','. $comp->getY();
 				$i++;
 			}

htdocs/includes/geoPHP/lib/adapters/GeoRSS.class.php

Spacing +4 added lines, -4 removed lines

@@ -53,14 +53,14 @@ 
 		$xmlobj = new DOMDocument();
 		@$xmlobj->loadXML($text);
 		if ($xmlobj === false) {
-			throw new Exception("Invalid GeoRSS: ". $text);
+			throw new Exception("Invalid GeoRSS: ".$text);
 		}
 
 		$this->xmlobj = $xmlobj;
 		try {
 			$geom = $this->geomFromXML();
 		} catch (InvalidText $e) {
-			throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);
+			throw new Exception("Cannot Read Geometry From GeoRSS: ".$text);
 		} catch (Exception $e) {
 			throw $e;
 		}
@@ -222,7 +222,7 @@ 
 		$output = '<'.$this->nss.'line>';
 		foreach ($geom->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($geom->numGeometries() -1)) $output .= ' ';
+			if ($k < ($geom->numGeometries() - 1)) $output .= ' ';
 		}
 		$output .= '</'.$this->nss.'line>';
 		return $output;
@@ -234,7 +234,7 @@ 
 		$exterior_ring = $geom->exteriorRing();
 		foreach ($exterior_ring->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
+			if ($k < ($exterior_ring->numGeometries() - 1)) $output .= ' ';
 		}
 		$output .= '</'.$this->nss.'polygon>';
 		return $output;

Braces +6 added lines, -2 removed lines

@@ -222,7 +222,9 @@ 
 		$output = '<'.$this->nss.'line>';
 		foreach ($geom->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($geom->numGeometries() -1)) $output .= ' ';
+			if ($k < ($geom->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'line>';
 		return $output;
@@ -234,7 +236,9 @@ 
 		$exterior_ring = $geom->exteriorRing();
 		foreach ($exterior_ring->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
+			if ($k < ($exterior_ring->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'polygon>';
 		return $output;

htdocs/includes/geoPHP/lib/adapters/GeoJSON.class.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		if ($type == 'GeometryCollection') {
 			return $this->objToGeometryCollection($obj);
 		}
-		$method = 'arrayTo' . $type;
+		$method = 'arrayTo'.$type;
 		return $this->$method($obj->coordinates);
 	}
 

Braces +3 added lines, -1 removed lines

@@ -153,9 +153,11 @@
 			'type'=> 'GeometryCollection',
 			'geometries'=> $component_array,
 			);
-		} else return array(
+		} else {
+			return array(
 		'type'=> $geometry->getGeomType(),
 		'coordinates'=> $geometry->asArray(),
 		);
+		}
 	}
 }

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

Spacing +46 added lines, -46 removed lines

@@ -17,24 +17,24 @@ 
 	/**
 	 * array of neighbouring hash character maps.
 	 */
-	private $neighbours = array (
+	private $neighbours = array(
 	  // north
-	  'top' => array (
+	  'top' => array(
 		  'even' => 'p0r21436x8zb9dcf5h7kjnmqesgutwvy',
 		  'odd' => 'bc01fg45238967deuvhjyznpkmstqrwx'
 	  ),
 	  // east
-	  'right' => array (
+	  'right' => array(
 		  'even' => 'bc01fg45238967deuvhjyznpkmstqrwx',
 		  'odd' => 'p0r21436x8zb9dcf5h7kjnmqesgutwvy'
 	  ),
 	  // west
-	  'left' => array (
+	  'left' => array(
 		  'even' => '238967debc01fg45kmstqrwxuvhjyznp',
 		  'odd' => '14365h7k9dcfesgujnmqp0r2twvyx8zb'
 	  ),
 	  // south
-	  'bottom' => array (
+	  'bottom' => array(
 		  'even' => '14365h7k9dcfesgujnmqp0r2twvyx8zb',
 		  'odd' => '238967debc01fg45kmstqrwxuvhjyznp'
 	  )
@@ -43,24 +43,24 @@ 
 	/**
 	 * array of bordering hash character maps.
 	 */
-	private $borders = array (
+	private $borders = array(
 	  // north
-	  'top' => array (
+	  'top' => array(
 		  'even' => 'prxz',
 		  'odd' => 'bcfguvyz'
 	  ),
 	  // east
-	  'right' => array (
+	  'right' => array(
 		  'even' => 'bcfguvyz',
 		  'odd' => 'prxz'
 	  ),
 	  // west
-	  'left' => array (
+	  'left' => array(
 		  'even' => '0145hjnp',
 		  'odd' => '028b'
 	  ),
 	  // south
-	  'bottom' => array (
+	  'bottom' => array(
 		  'even' => '028b',
 		  'odd' => '0145hjnp'
 	  )
@@ -134,27 +134,27 @@ 
 	private function encodePoint($point, $precision = null)
 	{
 		if ($precision === null) {
-			$lap = strlen($point->y())-strpos($point->y(), ".");
-			$lop = strlen($point->x())-strpos($point->x(), ".");
-			$precision = pow(10, -max($lap-1, $lop-1, 0))/2;
+			$lap = strlen($point->y()) - strpos($point->y(), ".");
+			$lop = strlen($point->x()) - strpos($point->x(), ".");
+			$precision = pow(10, -max($lap - 1, $lop - 1, 0)) / 2;
 		}
 
-		$minlat =  -90;
-		$maxlat =   90;
+		$minlat = -90;
+		$maxlat = 90;
 		$minlon = -180;
-		$maxlon =  180;
-		$latE   =   90;
-		$lonE   =  180;
+		$maxlon = 180;
+		$latE   = 90;
+		$lonE   = 180;
 		$i = 0;
 		$error = 180;
-		$hash='';
-		while ($error>=$precision) {
+		$hash = '';
+		while ($error >= $precision) {
 			$chr = 0;
-			for ($b=4;$b>=0;--$b) {
-				if ((1&$b) == (1&$i)) {
+			for ($b = 4; $b >= 0; --$b) {
+				if ((1 & $b) == (1 & $i)) {
 					// even char, even bit OR odd char, odd bit...a lon
-					$next = ($minlon+$maxlon)/2;
-					if ($point->x()>$next) {
+					$next = ($minlon + $maxlon) / 2;
+					if ($point->x() > $next) {
 						$chr |= pow(2, $b);
 						$minlon = $next;
 					} else {
@@ -163,8 +163,8 @@ 
 					$lonE /= 2;
 				} else {
 					// odd char, even bit OR even char, odd bit...a lat
-					$next = ($minlat+$maxlat)/2;
-					if ($point->y()>$next) {
+					$next = ($minlat + $maxlat) / 2;
+					if ($point->y() > $next) {
 						$chr |= pow(2, $b);
 						$minlat = $next;
 					} else {
@@ -188,28 +188,28 @@ 
 	private function decode($hash)
 	{
 		$ll = array();
-		$minlat =  -90;
-		$maxlat =   90;
+		$minlat = -90;
+		$maxlat = 90;
 		$minlon = -180;
-		$maxlon =  180;
-		$latE   =   90;
-		$lonE   =  180;
-		for ($i=0,$c=strlen($hash);$i<$c;$i++) {
+		$maxlon = 180;
+		$latE   = 90;
+		$lonE   = 180;
+		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 (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;
 				$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;
 			}
@@ -218,8 +218,8 @@ 
 		$ll['minlon'] = $minlon;
 		$ll['maxlat'] = $maxlat;
 		$ll['maxlon'] = $maxlon;
-		$ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-		$ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+		$ll['medlat'] = round(($minlat + $maxlat) / 2, max(1, -round(log10($latE))) - 1);
+		$ll['medlon'] = round(($minlon + $maxlon) / 2, max(1, -round(log10($lonE))) - 1);
 		return $ll;
 	}
 
@@ -243,7 +243,7 @@ 
 	public function adjacent($hash, $direction)
 	{
 		$last = substr($hash, -1);
-		$type = (strlen($hash) % 2)? 'odd': 'even';
+		$type = (strlen($hash) % 2) ? 'odd' : 'even';
 		$base = substr($hash, 0, strlen($hash) - 1);
 		if (strpos(($this->borders[$direction][$type]), $last) !== false) {
 			$base = $this->adjacent($base, $direction);

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

htdocs/includes/geoPHP/geoPHP.inc.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 
 	static function getAdapterMap()
 	{
-		return array (
+		return array(
 		'wkt' =>  'WKT',
 		'ewkt' => 'EWKT',
 		'wkb' =>  'WKB',
@@ -160,7 +160,7 @@ 
 
 		// If the geometry cannot even theoretically be reduced more, then pass it back
 		if (gettype($geometry) == 'object') {
-			$passbacks = array('Point','LineString','Polygon');
+			$passbacks = array('Point', 'LineString', 'Polygon');
 			if (in_array($geometry->geometryType(), $passbacks)) {
 				return $geometry;
 			}
@@ -169,7 +169,7 @@ 
 		// If it is a mutlti-geometry, check to see if it just has one member
 		// If it does, then pass the member, if not, then just pass back the geometry
 		if (gettype($geometry) == 'object') {
-			$simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');
+			$simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon');
 			if (in_array(get_class($geometry), $passbacks)) {
 				$components = $geometry->getComponents();
 				if (count($components) == 1) {
@@ -188,7 +188,7 @@ 
 		$geometries = array();
 		$geom_types = array();
 
-		$collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');
+		$collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection');
 
 		foreach ($geometry as $item) {
 			if ($item) {

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		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);

htdocs/ai/admin/setup.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 if (empty($action)) {
 	$action = 'edit';
@@ -70,7 +70,7 @@ 
 	//'gemini' => 'Gemini'
 );
 
-$item = $formSetup->newItem('AI_API_SERVICE');	// Name of constant must end with _KEY so it is encrypted when saved into database.
+$item = $formSetup->newItem('AI_API_SERVICE'); // Name of constant must end with _KEY so it is encrypted when saved into database.
 $item->setAsSelect($arrayofia);
 
 foreach ($arrayofia as $ia => $ialabel) {
@@ -79,7 +79,7 @@ 
 	$item->defaultFieldValue = '';
 	$item->cssClass = 'minwidth500';*/
 
-	$item = $formSetup->newItem('AI_API_'.strtoupper($ia).'_KEY');	// Name of constant must end with _KEY so it is encrypted when saved into database.
+	$item = $formSetup->newItem('AI_API_'.strtoupper($ia).'_KEY'); // Name of constant must end with _KEY so it is encrypted when saved into database.
 	$item->nameText = $langs->trans("AI_API_KEY").' ('.$ialabel.')';
 	$item->defaultFieldValue = '';
 	$item->cssClass = 'minwidth500';

htdocs/ai/ajax/generate_content.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 $ai = new Ai($db);
 
 // Get parameters
-$function = empty($jsonData['function']) ? 'textgeneration' : $jsonData['function'];	// Default value. Can also be 'textgenerationemail', 'textgenerationwebpage', ...
+$function = empty($jsonData['function']) ? 'textgeneration' : $jsonData['function']; // Default value. Can also be 'textgenerationemail', 'textgenerationwebpage', ...
 $instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
 $format = empty($jsonData['format']) ? '' : $jsonData['format'];
 
@@ -73,10 +73,10 @@ 
 	if (!empty($generatedContent['code']) && $generatedContent['code'] == 429) {
 		print "Quota or allowed period exceeded. Retry Later !";
 	} elseif ($generatedContent['code'] >= 400) {
-		print "Error : " . $generatedContent['message'];
+		print "Error : ".$generatedContent['message'];
 		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('ErrorGoToModuleSetup').'</a>';
 	} else {
-		print "Error returned by API call: " . $generatedContent['message'];
+		print "Error returned by API call: ".$generatedContent['message'];
 	}
 } else {
 	print $generatedContent;