Dolibarr / dolibarr

htdocs/ticket/document.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 	accessforbidden();
 }
 
-$permissiontoadd = $user->hasRight('ticket', 'write');	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $user->hasRight('ticket', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 
 
 /*
@@ -211,7 +211,7 @@ 
 	if ($resql) {
 		$file_msg_array = array();
 		$numrows = $db->num_rows($resql);
-		for ($i=0; $i < $numrows; $i++) {
+		for ($i = 0; $i < $numrows; $i++) {
 			$upload_msg_dir = $conf->agenda->dir_output.'/'.$db->fetch_row($resql)[0];
 			$file_msg = dol_dir_list($upload_msg_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 			if (count($file_msg)) {

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

Braces +92 added lines, -59 removed lines

@@ -52,9 +52,11 @@ 
 		 */
 		public static function addPath($path)
 		{
-			if (false === $path = stream_resolve_include_path($path))
-			return false;
-			else set_include_path($path.PATH_SEPARATOR.get_include_path());
+			if (false === $path = stream_resolve_include_path($path)) {
+						return false;
+			} else {
+				set_include_path($path.PATH_SEPARATOR.get_include_path());
+			}
 			return $path;
 		}
 
@@ -67,16 +69,19 @@ 
 		 */
 		public static function thereCanBeOnlyOne()
 		{
-			if (static::$perfectLoaders === spl_autoload_functions())
-			return static::$instance;
+			if (static::$perfectLoaders === spl_autoload_functions()) {
+						return static::$instance;
+			}
 
-			if (false !== $loaders = spl_autoload_functions())
-			if (0 < $count = count($loaders))
+			if (false !== $loaders = spl_autoload_functions()) {
+						if (0 < $count = count($loaders))
 				for ($i = 0, static::$rogueLoaders += $loaders;
+			}
 					 $i < $count && false != ($loader = $loaders[$i]);
-					 $i++)
-					if ($loader !== static::$perfectLoaders[0])
+					 $i++) {
+									if ($loader !== static::$perfectLoaders[0])
 						spl_autoload_unregister($loader);
+				}
 
 			return static::$instance;
 		}
@@ -105,12 +110,14 @@ 
 				return false;
 			}
 
-			if (empty(static::$classMap[$key]))
-			static::$classMap[$key] = $value;
+			if (empty(static::$classMap[$key])) {
+						static::$classMap[$key] = $value;
+			}
 
-			if (is_string($alias = static::$classMap[$key]))
-			if (isset(static::$classMap[$alias]))
+			if (is_string($alias = static::$classMap[$key])) {
+						if (isset(static::$classMap[$alias]))
 				return static::$classMap[$alias];
+			}
 
 			return static::$classMap[$key];
 		}
@@ -138,8 +145,8 @@ 
 					array($dir, 'vendor', 'composer'),
 					array($dir, '..', '..', '..', 'php'),
 					array($dir, 'vendor', 'php'))
-				as $includePath)
-				if (false !== $path = stream_resolve_include_path(
+				as $includePath) {
+								if (false !== $path = stream_resolve_include_path(
 						implode($slash, $includePath)
 					))
 				if ('composer' == end($includePath) &&
@@ -150,18 +157,22 @@ 
 					static::seen(static::loadFile(
 						$classmapPath
 					));
+				}
 					$paths = array_merge(
 						$paths,
 						array_values(static::loadFile(
 							"$path{$slash}autoload_namespaces.php"
 						))
 					);
-				} else $paths[] = $path;
+				} else {
+					$paths[] = $path;
+				}
 
 				$paths = array_filter(array_map(
 				function ($path) {
-					if (false == $realPath = @realpath($path))
-						return null;
+					if (false == $realPath = @realpath($path)) {
+											return null;
+					}
 					return $realPath . DIRECTORY_SEPARATOR;
 				},
 				$paths
@@ -200,9 +211,11 @@ 
 		private function loadPrefixes($className)
 		{
 			$currentClass = $className;
-			if (false !== $pos = strrpos($className, '\\'))
-			$className = substr($className, $pos);
-			else $className = "\\$className";
+			if (false !== $pos = strrpos($className, '\\')) {
+						$className = substr($className, $pos);
+			} else {
+				$className = "\\$className";
+			}
 
 			for (
 			$i = 0,
@@ -231,12 +244,13 @@ 
 		private function loadAliases($className)
 		{
 			$file = false;
-			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
-			for (
+			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) {
+						for (
 				$i = 0,
 				$aliases = isset(static::$aliases[$parts[1]])
 					? static::$aliases[$parts[1]] : array(),
 				$count = count($aliases);
+			}
 				$i < $count && false === $file;
 				$file = $this->discover(
 					"{$aliases[$i++]}$parts[2]",
@@ -263,13 +277,15 @@ 
 		{
 			$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
 			if (isset($loader)) {
-				if (false === array_search($loader, $loaders))
-				static::$rogueLoaders[] = $loader;
+				if (false === array_search($loader, $loaders)) {
+								static::$rogueLoaders[] = $loader;
+				}
 				return $this->loadThisLoader($className, $loader);
 			}
-			foreach ($loaders as $loader)
-				if (false !== $file = $this->loadThisLoader($className, $loader))
+			foreach ($loaders as $loader) {
+							if (false !== $file = $this->loadThisLoader($className, $loader))
 					return $file;
+			}
 
 			return false;
 		}
@@ -342,13 +358,18 @@ 
 		 */
 		private function alias($className, $currentClass)
 		{
-			if ($className == 'Luracast\Restler\string') return;
-			if ($className == 'Luracast\Restler\mixed') return;
+			if ($className == 'Luracast\Restler\string') {
+				return;
+			}
+			if ($className == 'Luracast\Restler\mixed') {
+				return;
+			}
 			if ($className != $currentClass
-			&& false !== strpos($className, $currentClass))
-				if (!class_exists($currentClass, false)
+			&& false !== strpos($className, $currentClass)) {
+							if (!class_exists($currentClass, false)
 					&& class_alias($className, $currentClass))
 						static::seen($currentClass, $className);
+			}
 		}
 
 		/**
@@ -366,11 +387,12 @@ 
 
 			/** The short version we've done this before and found it in cache */
 			if (false !== $file = static::seen($className)) {
-				if (!$this->exists($className))
-				if (is_callable($file))
+				if (!$this->exists($className)) {
+								if (is_callable($file))
 					$file = $this->loadLastResort($className, $file);
-				elseif ($file = stream_resolve_include_path($file))
-					$file = static::loadFile($file);
+				} elseif ($file = stream_resolve_include_path($file)) {
+									$file = static::loadFile($file);
+				}
 
 				$this->alias($className, $currentClass);
 				return $file;
@@ -380,15 +402,17 @@ 
 
 			/** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
 			$file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
-			if (false === $file = stream_resolve_include_path("$file.php"))
-			return false;
+			if (false === $file = stream_resolve_include_path("$file.php")) {
+						return false;
+			}
 
 			/** have we loaded this file before could this be an alias */
 			if (in_array($file, get_included_files())) {
-				if (false !== $sameFile = array_search($file, static::$classMap))
-				if (!$this->exists($className, $file))
+				if (false !== $sameFile = array_search($file, static::$classMap)) {
+								if (!$this->exists($className, $file))
 					if (false !== strpos($sameFile, $className))
 						$this->alias($sameFile, $className);
+				}
 
 				return $file;
 			}
@@ -396,17 +420,19 @@ 
 			$state = array_merge(get_declared_classes(), get_declared_interfaces());
 
 			if (false !== $result = static::loadFile($file)) {
-				if ($this->exists($className, $file))
-				$this->alias($className, $currentClass);
-				elseif (false != $diff = array_diff(
-				array_merge(get_declared_classes(), get_declared_interfaces()), $state))
-				foreach ($diff as $autoLoaded)
+				if ($this->exists($className, $file)) {
+								$this->alias($className, $currentClass);
+				} elseif (false != $diff = array_diff(
+				array_merge(get_declared_classes(), get_declared_interfaces()), $state)) {
+								foreach ($diff as $autoLoaded)
 					if ($this->exists($autoLoaded, $file))
 						if (false !== strpos($autoLoaded, $className))
 							$this->alias($autoLoaded, $className);
+				}
 
-				if (!$this->exists($currentClass))
-				$result = false;
+				if (!$this->exists($currentClass)) {
+								$result = false;
+				}
 			}
 
 			return $result;
@@ -424,10 +450,12 @@ 
 		private function exists($className, $mapping = null)
 		{
 			if (class_exists($className, false)
-			|| interface_exists($className, false))
-			if (isset($mapping))
+			|| interface_exists($className, false)) {
+						if (isset($mapping))
 				return static::seen($className, $mapping);
-			else return true;
+			} else {
+				return true;
+			}
 			return false;
 		}
 
@@ -440,22 +468,27 @@ 
 		 */
 		public function __invoke($className)
 		{
-			if (empty($className))
-			return false;
+			if (empty($className)) {
+						return false;
+			}
 
-			if (false !== $includeReference = $this->discover($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->discover($className)) {
+						return $includeReference;
+			}
 
 			//static::thereCanBeOnlyOne();
 
-			if (false !== $includeReference = $this->loadAliases($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadAliases($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadPrefixes($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadPrefixes($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadLastResort($className))
-				return $includeReference;
+			if (false !== $includeReference = $this->loadLastResort($className)) {
+							return $includeReference;
+			}
 
 			static::seen($className, true);
 			return null;

htdocs/includes/geoPHP/lib/geometry/Geometry.class.php

Spacing +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@ 
 	abstract public function geometryN($n);
 	abstract public function startPoint();
 	abstract public function endPoint();
-	abstract public function isRing();            // Mssing dependancy
-	abstract public function isClosed();          // Missing dependancy
+	abstract public function isRing(); // Mssing dependancy
+	abstract public function isClosed(); // Missing dependancy
 	abstract public function numPoints();
 	abstract public function pointN($n);
 	abstract public function exteriorRing();
@@ -67,7 +67,7 @@ 
 		}
 
 		$bbox = $this->getBBox();
-		$points = array (
+		$points = array(
 		new Point($bbox['maxx'], $bbox['miny']),
 		new Point($bbox['maxx'], $bbox['maxy']),
 		new Point($bbox['minx'], $bbox['maxy']),

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
 
 	public function envelope()
 	{
-		if ($this->isEmpty()) return new Polygon();
+		if ($this->isEmpty()) {
+			return new Polygon();
+		}
 
 		if ($this->geos()) {
 			return geoPHP::geosToGeometry($this->geos()->envelope());

htdocs/includes/geoPHP/lib/geometry/Collection.class.php

Spacing +4 added lines, -4 removed lines

@@ -52,8 +52,8 @@ 
 	* */
 	public function invertxy()
 	{
-		for ($i=0;$i<count($this->components);$i++) {
-			if ( method_exists($this->components[$i], 'invertxy') )
+		for ($i = 0; $i < count($this->components); $i++) {
+			if (method_exists($this->components[$i], 'invertxy'))
 			$this->components[$i]->invertxy();
 		}
 	}
@@ -172,8 +172,8 @@ 
 	public function geometryN($n)
 	{
 		$n = intval($n);
-		if (array_key_exists($n-1, $this->components)) {
-			return $this->components[$n-1];
+		if (array_key_exists($n - 1, $this->components)) {
+			return $this->components[$n - 1];
 		} else {
 			return null;
 		}

Braces +18 added lines, -7 removed lines

@@ -53,14 +53,17 @@ 
 	public function invertxy()
 	{
 		for ($i=0;$i<count($this->components);$i++) {
-			if ( method_exists($this->components[$i], 'invertxy') )
-			$this->components[$i]->invertxy();
+			if ( method_exists($this->components[$i], 'invertxy') ) {
+						$this->components[$i]->invertxy();
+			}
 		}
 	}
 
 	public function centroid()
 	{
-		if ($this->isEmpty()) return null;
+		if ($this->isEmpty()) {
+			return null;
+		}
 
 		if ($this->geos()) {
 			$geos_centroid = $this->geos()->centroid();
@@ -79,7 +82,9 @@ 
 
 	public function getBBox()
 	{
-		if ($this->isEmpty()) return null;
+		if ($this->isEmpty()) {
+			return null;
+		}
 
 		if ($this->geos()) {
 			$envelope = $this->geos()->envelope();
@@ -150,7 +155,9 @@ 
 	// By default, the boundary of a collection is the boundary of it's components
 	public function boundary()
 	{
-		if ($this->isEmpty()) return new LineString();
+		if ($this->isEmpty()) {
+			return new LineString();
+		}
 
 		if ($this->geos()) {
 			return $this->geos()->boundary();
@@ -224,7 +231,9 @@ 
 			return true;
 		} else {
 			foreach ($this->components as $component) {
-				if (!$component->isEmpty()) return false;
+				if (!$component->isEmpty()) {
+					return false;
+				}
 			}
 			return true;
 		}
@@ -295,7 +304,9 @@ 
 
 		// A collection is simple if all it's components are simple
 		foreach ($this->components as $component) {
-			if (!$component->isSimple()) return false;
+			if (!$component->isSimple()) {
+				return false;
+			}
 		}
 
 		return true;

htdocs/includes/geoPHP/lib/geometry/Point.class.php

Spacing +3 added lines, -3 removed lines

@@ -95,9 +95,9 @@
 	 * */
 	public function invertxy()
 	{
-		$x=$this->coords[0];
-		$this->coords[0]=$this->coords[1];
-		$this->coords[1]=$x;
+		$x = $this->coords[0];
+		$this->coords[0] = $this->coords[1];
+		$this->coords[1] = $x;
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -83,7 +83,9 @@
 	{
 		if ($this->dimension == 3) {
 			return $this->coords[2];
-		} else return null;
+		} else {
+			return null;
+		}
 	}
 
 	/**

htdocs/includes/geoPHP/lib/geometry/LineString.class.php

Spacing +12 added lines, -12 removed lines

@@ -80,7 +80,7 @@ 
 		foreach ($this->getPoints() as $delta => $point) {
 			$previous_point = $this->geometryN($delta);
 			if ($previous_point) {
-				$length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
+				$length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY() - $point->getY()), 2));
 			}
 		}
 		return $length;
@@ -90,10 +90,10 @@ 
 	{
 		$length = 0;
 		$points = $this->getPoints();
-		for ($i=0; $i<$this->numPoints()-1; $i++) {
+		for ($i = 0; $i < $this->numPoints() - 1; $i++) {
 			$point = $points[$i];
-			$next_point = $points[$i+1];
-			if (!is_object($next_point)) {continue;}
+			$next_point = $points[$i + 1];
+			if (!is_object($next_point)) {continue; }
 			// Great circle method
 			$lat1 = deg2rad($point->getY());
 			$lat2 = deg2rad($next_point->getY());
@@ -119,10 +119,10 @@ 
 	{
 		$degrees = 0;
 		$points = $this->getPoints();
-		for ($i=0; $i<$this->numPoints()-1; $i++) {
+		for ($i = 0; $i < $this->numPoints() - 1; $i++) {
 			$point = $points[$i];
-			$next_point = $points[$i+1];
-			if (!is_object($next_point)) {continue;}
+			$next_point = $points[$i + 1];
+			if (!is_object($next_point)) {continue; }
 			$degree = rad2deg(
 			acos(
 			  sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
@@ -142,8 +142,8 @@ 
 		$points = $this->getPoints();
 
 		foreach ($points as $i => $point) {
-			if (isset($points[$i+1])) {
-				$parts[] = new LineString(array($point, $points[$i+1]));
+			if (isset($points[$i + 1])) {
+				$parts[] = new LineString(array($point, $points[$i + 1]));
 			}
 		}
 		return $parts;
@@ -182,8 +182,8 @@ 
 		$p3_x = $segment->endPoint()->x();
 		$p3_y = $segment->endPoint()->y();
 
-		$s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
-		$s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
+		$s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y;
+		$s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y;
 
 		$fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
 		$fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
@@ -193,7 +193,7 @@ 
 		}
 
 		$s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
-		$t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
+		$t = ($s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
 
 		if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
 			// Collision detected

Braces +3 added lines, -1 removed lines

@@ -62,7 +62,9 @@
 
 	public function dimension()
 	{
-		if ($this->isEmpty()) return 0;
+		if ($this->isEmpty()) {
+			return 0;
+		}
 		return 1;
 	}
 

htdocs/includes/geoPHP/lib/geometry/Polygon.class.php

Spacing +6 added lines, -6 removed lines

@@ -76,8 +76,8 @@ 
 			$cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
 		}
 
-		$cn['x'] = $cn['x'] / ( 6 * $a);
-		$cn['y'] = $cn['y'] / ( 6 * $a);
+		$cn['x'] = $cn['x'] / (6 * $a);
+		$cn['y'] = $cn['y'] / (6 * $a);
 
 		$centroid = new Point($cn['x'], $cn['y']);
 		return $centroid;
@@ -115,12 +115,12 @@ 
 	public function numInteriorRings()
 	{
 		if ($this->isEmpty()) return 0;
-		return $this->numGeometries()-1;
+		return $this->numGeometries() - 1;
 	}
 
 	public function interiorRingN($n)
 	{
-		return $this->geometryN($n+1);
+		return $this->geometryN($n + 1);
 	}
 
 	public function dimension()
@@ -172,8 +172,8 @@ 
 		$intersections = 0;
 		$vertices_count = count($vertices);
 
-		for ($i=1; $i < $vertices_count; $i++) {
-			$vertex1 = $vertices[$i-1];
+		for ($i = 1; $i < $vertices_count; $i++) {
+			$vertex1 = $vertices[$i - 1];
 			$vertex2 = $vertices[$i];
 			if ($vertex1->y() == $vertex2->y()
 			&& $vertex1->y() == $point->y()

Braces +26 added lines, -9 removed lines

@@ -16,7 +16,9 @@ 
 
 	public function area($exterior_only = false, $signed = false)
 	{
-		if ($this->isEmpty()) return 0;
+		if ($this->isEmpty()) {
+			return 0;
+		}
 
 		if ($this->geos() && $exterior_only == false) {
 			return $this->geos()->area();
@@ -26,15 +28,20 @@ 
 		$pts = $exterior_ring->getComponents();
 
 		$c = count($pts);
-		if ((int) $c == '0') return null;
+		if ((int) $c == '0') {
+			return null;
+		}
 		$a = '0';
 		foreach ($pts as $k => $p) {
 			$j = ($k + 1) % $c;
 			$a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
 		}
 
-		if ($signed) $area = ($a / 2);
-		else $area = abs(($a / 2));
+		if ($signed) {
+			$area = ($a / 2);
+		} else {
+			$area = abs(($a / 2));
+		}
 
 		if ($exterior_only == true) {
 			return $area;
@@ -50,7 +57,9 @@ 
 
 	public function centroid()
 	{
-		if ($this->isEmpty()) return null;
+		if ($this->isEmpty()) {
+			return null;
+		}
 
 		if ($this->geos()) {
 			return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -60,7 +69,9 @@ 
 		$pts = $exterior_ring->getComponents();
 
 		$c = count($pts);
-		if ((int) $c == '0') return null;
+		if ((int) $c == '0') {
+			return null;
+		}
 		$cn = array('x' => '0', 'y' => '0');
 		$a = $this->area(true, true);
 
@@ -108,13 +119,17 @@ 
 
 	public function exteriorRing()
 	{
-		if ($this->isEmpty()) return new LineString();
+		if ($this->isEmpty()) {
+			return new LineString();
+		}
 		return $this->components[0];
 	}
 
 	public function numInteriorRings()
 	{
-		if ($this->isEmpty()) return 0;
+		if ($this->isEmpty()) {
+			return 0;
+		}
 		return $this->numGeometries()-1;
 	}
 
@@ -125,7 +140,9 @@ 
 
 	public function dimension()
 	{
-		if ($this->isEmpty()) return 0;
+		if ($this->isEmpty()) {
+			return 0;
+		}
 		return 2;
 	}
 

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

Spacing +6 added lines, -6 removed lines

@@ -94,8 +94,8 @@ 
 		$parts = explode('),(', $data_string);
 		$lines = array();
 		foreach ($parts as $part) {
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) $part = '('.$part;
+			if (!$this->endsWith($part, ')'))   $part = $part.')';
 			$lines[] = $this->parseLineString($part);
 		}
 		return new Polygon($lines);
@@ -127,8 +127,8 @@ 
 		$lines = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) $part = '('.$part;
+			if (!$this->endsWith($part, ')'))   $part = $part.')';
 			$lines[] = $this->parseLineString($part);
 		}
 		return new MultiLineString($lines);
@@ -145,8 +145,8 @@ 
 		$polys = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '((')) $part = '((' . $part;
-			if (!$this->endsWith($part, '))'))   $part = $part . '))';
+			if (!$this->beginsWith($part, '((')) $part = '(('.$part;
+			if (!$this->endsWith($part, '))'))   $part = $part.'))';
 			$polys[] = $this->parsePolygon($part);
 		}
 		return new MultiPolygon($polys);

Braces +55 added lines, -19 removed lines

@@ -63,7 +63,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty point
-		if ($data_string == 'EMPTY') return new Point();
+		if ($data_string == 'EMPTY') {
+			return new Point();
+		}
 
 		$parts = explode(' ', $data_string);
 		return new Point($parts[0], $parts[1]);
@@ -74,7 +76,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty line
-		if ($data_string == 'EMPTY') return new LineString();
+		if ($data_string == 'EMPTY') {
+			return new LineString();
+		}
 
 		$parts = explode(',', $data_string);
 		$points = array();
@@ -89,13 +93,19 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty polygon
-		if ($data_string == 'EMPTY') return new Polygon();
+		if ($data_string == 'EMPTY') {
+			return new Polygon();
+		}
 
 		$parts = explode('),(', $data_string);
 		$lines = array();
 		foreach ($parts as $part) {
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) {
+				$part = '(' . $part;
+			}
+			if (!$this->endsWith($part, ')')) {
+				$part = $part . ')';
+			}
 			$lines[] = $this->parseLineString($part);
 		}
 		return new Polygon($lines);
@@ -106,7 +116,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty MutiPoint
-		if ($data_string == 'EMPTY') return new MultiPoint();
+		if ($data_string == 'EMPTY') {
+			return new MultiPoint();
+		}
 
 		$parts = explode(',', $data_string);
 		$points = array();
@@ -121,14 +133,20 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty multi-linestring
-		if ($data_string == 'EMPTY') return new MultiLineString();
+		if ($data_string == 'EMPTY') {
+			return new MultiLineString();
+		}
 
 		$parts = explode('),(', $data_string);
 		$lines = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) {
+				$part = '(' . $part;
+			}
+			if (!$this->endsWith($part, ')')) {
+				$part = $part . ')';
+			}
 			$lines[] = $this->parseLineString($part);
 		}
 		return new MultiLineString($lines);
@@ -139,14 +157,20 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty multi-polygon
-		if ($data_string == 'EMPTY') return new MultiPolygon();
+		if ($data_string == 'EMPTY') {
+			return new MultiPolygon();
+		}
 
 		$parts = explode(')),((', $data_string);
 		$polys = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '((')) $part = '((' . $part;
-			if (!$this->endsWith($part, '))'))   $part = $part . '))';
+			if (!$this->beginsWith($part, '((')) {
+				$part = '((' . $part;
+			}
+			if (!$this->endsWith($part, '))')) {
+				$part = $part . '))';
+			}
 			$polys[] = $this->parsePolygon($part);
 		}
 		return new MultiPolygon($polys);
@@ -157,7 +181,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty geom-collection
-		if ($data_string == 'EMPTY') return new GeometryCollection();
+		if ($data_string == 'EMPTY') {
+			return new GeometryCollection();
+		}
 
 		$geometries = array();
 		$matches = array();
@@ -178,7 +204,9 @@ 
 			return substr($wkt, $first_paren);
 		} elseif (strstr($wkt, 'EMPTY')) {
 			return 'EMPTY';
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -191,19 +219,27 @@ 
 		// We want to only strip off one set of parenthesis
 		if ($this->beginsWith($str, '(')) {
 			return substr($str, 1, -1);
-		} else return $str;
+		} else {
+			return $str;
+		}
 	}
 
 	protected function beginsWith($str, $char)
 	{
-		if (substr($str, 0, strlen($char)) == $char) return true;
-		else return false;
+		if (substr($str, 0, strlen($char)) == $char) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	protected function endsWith($str, $char)
 	{
-		if (substr($str, (0 - strlen($char))) == $char) return true;
-		else return false;
+		if (substr($str, (0 - strlen($char))) == $char) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**

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

Spacing +3 added lines, -3 removed lines

@@ -54,14 +54,14 @@ 
 		$xmlobj = new DOMDocument();
 		@$xmlobj->loadXML($text);
 		if ($xmlobj === false) {
-			throw new Exception("Invalid GPX: ". $text);
+			throw new Exception("Invalid GPX: ".$text);
 		}
 
 		$this->xmlobj = $xmlobj;
 		try {
 			$geom = $this->geomFromXML();
 		} catch (InvalidText $e) {
-			throw new Exception("Cannot Read Geometry From GPX: ". $text);
+			throw new Exception("Cannot Read Geometry From GPX: ".$text);
 		} catch (Exception $e) {
 			throw $e;
 		}
@@ -119,7 +119,7 @@ 
 					$components[] = new Point($lon, $lat);
 				}
 			}
-			if ($components) {$lines[] = new LineString($components);}
+			if ($components) {$lines[] = new LineString($components); }
 		}
 		return $lines;
 	}

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 	 */
 	public function write(Geometry $geometry, $namespace = false)
 	{
-		if ($geometry->isEmpty()) return null;
+		if ($geometry->isEmpty()) {
+			return null;
+		}
 		if ($namespace) {
 			$this->namespace = $namespace;
 			$this->nss = $namespace.':';