phpMv / phpMv-UI

Ajax/bootstrap/components/Collapse.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	 * @see \Ajax\common\SimpleComponent::compileEvents()
 	 */
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
+		foreach ($this->events as $event => $jsCode) {
 			if ($event==="buttonClick") {
 				$this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});";
 			} else {

Ajax/semantic/html/content/HtmlMenuItem.php

Braces +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 				$title=@$content[1];
 				$desc=@$content[2];
 				$status=@$content[3];
-			}else{
+			} else{
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
@@ -32,7 +32,7 @@ 
 			if(isset($title)===true){
 				$this->setTitle($title,$desc);
 			}
-		}else{
+		} else{
 			$this->setContent($content);
 		}
 	}

Spacing +9 added lines, -9 removed lines

@@ -9,27 +9,27 @@
 class HtmlMenuItem extends HtmlSemDoubleElement {
 	use MenuItemTrait;
 	public function __construct($identifier, $content) {
-		parent::__construct($identifier,"div","item",$content);
+		parent::__construct($identifier, "div", "item", $content);
 	}
 
-	protected function initContent($content){
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
+	protected function initContent($content) {
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->addIcon($icon);
 			}
-			if(isset($title)){
-				$this->setTitle($title,$desc);
+			if (isset($title)) {
+				$this->setTitle($title, $desc);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}

Ajax/php/ci/JsUtils.php

Spacing +39 added lines, -39 removed lines

@@ -1,39 +1,39 @@ 
 <?php
 namespace Ajax\php\ci;
 
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 	protected $ci;
-	protected $_my_controller_paths= array();
-	protected $_my_controllers= array();
+	protected $_my_controller_paths=array();
+	protected $_my_controllers=array();
 
-	public function __construct($params=array(),$injected=NULL){
-		parent::__construct($params,$injected);
-		$this->_my_controller_paths = array(APPPATH);
+	public function __construct($params=array(), $injected=NULL) {
+		parent::__construct($params, $injected);
+		$this->_my_controller_paths=array(APPPATH);
 	}
-	public function getUrl($url){
+	public function getUrl($url) {
 		return site_url($url);
 	}
 
-	public function getCi(){
-		if(isset($this->ci)===false){
-			$this->ci =& get_instance();
+	public function getCi() {
+		if (isset($this->ci)===false) {
+			$this->ci=& get_instance();
 			$this->ci->load->helper('url');
 		}
 		return $this->ci;
 	}
 
-	public function addViewElement($identifier,$content,&$view){
-		if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\array_key_exists("q", $view)===false) {
 			$view["q"]=array();
 		}
 		$view["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view[$view_var]=$output;
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
 		$ci=$this->getCi();
 		$controllerName=strtolower($controllerName);
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
 		return $initialControllerInstance->load->view($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return array_values($dispatcher->uri->segment_array());
 	}
 
-	public function controller($controller, $name = '', $db_conn = FALSE){
-		if (is_array($controller)){
-			foreach ($controller as $babe){
+	public function controller($controller, $name='', $db_conn=FALSE) {
+		if (is_array($controller)) {
+			foreach ($controller as $babe) {
 				$this->controller($babe);
 			}
 			return;
 		}
-		if ($controller == ''){
+		if ($controller=='') {
 			return;
 		}
-		$path = '';
+		$path='';
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
 			// The path is in front of the last slash
-			$path = substr($controller, 0, $last_slash + 1);
+			$path=substr($controller, 0, $last_slash+1);
 			// And the controller name behind it
-			$controller = substr($controller, $last_slash + 1);
+			$controller=substr($controller, $last_slash+1);
 		}
 
-		if ($name == ''){
-			$name = $controller;
+		if ($name=='') {
+			$name=$controller;
 		}
 
-		if (in_array($name, $this->_my_controllers, TRUE)){
+		if (in_array($name, $this->_my_controllers, TRUE)) {
 			return;
 		}
 
-		$CI =$this->getCi();
-		if (isset($CI->$name)){
+		$CI=$this->getCi();
+		if (isset($CI->$name)) {
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
 		}
-		$controller = strtolower($controller);
-		foreach ($this->_my_controller_paths as $mod_path){
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
+		$controller=strtolower($controller);
+		foreach ($this->_my_controller_paths as $mod_path) {
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
 				continue;
 			}
-			if ($db_conn !== FALSE AND ! class_exists('CI_DB')){
-				if ($db_conn === TRUE){
-					$db_conn = '';
+			if ($db_conn!==FALSE AND !class_exists('CI_DB')) {
+				if ($db_conn===TRUE) {
+					$db_conn='';
 				}
 				$CI->load->database($db_conn, FALSE, TRUE);
 			}
-			if ( ! class_exists('CI_Controller')){
+			if (!class_exists('CI_Controller')) {
 				load_class('Controller', 'core');
 			}
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
-			$controller = ucfirst($controller);
-			$CI->$name = new $controller();
+			$controller=ucfirst($controller);
+			$CI->$name=new $controller();
 
-			$this->_my_controllers[] = $name;
+			$this->_my_controllers[]=$name;
 			return;
 		}
 		show_error('Unable to locate the controller you have specified: '.$controller);

Ajax/php/cakephp/_JsUtils.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 		$viewVars=$view->viewVars;
 		if (isset($viewVars["q"]) === false) {
 			$controls=array ();
-		}else{
+		} else{
 			$controls=$viewVars["q"];
 		}
 		$controls[$identifier]=$content;

Spacing +18 added lines, -18 removed lines

@@ -8,23 +8,23 @@ 
 use Cake\Network\Response;
 use Cake\Core\App;
 
-class _JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class _JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		return Router::url($url);
 	}
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$viewVars=$view->viewVars;
-		if (isset($viewVars["q"]) === false) {
-			$controls=array ();
-		}else{
+		if (isset($viewVars["q"])===false) {
+			$controls=array();
+		} else {
 			$controls=$viewVars["q"];
 		}
 		$controls[$identifier]=$content;
 		$view->set("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->set($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->set($view_var, $output);
 	}
 
 	/**
@@ -34,18 +34,18 @@ 
 	 * @param array $params
 	 * @see \Ajax\JsUtils::forward()
 	 */
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		\ob_start();
-		if(isset($params) && \is_array($params)===false){
+		if (isset($params) && \is_array($params)===false) {
 			$params=[$params];
 		}
 		$url=h(Router::url(\array_merge([
 				'controller' => $controllerName,
-				'action' => $actionName],$params),false
+				'action' => $actionName], $params), false
 		));
 		$base=Router::url("/");
-		if (substr($url, 0, strlen($base)) == $base) {
-			$url = substr($url, strlen($base));
+		if (substr($url, 0, strlen($base))==$base) {
+			$url=substr($url, strlen($base));
 		}
 		$initialControllerInstance->requestAction($url);
 		$result=\ob_get_contents();
@@ -53,17 +53,17 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		$view = new View(Router::getRequest(true), new Response());
-		if(\is_array($params)){
-			foreach ($params as $k=>$v){
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		$view=new View(Router::getRequest(true), new Response());
+		if (\is_array($params)) {
+			foreach ($params as $k=>$v) {
 				$view->set($k, $v);
 			}
 		}
 		return $view->render($viewName);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return \explode("/", Router::getRequest(true)->url);
 	}
 }
\ No newline at end of file

Ajax/php/cakephp/JsUtilsComponent.php

Spacing +2 added lines, -2 removed lines

@@ -11,10 +11,10 @@
 	 * @var Ajax\php\cakephp\_JsUtils
 	 */
 	public $jquery;
-	public function initialize(array $config){
+	public function initialize(array $config) {
 		\extract($config);
 		$this->jquery=new _JsUtils();
-		if(isset($semantic)){
+		if (isset($semantic)) {
 			$this->jquery->semantic(new Semantic());
 		}
 	}

Ajax/php/micro/JsUtils.php

Spacing +12 added lines, -12 removed lines

@@ -4,34 +4,34 @@
 
 use micro\controllers\Startup;
 use micro\utils\RequestUtils;
-class JsUtils extends \Ajax\JsUtils{
+class JsUtils extends \Ajax\JsUtils {
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return RequestUtils::getUrl($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		return $initialController->forward($controller,$action,$params,true,true,true);
+	public function forward($initialController, $controller, $action, $params=array()) {
+		return $initialController->forward($controller, $action, $params, true, true, true);
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return $initialControllerInstance->loadView($viewName,$params,true);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return $initialControllerInstance->loadView($viewName, $params, true);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		return Startup::$urlParts;
 	}
 }
\ No newline at end of file

Ajax/semantic/html/content/HtmlStepItem.php

Braces +7 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 				$title=@$content[1];
 				$desc=@$content[2];
 				$status=@$content[3];
-			}else{
+			} else{
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
@@ -32,16 +32,17 @@ 
 			if(isset($title)===true){
 				$this->setTitle($title,$desc);
 			}
-		}else{
+		} else{
 			$this->setContent($content);
 		}
 	}
 
 	public function setActive($value=true){
-		if($value)
-			$this->setStatus(StepStatus::ACTIVE);
-		else
-			$this->setStatus(StepStatus::NONE);
+		if($value) {
+					$this->setStatus(StepStatus::ACTIVE);
+		} else {
+					$this->setStatus(StepStatus::NONE);
+		}
 		return $this;
 	}
 

Spacing +15 added lines, -15 removed lines

@@ -8,52 +8,52 @@
 class HtmlStepItem extends HtmlAbsractItem {
 
 	public function __construct($identifier, $content) {
-		parent::__construct($identifier,"step",$content);
+		parent::__construct($identifier, "step", $content);
 	}
-	protected function initContent($content){
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
+	protected function initContent($content) {
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
 				$status=@$content[3];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 				$desc=@$content["description"];
 				$status=@$content["status"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->setIcon($icon);
 			}
-			if(isset($status)){
+			if (isset($status)) {
 				$this->setStatus($status);
 			}
-			if(isset($title)){
-				$this->setTitle($title,$desc);
+			if (isset($title)) {
+				$this->setTitle($title, $desc);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}
 
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->setStatus(StepStatus::ACTIVE);
 		else
 			$this->setStatus(StepStatus::NONE);
 		return $this;
 	}
 
-	public function setCompleted(){
+	public function setCompleted() {
 		return $this->setStatus(StepStatus::COMPLETED);
 	}
 
-	public function setStatus($status){
+	public function setStatus($status) {
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
 	}
 
-	public function removeStatus(){
+	public function removeStatus() {
 		$this->removePropertyValues("class", StepStatus::getConstants());
 	}
 }
\ No newline at end of file

Ajax/semantic/html/modules/HtmlTab.php

Braces +9 added lines, -6 removed lines

@@ -67,8 +67,9 @@ 
 		if($index<$menu->count()){
 			if(isset($this->content[$index])===false){
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
-				$this->content[$index]->setContent($content);
+			} else {
+							$this->content[$index]->setContent($content);
+			}
 		}
 		return $this;
 	}
@@ -228,15 +229,17 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		if(isset($this->_bsComponent)===false) {
+					$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		}
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
-			$this->activate(0);
+		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) {
+					$this->activate(0);
+		}
 		return parent::compile($js,$view);
 	}
 }
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -14,14 +14,14 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlTab extends HtmlSemCollection{
+class HtmlTab extends HtmlSemCollection {
 
 	protected $params=array("debug"=>true);
 
-	public function __construct( $identifier, $tabs=array()){
-		parent::__construct( $identifier, "div", "");
+	public function __construct($identifier, $tabs=array()) {
+		parent::__construct($identifier, "div", "");
 		$menu=new HtmlMenu("menu".$this->identifier);
-		$menu->asTab(false)->setAttachment(NULL,Side::TOP);
+		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
 		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
@@ -31,12 +31,12 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 * @return HtmlSegment
 	 */
-	protected function createItem($value){
+	protected function createItem($value) {
 		$count=$this->count();
 		$title=$value;
 		$content=NULL;
-		if(\is_array($value)){
-			$title=@$value[0];$content=@$value[1];
+		if (\is_array($value)) {
+			$title=@$value[0]; $content=@$value[1];
 		}
 		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
@@ -50,9 +50,9 @@ 
 	 * @param string $datatab
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	private function createSegment($count,$content,$datatab){
+	private function createSegment($count, $content, $datatab) {
 		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
-		$segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab);
+		$segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab);
 		return $segment;
 	}
 
@@ -62,12 +62,12 @@ 
 	 * @param String $content new content
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabContent($index,$content){
+	public function setTabContent($index, $content) {
 		$menu=$this->content["menu"];
-		if($index<$menu->count()){
-			if(isset($this->content[$index])===false){
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
 				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier());
-			}else
+			} else
 				$this->content[$index]->setContent($content);
 		}
 		return $this;
@@ -78,8 +78,8 @@ 
 	 * @param array $contents
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setTabsContent($contents){
-		for($i=0;$i<\sizeof($contents);$i++){
+	public function setTabsContent($contents) {
+		for ($i=0; $i<\sizeof($contents); $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -90,7 +90,7 @@ 
 	 * @param int $index
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function activate($index){
+	public function activate($index) {
 		$this->content["menu"]->getItem($index)->setActive(true);
 		$this->content[$index]->setActive(true);
 		return $this;
@@ -102,8 +102,8 @@ 
 	 * @param string $content
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addTab($title,$content){
-		return $this->addItem([$title,$content]);
+	public function addTab($title, $content) {
+		return $this->addItem([$title, $content]);
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->forward($initialController, $controller, $action,$params);
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
-		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params);
+		return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params);
 	}
 
 	/**
@@ -136,12 +136,12 @@ 
 	 * @param $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		if(\array_key_exists($index, $this->content)){
-			$this->content[$index]=$js->renderContent($initialController, $viewName,$params);
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		if (\array_key_exists($index, $this->content)) {
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
-		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params);
+		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
 	}
 
 
@@ -155,8 +155,8 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
-		return $this->addTab($title, $js->forward($initialController, $controller, $action,$params));
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
+		return $this->addTab($title, $js->forward($initialController, $controller, $action, $params));
 	}
 
 	/**
@@ -168,8 +168,8 @@ 
 	 * @param $params The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
-		return $this->addTab($title, $js->renderContent($initialController, $viewName,$params));
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
+		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
 	public function setPointing($value=Direction::NONE) {
@@ -185,7 +185,7 @@ 
 	 * @param int $index
 	 * @return Ajax\semantic\html\content\HtmlMenuItem
 	 */
-	public function getMenuTab($index){
+	public function getMenuTab($index) {
 		return $this->content["menu"]->getItem($index);
 	}
 
@@ -194,7 +194,7 @@ 
 	 * @param int $index
 	 * @return HtmlSegment
 	 */
-	public function getTab($index){
+	public function getTab($index) {
 		return $this->content[$index];
 	}
 
@@ -203,20 +203,20 @@ 
 	 * @param HtmlMenu $menu
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
-	public function setMenu($menu){
-		for($i=0;$i<\sizeof($this->content);$i++){
-			if($menu->getItem($i)!==NULL){
-				if(isset($this->content[$i])){
-					$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+	public function setMenu($menu) {
+		for ($i=0; $i<\sizeof($this->content); $i++) {
+			if ($menu->getItem($i)!==NULL) {
+				if (isset($this->content[$i])) {
+					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
-		for($i=0;$i<$menu->count();$i++){
+		for ($i=0; $i<$menu->count(); $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if(isset($this->content[$i])===false){
+			if (isset($this->content[$i])===false) {
 				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier());
 			}
-			$menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab"));
+			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
 		$this->content["menu"]=$menu;
@@ -228,15 +228,15 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
+		if ($this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 }
\ No newline at end of file

Ajax/semantic/html/base/traits/MenuItemTrait.php

Doc Comments +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * @param string $placeholder
 	 * @param string $icon
-	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
+	 * @return MenuItemTrait
 	 */
 	public function asSearchInput($placeholder=NULL,$icon=NULL){
 		$this->setClass("ui icon search input");
@@ -39,7 +39,7 @@ 
 	}
 
 	/**
-	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
+	 * @return MenuItemTrait
 	 */
 	public function asDivider(){
 		$this->content=NULL;
@@ -51,7 +51,7 @@ 
 	/**
 	 * @param string $caption
 	 * @param string $icon
-	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
+	 * @return MenuItemTrait
 	 */
 	public function asHeader($caption=NULL,$icon=NULL){
 		$this->setClass("header");

Spacing +17 added lines, -17 removed lines

@@ -8,16 +8,16 @@ 
 
 trait MenuItemTrait {
 
-	public function setContent($content){
-		if($content==="-"){
+	public function setContent($content) {
+		if ($content==="-") {
 			$this->asDivider();
-		}elseif($content==="-search-"){
-			$values=\explode(",",$content,-1);
-			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
-		}elseif(JString::startswith($content, "-")){
-			$content=\ltrim($content,"-");
+		}elseif ($content==="-search-") {
+			$values=\explode(",", $content, -1);
+			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search"));
+		}elseif (JString::startswith($content, "-")) {
+			$content=\ltrim($content, "-");
 			$this->asHeader($content);
-		}else
+		} else
 			parent::setContent($content);
 		return $this;
 	}
@@ -27,13 +27,13 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
 	 */
-	public function asSearchInput($placeholder=NULL,$icon=NULL){
+	public function asSearchInput($placeholder=NULL, $icon=NULL) {
 		$this->setClass("ui icon search input");
 		$input=new HtmlInput("search-".$this->identifier);
-		if(isset($placeholder))
+		if (isset($placeholder))
 			$input->setProperty("placeholder", $placeholder);
 			$this->content=$input;
-			if(isset($icon))
+			if (isset($icon))
 				$this->addIcon($icon);
 				return $this;
 	}
@@ -41,7 +41,7 @@ 
 	/**
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
 	 */
-	public function asDivider(){
+	public function asDivider() {
 		$this->content=NULL;
 		$this->tagName="div";
 		$this->setClass("divider");
@@ -53,16 +53,16 @@ 
 	 * @param string $icon
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem
 	 */
-	public function asHeader($caption=NULL,$icon=NULL){
+	public function asHeader($caption=NULL, $icon=NULL) {
 		$this->setClass("header");
 		$this->tagName="div";
 		$this->content=$caption;
-		if(isset($icon))
-			$this->addIcon($icon,Direction::LEFT);
+		if (isset($icon))
+			$this->addIcon($icon, Direction::LEFT);
 			return $this;
 	}
 
-	public function setPosition($direction){
-		$this->addToProperty("class",$direction);
+	public function setPosition($direction) {
+		$this->addToProperty("class", $direction);
 	}
 }
\ No newline at end of file

Braces +14 added lines, -10 removed lines

@@ -11,14 +11,15 @@ 
 	public function setContent($content){
 		if($content==="-"){
 			$this->asDivider();
-		}elseif($content==="-search-"){
+		} elseif($content==="-search-"){
 			$values=\explode(",",$content,-1);
 			$this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search"));
-		}elseif(JString::startswith($content, "-")){
+		} elseif(JString::startswith($content, "-")){
 			$content=\ltrim($content,"-");
 			$this->asHeader($content);
-		}else
-			parent::setContent($content);
+		} else {
+					parent::setContent($content);
+		}
 		return $this;
 	}
 
@@ -30,11 +31,13 @@ 
 	public function asSearchInput($placeholder=NULL,$icon=NULL){
 		$this->setClass("ui icon search input");
 		$input=new HtmlInput("search-".$this->identifier);
-		if(isset($placeholder))
-			$input->setProperty("placeholder", $placeholder);
+		if(isset($placeholder)) {
+					$input->setProperty("placeholder", $placeholder);
+		}
 			$this->content=$input;
-			if(isset($icon))
-				$this->addIcon($icon);
+			if(isset($icon)) {
+							$this->addIcon($icon);
+			}
 				return $this;
 	}
 
@@ -57,8 +60,9 @@ 
 		$this->setClass("header");
 		$this->tagName="div";
 		$this->content=$caption;
-		if(isset($icon))
-			$this->addIcon($icon,Direction::LEFT);
+		if(isset($icon)) {
+					$this->addIcon($icon,Direction::LEFT);
+		}
 			return $this;
 	}