phpMv / phpMv-UI

Ajax/common/BaseGui.php

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 	}
 
 	public function compile($internal = false) {
-		if ($internal === false && $this->autoCompile === true)
-			throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
+		if ($internal === false && $this->autoCompile === true) {
+					throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
+		}
 		foreach ($this->components as $component) {
 			$component->compile();
 		}
@@ -69,9 +70,10 @@ 
 				$this->components[] = $component;
 			}
 		}
-		if (isset($params))
-			if (\is_array($params))
+		if (isset($params)) {
+					if (\is_array($params))
 				$component->setParams($params);
+		}
 		return $component;
 	}
 

Spacing +17 added lines, -17 removed lines

@@ -29,10 +29,10 @@ 
 	 */
 	protected $js;
 
-	public function __construct($autoCompile = true) {
-		$this->autoCompile = $autoCompile;
-		$this->components = array();
-		$this->htmlComponents = array();
+	public function __construct($autoCompile=true) {
+		$this->autoCompile=$autoCompile;
+		$this->components=array();
+		$this->htmlComponents=array();
 	}
 
 	public function isAutoCompile() {
@@ -40,12 +40,12 @@ 
 	}
 
 	public function setAutoCompile($autoCompile) {
-		$this->autoCompile = $autoCompile;
+		$this->autoCompile=$autoCompile;
 		return $this;
 	}
 
-	public function compile($internal = false) {
-		if ($internal === false && $this->autoCompile === true)
+	public function compile($internal=false) {
+		if ($internal===false && $this->autoCompile===true)
 			throw new \Exception("Impossible to compile if autoCompile is set to 'true'");
 		foreach ($this->components as $component) {
 			$component->compile();
@@ -53,20 +53,20 @@ 
 	}
 
 	public function setJs(JsUtils $js) {
-		$this->js = $js;
+		$this->js=$js;
 	}
 
 	public function addComponent(SimpleComponent $component, $attachTo, $params) {
 		if ($this->autoCompile) {
-			if ($attachTo != null) {
-				if (! isset($this->components[$attachTo])) {
-					$this->components[$attachTo] = $component;
+			if ($attachTo!=null) {
+				if (!isset($this->components[$attachTo])) {
+					$this->components[$attachTo]=$component;
 				} else {
-					$this->components[] = $component;
+					$this->components[]=$component;
 				}
 				$component->attach($attachTo);
 			} else {
-				$this->components[] = $component;
+				$this->components[]=$component;
 			}
 		}
 		if (isset($params))
@@ -76,11 +76,11 @@ 
 	}
 
 	public function addHtmlComponent(BaseHtml $htmlComponent) {
-		$this->htmlComponents[$htmlComponent->getIdentifier()] = $htmlComponent;
+		$this->htmlComponents[$htmlComponent->getIdentifier()]=$htmlComponent;
 		return $htmlComponent;
 	}
 
-	public function compileHtml(JsUtils $js = NULL, &$view = NULL) {
+	public function compileHtml(JsUtils $js=NULL, &$view=NULL) {
 		foreach ($this->htmlComponents as $htmlComponent) {
 			$htmlComponent->compile($js, $view);
 		}
@@ -90,7 +90,7 @@ 
 		return array_filter($this->htmlComponents, $callback);
 	}
 	
-	public function getHtmlComponent($identifier){
-		return $this->htmlComponents[$identifier]??'';
+	public function getHtmlComponent($identifier) {
+		return $this->htmlComponents[$identifier] ?? '';
 	}
 }

Ajax/semantic/html/collections/HtmlMessage.php

Braces +8 added lines, -6 removed lines

@@ -85,10 +85,11 @@ 
 	}
 
 	public function setDismissable($dismiss = true) {
-		if ($dismiss === true)
-			$this->close = new HtmlIcon("close-" . $this->identifier, "close");
-		else
-			$this->close = NULL;
+		if ($dismiss === true) {
+					$this->close = new HtmlIcon("close-" . $this->identifier, "close");
+		} else {
+					$this->close = NULL;
+		}
 		return $this;
 	}
 
@@ -139,7 +140,8 @@ 
 	public function setMessage($message) {
 		if (\is_array($this->content)) {
 			$this->content[\sizeof($this->content) - 1] = $message;
-		} else
-			$this->setContent($message);
+		} else {
+					$this->setContent($message);
+		}
 	}
 }

Spacing +19 added lines, -19 removed lines

@@ -16,15 +16,15 @@ 
  * @version 1.001
  */
 class HtmlMessage extends HtmlSemDoubleElement {
-	use AttachedTrait,HasTimeoutTrait;
+	use AttachedTrait, HasTimeoutTrait;
 
 	protected $icon;
 
 	protected $close;
 
-	public function __construct($identifier, $content = "") {
+	public function __construct($identifier, $content="") {
 		parent::__construct($identifier, "div");
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%close%%icon%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 		$this->setClass("ui message");
 		$this->setContent($content);
 	}
@@ -36,9 +36,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
 	public function addHeader($header) {
-		$headerO = $header;
+		$headerO=$header;
 		if (\is_string($header)) {
-			$headerO = new HtmlSemDoubleElement("header-" . $this->identifier, "div");
+			$headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div");
 			$headerO->setClass("header");
 			$headerO->setContent($header);
 		}
@@ -53,9 +53,9 @@ 
 		$this->addToProperty("class", "icon");
 		$this->wrapContent("<div class='content'>", "</div>");
 		if (\is_string($icon)) {
-			$this->icon = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$this->icon=new HtmlIcon("icon-".$this->identifier, $icon);
 		} else {
-			$this->icon = $icon;
+			$this->icon=$icon;
 		}
 		return $this;
 	}
@@ -72,23 +72,23 @@ 
 	 *        	default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
 	 * @return $this
 	 */
-	public function getOnClose($url, $responseElement = "", $parameters = array()) {
+	public function getOnClose($url, $responseElement="", $parameters=array()) {
 		if (isset($this->close)) {
 			$this->close->getOnClick($url, $responseElement, $parameters);
 		}
 	}
 
-	public function addLoader($loaderIcon = "notched circle") {
+	public function addLoader($loaderIcon="notched circle") {
 		$this->setIcon($loaderIcon);
 		$this->icon->addToIcon("loading");
 		return $this;
 	}
 
-	public function setDismissable($dismiss = true) {
-		if ($dismiss === true)
-			$this->close = new HtmlIcon("close-" . $this->identifier, "close");
+	public function setDismissable($dismiss=true) {
+		if ($dismiss===true)
+			$this->close=new HtmlIcon("close-".$this->identifier, "close");
 		else
-			$this->close = NULL;
+			$this->close=NULL;
 		return $this;
 	}
 
@@ -98,9 +98,9 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		if (! isset($this->_bsComponent)) {
+		if (!isset($this->_bsComponent)) {
 			if (isset($this->close)) {
-				$js->execOn("click", "#" . $this->identifier . " .close", "$(this).closest('.message').transition({$this->_closeTransition}).trigger('close-message');");
+				$js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition}).trigger('close-message');");
 			}
 			if (isset($this->_timeout)) {
 				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}).trigger('close-message'); }, {$this->_timeout});", true);
@@ -109,15 +109,15 @@ 
 		return parent::run($js);
 	}
 
-	public function setState($visible = true) {
-		$visible = ($visible === true) ? "visible" : "hidden";
+	public function setState($visible=true) {
+		$visible=($visible===true) ? "visible" : "hidden";
 		return $this->addToPropertyCtrl("class", $visible, array(
 			"visible",
 			"hidden"
 		));
 	}
 
-	public function setVariation($value = "floating") {
+	public function setVariation($value="floating") {
 		return $this->addToPropertyCtrl("class", $value, array(
 			"floating",
 			"compact"
@@ -138,7 +138,7 @@ 
 
 	public function setMessage($message) {
 		if (\is_array($this->content)) {
-			$this->content[\sizeof($this->content) - 1] = $message;
+			$this->content[\sizeof($this->content)-1]=$message;
 		} else
 			$this->setContent($message);
 	}

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

Braces +12 added lines, -8 removed lines

@@ -15,8 +15,9 @@ 
 		$field = new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
 		$field->setProperty("name", $name);
 		$this->setField($field);
-		if (isset($label))
-			$this->setLabel($label, $value);
+		if (isset($label)) {
+					$this->setLabel($label, $value);
+		}
 		$this->setLibraryId($identifier);
 	}
 
@@ -40,8 +41,9 @@ 
 			$labelO->setContent($label);
 			$labelO->setProperty("for", $this->getField()
 				->getIdentifier());
-			if (isset($value))
-				$labelO->setProperty("data-value", $value);
+			if (isset($value)) {
+							$labelO->setProperty("data-value", $value);
+			}
 		}
 		$this->content["label"] = $labelO;
 	}
@@ -56,8 +58,9 @@ 
 	 * @return mixed
 	 */
 	public function getLabel() {
-		if (\array_key_exists("label", $this->content))
-			return $this->content["label"];
+		if (\array_key_exists("label", $this->content)) {
+					return $this->content["label"];
+		}
 	}
 
 	/**
@@ -138,8 +141,9 @@ 
 	}
 
 	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);
 	}
 }

Spacing +26 added lines, -26 removed lines

@@ -7,12 +7,12 @@ 
 
 abstract class AbstractCheckbox extends HtmlSemDoubleElement {
 
-	protected $_params = [];
+	protected $_params=[];
 
-	public function __construct($identifier, $name = NULL, $label = NULL, $value = NULL, $inputType = "checkbox", $type = "checkbox") {
-		parent::__construct("ck-" . $identifier, "div", "ui " . $type);
-		$this->_identifier = $identifier;
-		$field = new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
+	public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") {
+		parent::__construct("ck-".$identifier, "div", "ui ".$type);
+		$this->_identifier=$identifier;
+		$field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value);
 		$field->setProperty("name", $name);
 		$this->setField($field);
 		if (isset($label))
@@ -20,8 +20,8 @@ 
 		$this->setLibraryId($identifier);
 	}
 
-	public function setChecked($value = true) {
-		if ($value === true) {
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getField()->setProperty("checked", "checked");
 		} else {
 			$this->getField()->removeProperty("checked");
@@ -29,7 +29,7 @@ 
 		return $this;
 	}
 
-	public function forceValue($value = 'true') {
+	public function forceValue($value='true') {
 		$this->getField()->forceValue($value);
 		return $this;
 	}
@@ -38,21 +38,21 @@ 
 		return $this->addToPropertyCtrl("class", $checkboxType, CheckboxType::getConstants());
 	}
 
-	public function setLabel($label, $value = null) {
-		$labelO = $label;
+	public function setLabel($label, $value=null) {
+		$labelO=$label;
 		if (\is_string($label)) {
-			$labelO = new HtmlSemDoubleElement("", "label", "");
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
 			$labelO->setProperty("for", $this->getField()
 				->getIdentifier());
 			if (isset($value))
 				$labelO->setProperty("data-value", $value);
 		}
-		$this->content["label"] = $labelO;
+		$this->content["label"]=$labelO;
 	}
 
 	public function setField($field) {
-		$this->content["field"] = $field;
+		$this->content["field"]=$field;
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * puts the label before or behind
 	 */
 	public function swapLabel() {
-		$label = $this->getLabel();
+		$label=$this->getLabel();
 		unset($this->content["label"]);
-		$this->content["label"] = $label;
+		$this->content["label"]=$label;
 	}
 
 	public function setReadonly() {
@@ -97,13 +97,13 @@ 
 	 *        	action to execute : check, uncheck or NULL for toggle
 	 * @return AbstractCheckbox
 	 */
-	public function attachEvent($selector, $action = NULL) {
-		if (isset($action) || \is_numeric($action) === true) {
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '", "' . $action . '");';
+	public function attachEvent($selector, $action=NULL) {
+		if (isset($action) || \is_numeric($action)===true) {
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");';
 		} else {
-			$js = '$("#%identifier%").checkbox("attach events", "' . $selector . '");';
+			$js='$("#%identifier%").checkbox("attach events", "'.$selector.'");';
 		}
-		$js = \str_replace("%identifier%", $this->identifier, $js);
+		$js=\str_replace("%identifier%", $this->identifier, $js);
 		return $this->executeOnRun($js);
 	}
 
@@ -114,7 +114,7 @@ 
 	 *        	associative array of events to attach ex : ["#bt-toggle","check"=>"#bt-check","uncheck"=>"#bt-uncheck"]
 	 * @return AbstractCheckbox
 	 */
-	public function attachEvents($events = array()) {
+	public function attachEvents($events=array()) {
 		if (\is_array($events)) {
 			foreach ($events as $action => $selector) {
 				$this->attachEvent($selector, $action);
@@ -128,23 +128,23 @@ 
 	}
 
 	public function setOnChecked($jsCode) {
-		$this->_params["onChecked"] = $jsCode;
+		$this->_params["onChecked"]=$jsCode;
 		return $this;
 	}
 
 	public function setOnUnchecked($jsCode) {
-		$this->_params["onUnchecked"] = $jsCode;
+		$this->_params["onUnchecked"]=$jsCode;
 		return $this;
 	}
 
 	public function setOnChange($jsCode) {
-		$this->_params["onChange"] = $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/widgets/base/InstanceViewer.php

Spacing +107 added lines, -107 removed lines

@@ -29,17 +29,17 @@ 
 
 	protected $groupByFields;
 
-	public static $index = 0;
+	public static $index=0;
 
-	public function __construct($identifier, $instance = NULL, $captions = NULL) {
-		$this->widgetIdentifier = $identifier;
-		$this->values = [];
-		$this->afterCompile = [];
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		$this->widgetIdentifier=$identifier;
+		$this->values=[];
+		$this->afterCompile=[];
 		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
-		$this->captionCallback = NULL;
-		$this->defaultValueFunction = function ($name, $value) {
+		$this->captionCallback=NULL;
+		$this->defaultValueFunction=function($name, $value) {
 			return $value;
 		};
 	}
@@ -66,47 +66,47 @@ 
 	}
 
 	public function getValues() {
-		$values = [];
-		$index = 0;
-		$count = $this->count();
-		$hasGroupby = is_array($this->groupByFields);
-		if (! $hasGroupby) {
-			while ($index < $count) {
-				$values[] = $this->getValue($index ++);
+		$values=[];
+		$index=0;
+		$count=$this->count();
+		$hasGroupby=is_array($this->groupByFields);
+		if (!$hasGroupby) {
+			while ($index<$count) {
+				$values[]=$this->getValue($index++);
 			}
 		} else {
-			while ($index < $count) {
-				if (array_search($index, $this->groupByFields) === false) {
-					$values[] = $this->getValue($index);
+			while ($index<$count) {
+				if (array_search($index, $this->groupByFields)===false) {
+					$values[]=$this->getValue($index);
 				}
-				$index ++;
+				$index++;
 			}
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index = NULL) {
-		if (! isset($index))
-			$index = self::$index;
-		$value = $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"]))
-				$value = JReflection::callMethod($this->instance, $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) {
-		$property = $this->properties[$index];
+		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
 	protected function _beforeAddProperty($index, &$field) {}
 
 	protected function _getDefaultValue($name, $value, $index) {
-		$func = $this->defaultValueFunction;
+		$func=$this->defaultValueFunction;
 		return $func($name, $value, $index, $this->instance);
 	}
 
@@ -116,26 +116,26 @@ 
 	}
 
 	protected function _getValue($property, $index) {
-		$value = null;
-		$propertyName = $property;
+		$value=null;
+		$propertyName=$property;
 		if ($property instanceof \ReflectionProperty) {
-			$value = $this->_getPropertyValue($property);
-			$propertyName = $property->getName();
+			$value=$this->_getPropertyValue($property);
+			$propertyName=$property->getName();
 		} elseif (\is_callable($property) && array_search($property, [
 			"system"
-		]) === false)
-			$value = $property($this->instance);
+		])===false)
+			$value=$property($this->instance);
 		elseif (\is_array($property)) {
-			$values = \array_map(function ($v) use ($index) {
+			$values=\array_map(function($v) use ($index) {
 				return $this->_getValue($v, $index);
 			}, $property);
-			$value = \implode("", $values);
+			$value=\implode("", $values);
 		} elseif (\is_string($property)) {
-			$value = "";
+			$value="";
 			if (isset($this->instance->{$property})) {
-				$value = $this->instance->{$property};
-			} elseif (\method_exists($this->instance, $getter = JReflection::getterName($property))) {
-				$value = JReflection::callMethod($this->instance, $getter, []);
+				$value=$this->instance->{$property};
+			} elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
+				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 
@@ -144,9 +144,9 @@ 
 
 	protected function _postGetValue($index, $propertyName, $value) {
 		if (isset($this->values[$index])) {
-			$value = $this->values[$index]($value, $this->instance, $index, self::$index);
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
 		} else {
-			$value = $this->_getDefaultValue($propertyName, $value, $index);
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
 		if (isset($this->afterCompile[$index])) {
 			if (\is_callable($this->afterCompile[$index])) {
@@ -156,7 +156,7 @@ 
 		return $value;
 	}
 
-	public function insertField($index, $field, $key = null) {
+	public function insertField($index, $field, $key=null) {
 		if (isset($key)) {
 			array_splice($this->visibleProperties, $index, 0, [
 				$key => $field
@@ -170,29 +170,29 @@ 
 	public function sortColumnContent($index, $array) {
 		if (isset($this->visibleProperties[$index])) {
 			if (is_array($this->visibleProperties[$index])) {
-				$this->visibleProperties[$index] = JArray::sortAssociative($this->visibleProperties[$index], $array);
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
 			}
 		}
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$vb = $this->visibleProperties;
+	public function insertInField($index, $field, $key=null) {
+		$vb=$this->visibleProperties;
 		if (isset($vb[$index])) {
 			if (isset($key)) {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][$key] = $field;
+					$this->visibleProperties[$index][$key]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$key => $field
 					];
 				}
 			} else {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][] = $field;
+					$this->visibleProperties[$index][]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$field
 					];
@@ -204,19 +204,19 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		if (isset($key)) {
-			$this->visibleProperties[] = [
+			$this->visibleProperties[]=[
 				$key => $field
 			];
 		} else {
-			$this->visibleProperties[] = $field;
+			$this->visibleProperties[]=$field;
 		}
 		return $this;
 	}
 
 	public function addFields($fields) {
-		$this->visibleProperties = \array_merge($this->visibleProperties, $fields);
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
@@ -233,30 +233,30 @@ 
 	}
 
 	public function getFieldName($index) {
-		$property = $this->getProperty($index);
+		$property=$this->getProperty($index);
 		if ($property instanceof \ReflectionProperty) {
-			$result = $property->getName();
+			$result=$property->getName();
 		} elseif (\is_callable($property)) {
-			$result = $this->visibleProperties[$index];
+			$result=$this->visibleProperties[$index];
 		} else {
-			$result = $property;
+			$result=$property;
 		}
 		return $result;
 	}
 
 	protected function showableProperty(\ReflectionProperty $rProperty) {
-		return JString::startswith($rProperty->getName(), "_") === false;
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
 		if (\is_string($instance)) {
-			$instance = new $instance();
+			$instance=new $instance();
 		}
-		$this->instance = $instance;
-		$this->properties = [];
-		$this->reflect = new \ReflectionClass($instance);
-		if (JArray::count($this->visibleProperties) === 0) {
-			$this->properties = $this->getDefaultProperties();
+		$this->instance=$instance;
+		$this->properties=[];
+		$this->reflect=new \ReflectionClass($instance);
+		if (JArray::count($this->visibleProperties)===0) {
+			$this->properties=$this->getDefaultProperties();
 		} else {
 			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
@@ -267,56 +267,56 @@ 
 
 	private function setInstanceProperty($property) {
 		if (\is_callable($property)) {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		} elseif (\is_string($property)) {
 			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$rProperty = $this->reflect->getProperty($property);
-				$this->properties[] = $rProperty;
-			} catch (\Exception $e) {
+				$rProperty=$this->reflect->getProperty($property);
+				$this->properties[]=$rProperty;
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 			}
 		} elseif (\is_int($property)) {
-			$props = $this->getDefaultProperties();
+			$props=$this->getDefaultProperties();
 			if (isset($props[$property]))
-				$this->properties[] = $props[$property];
+				$this->properties[]=$props[$property];
 			else
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 		} else {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		}
 	}
 
 	protected function getDefaultProperties() {
-		$result = [];
-		$properties = $this->reflect->getProperties();
+		$result=[];
+		$properties=$this->reflect->getProperties();
 		foreach ($properties as $property) {
-			$showable = $this->showableProperty($property);
-			if ($showable !== false) {
-				$result[] = $property;
+			$showable=$this->showableProperty($property);
+			if ($showable!==false) {
+				$result[]=$property;
 			}
 		}
 		return $result;
 	}
 
 	public function setVisibleProperties($visibleProperties) {
-		$this->visibleProperties = $visibleProperties;
+		$this->visibleProperties=$visibleProperties;
 		return $this;
 	}
 
 	public function setValueFunction($index, $callback) {
-		$this->values[$index] = $callback;
+		$this->values[$index]=$callback;
 		return $this;
 	}
 
 	public function setIdentifierFunction($callback) {
-		$this->values["identifier"] = $callback;
+		$this->values["identifier"]=$callback;
 		return $this;
 	}
 
 	public static function setIndex($index) {
-		self::$index = $index;
+		self::$index=$index;
 	}
 
 	public function getProperties() {
@@ -336,43 +336,43 @@ 
 	}
 
 	public function getCaptions() {
-		$hasGroupby = is_array($this->groupByFields);
-		$count = $this->count();
-		$moreAdded = false;
+		$hasGroupby=is_array($this->groupByFields);
+		$count=$this->count();
+		$moreAdded=false;
 		if (isset($this->captions)) {
-			$captions = \array_values($this->captions);
-			$gbSize = $hasGroupby ? sizeof($this->groupByFields) : 0;
-			$captionsSize = \sizeof($captions);
-			for ($i = $captionsSize; $i < $count - $gbSize; $i ++) {
-				$captions[] = "";
-				$moreAdded = true;
+			$captions=\array_values($this->captions);
+			$gbSize=$hasGroupby ? sizeof($this->groupByFields) : 0;
+			$captionsSize=\sizeof($captions);
+			for ($i=$captionsSize; $i<$count-$gbSize; $i++) {
+				$captions[]="";
+				$moreAdded=true;
 			}
 		} else {
-			$captions = [];
-			$index = 0;
-			while ($index < $count) {
-				$captions[] = $this->getCaption($index ++);
+			$captions=[];
+			$index=0;
+			while ($index<$count) {
+				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if ($hasGroupby && sizeof($captions) >= $count && ! $moreAdded) {
-			$captions = JArray::removeByKeys($captions, $this->groupByFields);
+		if ($hasGroupby && sizeof($captions)>=$count && !$moreAdded) {
+			$captions=JArray::removeByKeys($captions, $this->groupByFields);
 		}
 		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
-			$callback = $this->captionCallback;
+			$callback=$this->captionCallback;
 			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
 	public function setCaption($index, $caption) {
-		if (isset($this->captions) === false)
-			$this->captions = [];
-		$this->captions[$index] = $caption;
+		if (isset($this->captions)===false)
+			$this->captions=[];
+		$this->captions[$index]=$caption;
 		return $this;
 	}
 
 	public function setCaptions($captions) {
-		$this->captions = $captions;
+		$this->captions=$captions;
 		return $this;
 	}
 
@@ -387,7 +387,7 @@ 
 	 * @return InstanceViewer
 	 */
 	public function afterCompile($index, $callback) {
-		$this->afterCompile[$index] = $callback;
+		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
 
@@ -399,7 +399,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setCaptionCallback($captionCallback) {
-		$this->captionCallback = $captionCallback;
+		$this->captionCallback=$captionCallback;
 		return $this;
 	}
 
@@ -411,7 +411,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setDefaultValueFunction($defaultValueFunction) {
-		$this->defaultValueFunction = $defaultValueFunction;
+		$this->defaultValueFunction=$defaultValueFunction;
 		return $this;
 	}
 
@@ -420,8 +420,8 @@ 
 	}
 
 	public function getSimpleProperties() {
-		return array_filter($this->visibleProperties, function ($item) {
-			return ! (is_array($item) || is_object($item));
+		return array_filter($this->visibleProperties, function($item) {
+			return !(is_array($item) || is_object($item));
 		});
 	}
 
@@ -446,7 +446,7 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 
 	public function getGroupByFieldsCount() {

Braces +29 added lines, -23 removed lines

@@ -35,8 +35,9 @@ 
 		$this->widgetIdentifier = $identifier;
 		$this->values = [];
 		$this->afterCompile = [];
-		if (isset($instance))
-			$this->setInstance($instance);
+		if (isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback = NULL;
 		$this->defaultValueFunction = function ($name, $value) {
@@ -86,14 +87,16 @@ 
 	}
 
 	public function getIdentifier($index = NULL) {
-		if (! isset($index))
-			$index = self::$index;
+		if (! isset($index)) {
+					$index = self::$index;
+		}
 		$value = $index;
 		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);
+			if (\is_string($this->values["identifier"])) {
+							$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value = $this->values["identifier"]($index, $this->instance);
+			}
 		}
 		return $value;
 	}
@@ -123,9 +126,9 @@ 
 			$propertyName = $property->getName();
 		} elseif (\is_callable($property) && array_search($property, [
 			"system"
-		]) === false)
-			$value = $property($this->instance);
-		elseif (\is_array($property)) {
+		]) === false) {
+					$value = $property($this->instance);
+		} elseif (\is_array($property)) {
 			$values = \array_map(function ($v) use ($index) {
 				return $this->_getValue($v, $index);
 			}, $property);
@@ -279,10 +282,11 @@ 
 			}
 		} elseif (\is_int($property)) {
 			$props = $this->getDefaultProperties();
-			if (isset($props[$property]))
-				$this->properties[] = $props[$property];
-			else
-				$this->properties[] = $property;
+			if (isset($props[$property])) {
+							$this->properties[] = $props[$property];
+			} else {
+							$this->properties[] = $property;
+			}
 		} else {
 			$this->properties[] = $property;
 		}
@@ -327,12 +331,13 @@ 
 		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if ($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif (\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if ($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif (\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions() {
@@ -365,8 +370,9 @@ 
 	}
 
 	public function setCaption($index, $caption) {
-		if (isset($this->captions) === false)
-			$this->captions = [];
+		if (isset($this->captions) === false) {
+					$this->captions = [];
+		}
 		$this->captions[$index] = $caption;
 		return $this;
 	}

Ajax/semantic/widgets/datatable/DataTable.php

Braces +36 added lines, -24 removed lines

@@ -81,16 +81,19 @@ 
 				"stopPropagation" => true
 			]);
 		}
-		if (\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
-		if (\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit", $this->_editBehavior, $js);
+		if (\is_array($this->_deleteBehavior)) {
+					$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		}
+		if (\is_array($this->_editBehavior)) {
+					$this->_generateBehavior("edit", $this->_editBehavior, $js);
+		}
 		if (\is_array($this->_displayBehavior)) {
 			$this->_generateBehavior("display", $this->_displayBehavior, $js);
 		}
 		parent::run($js);
-		if (isset($this->_pagination))
-			$this->_associatePaginationBehavior($js, $offset);
+		if (isset($this->_pagination)) {
+					$this->_associatePaginationBehavior($js, $offset);
+		}
 		$this->_associateSearchFieldBehavior($js, $offset);
 	}
 
@@ -139,8 +142,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table, $captions);
 
-			if (isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if (isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -175,8 +179,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table) {
-		if (isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if (isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 		if (isset($this->_colWidths)) {
 			foreach ($this->_colWidths as $colIndex => $width) {
 				$table->setColWidth($colIndex, $width);
@@ -285,8 +290,9 @@ 
 			$field = $ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if (isset($checkedClass))
-				$field->setClass($checkedClass);
+			if (isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result = $table->newRow();
@@ -303,8 +309,9 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if ($this->_toolbarPosition == PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer = $table->getFooter();
 		$footer->mergeCol();
@@ -344,8 +351,9 @@ 
 
 	protected function _getFieldName($index) {
 		$fieldName = parent::_getFieldName($index);
-		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
+		if (\is_object($fieldName)) {
+					$fieldName = "field-" . $index;
+		}
 		return $fieldName . "[]";
 	}
 
@@ -522,8 +530,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		if (! isset($result[$op])) {
+					$result = "#" . $this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -546,8 +555,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if (isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if (isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#" . $this->identifier . " tbody";
 	}
 
@@ -568,8 +578,9 @@ 
 	 */
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance = $modelInstance;
 	}
@@ -611,8 +622,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
+		if (! \is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns = [];
+		}
 		$this->_hiddenColumns[] = $colIndex;
 		return $this;
 	}

Spacing +112 added lines, -112 removed lines

@@ -24,7 +24,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -40,7 +40,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -50,7 +50,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -58,25 +58,25 @@ 
 
 	protected $_colWidths;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier, $model, $modelInstance);
 		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
-		$this->_urls = [];
-		$this->_emptyMessage = new HtmlMessage("", "nothing to display");
+		$this->_urls=[];
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
 	public function run(JsUtils $js) {
-		$offset = $js->scriptCount();
+		$offset=$js->scriptCount();
 		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
 		if ($this->_visibleHover) {
-			$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 				"preventDefault" => false,
 				"stopPropagation" => true
 			]);
-			$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
 				"preventDefault" => false,
 				"stopPropagation" => true
 			]);
@@ -96,10 +96,10 @@ 
 
 	protected function _generateBehavior($op, $params, JsUtils $js) {
 		if (isset($this->_urls[$op])) {
-			$params = \array_merge($params, [
+			$params=\array_merge($params, [
 				"attr" => "data-ajax"
 			]);
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -118,21 +118,21 @@ 
 	}
 
 	public function refreshTD($fieldName, $jquery, $view) {
-		$index = $this->_getIndex($fieldName);
+		$index=$this->_getIndex($fieldName);
 		$this->compile($jquery, $view);
 		return $this->refreshTR()
 			->getTable()
 			->getCell(0, $index);
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_generated) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
-			$captions = $this->_instanceViewer->getCaptions();
-			$table = $this->content["table"];
+			$captions=$this->_instanceViewer->getCaptions();
+			$table=$this->content["table"];
 			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
@@ -147,14 +147,14 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -199,21 +199,21 @@ 
 	}
 
 	protected function _generateContent($table) {
-		$objects = $this->_modelInstance;
+		$objects=$this->_modelInstance;
 		if (isset($this->_pagination)) {
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
+			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$fields = $this->_instanceViewer->getSimpleProperties();
-		$groupByFields = $this->_instanceViewer->getGroupByFields();
-		if (! is_array($groupByFields)) {
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields) {
+		$fields=$this->_instanceViewer->getSimpleProperties();
+		$groupByFields=$this->_instanceViewer->getGroupByFields();
+		if (!is_array($groupByFields)) {
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields) {
 				return $this->_generateRow($instance, $fields, $table);
 			});
 		} else {
-			$activeValues = array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
+			$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -221,8 +221,8 @@ 
 				return $this->_generateRow($instance, $fields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([
 				$this->_emptyMessage
@@ -231,20 +231,20 @@ 
 	}
 
 	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
-		$newValue = $this->_instanceViewer->getValue($gbField);
-		if ($this->getElementContent($activeValues[$gbField]) !== $this->getElementContent($newValue)) {
-			if ($index == 0) {
-				$uuids = [];
+		$newValue=$this->_instanceViewer->getValue($gbField);
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
+				$uuids=[];
 			}
-			$uuid = uniqid("grp");
-			$uuids[$gbField] = $uuid;
-			$id = $this->_instanceViewer->getIdentifier();
-			$result = $table->addMergeRow(sizeof($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
 			$result->setProperty("data-ajax", $id);
 			$result->setProperty("data-group", $uuid);
 			$result->addToProperty("class", $this->_rowClass);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -256,9 +256,9 @@ 
 	}
 
 	public function getFieldValue($index) {
-		$index = $this->_getIndex($index);
+		$index=$this->_getIndex($index);
 		if (is_numeric($index)) {
-			$values = $this->_instanceViewer->getValues();
+			$values=$this->_instanceViewer->getValues();
 			if (isset($values[$index])) {
 				return $values[$index];
 			}
@@ -266,31 +266,31 @@ 
 		return null;
 	}
 
-	protected function _generateRow($instance, $fields, &$table, $checkedClass = null, $uuids = null) {
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
-		InstanceViewer::$index ++;
-		$values = $this->_instanceViewer->getValues();
-		$id = $this->_instanceViewer->getIdentifier();
-		$dataAjax = $id;
-		$id = $this->cleanIdentifier($id);
+		InstanceViewer::$index++;
+		$values=$this->_instanceViewer->getValues();
+		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if ($this->_hasCheckboxes) {
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
-			$checked = false;
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
+			$checked=false;
 			if (isset($this->_checkedCallback)) {
-				$func = $this->_checkedCallback;
-				$checked = $func($instance);
+				$func=$this->_checkedCallback;
+				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			// $ck->setOnChange("event.stopPropagation();");
-			$field = $ck->getField();
+			$field=$ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
 			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
-		$result = $table->newRow();
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
+		$result=$table->newRow();
+		$result->setIdentifier($this->identifier."-tr-".$id);
 		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class", $this->_rowClass);
@@ -303,62 +303,62 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
-		$footer = $table->getFooter();
+		$footer=$table->getFooter();
 		$footer->mergeCol();
 		$footer->addValues($this->_pagination->generateMenu($this->identifier));
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		if (isset($this->_urls["refresh"])) {
-			$menu = $this->_pagination->getMenu();
+			$menu=$this->_pagination->getMenu();
 			if (isset($menu) && isset($js)) {
-				$js->postOnClick("#" . $menu->getIdentifier() . " .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", $this->getRefreshSelector(), [
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), [
 					"preventDefault" => false,
 					"jqueryDone" => "replaceWith",
 					"hasLoader" => false,
-					"jsCallback" => '$("#' . $this->identifier . '").trigger("pageChange");$("#' . $this->identifier . '").trigger("activeRowChange");'
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
 				]);
-				$page = $_POST["p"] ?? null;
+				$page=$_POST["p"] ?? null;
 				if (isset($page)) {
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("active");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("active");');
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
-			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", "#" . $this->identifier . " tbody", [
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", [
 				"preventDefault" => false,
 				"jqueryDone" => "replaceWith",
 				"hasLoader" => "internal",
-				"jsCallback" => '$("#' . $this->identifier . '").trigger("searchTerminate",[$(self).val()]);'
+				"jsCallback" => '$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);'
 			]);
 		}
 	}
 
-	protected function _associateSearchFieldBehavior(JsUtils $js = NULL, $offset = null) {}
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {}
 
 	protected function _getFieldName($index) {
-		$fieldName = parent::_getFieldName($index);
+		$fieldName=parent::_getFieldName($index);
 		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
-		return $fieldName . "[]";
+			$fieldName="field-".$index;
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$this->_toolbarPosition] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -385,11 +385,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\sizeof($captions));
+			$row=$table->getPart($part)->addRow(\sizeof($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -421,12 +421,12 @@ 
 	 */
 	public function setUrls($urls) {
 		if (\is_array($urls)) {
-			$this->_urls["refresh"] = JArray::getValue($urls, "refresh", 0);
-			$this->_urls["edit"] = JArray::getValue($urls, "edit", 1);
-			$this->_urls["delete"] = JArray::getValue($urls, "delete", 2);
-			$this->_urls["display"] = JArray::getValue($urls, "display", 3);
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
 		} else {
-			$this->_urls = [
+			$this->_urls=[
 				"refresh" => $urls,
 				"edit" => $urls,
 				"delete" => $urls,
@@ -449,8 +449,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page, $total_rowcount, $items_per_page = 10, $pages_visibles = null) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -465,8 +465,8 @@ 
 	 *        	The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page = 1, $items_per_page = 10, $pages_visibles = 4) {
-		$this->_pagination = new Pagination($items_per_page, $pages_visibles, $page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -475,10 +475,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		"tbody"
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -488,14 +488,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position = Direction::RIGHT) {
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())
 			->setPosition($position);
 	}
 
 	public function getSearchField() {
-		if (isset($this->_searchField) === false) {
-			$this->_searchField = new HtmlInput("search-" . $this->identifier, "search", "", "Search...");
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
 			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
@@ -523,9 +523,9 @@ 
 	}
 
 	protected function getTargetSelector($op) {
-		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		$result=$this->_targetSelector;
+		if (!isset($result[$op]))
+			$result="#".$this->identifier;
 		return $result[$op];
 	}
 
@@ -537,20 +537,20 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if (! \is_array($_targetSelector)) {
-			$_targetSelector = [
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=[
 				"edit" => $_targetSelector,
 				"delete" => $_targetSelector
 			];
 		}
-		$this->_targetSelector = $_targetSelector;
+		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
 		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
-		return "#" . $this->identifier . " tbody";
+		return "#".$this->identifier." tbody";
 	}
 
 	/**
@@ -559,7 +559,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -571,9 +571,9 @@ 
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
 			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getRowClass() {
@@ -587,7 +587,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -598,34 +598,34 @@ 
 	 * @return DataTable
 	 */
 	public function setEmptyMessage($_emptyMessage) {
-		$this->_emptyMessage = $_emptyMessage;
+		$this->_emptyMessage=$_emptyMessage;
 		return $this;
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$this->_sortable = $colIndex;
+	public function setSortable($colIndex=NULL) {
+		$this->_sortable=$colIndex;
 		return $this;
 	}
 
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
-		$this->_hiddenColumns[] = $colIndex;
+		if (!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$this->_colWidths[$colIndex] = $width;
+		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
@@ -634,7 +634,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -672,7 +672,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -696,6 +696,6 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 }

Ajax/service/JArray.php

Spacing +38 added lines, -38 removed lines

@@ -4,34 +4,34 @@ 
 class JArray {
 
 	public static function isAssociative($array) {
-		return (array_values($array) !== $array);
+		return (array_values($array)!==$array);
 	}
 
 	public static function getValue($array, $key, $pos) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		}
-		$values = array_values($array);
-		if ($pos < sizeof($values))
+		$values=array_values($array);
+		if ($pos<sizeof($values))
 			return $values[$pos];
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
-		$result = NULL;
+		$result=NULL;
 		if (array_key_exists($key, $array)) {
-			$result = $array[$key];
-			if ($condition($result) === true)
+			$result=$array[$key];
+			if ($condition($result)===true)
 				return $result;
 		}
-		$values = array_values($array);
+		$values=array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
+			if ($condition($val)===true)
 				return $val;
 		}
 		return $result;
 	}
 
-	public static function getDefaultValue($array, $key, $default = NULL) {
+	public static function getDefaultValue($array, $key, $default=NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
 		} else
@@ -39,77 +39,77 @@ 
 	}
 
 	public static function implode($glue, $pieces) {
-		$result = "";
+		$result="";
 		if (\is_array($glue)) {
-			$size = \sizeof($pieces);
-			if ($size > 0) {
-				for ($i = 0; $i < $size - 1; $i ++) {
-					$result .= $pieces[$i] . @$glue[$i];
+			$size=\sizeof($pieces);
+			if ($size>0) {
+				for ($i=0; $i<$size-1; $i++) {
+					$result.=$pieces[$i].@$glue[$i];
 				}
-				$result .= $pieces[$size - 1];
+				$result.=$pieces[$size-1];
 			}
 		} else {
-			$result = \implode($glue, $pieces);
+			$result=\implode($glue, $pieces);
 		}
 		return $result;
 	}
 
 	public static function dimension($array) {
 		if (\is_array(reset($array))) {
-			$return = self::dimension(reset($array)) + 1;
+			$return=self::dimension(reset($array))+1;
 		} else {
-			$return = 1;
+			$return=1;
 		}
 		return $return;
 	}
 
-	public static function sortAssociative($array, $sortedKeys = array()) {
-		$newArray = array();
+	public static function sortAssociative($array, $sortedKeys=array()) {
+		$newArray=array();
 		foreach ($sortedKeys as $key) {
 			if (\array_key_exists($key, $array)) {
-				$newArray[$key] = $array[$key];
+				$newArray[$key]=$array[$key];
 			}
 		}
 		return $newArray;
 	}
 
 	public static function moveElementTo(&$array, $from, $to) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$from])) {
-				$out = array_splice($array, $from, 1);
+				$out=array_splice($array, $from, 1);
 				array_splice($array, $to, 0, $out);
-				$result = true;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
 	public static function swapElements(&$array, $index1, $index2) {
-		$result = false;
+		$result=false;
 		if (isset($array)) {
 			if (isset($array[$index1]) && isset($array[$index2])) {
-				$tmp = $array[$index1];
-				$array[$index1] = $array[$index2];
-				$array[$index2] = $tmp;
-				$result = true;
+				$tmp=$array[$index1];
+				$array[$index1]=$array[$index2];
+				$array[$index2]=$tmp;
+				$result=true;
 			}
 		}
 		return $result;
 	}
 
-	public static function modelArray($objects, $identifierFunction = NULL, $modelFunction = NULL) {
-		$result = [];
-		if (isset($modelFunction) === false) {
-			$modelFunction = "__toString";
+	public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) {
+		$result=[];
+		if (isset($modelFunction)===false) {
+			$modelFunction="__toString";
 		}
-		if (isset($identifierFunction) === false) {
+		if (isset($identifierFunction)===false) {
 			foreach ($objects as $object) {
-				$result[] = self::callFunction($object, $modelFunction);
+				$result[]=self::callFunction($object, $modelFunction);
 			}
 		} else {
 			foreach ($objects as $object) {
-				$result[self::callFunction($object, $identifierFunction)] = self::callFunction($object, $modelFunction);
+				$result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction);
 			}
 		}
 		return $result;
@@ -134,9 +134,9 @@ 
 	}
 
 	public static function removeByKeys($array, $keys) {
-		$assocKeys = [];
+		$assocKeys=[];
 		foreach ($keys as $key) {
-			$assocKeys[$key] = true;
+			$assocKeys[$key]=true;
 		}
 		return \array_diff_key($array, $assocKeys);
 	}

Braces +15 added lines, -11 removed lines

@@ -12,21 +12,24 @@ 
 			return $array[$key];
 		}
 		$values = array_values($array);
-		if ($pos < sizeof($values))
-			return $values[$pos];
+		if ($pos < sizeof($values)) {
+					return $values[$pos];
+		}
 	}
 
 	public static function getConditionalValue($array, $key, $condition) {
 		$result = NULL;
 		if (array_key_exists($key, $array)) {
 			$result = $array[$key];
-			if ($condition($result) === true)
-				return $result;
+			if ($condition($result) === true) {
+							return $result;
+			}
 		}
 		$values = array_values($array);
 		foreach ($values as $val) {
-			if ($condition($val) === true)
-				return $val;
+			if ($condition($val) === true) {
+							return $val;
+			}
 		}
 		return $result;
 	}
@@ -34,8 +37,9 @@ 
 	public static function getDefaultValue($array, $key, $default = NULL) {
 		if (array_key_exists($key, $array)) {
 			return $array[$key];
-		} else
-			return $default;
+		} else {
+					return $default;
+		}
 	}
 
 	public static function implode($glue, $pieces) {
@@ -116,12 +120,12 @@ 
 	}
 
 	private static function callFunction($object, $callback) {
-		if (\is_string($callback))
-			return \call_user_func(array(
+		if (\is_string($callback)) {
+					return \call_user_func(array(
 				$object,
 				$callback
 			), []);
-		else if (\is_callable($callback)) {
+		} else if (\is_callable($callback)) {
 			return $callback($object);
 		}
 	}

Ajax/semantic/html/elements/HtmlButton.php

Spacing +40 added lines, -40 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string $onClick
 	 *        	JS Code for click event
 	 */
-	public function __construct($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function __construct($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		parent::__construct($identifier, "button", "ui button");
-		$this->content = $value;
+		$this->content=$value;
 		if (isset($cssStyle)) {
 			$this->setStyle($cssStyle);
 		}
@@ -51,12 +51,12 @@ 
 		if (is_array($this->content)) {
 			foreach ($this->content as $i => $content) {
 				if (is_string($content)) {
-					$this->content[$i] = $value;
+					$this->content[$i]=$value;
 					return $this;
 				}
 			}
 		}
-		$this->content = $value;
+		$this->content=$value;
 		return $this;
 	}
 
@@ -70,8 +70,8 @@ 
 		return $this->addToProperty("class", $cssStyle);
 	}
 
-	public function setFocusable($value = true) {
-		if ($value === true)
+	public function setFocusable($value=true) {
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -79,16 +79,16 @@ 
 		return $this;
 	}
 
-	public function setAnimated($content, $animation = "") {
+	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible = new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden = new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content = array(
+		$this->content=array(
 			$visible,
 			$hidden
 		);
@@ -101,12 +101,12 @@ 
 	 * @return HtmlButton
 	 */
 	public function asIcon($icon) {
-		$iconO = $icon;
+		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO = new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
-		$this->content = $iconO;
+		$this->content=$iconO;
 		return $this;
 	}
 
@@ -123,19 +123,19 @@ 
 	 * @param string $icon
 	 * @return HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$this->tagName = "div";
-		$prefix = "";
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$this->tagName="div";
+		$prefix="";
 		if ($before)
-			$prefix = "left ";
-		$this->addToProperty("class", $prefix . "labeled");
-		$isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content = new HtmlButton("button-" . $this->identifier, $this->content);
+			$prefix="left ";
+		$this->addToProperty("class", $prefix."labeled");
+		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
 		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label = new HtmlLabel("label-" . $this->identifier, $label, $icon, "a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -146,7 +146,7 @@ 
 	 * @see \Ajax\common\html\BaseHtml::fromArray()
 	 */
 	public function fromArray($array) {
-		$array = parent::fromArray($array);
+		$array=parent::fromArray($array);
 		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
@@ -187,9 +187,9 @@ 
 	 *
 	 * @return HtmlButton
 	 */
-	public function setToggle($active = "") {
-		$this->onCreate("$('#" . $this->identifier . "').state();");
-		return $this->addToProperty("class", "toggle " . $active);
+	public function setToggle($active="") {
+		$this->onCreate("$('#".$this->identifier."').state();");
+		return $this->addToProperty("class", "toggle ".$active);
 	}
 
 	/**
@@ -225,10 +225,10 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public static function social($identifier, $social, $value = NULL) {
-		if ($value === NULL)
-			$value = \ucfirst($social);
-		$return = new HtmlButton($identifier, $value);
+	public static function social($identifier, $social, $value=NULL) {
+		if ($value===NULL)
+			$value=\ucfirst($social);
+		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
 	}
@@ -242,8 +242,8 @@ 
 	 * @param boolean $before
 	 * @return \Ajax\semantic\html\elements\HtmlButton
 	 */
-	public static function labeled($identifier, $value, $icon, $before = true) {
-		$result = new HtmlButton($identifier, $value);
+	public static function labeled($identifier, $value, $icon, $before=true) {
+		$result=new HtmlButton($identifier, $value);
 		$result->addIcon($icon, $before, true);
 		return $result;
 	}
@@ -256,7 +256,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function icon($identifier, $icon) {
-		$result = new HtmlButton($identifier);
+		$result=new HtmlButton($identifier);
 		$result->asIcon($icon);
 		return $result;
 	}
@@ -266,7 +266,7 @@ 
 	 * {@inheritdoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		parent::asLink($href, $target);
 		return $this;
 	}
@@ -281,20 +281,20 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier, $value, $items = [], $asCombo = false, $icon = null) {
-		$result = new HtmlButtonGroups($identifier, [
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [
 			$value
 		]);
-		$dd = $result->addDropdown($items, $asCombo);
+		$dd=$result->addDropdown($items, $asCombo);
 		if (isset($icon) && $dd instanceof HtmlDropdown)
 			$dd->setIcon($icon);
 		return $result;
 	}
 
-	public function addPopupConfirmation($message, $buttons = ["Okay","Cancel"]) {
-		$elm = new HtmlSemDoubleElement('popup-confirm-' . $this->_identifier);
+	public function addPopupConfirmation($message, $buttons=["Okay", "Cancel"]) {
+		$elm=new HtmlSemDoubleElement('popup-confirm-'.$this->_identifier);
 		$elm->setContent([
-			'message' => new HtmlSemDoubleElement('popup-confirm-message-' . $this->_identifier, 'p', '', $message)
+			'message' => new HtmlSemDoubleElement('popup-confirm-message-'.$this->_identifier, 'p', '', $message)
 		]);
 		$this->addPopupHtml($elm, null, [
 			'on' => 'click'

Braces +18 added lines, -13 removed lines

@@ -71,9 +71,9 @@ 
 	}
 
 	public function setFocusable($value = true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -126,8 +126,9 @@ 
 	public function addLabel($label, $before = false, $icon = NULL) {
 		$this->tagName = "div";
 		$prefix = "";
-		if ($before)
-			$prefix = "left ";
+		if ($before) {
+					$prefix = "left ";
+		}
 		$this->addToProperty("class", $prefix . "labeled");
 		$isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
 		$this->content = new HtmlButton("button-" . $this->identifier, $this->content);
@@ -165,11 +166,13 @@ 
 	public function setColor($color) {
 		if (\is_array($this->content)) {
 			foreach ($this->content as $content) {
-				if ($content instanceof HtmlButton)
-					$content->setColor($color);
+				if ($content instanceof HtmlButton) {
+									$content->setColor($color);
+				}
 			}
-		} else
-			parent::setColor($color);
+		} else {
+					parent::setColor($color);
+		}
 		return $this;
 	}
 
@@ -226,8 +229,9 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value = NULL) {
-		if ($value === NULL)
-			$value = \ucfirst($social);
+		if ($value === NULL) {
+					$value = \ucfirst($social);
+		}
 		$return = new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -286,8 +290,9 @@ 
 			$value
 		]);
 		$dd = $result->addDropdown($items, $asCombo);
-		if (isset($icon) && $dd instanceof HtmlDropdown)
-			$dd->setIcon($icon);
+		if (isset($icon) && $dd instanceof HtmlDropdown) {
+					$dd->setIcon($icon);
+		}
 		return $result;
 	}
 

Ajax/semantic/html/collections/menus/HtmlMenu.php

Spacing +31 added lines, -31 removed lines

@@ -41,12 +41,12 @@ 
 	 * @return HtmlMenu
 	 */
 	public function setType($type="") {
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
 	}
 
 	public function setActiveItem($index) {
 		$item=$this->getItem($index);
-		if ($item !== null) {
+		if ($item!==null) {
 			$item->addToProperty("class", "active");
 		}
 		return $this;
@@ -54,7 +54,7 @@ 
 
 	private function getItemToInsert($item) {
 		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) {
-			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
+			$itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item);
 			$itemO->addClass("no-active");
 			$item=$itemO;
 		}
@@ -63,7 +63,7 @@ 
 
 	private function afterInsert($item) {
 		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
+			$item->addToPropertyCtrl("class", "item", array("item"));
 		else {
 			$this->setSecondary();
 		}
@@ -79,7 +79,7 @@ 
 	public function addItem($item) {
 		$number=$item;
 		$item=parent::addItem($this->getItemToInsert($item));
-		if(\is_int($number))
+		if (\is_int($number))
 			$item->setProperty("data-page", $number);
 		return $this->afterInsert($item);
 	}
@@ -97,15 +97,15 @@ 
 
 	public function generateMenuAsItem($menu, $header=null) {
 		$count=$this->count();
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
 		if (isset($header)) {
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
 			$headerItem->setContent($header);
 			$item->addContent($headerItem);
 			$this->_itemHeader=$headerItem;
 		}
-		if(\is_array($menu)){
-			$menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu);
+		if (\is_array($menu)) {
+			$menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu);
 		}
 		$menu->setClass("menu");
 		$item->addContent($menu);
@@ -117,11 +117,11 @@ 
 	 * @param String|HtmlDoubleElement $caption
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addHeader($caption){
-		if(!($caption instanceof HtmlDoubleElement)){
-			$header=new HtmlDoubleElement('','div');
+	public function addHeader($caption) {
+		if (!($caption instanceof HtmlDoubleElement)) {
+			$header=new HtmlDoubleElement('', 'div');
 			$header->setContent($caption);
-		}else{
+		} else {
 			$header=$caption;
 		}
 		$header->addClass('item header');
@@ -137,7 +137,7 @@ 
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
 		$value->addContent(new HtmlIcon("", "dropdown"));
 		$value=$this->addItem($value);
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
 		$this->wrap("", $popup);
 		return $popup;
@@ -146,7 +146,7 @@ 
 	public function addDropdownAsItem($value, $items=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
 		}
 		$this->addItem($dd);
 		return $dd;
@@ -159,14 +159,14 @@ 
 	 * @see HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),"");
+		$itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), "");
 		$itemO->setTagName("a");
 		$itemO->setContent($value);
 		return $itemO;
 	}
 
 	public function setSecondary($value=true) {
-		if($value)
+		if ($value)
 			$this->addToProperty("class", "secondary");
 		else
 			$this->removePropertyValue("class", "secondary");
@@ -174,28 +174,28 @@ 
 	}
 
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
 	public function setPosition($value="right") {
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
 	}
 
 	public function setPointing($value=Direction::NONE) {
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
 	public function asTab($vertical=false) {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
+		if ($vertical===true)
 			$this->setVertical();
 		return $this->addToProperty("class", "tabular");
 	}
 
 	public function asPagination() {
-		$this->apply(function (HtmlDoubleElement &$item) {
+		$this->apply(function(HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
 		return $this->addToProperty("class", "pagination");
@@ -232,10 +232,10 @@ 
 	 */
 	public function setWidth($width) {
 		if (\is_int($width)) {
-			$width=Wide::getConstants()["W" . $width];
+			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
+		return $this->addToPropertyCtrl("class", "item", array("item"));
 	}
 
 	public function addImage($identifier, $src="", $alt="") {
@@ -250,14 +250,14 @@ 
 		return $this->_itemHeader;
 	}
 
-	public function setHasContainer(){
-		return $this->wrapContent("<div class='ui container'>","</div>");
+	public function setHasContainer() {
+		return $this->wrapContent("<div class='ui container'>", "</div>");
 	}
 
-	public function run(JsUtils $js){
-		if($this->identifier!=="" && !isset($this->_bsComponent))
-			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		if ($this->identifier!=="" && !isset($this->_bsComponent))
+			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false);
+		$result=parent::run($js);
 		return $result->setItemSelector(">.item:not(.header)");
 	}
 }

Braces +23 added lines, -18 removed lines

@@ -62,9 +62,9 @@ 
 	}
 
 	private function afterInsert($item) {
-		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
-		else {
+		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) {
+					$item->addToPropertyCtrl("class", "item", array ("item" ));
+		} else {
 			$this->setSecondary();
 		}
 		return $item;
@@ -79,8 +79,9 @@ 
 	public function addItem($item) {
 		$number=$item;
 		$item=parent::addItem($this->getItemToInsert($item));
-		if(\is_int($number))
-			$item->setProperty("data-page", $number);
+		if(\is_int($number)) {
+					$item->setProperty("data-page", $number);
+		}
 		return $this->afterInsert($item);
 	}
 
@@ -121,7 +122,7 @@ 
 		if(!($caption instanceof HtmlDoubleElement)){
 			$header=new HtmlDoubleElement('','div');
 			$header->setContent($caption);
-		}else{
+		} else{
 			$header=$caption;
 		}
 		$header->addClass('item header');
@@ -166,10 +167,11 @@ 
 	}
 
 	public function setSecondary($value=true) {
-		if($value)
-			$this->addToProperty("class", "secondary");
-		else
-			$this->removePropertyValue("class", "secondary");
+		if($value) {
+					$this->addToProperty("class", "secondary");
+		} else {
+					$this->removePropertyValue("class", "secondary");
+		}
 		return $this;
 	}
 
@@ -189,8 +191,9 @@ 
 		$this->apply(function (HtmlDoubleElement &$item) {
 			$item->setTagName("a");
 		});
-		if ($vertical === true)
-			$this->setVertical();
+		if ($vertical === true) {
+					$this->setVertical();
+		}
 		return $this->addToProperty("class", "tabular");
 	}
 
@@ -219,10 +222,11 @@ 
 	 */
 	public function fromDatabaseObject($object, $function) {
 		$return=$function($object);
-		if (\is_array($return))
-			$this->addItems($return);
-		else
-			$this->addItem($return);
+		if (\is_array($return)) {
+					$this->addItems($return);
+		} else {
+					$this->addItem($return);
+		}
 	}
 
 	/**
@@ -255,8 +259,9 @@ 
 	}
 
 	public function run(JsUtils $js){
-		if($this->identifier!=="" && !isset($this->_bsComponent))
-			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
+		if($this->identifier!=="" && !isset($this->_bsComponent)) {
+					$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
+		}
 		$result= parent::run($js);
 		return $result->setItemSelector(">.item:not(.header)");
 	}

Ajax/common/components/BaseComponent.php

Spacing +7 added lines, -7 removed lines

@@ -10,8 +10,8 @@ 
  * @version 1.001
  */
 abstract class BaseComponent {
-	public $jquery_code_for_compile=array ();
-	protected $params=array ();
+	public $jquery_code_for_compile=array();
+	protected $params=array();
 
 	/**
 	 *
@@ -68,7 +68,7 @@ 
 	}
 
 	public function setParams($params) {
-		foreach ( $params as $k => $v ) {
+		foreach ($params as $k => $v) {
 			$method="set".ucfirst($k);
 			if (method_exists($this, $method))
 				$this->$method($v);
@@ -81,8 +81,8 @@ 
 		return $this;
 	}
 
-	public function addParams($params){
-		foreach ($params as $k=>$v){
+	public function addParams($params) {
+		foreach ($params as $k=>$v) {
 				$this->setParam($k, $v);
 		}
 		return $this;
@@ -90,11 +90,11 @@ 
 
 	abstract public function getScript();
 
-	public function setDebug($value){
+	public function setDebug($value) {
 		return $this->setParam("debug", $value);
 	}
 
-	public function setVerbose($value){
+	public function setVerbose($value) {
 		return $this->setParam("verbose", $value);
 	}
 

Braces +12 added lines, -9 removed lines

@@ -39,8 +39,9 @@ 
 
 	public function getParam($key) {
 		$value=null;
-		if (array_key_exists($key, $this->params))
-			$value=$this->params [$key];
+		if (array_key_exists($key, $this->params)) {
+					$value=$this->params [$key];
+		}
 		return $value;
 	}
 
@@ -49,16 +50,18 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL) {
-		if ($js==NULL)
-			$js=$this->js;
+		if ($js==NULL) {
+					$js=$this->js;
+		}
 		$script=$this->getScript();
 		$js->addToCompile($script);
 	}
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl)===false)
-				throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
+			if (array_search($value, $typeCtrl)===false) {
+							throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
+			}
 		} else {
 			if (!$typeCtrl($value)) {
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key);
@@ -70,9 +73,9 @@ 
 	public function setParams($params) {
 		foreach ( $params as $k => $v ) {
 			$method="set".ucfirst($k);
-			if (method_exists($this, $method))
-				$this->$method($v);
-			else {
+			if (method_exists($this, $method)) {
+							$this->$method($v);
+			} else {
 				$this->setParam($k, $v);
 				trigger_error("`{$k}` doesn't exists!", E_USER_NOTICE);
 			}