jcheron / phalcon-jquery

Ajax/bootstrap/html/HtmlButtongroups.php

Doc Comments +3 added lines

@@ -48,6 +48,9 @@
 			$element->setStyle($value);
 	}
 
+	/**
+	 * @param HtmlDropdown $bt
+	 */
 	private function dropdownAsButton($bt) {
 		$this->addExistingDropDown($bt);
 		$bt->setTagName("button");

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return HtmlButtongroups default : ""
 	 */
 	public function setSize($size) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->setSize($size);
 		}
 		if (is_int($size)) {
@@ -44,7 +44,7 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
+		foreach ($this->elements as $element)
 			$element->setStyle($value);
 	}
 
@@ -64,7 +64,7 @@ 
 	public function addElement($element) {
 		$result=$element;
 		$iid=sizeof($this->elements)+1;
-		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) {
+		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) {
 			$this->addExistingDropDown($element);
 			$this->elements[]=$element;
 		} elseif ($element instanceof HtmlButton) {
@@ -78,7 +78,7 @@ 
 				else
 					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
 				$this->dropdownAsButton($bt);
-			} else
+			}else
 				$bt=new HtmlButton($this->identifier."-button-".$iid);
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
@@ -93,7 +93,7 @@ 
 	}
 
 	public function addElements($elements) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
@@ -110,10 +110,10 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
+		}else
 			$value="btn-group-".$value;
 		if (strstr($value, "justified")) {
-			foreach ( $this->elements as $element ) {
+			foreach ($this->elements as $element) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
 			}
 		}
@@ -144,7 +144,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;

Braces +20 added lines, -16 removed lines

@@ -44,8 +44,9 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
-			$element->setStyle($value);
+		foreach ( $this->elements as $element ) {
+					$element->setStyle($value);
+		}
 	}
 
 	private function dropdownAsButton($bt) {
@@ -70,16 +71,18 @@ 
 		} elseif ($element instanceof HtmlButton) {
 			$this->elements[]=$element;
 		} elseif (is_array($element)) {
-			if (array_key_exists("glyph", $element))
-				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
-			elseif (array_key_exists("btnCaption", $element)) {
-				if (array_key_exists("split", $element))
-					$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-				else
-					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+			if (array_key_exists("glyph", $element)) {
+							$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
+			} elseif (array_key_exists("btnCaption", $element)) {
+				if (array_key_exists("split", $element)) {
+									$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
+				} else {
+									$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+				}
 				$this->dropdownAsButton($bt);
-			} else
-				$bt=new HtmlButton($this->identifier."-button-".$iid);
+			} else {
+							$bt=new HtmlButton($this->identifier."-button-".$iid);
+			}
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
 			$result=$bt;
@@ -110,8 +113,9 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
-			$value="btn-group-".$value;
+		} else {
+					$value="btn-group-".$value;
+		}
 		if (strstr($value, "justified")) {
 			foreach ( $this->elements as $element ) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -126,9 +130,9 @@ 
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
-		if (is_int($index))
-			return $this->elements[$index];
-		else {
+		if (is_int($index)) {
+					return $this->elements[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->elements);
 			return $elm;
 		}

Ajax/bootstrap/html/HtmlButtontoolbar.php

Doc Comments +6 added lines, -1 removed lines

@@ -11,6 +11,11 @@ 
 
 class HtmlButtontoolbar extends HtmlButtongroups {
 
+	/**
+	 * @param string $identifier
+	 * @param string $cssStyle
+	 * @param string $size
+	 */
 	public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") {
 		parent::__construct($identifier, $elements, $cssStyle, $size, $tagName);
 		$this->setClass("btn-toolbar");
@@ -56,7 +61,7 @@ 
 
 	/**
 	 * return the Buttongroups at position $index
-	 * @return \Ajax\bootstrap\html\HtmlButtongroups
+	 * @return HtmlButton
 	 */
 	public function getGroup($index) {
 		return parent::getElement($index);

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 	public function addElement($element) {
 		if ($element instanceof HtmlButtongroups) {
 			$this->elements []=$element;
-		} else {
+		}else {
 			$this->getLastButtonGroup()->addElement($element);
 		}
 	}
@@ -78,15 +78,15 @@ 
 		$element=null;
 		$i=0;
 		if (is_int($index)) {
-			$elements=array ();
-			foreach ( $this->elements as $group ) {
+			$elements=array();
+			foreach ($this->elements as $group) {
 				$elements=array_merge($elements, $group->getElements());
 			}
 			if ($index<sizeof($elements)) {
 				$element=$elements [$index];
 			}
-		} else {
-			while ( $element==null&&$i<sizeof($this->elements) ) {
+		}else {
+			while ($element==null && $i<sizeof($this->elements)) {
 				$element=$this->elements [$i]->getElement($index);
 				$i++;
 			}

Braces +6 added lines, -5 removed lines

@@ -45,9 +45,9 @@ 
 	 */
 	private function getLastButtonGroup() {
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
-		else {
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		} else {
 			$bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb);
 			$this->elements []=$bg;
 		}
@@ -65,8 +65,9 @@ 
 	public function getLastGroup() {
 		$bg=null;
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		}
 		return $bg;
 	}
 

Ajax/bootstrap/html/HtmlCarousel.php

Doc Comments +4 added lines, -1 removed lines

@@ -23,6 +23,9 @@ 
 	protected $_base="";
 	protected $_glyphs=array ();
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $images=NULL) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplCarousel.php';
@@ -61,7 +64,7 @@ 
 	 *
 	 * @param string $caption
 	 * @param string $sens
-	 * @return HtmlCarouselControl|string
+	 * @return HtmlCarouselControl
 	 */
 	private function createControl($caption="next", $sens="left") {
 		$control=new HtmlCarouselControl($sens."-ctrl-".$this->identifier);

Spacing +9 added lines, -9 removed lines

@@ -16,12 +16,12 @@ 
  * @version 1.001
  */
 class HtmlCarousel extends BaseHtml {
-	protected $indicators=array ();
-	protected $slides=array ();
+	protected $indicators=array();
+	protected $slides=array();
 	protected $leftControl="";
 	protected $rightControl="";
 	protected $_base="";
-	protected $_glyphs=array ();
+	protected $_glyphs=array();
 
 	public function __construct($identifier, $images=NULL) {
 		parent::__construct($identifier);
@@ -38,7 +38,7 @@ 
 	}
 
 	public function setBase($_base) {
-		foreach ($this->slides as $slide){
+		foreach ($this->slides as $slide) {
 			$imgSrc=$slide->getImageSrc();
 			$slide->setImageSrc(str_replace($this->_base.$imgSrc, $_base.$imgSrc, $imgSrc));
 		}
@@ -93,9 +93,9 @@ 
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
-		if(is_array($imageSrc)){
-			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
-		}else{
+		if (is_array($imageSrc)) {
+			$this->addImage($imageSrc[0], @$imageSrc[1], @$imageSrc[2], @$imageSrc[3]);
+		}else {
 			$image=new HtmlCarouselItem("item-".$this->identifier);
 			$image->setImageSrc($this->_base.$imageSrc);
 			$image->setImageAlt($imageAlt);
@@ -118,10 +118,10 @@ 
 	 */
 	public function fromArray($array) {
 		if (is_array($array) && sizeof($array)>0) {
-			foreach ( $array as $value ) {
+			foreach ($array as $value) {
 				if (is_array($value)) {
 					$this->addImage($value ["src"], @$value ["alt"], @$value ["caption"], @$value ["description"]);
-				} else {
+				}else {
 					$this->addImage($value);
 				}
 			}

Braces +10 added lines, -7 removed lines

@@ -75,27 +75,30 @@
 	}
 
 	private function getGlyph($sens="left") {
-		if (array_key_exists($sens, $this->_glyphs))
-			return $this->_glyphs [$sens];
+		if (array_key_exists($sens, $this->_glyphs)) {
+					return $this->_glyphs [$sens];
+		}
 		return "glyphicon-chevron-".$sens;
 	}
 
 	public function setRightGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["right"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["right"]=$glyphicon;
+		}
 	}
 
 	public function setLeftGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["left"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["left"]=$glyphicon;
+		}
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
 		if(is_array($imageSrc)){
 			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
-		}else{
+		} else{
 			$image=new HtmlCarouselItem("item-".$this->identifier);
 			$image->setImageSrc($this->_base.$imageSrc);
 			$image->setImageAlt($imageAlt);

Ajax/bootstrap/html/HtmlForm.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getPrefix($element) {
 		$result="input_text";
 		foreach ( $this->formElementsPrefix as $k => $v ) {

Spacing +10 added lines, -10 removed lines

@@ -15,8 +15,8 @@ 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "form");
 		$this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>';
-		$this->futureElements=array ();
-		$this->formGroups=array ();
+		$this->futureElements=array();
+		$this->formGroups=array();
 	}
 
 	/*
@@ -26,10 +26,10 @@ 
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		if (isset($js)) {
 			$this->formElementsPrefix=$js->config()->getVar("formElementsPrefix");
-			foreach ( $this->futureElements as $futureElement ) {
+			foreach ($this->futureElements as $futureElement) {
 				$futureElementValue=$this->getPrefix($futureElement);
 				$futureElementValues=explode("_", $futureElementValue);
-				switch($futureElementValues [0]) {
+				switch ($futureElementValues [0]) {
 					case "input":
 						$control=new HtmlInput($futureElement);
 						$control->setClass("form-control");
@@ -61,7 +61,7 @@ 
 				$this->addElement($control);
 			}
 		}
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 			$this->addContent($group);
 		}
 		return parent::compile($js, $view);
@@ -71,7 +71,7 @@ 
 		$result=preg_split('/(?=[A-Z])/', $str);
 		if (sizeof($result)>$part) {
 			$result=$result [$part];
-		} else {
+		}else {
 			$result=$str;
 		}
 		return $result;
@@ -81,7 +81,7 @@ 
 		$result=preg_split('/(?=[A-Z])/', $str);
 		if (sizeof($result)>2) {
 			$result=$result [2];
-		} else {
+		}else {
 			$result=$str;
 		}
 		return $result;
@@ -89,7 +89,7 @@ 
 
 	private function getPrefix($element) {
 		$result="input_text";
-		foreach ( $this->formElementsPrefix as $k => $v ) {
+		foreach ($this->formElementsPrefix as $k => $v) {
 			if (Text::startsWith($element, $k)) {
 				$result=$v;
 				break;
@@ -119,7 +119,7 @@ 
 
 	public function getElement($name) {
 		$element=null;
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 		}
 		return $element;
 	}
@@ -129,7 +129,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray()
 	 */
 	public function fromArray($array) {
-		foreach ( $array as $value ) {
+		foreach ($array as $value) {
 			if (is_string($value)) {
 				$this->futureElements []=$value;
 			}

Braces +3 added lines, -2 removed lines

@@ -99,8 +99,9 @@
 	}
 
 	public function addGroup($identifier="") {
-		if ($identifier==="")
-			$identifier="form-".$this->identifier;
+		if ($identifier==="") {
+					$identifier="form-".$this->identifier;
+		}
 		$group=new HtmlDoubleElement($identifier);
 		$group->setTagName("div");
 		$group->setClass("form-group");

Ajax/bootstrap/html/HtmlModal.php

Doc Comments +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
 	 * Includes a modal-backdrop element.
 	 * Alternatively, specify static for a backdrop which doesn't close the modal on click.
 	 * @param Boolean $value default : true
-	 * @return HtmlModal
+	 * @return boolean
 	 */
 	public function setBackdrop($value) {
 		return $this->backdrop=$value;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Phalcon\Mvc\View;
 use Ajax\JsUtils;
 use Ajax\bootstrap\html\base\BaseHtml;
-use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\Controller;
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 class HtmlModal extends BaseHtml {
 	protected $title="Titre de ma boîte";
 	protected $content="";
-	protected $buttons=array ();
+	protected $buttons=array();
 	protected $showOnStartup=false;
 	protected $draggable=false;
 	protected $validCondition=NULL;
@@ -29,10 +29,10 @@ 
 	public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplModal.php';
-		$this->buttons=array ();
+		$this->buttons=array();
 		$this->title=$title;
 		$this->content=$content;
-		foreach ( $buttonCaptions as $button ) {
+		foreach ($buttonCaptions as $button) {
 			$this->addButton($button);
 		}
 	}
@@ -67,7 +67,7 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public function addOkayButton($value="Okay",$jsCode="") {
+	public function addOkayButton($value="Okay", $jsCode="") {
 		$btn=$this->addButton($value, "btn-primary");
 		$btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}");
 		return $btn;
@@ -84,7 +84,7 @@ 
 	public function getValidCondition() {
 		if ($this->validCondition==NULL) {
 			return $this->getDefaultValidCondition();
-		} else {
+		}else {
 			return $this->validCondition;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * @param $params The parameters to pass to the view
 	 */
 	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);
 		});
 		$this->content=$template;
@@ -129,12 +129,12 @@ 
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public function forward($initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($initialController, $controller, $action) {
+		$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);
 		});
 		$this->content=$template;
@@ -145,10 +145,10 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->content instanceof BaseHtml){
+		if ($this->content instanceof BaseHtml) {
 			$this->content->run($js);
 		}
-		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
+		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array(
 				"show" => $this->showOnStartup
 		));
 		if ($this->draggable)

Braces +11 added lines, -8 removed lines

@@ -151,18 +151,20 @@ 
 		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
 				"show" => $this->showOnStartup
 		));
-		if ($this->draggable)
-			$this->_bsComponent->setDraggable(true);
+		if ($this->draggable) {
+					$this->_bsComponent->setDraggable(true);
+		}
 		$this->_bsComponent->setBackdrop($this->backdrop);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function getButton($index) {
-		if (is_int($index))
-			return $this->buttons [$index];
-		else
-			return $this->getElementById($index, $this->buttons);
+		if (is_int($index)) {
+					return $this->buttons [$index];
+		} else {
+					return $this->getElementById($index, $this->buttons);
+		}
 	}
 
 	public function showOnCreate() {
@@ -188,8 +190,9 @@ 
 
 	public function jsHideButton($index) {
 		$btn=$this->getButton($index);
-		if ($btn)
-			return "$('#".$btn->getIdentifier()."').hide();";
+		if ($btn) {
+					return "$('#".$btn->getIdentifier()."').hide();";
+		}
 	}
 
 	/**

Ajax/bootstrap/html/HtmlPanel.php

Doc Comments +8 added lines

@@ -21,6 +21,11 @@ 
 	protected $collapseEnd;
 	protected $_showOnStartup;
 
+	/**
+	 * @param string $identifier
+	 * @param string $header
+	 * @param string $footer
+	 */
 	public function __construct($identifier, $content=NULL, $header=NULL, $footer=NULL) {
 		parent::__construct($identifier, "div");
 		$this->_template=include 'templates/tplPanel.php';
@@ -109,6 +114,9 @@ 
 		return $this->_bsComponent;
 	}
 
+	/**
+	 * @param boolean $_collapsable
+	 */
 	public function setCollapsable($_collapsable) {
 		$this->_collapsable=$_collapsable;
 		if ($_collapsable) {

Braces +6 added lines, -4 removed lines

@@ -89,8 +89,9 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
 	 */
 	public function setStyle($cssStyle) {
-		if (!PhalconUtils::startsWith($cssStyle, "panel"))
-			$cssStyle="panel".$cssStyle;
+		if (!PhalconUtils::startsWith($cssStyle, "panel")) {
+					$cssStyle="panel".$cssStyle;
+		}
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
 	}
 
@@ -132,7 +133,8 @@ 
 	 * @return $this default : false
 	 */
 	public function show($value) {
-		if ($this->_collapsable)
-			$this->_showOnStartup=$value;
+		if ($this->_collapsable) {
+					$this->_showOnStartup=$value;
+		}
 	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 		$glyph->setGlyphicon($glyphicon);
 		if ($left) {
 			$this->content=$glyph->compile().$separator.$this->content;
-		} else {
+		}else {
 			$this->content.=$separator.$glyph->compile();
 		}
 		return $this;

Ajax/bootstrap/html/HtmlTabs.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $tagName="ul") {
 		parent::__construct($identifier, $tagName);
 		$this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%";

Spacing +18 added lines, -18 removed lines

@@ -16,7 +16,7 @@ 
 use Phalcon\Mvc\View;
 
 class HtmlTabs extends HtmlDoubleElement {
-	protected $tabs=array ();
+	protected $tabs=array();
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
@@ -27,25 +27,25 @@ 
 	}
 
 	protected function addTab_($tab, $index=null) {
-		if($tab instanceof HtmlDropdown){
+		if ($tab instanceof HtmlDropdown) {
 			$tab->setMTagName("li");
 		}
 		if (isset($index)) {
-			$inserted=array (
+			$inserted=array(
 					$tab
 			);
 			array_splice($this->tabs, $index, 0, $inserted);
-		} else
+		}else
 			$this->tabs []=$tab;
 	}
 
-	public function setActive($index){
-		for ($i=0;$i<sizeof($this->tabs);$i++){
+	public function setActive($index) {
+		for ($i=0; $i<sizeof($this->tabs); $i++) {
 			$this->tabs[$i]->setActive($i==$index);
 		}
 	}
 
-	public function disable($index){
+	public function disable($index) {
 		$this->tabs[$index]->disable();
 	}
 
@@ -59,7 +59,7 @@ 
 			$tab=new HtmlTabItem("tab-".$this->identifier."-".$iid);
 			$tab->fromArray($element);
 			$this->addTab_($tab, $index);
-		} else {
+		}else {
 			$this->addTab_($tab, $index);
 		}
 		return $tab;
@@ -76,7 +76,7 @@ 
 	}
 
 	public function addTabs($tabs) {
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$this->addTab($tab);
 		}
 		return $this;
@@ -106,7 +106,7 @@ 
 	 */
 	public function run(JsUtils $js) {
 		$this->_bsComponent=new Tabs($js);
-		foreach ( $this->tabs as $tab ) {
+		foreach ($this->tabs as $tab) {
 			$this->_bsComponent->addTab($tab->run($js));
 		}
 		$this->addEventsOnRun($js);
@@ -115,11 +115,11 @@ 
 
 	public function createTabContents() {
 		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier);
-		foreach ( $this->tabs as $tab ) {
+		foreach ($this->tabs as $tab) {
 			if ($tab instanceof HtmlTabItem)
 				$tabContent->addTabItem($tab->getHref());
 			elseif ($tab instanceof HtmlDropdown) {
-				foreach ( $tab->getItems() as $dropdownItem ) {
+				foreach ($tab->getItems() as $dropdownItem) {
 					$tabContent->addTabItem($dropdownItem->getHref());
 				}
 			}
@@ -154,21 +154,21 @@ 
 		if (sizeof($this->content->getTabItems())>0) {
 			$this->content->getTabItem(0)->addToProperty("class", "fade in");
 			$size=sizeof($this->tabs);
-			for($index=0; $index<$size; $index++) {
+			for ($index=0; $index<$size; $index++) {
 				$this->content->getTabItem($index)->addToProperty("class", "fade");
 			}
 		}
 	}
 	
-	public function on($event, $jsCode,$stopPropagation=false,$preventDefault=false){
-		foreach ($this->tabs as $tab){
-			$tab->on($event,$jsCode,$stopPropagation,$preventDefault);
+	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		foreach ($this->tabs as $tab) {
+			$tab->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
-	public function setStacked($stacked=true){
-		if($stacked)
+	public function setStacked($stacked=true) {
+		if ($stacked)
 			$this->stacked="nav-stacked";
 		else $this->stacked="";
 	}

Braces +17 added lines, -12 removed lines

@@ -35,8 +35,9 @@ 
 					$tab
 			);
 			array_splice($this->tabs, $index, 0, $inserted);
-		} else
-			$this->tabs []=$tab;
+		} else {
+					$this->tabs []=$tab;
+		}
 	}
 
 	public function setActive($index){
@@ -116,9 +117,9 @@ 
 	public function createTabContents() {
 		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier);
 		foreach ( $this->tabs as $tab ) {
-			if ($tab instanceof HtmlTabItem)
-				$tabContent->addTabItem($tab->getHref());
-			elseif ($tab instanceof HtmlDropdown) {
+			if ($tab instanceof HtmlTabItem) {
+							$tabContent->addTabItem($tab->getHref());
+			} elseif ($tab instanceof HtmlDropdown) {
 				foreach ( $tab->getItems() as $dropdownItem ) {
 					$tabContent->addTabItem($dropdownItem->getHref());
 				}
@@ -137,8 +138,9 @@ 
 
 	public function setContentToTab($index, $text) {
 		$tabContentItem=$this->content->getTabItem($index);
-		if (isset($tabContentItem))
-			$tabContentItem->setContent($text);
+		if (isset($tabContentItem)) {
+					$tabContentItem->setContent($text);
+		}
 	}
 
 	public function countTabs() {
@@ -146,8 +148,9 @@ 
 	}
 
 	public function getTabItem($index) {
-		if ($index<sizeof($this->content->get))
-			return $this->content;
+		if ($index<sizeof($this->content->get)) {
+					return $this->content;
+		}
 	}
 
 	public function fadeEffect() {
@@ -168,9 +171,11 @@ 
 	}
 
 	public function setStacked($stacked=true){
-		if($stacked)
-			$this->stacked="nav-stacked";
-		else $this->stacked="";
+		if($stacked) {
+					$this->stacked="nav-stacked";
+		} else {
+			$this->stacked="";
+		}
 	}
 
 	/* (non-PHPdoc)

Ajax/JsUtils.php

Doc Comments +6 added lines, -3 removed lines

@@ -676,6 +676,9 @@ 
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
+	/**
+	 * @param boolean $match_array_type
+	 */
 	private function _create_json($json_result, $match_array_type) {
 		$json=array ();
 		$_is_assoc=TRUE;
@@ -699,7 +702,7 @@ 
 	 * Checks for an associative array
 	 *
 	 * @param type
-	 * @return type
+	 * @return boolean
 	 */
 	public function _is_associative_array($arr) {
 		foreach ( array_keys($arr) as $key => $val ) {
@@ -939,7 +942,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->js->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
@@ -951,7 +954,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->js->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);

Spacing +65 added lines, -65 removed lines

@@ -50,7 +50,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -145,18 +145,18 @@ 
 	}
 
 	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->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -408,7 +408,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -418,8 +418,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -429,8 +429,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -450,8 +450,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -461,7 +461,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -486,7 +486,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -548,7 +548,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -609,7 +609,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -656,11 +656,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);
@@ -740,27 +740,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);
 			}
 		}
@@ -775,7 +775,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;
 			}
@@ -794,11 +794,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;
@@ -813,8 +813,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -825,8 +825,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
 	}
 
 	/**
@@ -836,8 +836,8 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
+	public function jsonOn($event, $element, $url, $parameters=array()) {
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
 	}
 
 	/**
@@ -881,8 +881,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
 	}
 
 	/**
@@ -894,7 +894,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $attr the html attribute added to the request
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
 	}
 
@@ -932,8 +932,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -946,8 +946,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -961,7 +961,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -985,8 +985,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -999,8 +999,8 @@ 
 	 * @param string $attr the html attribute added to the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -1014,7 +1014,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -1069,7 +1069,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -1096,7 +1096,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -1106,7 +1106,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -1118,9 +1118,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;
@@ -1130,11 +1130,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;
 			}
@@ -1142,14 +1142,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);
@@ -1162,7 +1162,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

Braces +11 added lines, -8 removed lines

@@ -50,8 +50,9 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
-			$this->js->setDi($di);
+		if ($this->js!=null&&$di!=null) {
+					$this->js->setDi($di);
+		}
 	}
 
 	/**
@@ -1130,12 +1131,14 @@ 
 					$result[1]=$cdn;
 					break;
 				case "Ajax\lib\CDNCoreCss":
-					if($cdn->getFramework()==="Bootstrap")
-						$hasBootstrap=true;
-					elseif($cdn->getFramework()==="Semantic")
-						$hasSemantic=true;
-					if($hasSemantic || $hasBootstrap)
-						$result[2]=$cdn;
+					if($cdn->getFramework()==="Bootstrap") {
+											$hasBootstrap=true;
+					} elseif($cdn->getFramework()==="Semantic") {
+											$hasSemantic=true;
+					}
+					if($hasSemantic || $hasBootstrap) {
+											$result[2]=$cdn;
+					}
 					break;
 			}
 		}

Ajax/bootstrap/components/Collapse.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	}
 
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
+		foreach ($this->events as $event => $jsCode) {
 			$this->jquery_code_for_compile []="$( \"".$this->collapsed."\" ).on(\"".$event."\" , function (e) {".$jsCode."});";
 		}
 	}