phpMv / phpMv-UI

Ajax/semantic/html/modules/checkbox/AbstractCheckbox.php

Spacing +13 added lines, -13 removed lines

@@ -16,13 +16,13 @@ 
 		$field->setProperty("name", $name);
 		$this->setField($field);
 		if (isset($label))
-			$this->setLabel($label,$value);
+			$this->setLabel($label, $value);
 	}
 
-	public function setChecked($value=true){
-		if($value===true){
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getField()->setProperty("checked", "checked");
-		}else{
+		} else {
 			$this->getField()->removeProperty("checked");
 		}
 		return $this;
@@ -32,13 +32,13 @@ 
 		return $this->addToPropertyCtrl("class", $checkboxType, CheckboxType::getConstants());
 	}
 
-	public function setLabel($label,$value=null) {
+	public function setLabel($label, $value=null) {
 		$labelO=$label;
 		if (\is_string($label)) {
 			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
 			$labelO->setProperty("for", $this->getField()->getIdentifier());
-			if(isset($value))
+			if (isset($value))
 				$labelO->setProperty("data-value", $value);
 		}
 		$this->content["label"]=$labelO;
@@ -86,7 +86,7 @@ 
 	 * @return AbstractCheckbox
 	 */
 	public function attachEvent($selector, $action=NULL) {
-		if (isset($action)||\is_numeric($action)===true) {
+		if (isset($action) || \is_numeric($action)===true) {
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
 		} else {
 			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
@@ -102,7 +102,7 @@ 
 	 */
 	public function attachEvents($events=array()) {
 		if (\is_array($events)) {
-			foreach ( $events as $action => $selector ) {
+			foreach ($events as $action => $selector) {
 				$this->attachEvent($selector, $action);
 			}
 		}
@@ -113,24 +113,24 @@ 
 		return $this->addToProperty("class", "fitted");
 	}
 
-	public function setOnChecked($jsCode){
+	public function setOnChecked($jsCode) {
 		$this->_params["onChecked"]=$jsCode;
 		return $this;
 	}
 
-	public function setOnUnchecked($jsCode){
+	public function setOnUnchecked($jsCode) {
 		$this->_params["onUnchecked"]=$jsCode;
 		return $this;
 	}
 
-	public function setOnChange($jsCode){
+	public function setOnChange($jsCode) {
 		$this->_params["onChange"]=$jsCode;
 		return $this;
 	}
 
 	public function run(JsUtils $js) {
-		if(!isset($this->_bsComponent))
-			$this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params);
+		if (!isset($this->_bsComponent))
+			$this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params);
 		return parent::run($js);
 	}
 }

Ajax/semantic/html/modules/HtmlShape.php

Spacing +40 added lines, -40 removed lines

@@ -8,13 +8,13 @@ 
 use Ajax\common\html\BaseHtml;
 
 
-class HtmlShape extends HtmlSemCollection{
+class HtmlShape extends HtmlSemCollection {
 
 	protected $_params=array();
 	protected $_autoActive=true;
 
-	public function __construct( $identifier, $sides){
-		parent::__construct( $identifier, "div", "ui shape");
+	public function __construct($identifier, $sides) {
+		parent::__construct($identifier, "div", "ui shape");
 		$this->_template='<%tagName% id="%identifier%" %properties%><div class="sides">%wrapContentBefore%%content%%wrapContentAfter%</div></%tagName%>';
 		$this->addItems($sides);
 	}
@@ -23,9 +23,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
-	protected function createItem($value){
-		if(\is_object($value)===false){
-			$value=new HtmlSemDoubleElement("","div","content",$value);
+	protected function createItem($value) {
+		if (\is_object($value)===false) {
+			$value=new HtmlSemDoubleElement("", "div", "content", $value);
 		}
 		return new HtmlShapeItem("side-".$this->identifier."-".$this->count(), $value);
 	}
@@ -34,7 +34,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\HtmlCollection::createCondition()
 	 */
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return ($value instanceof HtmlShapeItem)===false;
 	}
 
@@ -42,7 +42,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\content\HtmlShapeItem
 	 */
-	public function getSide($index){
+	public function getSide($index) {
 		return $this->getItem($index);
 	}
 
@@ -50,96 +50,96 @@ 
 	 * @param int $index
 	 * @return mixed|NULL
 	 */
-	public function getSideContent($index){
-		$item= $this->getItem($index);
-		if(isset($item))
+	public function getSideContent($index) {
+		$item=$this->getItem($index);
+		if (isset($item))
 			return $item->getContent();
 		return null;
 	}
 
-	public function jsDo($action){
+	public function jsDo($action) {
 		return "$('#".$this->identifier."').shape('".$action."');";
 	}
 
-	public function jsFlipLeft(){
+	public function jsFlipLeft() {
 		return $this->jsDo("flip left");
 	}
 
-	public function jsFlipRight(){
+	public function jsFlipRight() {
 		return $this->jsDo("flip right");
 	}
 
-	public function jsFlipUp(){
+	public function jsFlipUp() {
 		return $this->jsDo("flip up");
 	}
 
-	public function jsFlipDown(){
+	public function jsFlipDown() {
 		return $this->jsDo("flip down");
 	}
 
-	public function jsFlipOver(){
+	public function jsFlipOver() {
 		return $this->jsDo("flip over");
 	}
 
-	public function jsFlipBack(){
+	public function jsFlipBack() {
 		return $this->jsDo("flip back");
 	}
 
-	private function doActionOn($element,$event,$what){
-		if($element instanceof BaseHtml){
-			return $element->on($event, $what,true,true);
+	private function doActionOn($element, $event, $what) {
+		if ($element instanceof BaseHtml) {
+			return $element->on($event, $what, true, true);
 		}
 	}
 
-	public function flipLeftOn($element,$event){
+	public function flipLeftOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipLeft());
 	}
 
-	public function flipRightOn($element,$event){
+	public function flipRightOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipRight());
 	}
 
-	public function flipUpOn($element,$event){
+	public function flipUpOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipUp());
 	}
 
-	public function flipDownOn($element,$event){
+	public function flipDownOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipDown());
 	}
 
-	public function flipBackOn($element,$event){
+	public function flipBackOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipBack());
 	}
 
-	public function flipOverOn($element,$event){
+	public function flipOverOn($element, $event) {
 		return $this->doActionOn($element, $event, $this->jsFlipOver());
 	}
 
-	public function setActiveSide($index){
+	public function setActiveSide($index) {
 		$side=$this->getSide($index);
-		if(isset($side)){
+		if (isset($side)) {
 			$side->setActive(true);
 		}
 		return $this;
 	}
 
-	public function asCube(){
+	public function asCube() {
 		return $this->addToPropertyCtrl("class", "cube", ["cube"]);
 	}
 
-	public function asText(){
+	public function asText() {
 		return $this->addToPropertyCtrl("class", "text", ["text"]);
 	}
 
-	public function setWidth($width="initial"){
+	public function setWidth($width="initial") {
 		$this->_params["width"]=$width;
 	}
-	public function onChange($jsCode){
-		return $this->_params["onChange"]="%function(){" . $jsCode . "}%";
+	public function onChange($jsCode) {
+		return $this->_params["onChange"]="%function(){".$jsCode."}%";
 	}
 
-	public function beforeChange($jsCode){
-		return $this->_params["beforeChange"]="%function(){" . $jsCode . "}%";
+	public function beforeChange($jsCode) {
+		return $this->_params["beforeChange"]="%function(){".$jsCode."}%";
 	}
 
 	/*
@@ -147,15 +147,15 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent=$js->semantic()->shape("#" . $this->identifier, $this->_params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->shape("#".$this->identifier, $this->_params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->_autoActive)
+		if ($this->_autoActive)
 			$this->setActiveSide(0);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }

Ajax/semantic/html/modules/HtmlModal.php

Spacing +50 added lines, -50 removed lines

@@ -15,36 +15,36 @@ 
 	protected $_paramParts=array();
 
 	public function __construct($identifier, $header="", $content="", $actions=null) {
-		parent::__construct($identifier, "div","ui modal");
-		if(isset($header)){
+		parent::__construct($identifier, "div", "ui modal");
+		if (isset($header)) {
 			$this->setHeader($header);
 		}
-		if(isset($content)){
+		if (isset($content)) {
 			$this->setContent($content);
 		}
-		if(isset($actions)){
+		if (isset($actions)) {
 			$this->setActions($actions);
 		}
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 		return $this;
 	}
 
 	public function setContent($value) {
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
 		return $this;
 	}
 
 	public function setActions($actions) {
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
-		if(\is_array($actions)){
-			foreach ($actions as $action){
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
+		if (\is_array($actions)) {
+			foreach ($actions as $action) {
 				$this->addAction($action);
 			}
 		}
-		else{
+		else {
 			$this->addAction($actions);
 		}
 		return $this;
@@ -54,17 +54,17 @@ 
 	 * @param string|BaseHtml $action
 	 * @return HtmlButton
 	 */
-	public function addAction($action){
-		if(!$action instanceof BaseHtml){
+	public function addAction($action) {
+		if (!$action instanceof BaseHtml) {
 			$class="";
-			if(\array_search($action, ["Okay","Yes","Validate"])!==false){
+			if (\array_search($action, ["Okay", "Yes", "Validate"])!==false) {
 				$class="approve";
 			}
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
 				$class="cancel";
 			}
-			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()),$action);
-			if($class!=="")
+			$action=new HtmlButton("action-".$this->identifier."-".JArray::count($this->content["actions"]->getContent()), $action);
+			if ($class!=="")
 				$action->addToProperty("class", $class);
 		}
 		return $this->addElementInPart($action, "actions");
@@ -74,66 +74,66 @@ 
 	 * @param int $index
 	 * @return HtmlButton
 	 */
-	public function getAction($index){
+	public function getAction($index) {
 		return $this->content["actions"]->getContent()[$index];
 	}
 
-	public function addContent($content,$before=false){
-		$this->content["content"]->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->content["content"]->addContent($content, $before);
 		return $this;
 	}
 
-	public function addImageContent($image,$description=NULL){
+	public function addImageContent($image, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($image!==""){
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($image!=="") {
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	public function addIconContent($icon,$description=NULL){
+	public function addIconContent($icon, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($icon!==""){
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($icon!=="") {
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	private function addElementInPart($element,$part) {
+	private function addElementInPart($element, $part) {
 		$this->content[$part]->addContent($element);
 		return $element;
 	}
 
-	public function showDimmer($value){
-		$value=$value?"show":"hide";
+	public function showDimmer($value) {
+		$value=$value ? "show" : "hide";
 		$this->_paramParts[]=["'".$value." dimmer'"];
 		return $this;
 	}
 
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		$this->_params["inverted"]=true;
 		return $this;
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
 
-	public function setTransition($value){
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
+	public function setTransition($value) {
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
 	}
 
 	/**
@@ -143,8 +143,8 @@ 
 	 * @param string $viewName
 	 * @param array $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
 		return parent::compile($js, $view);
 	}
 	/*
@@ -174,8 +174,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
@@ -188,7 +188,7 @@ 
 		return $this->jsDo("hide");
 	}
 
-	public function onHidden($js){
+	public function onHidden($js) {
 		$this->_params["onHidden"]=$js;
 	}
 }

Ajax/semantic/html/modules/HtmlTab.php

Spacing +45 added lines, -45 removed lines

@@ -15,14 +15,14 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlTab extends HtmlSemCollection{
+class HtmlTab extends HtmlSemCollection {
 
 	protected $params=[];
 
-	public function __construct( $identifier, $tabs=array()){
-		parent::__construct( $identifier, "div", "");
+	public function __construct($identifier, $tabs=array()) {
+		parent::__construct($identifier, "div", "");
 		$menu=new HtmlMenu("menu".$this->identifier);
-		$menu->asTab(false)->setAttachment(NULL,Side::TOP);
+		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
 		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
@@ -32,12 +32,12 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 * @return HtmlSegment
 	 */
-	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];
 		}
 		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
@@ -53,9 +53,9 @@ 
 	 * @param string $datatab
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	private function createSegment($count,$content,$datatab){
+	private function createSegment($count, $content, $datatab) {
 		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
-		$segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab);
+		$segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab);
 		return $segment;
 	}
 
@@ -65,12 +65,12 @@ 
 	 * @param String $content new content
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabContent($index,$content){
+	public function setTabContent($index, $content) {
 		$menu=$this->content["menu"];
-		if($index<$menu->count()){
-			if(isset($this->content[$index])===false){
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
+			} else
 				$this->content[$index]->setContent($content);
 		}
 		return $this;
@@ -81,9 +81,9 @@ 
 	 * @param array $contents
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabsContent($contents){
+	public function setTabsContent($contents) {
 		$size=\sizeof($contents);
-		for($i=0;$i<$size;$i++){
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -94,7 +94,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function activate($index){
+	public function activate($index) {
 		$this->content["menu"]->getItem($index)->setActive(true);
 		$this->content[$index]->setActive(true);
 		return $this;
@@ -106,8 +106,8 @@ 
 	 * @param string $content
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addTab($title,$content){
-		return $this->addItem([$title,$content]);
+	public function addTab($title, $content) {
+		return $this->addItem([$title, $content]);
 	}
 
 	/**
@@ -121,13 +121,13 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->forward($initialController, $controller, $action,$params);
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
-		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params);
+		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params);
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 * @param array $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->renderContent($initialController, $viewName,$params);
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
-		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params);
+		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
 	}
 
 
@@ -159,11 +159,11 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		\ob_start();
-		$js->forward($initialController, $controller, $action,$params);
+		$js->forward($initialController, $controller, $action, $params);
 		$content=\ob_get_clean();
-		return $this->addTab($title,$content);
+		return $this->addTab($title, $content);
 	}
 
 	/**
@@ -175,8 +175,8 @@ 
 	 * @param array $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addTab($title, $js->renderContent($initialController, $viewName,$params));
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
 	public function setPointing($value=Direction::NONE) {
@@ -192,7 +192,7 @@ 
 	 * @param int $index
 	 * @return HtmlMenuItem
 	 */
-	public function getMenuTab($index){
+	public function getMenuTab($index) {
 		return $this->content["menu"]->getItem($index);
 	}
 
@@ -201,7 +201,7 @@ 
 	 * @param int $index
 	 * @return HtmlSegment
 	 */
-	public function getTab($index){
+	public function getTab($index) {
 		return $this->content[$index];
 	}
 
@@ -210,22 +210,22 @@ 
 	 * @param HtmlMenu $menu
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setMenu($menu){
+	public function setMenu($menu) {
 		$contentSize=\sizeof($this->content);
-		for($i=0;$i<$contentSize;$i++){
-			if($menu->getItem($i)!==NULL){
-				if(isset($this->content[$i])){
-					$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
+				if (isset($this->content[$i])) {
+					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
 		$menuSize=$menu->count();
-		for($i=0;$i<$menuSize;$i++){
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if(isset($this->content[$i])===false){
+			if (isset($this->content[$i])===false) {
 				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier());
 			}
-			$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
 		$this->content["menu"]=$menu;
@@ -237,15 +237,15 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
+		if ($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }

Ajax/semantic/html/modules/HtmlAccordion.php

Spacing +19 added lines, -19 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]);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @param string $action a Phalcon action
 	 * @param array $params
 	 */
-	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params));
+	public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		return $this->addPanel($title, $js->forward($initialController, $controller, $action, $params));
 	}
 
 	/**
@@ -54,30 +54,30 @@ 
 	 * @param string $viewName
 	 * @param array $params The parameters to pass to the view
 	 */
-	public function renderViewPanel(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addPanel($title, $js->renderContent($initialController, $viewName,$params));
+	public function renderViewPanel(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		return $this->addPanel($title, $js->renderContent($initialController, $viewName, $params));
 	}
 	/*
 	 * (non-PHPdoc)
 	 * @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 activate($index){
+	public function activate($index) {
 		$this->getItem($index)->setActive(true);
 		return $this;
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		$this->params["exclusive"]=$value;
 	}
 }

Ajax/semantic/widgets/base/FieldAsTrait.php

Spacing +118 added lines, -118 removed lines

@@ -30,23 +30,23 @@ 
  * @property boolean $_edition
  * @property mixed _modelInstance
  */
-trait FieldAsTrait{
+trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix,$name="");
-	abstract public function setValueFunction($index,$callback);
+	abstract protected function _getFieldIdentifier($prefix, $name="");
+	abstract public function setValueFunction($index, $callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element,&$attributes,$index,$instance=null){
-		if(isset($attributes["jsCallback"])){
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
+		if (isset($attributes["jsCallback"])) {
 			$callback=$attributes["jsCallback"];
-			if(\is_callable($callback)){
-				$callback($element,$instance,$index,InstanceViewer::$index);
+			if (\is_callable($callback)) {
+				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
 		}
 		unset($attributes["rules"]);
@@ -55,43 +55,43 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption,$icon=NULL){
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 
-	protected function _addRules(HtmlFormField $element,&$attributes){
-		if(isset($attributes["rules"])){
+	protected function _addRules(HtmlFormField $element, &$attributes) {
+		if (isset($attributes["rules"])) {
 			$rules=$attributes["rules"];
-			if(\is_array($rules)){
+			if (\is_array($rules)) {
 				$element->addRules($rules);
 			}
-			else{
+			else {
 				$element->addRule($rules);
 			}
 			unset($attributes["rules"]);
 		}
 	}
 
-	protected function _prepareFormFields(HtmlFormField &$field,$name,&$attributes){
+	protected function _prepareFormFields(HtmlFormField &$field, $name, &$attributes) {
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value,$instance,$index,$rowIndex) use (&$attributes,$elementCallback,$prefix){
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
-			$id=$this->_getFieldIdentifier($prefix,$name);
-			if(isset($attributes["name"])){
+			$id=$this->_getFieldIdentifier($prefix, $name);
+			if (isset($attributes["name"])) {
 				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element=$elementCallback($id,$name,$value,$caption);
-			if(\is_array($attributes)){
-				$this->_applyAttributes($element, $attributes,$index,$instance);
+			$element=$elementCallback($id, $name, $value, $caption);
+			if (\is_array($attributes)) {
+				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
 			$element->setDisabled(!$this->_edition);
 			return $element;
@@ -100,197 +100,197 @@ 
 	}
 
 
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
-		$this->setValueFunction($index,function($value) use($label,$attributes){
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use($label, $attributes){
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 			return $this;
 	}
 
-	public function fieldAsRating($index,$max=5, $icon=""){
-		$this->setValueFunction($index,function($value) use($max,$icon){
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use($max, $icon){
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($icon){
-			$lbl=new HtmlLabel($id,$value);
-			if(isset($icon))
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($icon){
+			$lbl=new HtmlLabel($id, $value);
+			if (isset($icon))
 				$lbl->addIcon($icon);
 				return $lbl;
-		}, $index,$attributes,"label");
+		}, $index, $attributes, "label");
 	}
 
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
-			$header=new HtmlHeader($id,$niveau,$value);
-			if(isset($icon))
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
+			$header=new HtmlHeader($id, $niveau, $value);
+			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
-		}, $index,$attributes,"header");
+		}, $index, $attributes, "header");
 	}
 
 
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
-		$this->setValueFunction($index,function($img) use($size,$circular){
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use($size, $circular){
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
 			return $image;
 		});
 			return $this;
 	}
 
-	public function fieldAsFlag($index){
-		$this->setValueFunction($index,function($flag){
-			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"),$flag);
+	public function fieldAsFlag($index) {
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 			return $this;
 	}
 
-	public function fieldAsIcon($index){
-		$this->setValueFunction($index,function($icon){
-			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"),$icon);
+	public function fieldAsIcon($index) {
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 			return $this;
 	}
 
-	public function fieldAsAvatar($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value){
-			$img=new HtmlImage($id,$value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
-		}, $index,$attributes,"avatar");
+		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use($attributes){
-			$input= new HtmlFormRadio($id,$name,$value,$value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use($attributes){
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"radio");
+		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
-		}, $index,$attributes,"radios");
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
+		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsInput($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$input= new HtmlFormInput($id,$caption,"text",$value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"input");
+		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
-		}, $index,$attributes,"textarea");
+		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index,$tagName="div",$baseClass="",$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes,$tagName,$baseClass){
-			$div=new HtmlSemDoubleElement($id,$tagName,$baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass){
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea=new HtmlFormField("field-".$id, $div,$caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
-		}, $index,$attributes,"element");
+		}, $index, $attributes, "element");
 	}
 
 
-	public function fieldAsHidden($index,$attributes=NULL){
-		if(!\is_array($attributes)){
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
 			$attributes=[];
 		}
 		$attributes["inputType"]="hidden";
 		$attributes["style"]="display:none;";
-		return $this->fieldAsInput($index,$attributes);
+		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
-			if($caption===null || $caption==="")
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($attributes){
+			if ($caption===null || $caption==="")
 				$caption="";
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
-		}, $index,$attributes,"ck");
+		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple,$attributes){
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
-			$dd->asSelect($name,$multiple);
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple, $attributes){
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
+			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
-		}, $index,$attributes,"dd");
+		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$mess= new HtmlMessage("message-".$id,$caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
-		}, $index,$attributes,"message");
+		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption){
-			$lnk= new HtmlLink("message-".$id,"#",$caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
-		}, $index,$attributes,"link");
+		}, $index, $attributes, "link");
 	}
 
 	/**Change fields type
 	 * @param array $types an array or associative array $type=>$attributes
 	 */
-	public function fieldsAs(array $types){
+	public function fieldsAs(array $types) {
 		$i=0;
-		if(JArray::isAssociative($types)){
-			foreach ($types as $type=>$attributes){
-				if(\is_int($type))
-					$this->fieldAs($i++,$attributes,[]);
-				else{
-					$type=preg_replace('/\d/', '', $type );
-					$this->fieldAs($i++,$type,$attributes);
+		if (JArray::isAssociative($types)) {
+			foreach ($types as $type=>$attributes) {
+				if (\is_int($type))
+					$this->fieldAs($i++, $attributes, []);
+				else {
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
-		}else{
-			foreach ($types as $type){
-				$this->fieldAs($i++,$type);
+		} else {
+			foreach ($types as $type) {
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index,$type,$attributes=NULL){
+	public function fieldAs($index, $type, $attributes=NULL) {
 		$method="fieldAs".\ucfirst($type);
-		if(\method_exists($this, $method)){
-			if(!\is_array($attributes)){
+		if (\method_exists($this, $method)) {
+			if (!\is_array($attributes)) {
 				$attributes=[$index];
-			}else{
+			} else {
 				\array_unshift($attributes, $index);
 			}
-			\call_user_func_array([$this,$method], $attributes);
+			\call_user_func_array([$this, $method], $attributes);
 		}
 	}
 
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$caption,$cssStyle);
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $caption, $cssStyle);
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
-		}, $index,$attributes,"submit");
+		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
-		}, $index,$attributes,"button");
+		}, $index, $attributes, "button");
 	}
 }

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +91 added lines, -91 removed lines

@@ -19,220 +19,220 @@ 
 
 	public static $index=0;
 
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
 		$this->widgetIdentifier=$identifier;
 		$this->values=[];
 		$this->afterCompile=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 		$this->captionCallback=NULL;
-		$this->defaultValueFunction=function($name,$value){return $value;};
+		$this->defaultValueFunction=function($name, $value) {return $value; };
 	}
 
-	public function moveFieldTo($from,$to){
-		if(JArray::moveElementTo($this->visibleProperties, $from, $to)){
+	public function moveFieldTo($from, $to) {
+		if (JArray::moveElementTo($this->visibleProperties, $from, $to)) {
 			return JArray::moveElementTo($this->values, $from, $to);
 		}
 		return false;
 	}
 
-	public function swapFields($index1,$index2){
-		if(JArray::swapElements($this->visibleProperties, $index1, $index2)){
+	public function swapFields($index1, $index2) {
+		if (JArray::swapElements($this->visibleProperties, $index1, $index2)) {
 			return JArray::swapElements($this->values, $index1, $index2);
 		}
 		return false;
 	}
 
-	public function removeField($index){
-		\array_splice($this->visibleProperties,$index,1);
-		\array_splice($this->values,$index,1);
-		\array_splice($this->captions,$index,1);
+	public function removeField($index) {
+		\array_splice($this->visibleProperties, $index, 1);
+		\array_splice($this->values, $index, 1);
+		\array_splice($this->captions, $index, 1);
 		return $this;
 	}
 
-	public function getValues(){
+	public function getValues() {
 		$values=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$values[]=$this->getValue($index++);
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index=NULL){
-		if(!isset($index))
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"])){
-			if(\is_string($this->values["identifier"]))
+		if (isset($this->values["identifier"])) {
+			if (\is_string($this->values["identifier"]))
 				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value=$this->values["identifier"]($index,$this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	protected function _beforeAddProperty($index,&$field){
+	protected function _beforeAddProperty($index, &$field) {
 
 	}
 
-	protected function _getDefaultValue($name,$value,$index){
+	protected function _getDefaultValue($name, $value, $index) {
 		$func=$this->defaultValueFunction;
-		return $func($name,$value,$index,$this->instance);
+		return $func($name, $value, $index, $this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property,$index){
+	protected function _getPropertyValue(\ReflectionProperty $property, $index) {
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
 
-	protected function _getValue($property,$index){
+	protected function _getValue($property, $index) {
 		$value=null;
 		$propertyName=$property;
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$value=$this->_getPropertyValue($property, $index);
 			$propertyName=$property->getName();
-		}elseif(\is_callable($property))
+		}elseif (\is_callable($property))
 			$value=$property($this->instance);
-		elseif(\is_array($property)){
-			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+		elseif (\is_array($property)) {
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
 			$value=\implode("", $values);
-		}elseif(\is_string($property)){
+		}elseif (\is_string($property)) {
 			$value=$property;
-			if(isset($this->instance->{$property})){
+			if (isset($this->instance->{$property})) {
 				$value=$this->instance->{$property};
-			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+			}elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
 				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 		return $this->_postGetValue($index, $propertyName, $value);
 	}
 
-	protected function _postGetValue($index,$propertyName,$value){
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
-		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index,self::$index);
+	protected function _postGetValue($index, $propertyName, $value) {
+		if (isset($this->values[$index])) {
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
+		} else {
+			$value=$this->_getDefaultValue($propertyName, $value, $index, self::$index);
 		}
-		if(isset($this->afterCompile[$index])){
-			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,self::$index);
+		if (isset($this->afterCompile[$index])) {
+			if (\is_callable($this->afterCompile[$index])) {
+				$this->afterCompile[$index]($value, $this->instance, self::$index);
 			}
 		}
 		return $value;
 	}
 
-	public function insertField($index,$field){
-		array_splice( $this->visibleProperties, $index, 0, $field );
+	public function insertField($index, $field) {
+		array_splice($this->visibleProperties, $index, 0, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$vb=$this->visibleProperties;
-		if(isset($vb[$index])){
-			if(\is_array($vb[$index])){
+		if (isset($vb[$index])) {
+			if (\is_array($vb[$index])) {
 				$this->visibleProperties[$index][]=$field;
-			}else{
-				$this->visibleProperties[$index]=[$vb[$index],$field];
+			} else {
+				$this->visibleProperties[$index]=[$vb[$index], $field];
 			}
-		}else{
+		} else {
 			return $this->insertField($index, $field);
 		}
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->visibleProperties[]=$field;
 		return $this;
 	}
 
-	public function addFields($fields){
-		$this->visibleProperties=\array_merge($this->visibleProperties,$fields);
+	public function addFields($fields) {
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	public function visiblePropertiesCount(){
+	public function visiblePropertiesCount() {
 		return \sizeof($this->visibleProperties);
 	}
 
-	public function getProperty($index){
+	public function getProperty($index) {
 		return $this->properties[$index];
 	}
 
-	public function getFieldName($index){
+	public function getFieldName($index) {
 		$property=$this->getProperty($index);
-		if($property instanceof \ReflectionProperty){
+		if ($property instanceof \ReflectionProperty) {
 			$result=$property->getName();
-		}elseif(\is_callable($property)){
+		}elseif (\is_callable($property)) {
 			$result=$this->visibleProperties[$index];
-		}else{
+		} else {
 			$result=$property;
 		}
 		return $result;
 	}
 
 
-	protected function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	protected function showableProperty(\ReflectionProperty $rProperty) {
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
-		if(\is_string($instance)){
+		if (\is_string($instance)) {
 			$instance=new $instance();
 		}
 		$this->instance=$instance;
 		$this->properties=[];
 		$this->reflect=new \ReflectionClass($instance);
-		if(JArray::count($this->visibleProperties)===0){
+		if (JArray::count($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
+		} else {
+			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
-	private function setInstanceProperty($property){
-		if(\is_callable($property)){
+	private function setInstanceProperty($property) {
+		if (\is_callable($property)) {
 			$this->properties[]=$property;
-		}elseif(\is_string($property)){
-			try{
+		}elseif (\is_string($property)) {
+			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$rProperty=$this->reflect->getProperty($property);
 				$this->properties[]=$rProperty;
-			}catch(\Exception $e){
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
 				$this->properties[]=$property;
 			}
-		}elseif(\is_int($property)){
+		}elseif (\is_int($property)) {
 			$props=$this->getDefaultProperties();
-			if(isset($props[$property]))
+			if (isset($props[$property]))
 				$this->properties[]=$props[$property];
 				else
 					$this->properties[]=$property;
-		}else{
+		} else {
 			$this->properties[]=$property;
 		}
 	}
 
-	protected function getDefaultProperties(){
+	protected function getDefaultProperties() {
 		$result=[];
 		$properties=$this->reflect->getProperties();
-		foreach ($properties as $property){
+		foreach ($properties as $property) {
 			$showable=$this->showableProperty($property);
-			if($showable!==false){
+			if ($showable!==false) {
 				$result[]=$property;
 			}
 		}
@@ -244,12 +244,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->values["identifier"]=$callback;
 		return $this;
 	}
@@ -262,42 +262,42 @@ 
 		return $this->properties;
 	}
 
-	public function getCaption($index){
-		if(isset($this->captions[$index])){
+	public function getCaption($index) {
+		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if($this->properties[$index] instanceof \ReflectionProperty)
+		if ($this->properties[$index] instanceof \ReflectionProperty)
 			return $this->properties[$index]->getName();
-		elseif(\is_callable($this->properties[$index]))
+		elseif (\is_callable($this->properties[$index]))
 			return "";
 		else
 			return $this->properties[$index];
 	}
 
-	public function getCaptions(){
+	public function getCaptions() {
 		$count=$this->count();
-		if(isset($this->captions)){
-			$captions= \array_values($this->captions);
+		if (isset($this->captions)) {
+			$captions=\array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for ($i=$captionsSize; $i<$count; $i++) {
 				$captions[]="";
 			}
-		}else{
+		} else {
 			$captions=[];
 			$index=0;
-			while($index<$count){
+			while ($index<$count) {
 				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
 			$callback=$this->captionCallback;
-			$callback($captions,$this->instance);
+			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
-	public function setCaption($index,$caption){
-		if(isset($this->captions)===false)
+	public function setCaption($index, $caption) {
+		if (isset($this->captions)===false)
 			$this->captions=[];
 		$this->captions[$index]=$caption;
 		return $this;
@@ -315,7 +315,7 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return InstanceViewer
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$this->afterCompile[$index]=$callback;
 		return $this;
 	}

Ajax/bootstrap/html/HtmlDropdown.php

Braces +12 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
 	public function addItem($caption, $href="#") {
 		if($caption instanceof HtmlDropdownItem){
 			$item=$caption;
-		}else{
+		} else{
 			$iid=$this->getItemsCount()+1;
 			$item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
 			$item->setCaption($caption)->setHref($href);
@@ -130,10 +130,11 @@ 
 	 * @see BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		if (array_keys($array)!==range(0, count($array)-1))
-			return parent::fromArray($array);
-		else
-			return $this->addItems($array);
+		if (array_keys($array)!==range(0, count($array)-1)) {
+					return parent::fromArray($array);
+		} else {
+					return $this->addItems($array);
+		}
 	}
 
 	public function setItems($items) {
@@ -186,8 +187,9 @@ 
 	 * @see BaseHtml::setTagName()
 	 */
 	public function setTagName($tagName) {
-		if ($tagName=="button")
-			$this->class="btn dropdown-toggle";
+		if ($tagName=="button") {
+					$this->class="btn dropdown-toggle";
+		}
 		return parent::setTagName($tagName);
 	}
 
@@ -205,8 +207,9 @@ 
 	}
 
 	public function setAlignment($alignment) {
-		if (is_int($alignment))
-			$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
+		if (is_int($alignment)) {
+					$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
+		}
 		return $this->addToMemberCtrl($this->class, $alignment, CssRef::alignment());
 	}
 

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Spacing +35 added lines, -35 removed lines

@@ -41,15 +41,15 @@ 
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
 	 * @param callable $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
-	public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		parent::__construct($identifier,"ol");
+	public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		parent::__construct($identifier, "ol");
 		$this->startIndex=$startIndex;
 		$this->setProperty("class", "breadcrumb");
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function (HtmlDoubleElement $e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function(HtmlDoubleElement $e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addElements($elements);
@@ -60,43 +60,43 @@ 
 	 * @param string $href
 	 * @return \Ajax\bootstrap\html\HtmlLink
 	 */
-	public function addElement($element,$href="",$glyph=NULL){
+	public function addElement($element, $href="", $glyph=NULL) {
 		$size=sizeof($this->content);
-		if(\is_array($element)){
+		if (\is_array($element)) {
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		} else if ($element instanceof HtmlLink) {
 			$elm=$element;
-		}else{
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
-			if(isset($glyph)){
+		} else {
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
+			if (isset($glyph)) {
 				$elm->wrapContentWithGlyph($glyph);
 			}
 		}
-		$elm->wrap("<li>","</li>");
+		$elm->wrap("<li>", "</li>");
 		$this->content[]=$elm;
 		$elm->setProperty($this->attr, $this->getHref($size));
 		return $elm;
 	}
 
-	public function setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
-		$li=new HtmlBsDoubleElement("","li");
+		$li=new HtmlBsDoubleElement("", "li");
 		$li->setClass("active");
 		$li->setContent($this->content[$index]->getContent());
 		$this->content[$index]=$li;
 	}
 
-	public function addElements($elements){
-		foreach ( $elements as $element ) {
+	public function addElements($elements) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
 	}
 
-	public function fromArray($array){
+	public function fromArray($array) {
 		$array=parent::fromArray($array);
 		$this->addElements($array);
 		return $array;
@@ -108,14 +108,14 @@ 
 	 * @param string $separator
 	 * @return string
 	 */
-	public function getHref($index=null,$separator="/"){
-		if(!isset($index)){
+	public function getHref($index=null, $separator="/") {
+		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){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
+		} else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::compile($js, $view);
@@ -142,19 +142,19 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ($this->content as $element){
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
+		foreach ($this->content as $element) {
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
+		foreach ($this->content as $element) {
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -166,18 +166,18 @@ 
 	 * @param string $targetSelector the target of the get
 	 * @return HtmlBreadcrumbs
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
-		if($this->autoActive){
+	public function contentAsString() {
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::contentAsString();
 	}
 
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->content[$index];
 	}
 
@@ -186,7 +186,7 @@ 
 	 * @param mixed $glyph
 	 * @param int $index
 	 */
-	public function addGlyph($glyph,$index=0){
+	public function addGlyph($glyph, $index=0) {
 		$elm=$this->getElement($index);
 		return $elm->wrapContentWithGlyph($glyph);
 	}
@@ -197,7 +197,7 @@ 
 	 * @param object $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) {
 		$this->startIndex=$startIndex;
 		return $this->addElements($js->fromDispatcher($dispatcher));
 	}
@@ -209,7 +209,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}