jcheron / phalcon-jquery

Ajax/Jquery.php

Spacing +26 added lines, -26 removed lines

@@ -17,21 +17,21 @@ 
  * jQuery Class
  */
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $jsUtils;
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function ui($ui=NULL) {
@@ -55,9 +55,9 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
@@ -125,12 +125,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -142,12 +142,12 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
+		}else
 			$str="$({$element}).{$jQueryCall}();";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -161,7 +161,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -179,12 +179,12 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
-		} else {
+		}else {
 			$sort_options='';
 		}
 
@@ -212,7 +212,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -226,7 +226,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -266,7 +266,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -281,13 +281,13 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
 		if ($view!=NULL)
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		return $output;
 	}
 
@@ -301,7 +301,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -310,12 +310,12 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -329,7 +329,7 @@ 
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -347,14 +347,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/semantic/html/modules/HtmlAccordion.php

Spacing +16 added lines, -16 removed lines

@@ -6,31 +6,31 @@ 
 use Ajax\semantic\html\content\HtmlAccordionItem;
 use Ajax\JsUtils;
 
-class HtmlAccordion extends HtmlSemCollection{
+class HtmlAccordion extends HtmlSemCollection {
 
 	protected $params=array();
 
-	public function __construct( $identifier, $tagName="div", $baseClass="ui"){
-		parent::__construct( $identifier, "div", "ui accordion");
+	public function __construct($identifier, $tagName="div", $baseClass="ui") {
+		parent::__construct($identifier, "div", "ui accordion");
 	}
 
 
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
 		$title=$value;
 		$content=NULL;
-		if(\is_array($value)){
-			$title=@$value[0];$content=@$value[1];
+		if (\is_array($value)) {
+			$title=@$value[0]; $content=@$value[1];
 		}
-		return new HtmlAccordionItem("item-".$this->identifier."-".$count, $title,$content);
+		return new HtmlAccordionItem("item-".$this->identifier."-".$count, $title, $content);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return ($value instanceof HtmlAccordionItem)===false;
 	}
 
-	public function addPanel($title,$content){
-		return $this->addItem([$title,$content]);
+	public function addPanel($title, $content) {
+		return $this->addItem([$title, $content]);
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action){
+	public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action) {
 		return $this->addPanel($title, $js->forward($initialController, $controller, $action));
 	}
 
@@ -50,22 +50,22 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier, $this->params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
-	public function setStyled(){
+	public function setStyled() {
 		return $this->addToProperty("class", "styled");
 	}
 
-	public function setActive($index){
+	public function setActive($index) {
 		$this->getItem($index)->setActive(true);
 		return $this;
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		$this->params["exclusive"]=$value;
 	}
 }
\ No newline at end of file

Ajax/semantic/html/collections/HtmlBreadcrumb.php

Spacing +16 added lines, -16 removed lines

@@ -51,7 +51,7 @@ 
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function ($e) {
+		$this->_hrefFunction=function($e) {
 			return $e->getContent();
 		};
 		if (isset($hrefFunction)) {
@@ -68,7 +68,7 @@ 
 	 * @return HtmlBreadcrumbs
 	 */
 	public function autoGetOnClick($targetSelector) {
-		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
+		return $this->getOnClick($this->root, $targetSelector, array("attr" => $this->attr));
 	}
 
 	public function contentAsString() {
@@ -80,7 +80,7 @@ 
 
 	public function setActive($index=null) {
 		if (!isset($index)) {
-			$index=sizeof($this->content) - 1;
+			$index=sizeof($this->content)-1;
 		}
 		$activeItem=$this->content[$index];
 		$activeItem->addToProperty("class", "active");
@@ -93,7 +93,7 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		return $this->addItems($js->fromDispatcher($dispatcher));
 	}
 
@@ -107,12 +107,12 @@ 
 		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if ($this->absolutePaths === true) {
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
-		} else {
-			return $this->root . implode($separator, array_slice(array_map(function ($e) {
+		}else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {
 				return $this->_hrefFunction($e);
-			}, $this->content), $this->startIndex, $index + 1));
+			}, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -146,8 +146,8 @@ 
 			$this->setActive();
 		}
 		$count=$this->count();
-		for($i=1; $i < $count; $i++) {
-			$this->content[$i]->wrap($this->getContentDivider($i - 1));
+		for ($i=1; $i<$count; $i++) {
+			$this->content[$i]->wrap($this->getContentDivider($i-1));
 		}
 		return parent::compile($js, $view);
 	}
@@ -157,15 +157,15 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ( $this->content as $element ) {
-			if ($element->getProperty($this->attr) != NULL)
+		foreach ($this->content as $element) {
+			if ($element->getProperty($this->attr)!=NULL)
 				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -179,7 +179,7 @@ 
 	 */
 	protected function createItem($value) {
 		$count=$this->count();
-		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
+		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section");
 		if (\is_array($value))
 			$itemO->fromArray($value);
 		else {
@@ -191,7 +191,7 @@ 
 	public function addIconAt($icon, $index) {
 		$item=$this->getItem($index);
 		if (isset($item)) {
-			$icon=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$icon=new HtmlIcon("icon-".$this->identifier, $icon);
 			$item->wrapContent($icon);
 		}
 	}
@@ -199,7 +199,7 @@ 
 	public function addItem($item) {
 		$count=$this->count();
 		$itemO=parent::addItem($item);
-		$this->addToPropertyCtrl("class", "section", array ("section" ));
+		$this->addToPropertyCtrl("class", "section", array("section"));
 		$itemO->setProperty($this->attr, $this->getHref($count));
 		return $itemO;
 	}

Ajax/php/laravel/JsUtils.php

Spacing +12 added lines, -12 removed lines

@@ -5,27 +5,27 @@ 
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Route;
-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($initialController,$controller,$action){
+	public function forward($initialController, $controller, $action) {
 		//\request()->attributes->all()
-		$url=\action($controller.'@'.$action, [],false);
-		$request = Request::create($url, 'GET');
+		$url=\action($controller.'@'.$action, [], false);
+		$request=Request::create($url, 'GET');
 		// handle the response
 		return Route::dispatch($request)->getContent();
 		//return App::make($controller)->{$action}(\request()->attributes->all());
@@ -34,13 +34,13 @@ 
 	}
 
 	public function renderContent($view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return $dispatcher->segments();
 	}
 }
\ No newline at end of file

Ajax/php/yii/JsUtils.php

Spacing +9 added lines, -9 removed lines

@@ -4,14 +4,14 @@ 
 
 use yii\helpers\Url;
 
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
-		if($url==="")
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
+		if ($url==="")
 			$url="/";
 		return Url::toRoute($url);
 	}
 
-	public function addViewElement($identifier,$content,$view){
+	public function addViewElement($identifier, $content, $view) {
 		$params=$view->params;
 		if (\array_key_exists("q", $params)==false) {
 			$view->params["q"]=array();
@@ -19,11 +19,11 @@ 
 		$view->params["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable($view,$view_var, $output){
+	public function createScriptVariable($view, $view_var, $output) {
 		$view->params[$view_var]=$output;
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
 		\ob_start();
 		$ctrInfo=\yii::$app->createController($controllerName."/".$actionName);
 		$ctrInfo[0]->{$ctrInfo[1]}($params);
@@ -32,11 +32,11 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return \yii::$app->view->render($viewName,$params);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return \yii::$app->view->render($viewName, $params);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$uri=new \Ajax\php\yii\URI();
 		return $uri->segment_array();
 	}

Ajax/php/yii/URI.php

Spacing +43 added lines, -43 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);
@@ -175,19 +175,19 @@ 
 		if (isset($parts[1])) {
 			$_SERVER['QUERY_STRING']=$parts[1];
 			parse_str($_SERVER['QUERY_STRING'], $_GET);
-		} else {
+		}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,10 +364,10 @@ 
 	 *
 	 */
 	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 {
+		}else {
 			$total_segments='total_rsegments';
 			$segment_array='rsegment_array';
 		}
@@ -380,27 +380,27 @@ 
 			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 ) {
+		$retval=array();
+		foreach ($segments as $seg) {
 			if ($i % 2) {
 				$retval[$lastval]=$seg;
-			} else {
+			}else {
 				$retval[$seg]=FALSE;
 				$lastval=$seg;
 			}
@@ -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

Ajax/JsUtils.php

Spacing +39 added lines, -39 removed lines

@@ -21,8 +21,8 @@ 
 /**
  * JsUtils Class : Service to be injected
  */
-abstract class JsUtils{
-	use JsUtilsEventsTrait,JsUtilsActionsTrait,JsUtilsAjaxTrait;
+abstract class JsUtils {
+	use JsUtilsEventsTrait, JsUtilsActionsTrait, JsUtilsAjaxTrait;
 
 	protected $js;
 	protected $cdns;
@@ -49,26 +49,26 @@ 
 	protected $config;
 
 	protected function _setDi($di) {
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
 	public abstract function getUrl($url);
-	public abstract function addViewElement($identifier,$content,$view);
+	public abstract function addViewElement($identifier, $content, $view);
 	/**
 	 * render the content of $controller::$action and set the response to the modal content
 	 * @param Controller $initialController
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public abstract function forward($initialController,$controller,$action);
+	public abstract function forward($initialController, $controller, $action);
 	/**
 	 * render the content of an existing view : $viewName and set the response to the modal content
  	 * @param Controller $initialControllerInstance
 	 * @param View $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public abstract function renderContent($initialControllerInstance,$viewName, $params=NULL);
+	public abstract function renderContent($initialControllerInstance, $viewName, $params=NULL);
 
 	/**
 	 * Collect url parts from the request dispatcher : controllerName, actionName, parameters
@@ -160,22 +160,22 @@ 
 	}
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery',
 				'debug' => true
 		);
-		foreach ( $defaults as $key => $val ) {
-			if (isset($params[$key])&&$params[$key]!=="") {
+		foreach ($defaults as $key => $val) {
+			if (isset($params[$key]) && $params[$key]!=="") {
 				$defaults[$key]=$params[$key];
 			}
 		}
 		extract($defaults);
-		$this->js=new Jquery($defaults,$this);
-		$this->cdns=array ();
+		$this->js=new Jquery($defaults, $this);
+		$this->cdns=array();
 	}
 
-	public function __set($property, $value){
-		switch ($property){
+	public function __set($property, $value) {
+		switch ($property) {
 			case "bootstrap":
 				$this->bootstrap($value);
 				break;
@@ -224,11 +224,11 @@ 
 	 */
 	public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) {
 		$bs=$this->_bootstrap;
-		if (isset($bs)&&isset($view)) {
+		if (isset($bs) && isset($view)) {
 			$bs->compileHtml($this, $view);
 		}
 		$sem=$this->_semantic;
-		if (isset($sem)&&isset($view)) {
+		if (isset($sem) && isset($view)) {
 			$sem->compileHtml($this, $view);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -295,27 +295,27 @@ 
 				$json_result=$result->result_array();
 			} elseif (is_array($result)) {
 				$json_result=$result;
-			} else {
+			}else {
 				return $this->_prep_args($result);
 			}
-		} else {
+		}else {
 			return 'null';
 		}
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
 	private function _create_json($json_result, $match_array_type) {
-		$json=array ();
+		$json=array();
 		$_is_assoc=TRUE;
-		if (!is_array($json_result)&&empty($json_result)) {
+		if (!is_array($json_result) && empty($json_result)) {
 			show_error("Generate JSON Failed - Illegal key, value pair.");
 		} elseif ($match_array_type) {
 			$_is_assoc=$this->_is_associative_array($json_result);
 		}
-		foreach ( $json_result as $k => $v ) {
+		foreach ($json_result as $k => $v) {
 			if ($_is_assoc) {
 				$json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			} else {
+			}else {
 				$json[]=$this->generate_json($v, $match_array_type);
 			}
 		}
@@ -330,7 +330,7 @@ 
 	 * @return type
 	 */
 	public function _is_associative_array($arr) {
-		foreach ( array_keys($arr) as $key => $val ) {
+		foreach (array_keys($arr) as $key => $val) {
 			if ($key!==$val) {
 				return TRUE;
 			}
@@ -349,11 +349,11 @@ 
 			return 'null';
 		} elseif (is_bool($result)) {
 			return ($result===TRUE) ? 'true' : 'false';
-		} elseif (is_string($result)||$is_key) {
-			return '"'.str_replace(array (
-					'\\',"\t","\n","\r",'"','/'
-			), array (
-					'\\\\','\\t','\\n',"\\r",'\"','\/'
+		} elseif (is_string($result) || $is_key) {
+			return '"'.str_replace(array(
+					'\\', "\t", "\n", "\r", '"', '/'
+			), array(
+					'\\\\', '\\t', '\\n', "\\r", '\"', '\/'
 			), $result).'"';
 		} elseif (is_scalar($result)) {
 			return $result;
@@ -366,7 +366,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -378,9 +378,9 @@ 
 		$hasJQueryUI=false;
 		$hasBootstrap=false;
 		$hasSemantic=false;
-		$result=array ();
-		foreach ( $this->cdns as $cdn ) {
-			switch(get_class($cdn)) {
+		$result=array();
+		foreach ($this->cdns as $cdn) {
+			switch (get_class($cdn)) {
 				case "Ajax\lib\CDNJQuery":
 					$hasJQuery=true;
 					$result[0]=$cdn;
@@ -390,11 +390,11 @@ 
 					$result[1]=$cdn;
 					break;
 				case "Ajax\lib\CDNCoreCss":
-					if($cdn->getFramework()==="Bootstrap")
+					if ($cdn->getFramework()==="Bootstrap")
 						$hasBootstrap=true;
-					elseif($cdn->getFramework()==="Semantic")
+					elseif ($cdn->getFramework()==="Semantic")
 						$hasSemantic=true;
-					if($hasSemantic || $hasBootstrap)
+					if ($hasSemantic || $hasBootstrap)
 						$result[2]=$cdn;
 					break;
 			}
@@ -402,14 +402,14 @@ 
 		if ($hasJQuery===false) {
 			$result[0]=new CDNJQuery("x");
 		}
-		if ($hasJQueryUI===false&&isset($this->_ui)) {
+		if ($hasJQueryUI===false && isset($this->_ui)) {
 			$result[1]=new CDNGuiGen("x", $template);
 		}
-		if ($hasBootstrap===false&&isset($this->_bootstrap)) {
-			$result[2]=new CDNCoreCss("Bootstrap","x");
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
+			$result[2]=new CDNCoreCss("Bootstrap", "x");
 		}
-		if ($hasSemantic===false&&isset($this->_semantic)) {
-			$result[2]=new CDNCoreCss("Semantic","x");
+		if ($hasSemantic===false && isset($this->_semantic)) {
+			$result[2]=new CDNCoreCss("Semantic", "x");
 		}
 		ksort($result);
 		return implode("\n", $result);