phpMv / phpMv-UI

Ajax/common/html/BaseHtml.php

Spacing +55 added lines, -55 removed lines

@@ -16,10 +16,10 @@ 
 abstract class BaseHtml extends BaseWidget {
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $_events=array ();
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $properties=array();
+	protected $_events=array();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 
 	public function getBsComponent() {
@@ -32,7 +32,7 @@ 
 	}
 
 	protected function getTemplate(JsUtils $js=NULL) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
 	}
 
 	public function getProperties() {
@@ -56,13 +56,13 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		if (\is_array($value)) {
-			foreach ( $value as $v ) {
+			foreach ($value as $v) {
 				$this->addToProperty($name, $v, $separator);
 			}
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
 			$v=@$this->properties[$name];
-			if (isset($v) && $v !== "")
-				$v=$v . $separator . $value;
+			if (isset($v) && $v!=="")
+				$v=$v.$separator.$value;
 			else
 				$v=$value;
 
@@ -78,19 +78,19 @@ 
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$result=$this->getTemplate($js);
-		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
+		foreach ($this as $key => $value) {
+			if (JString::startswith($key, "_")===false && $key!=="events") {
 				if (is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
 				} else {
 					$v=$value;
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
+				$result=str_ireplace("%".$key."%", $v, $result);
 			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->identifier, $result, $view);
 			}
 		}
@@ -99,12 +99,12 @@ 
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -119,13 +119,13 @@ 
 	}
 
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
 			return $this->setProperty($name, $value);
 		return $this;
 	}
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $name=$value;
 		}
 		return $this;
@@ -134,7 +134,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -156,17 +156,17 @@ 
 	}
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (is_array($typeCtrl)) {
 				$this->removeOldValues($name, $typeCtrl);
 			}
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -184,7 +184,7 @@ 
 	}
 
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			return $this->addToProperty($name, $value);
 		}
 		return $this;
@@ -212,28 +212,28 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
+		foreach ($this as $key => $value) {
 			if (array_key_exists($key, $array) && !JString::startswith($key, "_")) {
-				$setter="set" . ucfirst($key);
+				$setter="set".ucfirst($key);
 				$this->$setter($array[$key]);
 				unset($array[$key]);
 			}
 		}
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			if (method_exists($this, $key)) {
 				try {
 					$this->$key($value);
 					unset($array[$key]);
-				} catch ( \Exception $e ) {
+				}catch (\Exception $e) {
 					// Nothing to do
 				}
 			} else {
-				$setter="set" . ucfirst($key);
+				$setter="set".ucfirst($key);
 				if (method_exists($this, $setter)) {
 					try {
 						$this->$setter($value);
 						unset($array[$key]);
-					} catch ( \Exception $e ) {
+					}catch (\Exception $e) {
 						// Nothing to do
 					}
 				}
@@ -244,7 +244,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -264,11 +264,11 @@ 
 	}
 
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		if ($stopPropagation === true) {
-			$jsCode="event.stopPropagation();" . $jsCode;
+		if ($stopPropagation===true) {
+			$jsCode="event.stopPropagation();".$jsCode;
 		}
-		if ($preventDefault === true) {
-			$jsCode="event.preventDefault();" . $jsCode;
+		if ($preventDefault===true) {
+			$jsCode="event.preventDefault();".$jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}
@@ -278,7 +278,7 @@ 
 			if (is_array($this->_events[$event])) {
 				$this->_events[$event][]=$jsCode;
 			} else {
-				$this->_events[$event]=array ($this->_events[$event],$jsCode );
+				$this->_events[$event]=array($this->_events[$event], $jsCode);
 			}
 		} else {
 			$this->_events[$event]=$jsCode;
@@ -300,15 +300,15 @@ 
 
 	public function addEventsOnRun(JsUtils $js) {
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
-							$code.="\n" . $jsC->compile($js);
+							$code.="\n".$jsC->compile($js);
 						} else {
-							$code.="\n" . $jsC;
+							$code.="\n".$jsC;
 						}
 					}
 				} elseif ($jsCode instanceof AjaxCall) {
@@ -316,12 +316,12 @@ 
 				}
 				$this->_bsComponent->addEvent($event, $code);
 			}
-			$this->_events=array ();
+			$this->_events=array();
 		}
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array ("url" => $url,"responseElement" => $responseElement );
+		$params=array("url" => $url, "responseElement" => $responseElement);
 		$params=array_merge($params, $parameters);
 		$this->_addEvent($event, new AjaxCall($operation, $params));
 		return $this;
@@ -357,33 +357,33 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->getIdentifier() === $identifier);
+					$flag=($elements[$index]->getIdentifier()===$identifier);
 				$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->getIdentifier() === $identifier)
+			if ($elements->getIdentifier()===$identifier)
 				return $elements;
 		}
 		return null;
 	}
 
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
-					$flag=($elements[$index]->propertyContains($propertyName, $value) === true);
+					$flag=($elements[$index]->propertyContains($propertyName, $value)===true);
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
-			if ($elements->propertyContains($propertyName, $value) === true)
+			if ($elements->propertyContains($propertyName, $value)===true)
 				return $elements;
 		}
 		return null;
@@ -405,14 +405,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this') === false && strrpos($value, 'event') === false) {
-			$value='"' . $value . '"';
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
+			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	public function jsDoJquery($jqueryCall, $param="") {
-		return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . $this->_prep_value($param) . ");";
+		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}
 
 	public function executeOnRun($jsCode) {

Ajax/common/html/HtmlDoubleElement.php

Spacing +6 added lines, -6 removed lines

@@ -27,15 +27,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -50,7 +50,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}

Ajax/service/JString.php

Spacing +6 added lines, -6 removed lines

@@ -2,21 +2,21 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 }
\ No newline at end of file

Ajax/service/JArray.php

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 		// return (array_keys($array)!==range(0, count($array)-1));
 	}
 
@@ -14,7 +14,7 @@ 
 			return $array[$key];
 		}
 		$values=array_values($array);
-		if ($pos < sizeof($values))
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
@@ -22,12 +22,12 @@ 
 		$result=NULL;
 		if (array_key_exists($key, $array)) {
 			$result=$array[$key];
-			if ($condition($result) === true)
+			if ($condition($result)===true)
 				return $result;
 		}
 		$values=array_values($array);
-		foreach ( $values as $val ) {
-			if ($condition($val) === true)
+		foreach ($values as $val) {
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
@@ -44,11 +44,11 @@ 
 		$result="";
 		if (\is_array($glue)) {
 			$size=\sizeof($pieces);
-			if ($size > 0) {
-				for($i=0; $i < $size - 1; $i++) {
-					$result.=$pieces[$i] . @$glue[$i];
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result.=$pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
 			$result=\implode($glue, $pieces);
@@ -58,7 +58,7 @@ 
 
 	public static function dimension($array) {
 		if (is_array(reset($array))) {
-			$return=self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
 			$return=1;
 		}
@@ -66,8 +66,8 @@ 
 	}
 
 	public static function sortAssociative($array, $sortedKeys=array()) {
-		$newArray=array ();
-		foreach ( $sortedKeys as $key ) {
+		$newArray=array();
+		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
 				$newArray[$key]=$array[$key];
 			}

Ajax/service/AjaxCall.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 		if ($stopPropagation===true) {
 			$result.="event.stopPropagation();\n";
 		}
-		switch($this->method) {
+		switch ($this->method) {
 			case "get":
 				$result.=$js->getDeferred($url, $responseElement, $params, $callback, $attr);
 				break;

Ajax/php/laravel/JsUtils.php

Spacing +11 added lines, -11 removed lines

@@ -4,24 +4,24 @@ 
 
 use Illuminate\Support\Facades\App;
 
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		return \url($url);
 	}
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->__get("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->__set("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->__set($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->__set($view_var, $output);
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
 		\ob_start();
 		App::make($controllerName)->{$actionName}($params);
 		$result=\ob_get_contents();
@@ -29,11 +29,11 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return \view()->make($viewName,$params)->render();
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return \view()->make($viewName, $params)->render();
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return $dispatcher->segments();
 	}
 }
\ No newline at end of file

Ajax/php/symfony/JsUtils.php

Spacing +17 added lines, -17 removed lines

@@ -6,27 +6,27 @@ 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Ajax\service\JString;
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		//$request = Request::createFromGlobals();
 		$router=$this->getInjected();
-		if(isset($router)===true){
+		if (isset($router)===true) {
 			try {
 			$url=$router->generate($url);
-			}catch (\Exception $e){
+			}catch (\Exception $e) {
 				return $router->getContext()->getBaseUrl();
 			}
 		}
 		return $url;
 	}
-	public function addViewElement($identifier,$content,&$view){
-		if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\array_key_exists("q", $view)===false) {
 			$view["q"]=array();
 		}
 		$view["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view[$view_var]=$output;
 	}
 
@@ -37,17 +37,17 @@ 
 	 * @param array $params
 	 * @see \Ajax\JsUtils::forward()
 	 */
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		$path=$params;
-		$request = $initialControllerInstance->get('request_stack')->getCurrentRequest();
-		$path['_forwarded'] = $request->attributes;
-		$path['_controller'] = $controllerName.":".$actionName;
-		$subRequest = $request->duplicate([], null, $path);
-		$response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+		$request=$initialControllerInstance->get('request_stack')->getCurrentRequest();
+		$path['_forwarded']=$request->attributes;
+		$path['_controller']=$controllerName.":".$actionName;
+		$subRequest=$request->duplicate([], null, $path);
+		$response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
 		return $response->getContent();
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
         if ($initialControllerInstance->has('templating')) {
             return $initialControllerInstance->get('templating')->render($viewName, $params);
         }
@@ -59,10 +59,10 @@ 
         return $initialControllerInstance->get('twig')->render($viewName, $params);
 	}
 
-	public function fromDispatcher($dispatcher){
-		$request = $dispatcher->get('request_stack')->getCurrentRequest();
+	public function fromDispatcher($dispatcher) {
+		$request=$dispatcher->get('request_stack')->getCurrentRequest();
 		$uri=$request->getPathInfo();
-		if(JString::startswith($uri, "/")){
+		if (JString::startswith($uri, "/")) {
 			$uri=\substr($uri, 1);
 		}
 		return \explode("/", $uri);

Ajax/php/phalcon/JsUtils.php

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\Controller;
 
-class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface{
+class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface {
 	protected $_di;
 	public function setDi(DiInterface $di) {
 		$this->_di=$di;
@@ -18,50 +18,50 @@ 
 		return $this->_di;
 	}
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return $this->_di->get("url")->get($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($initialController, $controller, $action, $params=array()) {
+		$dispatcher=$initialController->dispatcher;
 		$dispatcher->setControllerName($controller);
 		$dispatcher->setActionName($action);
 		$dispatcher->dispatch();
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		list($controller,$action)=\explode("@", $viewName);
-		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function ($view) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		list($controller, $action)=\explode("@", $viewName);
+		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$params=$dispatcher->getParams();
 		$action=$dispatcher->getActionName();
 		$items=array($dispatcher->getControllerName());
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
 			$items[]=$action;
-			foreach ($params as $p){
-				if(\is_object($p)===false)
+			foreach ($params as $p) {
+				if (\is_object($p)===false)
 					$items[]=$p;
 			}
 		}

Ajax/php/yii/URI.php

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $keyval=array ();
+	var $keyval=array();
 	/**
 	 * Current uri string
 	 *
@@ -26,7 +26,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $segments=array ();
+	var $segments=array();
 	/**
 	 * Re-indexed list of uri segments
 	 * Starts at 1 instead of 0
@@ -35,7 +35,7 @@ 
 	 * @access public
 	 *
 	 */
-	var $rsegments=array ();
+	var $rsegments=array();
 	var $permitted_uri_chars="a-z 0-9~%.:_\-";
 	var $enable_query_strings=false;
 
@@ -75,9 +75,9 @@ 
 	 */
 	function _fetch_uri_string() {
 		$uri="";
-		if ($this->uri_protocol == 'AUTO') {
+		if ($this->uri_protocol=='AUTO') {
 			// Is the request coming from the command line?
-			if (php_sapi_name() == 'cli' or defined('STDIN')) {
+			if (php_sapi_name()=='cli' or defined('STDIN')) {
 				$this->_set_uri_string($this->_parse_cli_args());
 				return;
 			}
@@ -91,20 +91,20 @@ 
 			// Is there a PATH_INFO variable?
 			// Note: some servers seem to have trouble with getenv() so we'll test it two ways
 			$path=(isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO');
-			if (trim($path, '/') != '' && $path != "/" . SELF) {
+			if (trim($path, '/')!='' && $path!="/".SELF) {
 				$this->_set_uri_string($path);
 				return;
 			}
 
 			// No PATH_INFO?... What about QUERY_STRING?
 			$path=(isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
-			if (trim($path, '/') != '') {
+			if (trim($path, '/')!='') {
 				$this->_set_uri_string($path);
 				return;
 			}
 
 			// As a last ditch effort lets try using the $_GET array
-			if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') {
+			if (is_array($_GET) && count($_GET)==1 && trim(key($_GET), '/')!='') {
 				$this->_set_uri_string(key($_GET));
 				return;
 			}
@@ -114,7 +114,7 @@ 
 			return;
 		}
 
-		if ($uri == 'REQUEST_URI') {
+		if ($uri=='REQUEST_URI') {
 			$this->_set_uri_string($this->_detect_uri());
 			return;
 		}
@@ -138,7 +138,7 @@ 
 		// $str = remove_invisible_characters($str, FALSE);
 
 		// If the URI contains only a slash we'll kill it
-		$this->uri_string=($str == '/') ? '' : $str;
+		$this->uri_string=($str=='/') ? '' : $str;
 	}
 
 	// --------------------------------------------------------------------
@@ -159,15 +159,15 @@ 
 		}
 
 		$uri=$_SERVER['REQUEST_URI'];
-		if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) {
+		if (strpos($uri, $_SERVER['SCRIPT_NAME'])===0) {
 			$uri=substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-		} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) {
+		} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME']))===0) {
 			$uri=substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
 		}
 
 		// This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct
 		// URI is found, and also fixes the QUERY_STRING server var and $_GET array.
-		if (strncmp($uri, '?/', 2) === 0) {
+		if (strncmp($uri, '?/', 2)===0) {
 			$uri=substr($uri, 2);
 		}
 		$parts=preg_split('#\?#i', $uri, 2);
@@ -177,17 +177,17 @@ 
 			parse_str($_SERVER['QUERY_STRING'], $_GET);
 		} else {
 			$_SERVER['QUERY_STRING']='';
-			$_GET=array ();
+			$_GET=array();
 		}
 
-		if ($uri == '/' || empty($uri)) {
+		if ($uri=='/' || empty($uri)) {
 			return '/';
 		}
 
 		$uri=parse_url($uri, PHP_URL_PATH);
 
 		// Do some final cleaning of the URI and return it
-		return str_replace(array ('//','../' ), '/', trim($uri, '/'));
+		return str_replace(array('//', '../'), '/', trim($uri, '/'));
 	}
 
 	// --------------------------------------------------------------------
@@ -204,7 +204,7 @@ 
 	private function _parse_cli_args() {
 		$args=array_slice($_SERVER['argv'], 1);
 
-		return $args ? '/' . implode('/', $args) : '';
+		return $args ? '/'.implode('/', $args) : '';
 	}
 
 	// --------------------------------------------------------------------
@@ -218,17 +218,17 @@ 
 	 *
 	 */
 	function _filter_uri($str) {
-		if ($str != '' && $this->permitted_uri_chars != '' && $this->enable_query_strings == FALSE) {
+		if ($str!='' && $this->permitted_uri_chars!='' && $this->enable_query_strings==FALSE) {
 			// preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards
 			// compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern
-			if (!preg_match("|^[" . str_replace(array ('\\-','\-' ), '-', preg_quote($this->permitted_uri_chars, '-')) . "]+$|i", $str)) {
+			if (!preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->permitted_uri_chars, '-'))."]+$|i", $str)) {
 				show_error('The URI you submitted has disallowed characters.', 400);
 			}
 		}
 
 		// Convert programatic characters to entities
-		$bad=array ('$','(',')','%28','%29' );
-		$good=array ('$','(',')','(',')' );
+		$bad=array('$', '(', ')', '%28', '%29');
+		$good=array('$', '(', ')', '(', ')');
 
 		return str_replace($bad, $good, $str);
 	}
@@ -243,11 +243,11 @@ 
 	 *
 	 */
 	function _explode_segments() {
-		foreach ( explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val ) {
+		foreach (explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) {
 			// Filter segments for security
 			$val=trim($this->_filter_uri($val));
 
-			if ($val != '') {
+			if ($val!='') {
 				$this->segments[]=$val;
 			}
 		}
@@ -364,7 +364,7 @@ 
 	 *
 	 */
 	function _uri_to_assoc($n=3, $default=array(), $which='segment') {
-		if ($which == 'segment') {
+		if ($which=='segment') {
 			$total_segments='total_segments';
 			$segment_array='segment_array';
 		} else {
@@ -380,25 +380,25 @@ 
 			return $this->keyval[$n];
 		}
 
-		if ($this->$total_segments() < $n) {
-			if (count($default) == 0) {
-				return array ();
+		if ($this->$total_segments()<$n) {
+			if (count($default)==0) {
+				return array();
 			}
 
-			$retval=array ();
-			foreach ( $default as $val ) {
+			$retval=array();
+			foreach ($default as $val) {
 				$retval[$val]=FALSE;
 			}
 			return $retval;
 		}
 
-		$segments=array_slice($this->$segment_array(), ($n - 1));
+		$segments=array_slice($this->$segment_array(), ($n-1));
 
 		$i=0;
 		$lastval='';
-		$retval=array ();
-		foreach ( $segments as $seg ) {
-			if ($i % 2) {
+		$retval=array();
+		foreach ($segments as $seg) {
+			if ($i%2) {
 				$retval[$lastval]=$seg;
 			} else {
 				$retval[$seg]=FALSE;
@@ -408,8 +408,8 @@ 
 			$i++;
 		}
 
-		if (count($default) > 0) {
-			foreach ( $default as $val ) {
+		if (count($default)>0) {
+			foreach ($default as $val) {
 				if (!array_key_exists($val, $retval)) {
 					$retval[$val]=FALSE;
 				}
@@ -433,8 +433,8 @@ 
 	 *
 	 */
 	function assoc_to_uri($array) {
-		$temp=array ();
-		foreach ( ( array ) $array as $key => $val ) {
+		$temp=array();
+		foreach ((array)$array as $key => $val) {
 			$temp[]=$key;
 			$temp[]=$val;
 		}
@@ -488,13 +488,13 @@ 
 		$leading='/';
 		$trailing='/';
 
-		if ($where == 'trailing') {
+		if ($where=='trailing') {
 			$leading='';
-		} elseif ($where == 'leading') {
+		} elseif ($where=='leading') {
 			$trailing='';
 		}
 
-		return $leading . $this->$which($n) . $trailing;
+		return $leading.$this->$which($n).$trailing;
 	}
 
 	// --------------------------------------------------------------------
@@ -572,7 +572,7 @@ 
 	 *
 	 */
 	function ruri_string() {
-		return '/' . implode('/', $this->rsegment_array());
+		return '/'.implode('/', $this->rsegment_array());
 	}
 }
 // END URI Class
\ No newline at end of file