phpMv / phpMv-UI

Ajax/semantic/html/content/table/HtmlTableContent.php

Doc Comments +13 added lines, -1 removed lines

@@ -69,6 +69,9 @@ 
 		return $tr;
 	}
 
+	/**
+	 * @param integer $value
+	 */
 	public function newRow($value) {
 		return $this->createItem($value);
 	}
@@ -102,7 +105,7 @@ 
 	/**
 	 *
 	 * @param int $index
-	 * @return \Ajax\semantic\html\content\HtmlTR
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index) {
 		return $this->getItem($index);
@@ -146,6 +149,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $colIndex
+	 */
 	public function setColValues($colIndex, $values=array()) {
 		$count=$this->count();
 		if (\is_array($values) === false) {
@@ -166,6 +172,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param integer $rowIndex
+	 */
 	public function setRowValues($rowIndex, $values=array()) {
 		$count=$this->count();
 		if (\is_array($values) === false) {
@@ -175,6 +184,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $function
+	 */
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
 		for($i=0; $i < $count; $i++) {

Ajax/semantic/widgets/datatable/DataTable.php

Doc Comments +28 added lines, -3 removed lines

@@ -33,6 +33,10 @@ 
 		parent::run($js);
 	}
 
+	/**
+	 * @param string $identifier
+	 * @param string $model
+	 */
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
@@ -112,6 +116,9 @@ 
 		return parent::compile($js,$view);
 	}
 
+	/**
+	 * @param string $part
+	 */
 	private function addToolbarRow($part,$table,$captions){
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
@@ -137,16 +144,26 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function addField($field){
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
+	/**
+	 * @param integer $index
+	 * @param \Closure $field
+	 */
 	public function insertField($index,$field){
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
+	/**
+	 * @param \Closure $field
+	 */
 	public function insertInField($index,$field){
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
@@ -195,16 +212,16 @@ 
 	/**
 	 * @param string $caption
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getFieldButtonCallable($caption,$callback=null){
 		return $this->getCallable($this->getFieldButton($caption),$callback);
 	}
 
 	/**
-	 * @param mixed $object
+	 * @param HtmlButton $object
 	 * @param callable $callback
-	 * @return callable
+	 * @return \Closure
 	 */
 	private function getCallable($object,$callback=null){
 		$result=function($instance) use($object,$callback){
@@ -263,12 +280,20 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function addDefaultButton($icon,$class=null,$callback=null){
 		$bt=$this->getDefaultButton($icon,$class);
 		$this->addField($this->getCallable($bt,$callback));
 		return $this;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $class
+	 */
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
 		$bt=$this->getDefaultButton($icon,$class);
 		$this->insertInField($index,$this->getCallable($bt,$callback));

Spacing +93 added lines, -93 removed lines

@@ -23,8 +23,8 @@ 
 	protected $_compileParts;
 	protected $_toolbarPosition;
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
@@ -33,18 +33,18 @@ 
 		parent::run($js);
 	}
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
 		$this->_instanceViewer=new InstanceViewer();
-		$this->content=["table"=>new HtmlTable($identifier, 0,0)];
+		$this->content=["table"=>new HtmlTable($identifier, 0, 0)];
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(isset($this->_toolbar) && isset($this->_compileParts)===false){
-			if($this->_toolbarPosition===PositionInTable::BEFORETABLE){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (isset($this->_toolbar) && isset($this->_compileParts)===false) {
+			if ($this->_toolbarPosition===PositionInTable::BEFORETABLE) {
 				$this->content["before"]=$this->_toolbar;
-			}elseif($this->_toolbarPosition===PositionInTable::BEFORETABLE){
+			}elseif ($this->_toolbarPosition===PositionInTable::BEFORETABLE) {
 				$this->content["after"]=$this->_toolbar;
 			}
 		}
@@ -54,8 +54,8 @@ 
 
 		$table=$this->content["table"];
 		//$table=new HtmlTable($identifier, 0, 0);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
 			$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
 			$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
 			\array_unshift($captions, $ck);
@@ -63,56 +63,56 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
+		if (isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_searchUrl,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if (isset($this->_searchField)) {
+			if (isset($js))
+				$this->_searchField->postOn("change", $this->_searchUrl, "{'s':$(this).val()}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
 
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$table->fromDatabaseObjects($objects, function($instance){
+		$table->fromDatabaseObjects($objects, function($instance) {
 			$this->_instanceViewer->setInstance($instance);
-			$result= $this->_instanceViewer->getValues();
-			if($this->_hasCheckboxes){
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
+			$result=$this->_instanceViewer->getValues();
+			if ($this->_hasCheckboxes) {
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
 				$field=$ck->getField();
-				$field->setProperty("value",$this->_instanceViewer->getCkValue());
+				$field->setProperty("value", $this->_instanceViewer->getCkValue());
 				$field->setProperty("name", "selection[]");
 				\array_unshift($result, $ck);
 			}
 			return $result;
 		});
-			if($this->_hasCheckboxes){
-				if($table->hasPart("thead"))
-					$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			if ($this->_hasCheckboxes) {
+				if ($table->hasPart("thead"))
+					$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
 			}
 
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
 			$footer=$table->getFooter();
 			$footer->mergeCol();
-			$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+			$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 			$menu->floatRight();
 			$menu->setActiveItem($this->_pagination->getPage()-1);
 			$footer->setValues($menu);
-			$menu->postOnClick($this->_searchUrl,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			$menu->postOnClick($this->_searchUrl, "{'p':$(this).attr('data-page')}", "-#".$this->identifier." tbody", ["preventDefault"=>false]);
 		}
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition===PositionInTable::FOOTER)
-				$this->addToolbarRow("tfoot",$table, $captions);
-			elseif($this->_toolbarPosition===PositionInTable::HEADER){
-				$this->addToolbarRow("thead",$table, $captions);
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition===PositionInTable::FOOTER)
+				$this->addToolbarRow("tfoot", $table, $captions);
+			elseif ($this->_toolbarPosition===PositionInTable::HEADER) {
+				$this->addToolbarRow("thead", $table, $captions);
 			}
 		}
-		$this->content=JArray::sortAssociative($this->content, ["before","table","after"]);
-		return parent::compile($js,$view);
+		$this->content=JArray::sortAssociative($this->content, ["before", "table", "after"]);
+		return parent::compile($js, $view);
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$row=$table->getPart($part)->addRow(\sizeof($captions));
 		$row->mergeCol();
 		$row->setValues([$this->_toolbar]);
@@ -127,42 +127,42 @@ 
 		return $this;
 	}
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setCkValueFunction($callback){
+	public function setCkValueFunction($callback) {
 		$this->_instanceViewer->setCkValueFunction($callback);
 		return $this;
 	}
 
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -175,8 +175,8 @@ 
 		return $this;
 	}
 
-	public function paginate($items_per_page=10,$page=1){
-		$this->_pagination=new Pagination($items_per_page,4,$page);
+	public function paginate($items_per_page=10, $page=1) {
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
 	}
 
 	public function getHasCheckboxes() {
@@ -188,7 +188,7 @@ 
 		return $this;
 	}
 
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -197,8 +197,8 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable($this->getFieldButton($caption),$callback);
+	private function getFieldButtonCallable($caption, $callback=null) {
+		return $this->getCallable($this->getFieldButton($caption), $callback);
 	}
 
 	/**
@@ -206,11 +206,11 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($object,$callback=null){
-		$result=function($instance) use($object,$callback){
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance);
+	private function getCallable($object, $callback=null) {
+		$result=function($instance) use($object, $callback){
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance);
 				}
 			}
 			return $object;
@@ -222,9 +222,9 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption){
-			$bt=new HtmlButton("",$caption);
-			$bt->setProperty("data-ajax",$this->_instanceViewer->getCkValue());
+	private function getFieldButton($caption) {
+			$bt=new HtmlButton("", $caption);
+			$bt->setProperty("data-ajax", $this->_instanceViewer->getCkValue());
 			return $bt;
 	}
 
@@ -234,8 +234,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getFieldButtonCallable($caption,$callback));
+	public function addFieldButton($caption, $callback=null) {
+		$this->addField($this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -246,8 +246,8 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertFieldButton($index,$caption,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertFieldButton($index, $caption, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
@@ -258,48 +258,48 @@ 
 	 * @param callable $callback
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$callback));
+	public function insertInFieldButton($index, $caption, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->addField($this->getCallable($bt,$callback));
+	private function addDefaultButton($icon, $class=null, $callback=null) {
+		$bt=$this->getDefaultButton($icon, $class);
+		$this->addField($this->getCallable($bt, $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->insertInField($index,$this->getCallable($bt,$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $callback=null) {
+		$bt=$this->getDefaultButton($icon, $class);
+		$this->insertInField($index, $this->getCallable($bt, $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null){
+	private function getDefaultButton($icon, $class=null) {
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addToProperty("class", $class);
 		return $bt;
 	}
 
-	public function addDeleteButton($callback=null){
-		return $this->addDefaultButton("remove","delete red basic",$callback);
+	public function addDeleteButton($callback=null) {
+		return $this->addDefaultButton("remove", "delete red basic", $callback);
 	}
 
-	public function addEditButton($callback=null){
-		return $this->addDefaultButton("edit","edit basic",$callback);
+	public function addEditButton($callback=null) {
+		return $this->addDefaultButton("edit", "edit basic", $callback);
 	}
 
-	public function insertDeleteButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$callback);
+	public function insertDeleteButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $callback);
 	}
 
-	public function insertEditButtonIn($index,$callback=null){
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$callback);
+	public function insertEditButtonIn($index, $callback=null) {
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $callback);
 	}
 
-	public function setSelectable(){
+	public function setSelectable() {
 		$this->content["table"]->setSelectable();
 		return $this;
 	}
@@ -307,8 +307,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 			$this->_toolbar->setSecondary();
 		}
@@ -319,37 +319,37 @@ 
 	 * @param unknown $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element){
+	public function addInToolbar($element) {
 		$tb=$this->getToolbar();
 		return $tb->addItem($element);
 	}
 
-	public function addItemInToolbar($caption,$icon=NULL){
+	public function addItemInToolbar($caption, $icon=NULL) {
 		$result=$this->addInToolbar($caption);
 		$result->addIcon($icon);
 		return $result;
 	}
 
-	public function addButtonInToolbar($caption){
-		$bt=new HtmlButton("",$caption);
+	public function addButtonInToolbar($caption) {
+		$bt=new HtmlButton("", $caption);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
 
-	public function addSearchInToolbar(){
+	public function addSearchInToolbar() {
 		return $this->addInToolbar($this->getSearchField())->setPosition("right");
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}

Braces +16 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
 		if(isset($this->_toolbar) && isset($this->_compileParts)===false){
 			if($this->_toolbarPosition===PositionInTable::BEFORETABLE){
 				$this->content["before"]=$this->_toolbar;
-			}elseif($this->_toolbarPosition===PositionInTable::BEFORETABLE){
+			} elseif($this->_toolbarPosition===PositionInTable::BEFORETABLE){
 				$this->content["after"]=$this->_toolbar;
 			}
 		}
@@ -63,11 +63,13 @@ 
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
+		if(isset($this->_compileParts)) {
+					$table->setCompileParts($this->_compileParts);
+		}
 		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_searchUrl,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			if(isset($js)) {
+							$this->_searchField->postOn("change", $this->_searchUrl,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+			}
 		}
 
 		$objects=$this->_modelInstance;
@@ -88,8 +90,9 @@ 
 			return $result;
 		});
 			if($this->_hasCheckboxes){
-				if($table->hasPart("thead"))
-					$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+				if($table->hasPart("thead")) {
+									$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+				}
 			}
 
 		if(isset($this->_pagination) && $this->_pagination->getVisible()){
@@ -102,9 +105,9 @@ 
 			$menu->postOnClick($this->_searchUrl,"{'p':$(this).attr('data-page')}","-#".$this->identifier." tbody",["preventDefault"=>false]);
 		}
 		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition===PositionInTable::FOOTER)
-				$this->addToolbarRow("tfoot",$table, $captions);
-			elseif($this->_toolbarPosition===PositionInTable::HEADER){
+			if($this->_toolbarPosition===PositionInTable::FOOTER) {
+							$this->addToolbarRow("tfoot",$table, $captions);
+			} elseif($this->_toolbarPosition===PositionInTable::HEADER){
 				$this->addToolbarRow("thead",$table, $captions);
 			}
 		}
@@ -278,8 +281,9 @@ 
 	private function getDefaultButton($icon,$class=null){
 		$bt=$this->getFieldButton("");
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addToProperty("class", $class);
+		if(isset($class)) {
+					$bt->addToProperty("class", $class);
+		}
 		return $bt;
 	}
 

Ajax/common/Widget.php

Spacing +4 added lines, -4 removed lines

@@ -10,15 +10,15 @@ 
 	protected $_modelInstance;
 	protected $_instanceViewer;
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance));
+		if (isset($modelInstance));
 			$this->show($modelInstance);
 	}
 
-	public function show($modelInstance){
+	public function show($modelInstance) {
 		$this->_modelInstance=$modelInstance;
 	}
 
@@ -42,7 +42,7 @@ 
 
 	public abstract function getHtmlComponent();
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 }
\ No newline at end of file

Ajax/common/components/SimpleComponent.php

Spacing +8 added lines, -8 removed lines

@@ -17,18 +17,18 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->events=array ();
+		$this->events=array();
 	}
 
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
-			if($event=="execute"){
+		foreach ($this->events as $event => $jsCode) {
+			if ($event=="execute") {
 				$this->jquery_code_for_compile []=$jsCode;
-			}else if($event=="beforeExecute"){
+			} else if ($event=="beforeExecute") {
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
-			}else{
+			} else {
 				$selector=$this->attachTo;
-				if(isset($this->itemSelector)){
+				if (isset($this->itemSelector)) {
 					$selector.=" ".$this->itemSelector;
 				}
 				$this->jquery_code_for_compile []="$( \"".$selector."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
@@ -40,7 +40,7 @@ 
 		$result=implode("\n", $this->jquery_code_for_compile);
 		$result=str_ireplace("\"%", "", $result);
 		$result=str_ireplace("%\"", "", $result);
-		$result=str_replace(array (
+		$result=str_replace(array(
 				"\\n",
 				"\\r",
 				"\\t"
@@ -50,7 +50,7 @@ 
 
 	public function getScript() {
 		$allParams=$this->params;
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
 		$this->compileEvents();
 		return $this->compileJQueryCode();

Braces +5 added lines, -4 removed lines

@@ -24,9 +24,9 @@ 
 		foreach ( $this->events as $event => $jsCode ) {
 			if($event=="execute"){
 				$this->jquery_code_for_compile []=$jsCode;
-			}else if($event=="beforeExecute"){
+			} else if($event=="beforeExecute"){
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
-			}else{
+			} else{
 				$selector=$this->attachTo;
 				if(isset($this->itemSelector)){
 					$selector.=" ".$this->itemSelector;
@@ -75,8 +75,9 @@ 
 
 	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."` pour le composant `".$this->uiName."` 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."` pour le composant `".$this->uiName."` 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." au composant ".$this->uiName);

Ajax/common/traits/JqueryAjaxTrait.php

Spacing +37 added lines, -37 removed lines

@@ -15,7 +15,7 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -28,20 +28,20 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -51,30 +51,30 @@ 
 			return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
+		if (JString::endswith($url, "/")===true)
 			$slash="";
-		if(JString::isNotNull($attr)){
+		if (JString::isNotNull($attr)) {
 			if ($attr==="value")
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
 			elseif ($attr==="html")
 			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
+			elseif ($attr!=null && $attr!=="")
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
-			if(JString::startswith($responseElement, "\"-")===true){
+			if (JString::startswith($responseElement, "\"-")===true) {
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
-			}else{
+			} else {
 				$retour="\t$({$responseElement}).html( data );\n";
 			}
 		}
@@ -82,7 +82,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -92,7 +92,7 @@ 
 	protected function _correctAjaxUrl($url) {
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
 			$url=substr($url, 0, strlen($url)-1);
-		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+		if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
 		return $url;
@@ -106,7 +106,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -127,7 +127,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -137,7 +137,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		} else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -176,26 +176,26 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -222,7 +222,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -230,7 +230,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -251,7 +251,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -273,6 +273,6 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

Braces +27 added lines, -20 removed lines

@@ -46,8 +46,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -55,15 +56,17 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(JString::endswith($url, "/")===true)
-			$slash="";
+		if(JString::endswith($url, "/")===true) {
+					$slash="";
+		}
 		if(JString::isNotNull($attr)){
-			if ($attr==="value")
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
-			elseif ($attr==="html")
-			$retour.="url=url+'".$slash."'+$(this).html();\n";
-			elseif($attr!=null && $attr!=="")
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			if ($attr==="value") {
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
+			} elseif ($attr==="html") {
+						$retour.="url=url+'".$slash."'+$(this).html();\n";
+			} elseif($attr!=null && $attr!=="") {
+								$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+			}
 		}
 		return $retour;
 	}
@@ -74,7 +77,7 @@ 
 			if(JString::startswith($responseElement, "\"-")===true){
 				$responseElement=\str_replace("\"-", "\"", $responseElement);
 				$retour="\t$({$responseElement}).replaceWith( data );\n";
-			}else{
+			} else{
 				$retour="\t$({$responseElement}).html( data );\n";
 			}
 		}
@@ -90,8 +93,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
-			$url=substr($url, 0, strlen($url)-1);
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 			$url=$this->jsUtils->getUrl($url);
 		}
@@ -115,8 +119,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -155,7 +160,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -165,8 +170,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -207,8 +213,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Ajax/semantic/widgets/datatable/Pagination.php

Spacing +15 added lines, -15 removed lines

@@ -8,34 +8,34 @@ 
 	private $page_count;
 	private $pages_visibles;
 
-	public function __construct($items_per_page=10,$pages_visibles=4,$page=1){
+	public function __construct($items_per_page=10, $pages_visibles=4, $page=1) {
 		$this->items_per_page=$items_per_page;
 		$this->page=$page;
 		$this->pages_visibles=$pages_visibles;
 		$this->visible=true;
 	}
 
-	public function getObjects($objects){
-		$offset = ($this->page - 1) * $this->items_per_page;
+	public function getObjects($objects) {
+		$offset=($this->page-1)*$this->items_per_page;
 		$os=$objects;
-		if(\is_array($os)===false){
+		if (\is_array($os)===false) {
 			$os=[];
-			foreach ($objects as $o){
+			foreach ($objects as $o) {
 				$os[]=$o;
 			}
 		}
-		$this->page_count = 0;
+		$this->page_count=0;
 		$row_count=\sizeof($os);
-		if (0 === $row_count) {
+		if (0===$row_count) {
 			$this->visible=false;
 		} else {
 			$this->visible=true;
-			$this->page_count = (int)ceil($row_count / $this->items_per_page);
-			if($this->page > $this->page_count+1) {
-				$this->page = 1;
+			$this->page_count=(int)ceil($row_count/$this->items_per_page);
+			if ($this->page>$this->page_count+1) {
+				$this->page=1;
 			}
 		}
-		return array_slice($os, $offset,$this->items_per_page);
+		return array_slice($os, $offset, $this->items_per_page);
 	}
 
 	public function getItemsPerPage() {
@@ -69,14 +69,14 @@ 
 		return $this->page_count;
 	}
 
-	public function getPagesNumbers(){
-		$middle= (int)ceil(($this->pages_visibles-1)/ 2);
+	public function getPagesNumbers() {
+		$middle=(int)ceil(($this->pages_visibles-1)/2);
 		$first=$this->page-$middle;
-		if($first<1){
+		if ($first<1) {
 			$first=1;
 		}
 		$last=$first+$this->pages_visibles-1;
-		if($last>$this->page_count){
+		if ($last>$this->page_count) {
 			$last=$this->page_count;
 		}
 		return \range($first, $last);

Ajax/semantic/widgets/datatable/InstanceViewer.php

Spacing +51 added lines, -51 removed lines

@@ -11,21 +11,21 @@ 
 	private $values;
 	private static $index=0;
 
-	public function __construct($instance=NULL,$captions=NULL){
+	public function __construct($instance=NULL, $captions=NULL) {
 		$this->values=[];
-		if(isset($instance))
+		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
 	}
 
-	public function getCaption($index){
+	public function getCaption($index) {
 		return $this->properties[$index]->getName();
 	}
 
-	public function getCaptions(){
-		if(isset($this->captions)){
-			$result= $this->captions;
-			for($i=\sizeof($result);$i<$this->count();$i++){
+	public function getCaptions() {
+		if (isset($this->captions)) {
+			$result=$this->captions;
+			for ($i=\sizeof($result); $i<$this->count(); $i++) {
 				$result[]="";
 			}
 			return $result;
@@ -33,113 +33,113 @@ 
 		$captions=[];
 		$index=0;
 		$count=$this->count();
-		while($index<$count){
+		while ($index<$count) {
 			$captions[]=$this->getCaption($index++);
 		}
 		return $captions;
 	}
 
-	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 getCkValue(){
+	public function getCkValue() {
 		$value=self::$index;
-		if(isset($this->values["ck"]))
-			$value=$this->values["ck"](self::$index,$this->instance);
+		if (isset($this->values["ck"]))
+			$value=$this->values["ck"](self::$index, $this->instance);
 		self::$index++;
 		return $value;
 	}
 
-	public function getValue($index){
+	public function getValue($index) {
 		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
-	private function _getValue($property,$index){
-		if($property instanceof \ReflectionProperty){
+	private function _getValue($property, $index) {
+		if ($property instanceof \ReflectionProperty) {
 			$property->setAccessible(true);
 			$value=$property->getValue($this->instance);
-			if(isset($this->values[$index])){
-				$value= $this->values[$index]($value);
+			if (isset($this->values[$index])) {
+				$value=$this->values[$index]($value);
 			}
-		}else{
-			if(\is_callable($property))
+		} else {
+			if (\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);
-			}else
+			} else
 				$value=$property;
 		}
 		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 count(){
+	public function count() {
 		return \sizeof($this->properties);
 	}
 
-	private function showableProperty(\ReflectionProperty $rProperty){
-		return JString::startswith($rProperty->getName(),"_")===false;
+	private 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(\sizeof($this->visibleProperties)===0){
+		if (\sizeof($this->visibleProperties)===0) {
 			$this->properties=$this->getDefaultProperties();
-		}else{
-			foreach ($this->visibleProperties as $property){
-				if(\is_callable($property)){
+		} else {
+			foreach ($this->visibleProperties as $property) {
+				if (\is_callable($property)) {
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
-					try{
+				}elseif (\is_string($property)) {
+					try {
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					}catch (\Exception $e) {
 						$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;
 				}
 			}
@@ -147,12 +147,12 @@ 
 		return $this;
 	}
 
-	private function getDefaultProperties(){
+	private 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;
 			}
 		}
@@ -169,12 +169,12 @@ 
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$this->values[$index]=$callback;
 		return $this;
 	}
 
-	public function setCkValueFunction($callback){
+	public function setCkValueFunction($callback) {
 		$this->values["ck"]=$callback;
 		return $this;
 	}

Braces +25 added lines, -21 removed lines

@@ -13,8 +13,9 @@ 
 
 	public function __construct($instance=NULL,$captions=NULL){
 		$this->values=[];
-		if(isset($instance))
-			$this->setInstance($instance);
+		if(isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 	}
 
@@ -51,8 +52,9 @@ 
 
 	public function getCkValue(){
 		$value=self::$index;
-		if(isset($this->values["ck"]))
-			$value=$this->values["ck"](self::$index,$this->instance);
+		if(isset($this->values["ck"])) {
+					$value=$this->values["ck"](self::$index,$this->instance);
+		}
 		self::$index++;
 		return $value;
 	}
@@ -69,14 +71,15 @@ 
 			if(isset($this->values[$index])){
 				$value= $this->values[$index]($value);
 			}
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($property)){
+		} else{
+			if(\is_callable($property)) {
+							$value=$property($this->instance);
+			} elseif(\is_array($property)){
 				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
 				$value=\implode("", $values);
-			}else
-				$value=$property;
+			} else {
+							$value=$property;
+			}
 		}
 		return $value;
 	}
@@ -91,10 +94,10 @@ 
 		if(isset($vb[$index])){
 			if(\is_array($vb[$index])){
 				$this->visibleProperties[$index][]=$field;
-			}else{
+			} else{
 				$this->visibleProperties[$index]=[$vb[$index],$field];
 			}
-		}else{
+		} else{
 			return $this->insertField($index, $field);
 		}
 		return $this;
@@ -122,24 +125,25 @@ 
 		$this->reflect=new \ReflectionClass($instance);
 		if(\sizeof($this->visibleProperties)===0){
 			$this->properties=$this->getDefaultProperties();
-		}else{
+		} else{
 			foreach ($this->visibleProperties as $property){
 				if(\is_callable($property)){
 					$this->properties[]=$property;
-				}elseif(\is_string($property)){
+				} elseif(\is_string($property)){
 					try{
 						$rProperty=$this->reflect->getProperty($property);
 						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
+					} catch(\Exception $e){
 						$this->properties[]=$property;
 					}
-				}elseif(\is_int($property)){
+				} elseif(\is_int($property)){
 					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
-						$this->properties[]=$props[$property];
-					else
-						$this->properties[]=$property;
-				}else{
+					if(isset($props[$property])) {
+											$this->properties[]=$props[$property];
+					} else {
+											$this->properties[]=$property;
+					}
+				} else{
 					$this->properties[]=$property;
 				}
 			}

Ajax/semantic/widgets/datatable/PositionInTable.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 use Ajax\common\BaseEnum;
 
 abstract class PositionInTable extends BaseEnum {
-	const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="header",FOOTER="footer";
+	const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="header", FOOTER="footer";
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 }
\ No newline at end of file