@@ -14,10 +14,11 @@ discard block |
||
| 14 | 14 | $this->data=$this->data ["JQueryUI"]; |
| 15 | 15 | if (is_int($theme)) { |
| 16 | 16 | $themes=$this->getThemes(); |
| 17 | - if (sizeof($themes)>$theme-1) |
|
| 18 | - $this->theme=$themes [$theme-1]; |
|
| 19 | - else |
|
| 20 | - throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 17 | + if (sizeof($themes)>$theme-1) { |
|
| 18 | + $this->theme=$themes [$theme-1]; |
|
| 19 | + } else { |
|
| 20 | + throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 21 | + } |
|
| 21 | 22 | } |
| 22 | 23 | $this->theme=$theme; |
| 23 | 24 | $this->cssUrl=null; |
@@ -28,16 +29,18 @@ discard block |
||
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | public function getThemes($provider=NULL) { |
| 31 | - if (isset($provider)) |
|
| 32 | - return $this->data [$provider] ["themes"]; |
|
| 33 | - else |
|
| 34 | - return $this->data [$this->provider] ["themes"]; |
|
| 32 | + if (isset($provider)) { |
|
| 33 | + return $this->data [$provider] ["themes"]; |
|
| 34 | + } else { |
|
| 35 | + return $this->data [$this->provider] ["themes"]; |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | public function getFirstTheme($provider=NULL) { |
| 38 | 40 | $themes=$this->getThemes($provider); |
| 39 | - if (sizeof($themes)>0) |
|
| 40 | - return $themes [0]; |
|
| 41 | + if (sizeof($themes)>0) { |
|
| 42 | + return $themes [0]; |
|
| 43 | + } |
|
| 41 | 44 | return ""; |
| 42 | 45 | } |
| 43 | 46 | |
@@ -46,14 +49,17 @@ discard block |
||
| 46 | 49 | } |
| 47 | 50 | |
| 48 | 51 | public function getCss() { |
| 49 | - if (isset($this->cssUrl)) |
|
| 50 | - return $this->cssUrl; |
|
| 52 | + if (isset($this->cssUrl)) { |
|
| 53 | + return $this->cssUrl; |
|
| 54 | + } |
|
| 51 | 55 | $version=$this->version; |
| 52 | - if (array_search($version, $this->getVersions())===false) |
|
| 53 | - $version=$this->getLastVersion(); |
|
| 56 | + if (array_search($version, $this->getVersions())===false) { |
|
| 57 | + $version=$this->getLastVersion(); |
|
| 58 | + } |
|
| 54 | 59 | $theme=$this->theme; |
| 55 | - if (array_search($theme, $this->getThemes())===false) |
|
| 56 | - $theme=$this->getFirstTheme(); |
|
| 60 | + if (array_search($theme, $this->getThemes())===false) { |
|
| 61 | + $theme=$this->getFirstTheme(); |
|
| 62 | + } |
|
| 57 | 63 | return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme); |
| 58 | 64 | } |
| 59 | 65 | |
@@ -13,6 +13,9 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | class HtmlIconGroups extends HtmlSemCollection { |
| 15 | 15 | |
| 16 | + /** |
|
| 17 | + * @param string $identifier |
|
| 18 | + */ |
|
| 16 | 19 | public function __construct($identifier, $icons=array(), $size="") { |
| 17 | 20 | parent::__construct($identifier, "i", "icons"); |
| 18 | 21 | $this->addItems($icons); |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
| 6 | 6 | use Ajax\JsUtils; |
| 7 | 7 | use Ajax\service\JArray; |
| 8 | - |
|
| 9 | 8 | use Ajax\semantic\html\base\constants\State; |
| 10 | 9 | |
| 11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | if (isset($label)) |
| 37 | 37 | $this->setLabel($label); |
| 38 | - foreach ( $fields as $field ) { |
|
| 38 | + foreach ($fields as $field) { |
|
| 39 | 39 | $this->addItem($field); |
| 40 | 40 | } |
| 41 | 41 | return $this; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | public function addItem($item) { |
| 59 | 59 | $item=parent::addItem($item); |
| 60 | - if($item instanceof HtmlFormField) |
|
| 60 | + if ($item instanceof HtmlFormField) |
|
| 61 | 61 | $item->setContainer($this); |
| 62 | 62 | return $item; |
| 63 | 63 | } |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 | public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) { |
| 101 | - $fields=array (); |
|
| 101 | + $fields=array(); |
|
| 102 | 102 | $i=0; |
| 103 | - foreach ( $items as $val => $caption ) { |
|
| 103 | + foreach ($items as $val => $caption) { |
|
| 104 | 104 | $itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type); |
| 105 | 105 | if ($val===$value) { |
| 106 | 106 | $itemO->getField()->setProperty("checked", ""); |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) { |
| 117 | - $fields=array (); |
|
| 117 | + $fields=array(); |
|
| 118 | 118 | $i=0; |
| 119 | - foreach ( $items as $val => $caption ) { |
|
| 119 | + foreach ($items as $val => $caption) { |
|
| 120 | 120 | $itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type); |
| 121 | 121 | if (\array_search($val, $values)!==false) { |
| 122 | 122 | $itemO->getField()->getField()->setProperty("checked", ""); |
@@ -29,12 +29,14 @@ discard block |
||
| 29 | 29 | if (\is_string($end)) { |
| 30 | 30 | $label=$end; |
| 31 | 31 | \array_pop($fields); |
| 32 | - } else |
|
| 33 | - $label=NULL; |
|
| 32 | + } else { |
|
| 33 | + $label=NULL; |
|
| 34 | + } |
|
| 34 | 35 | } |
| 35 | 36 | } |
| 36 | - if (isset($label)) |
|
| 37 | - $this->setLabel($label); |
|
| 37 | + if (isset($label)) { |
|
| 38 | + $this->setLabel($label); |
|
| 39 | + } |
|
| 38 | 40 | foreach ( $fields as $field ) { |
| 39 | 41 | $this->addItem($field); |
| 40 | 42 | } |
@@ -57,8 +59,9 @@ discard block |
||
| 57 | 59 | |
| 58 | 60 | public function addItem($item) { |
| 59 | 61 | $item=parent::addItem($item); |
| 60 | - if($item instanceof HtmlFormField) |
|
| 61 | - $item->setContainer($this); |
|
| 62 | + if($item instanceof HtmlFormField) { |
|
| 63 | + $item->setContainer($this); |
|
| 64 | + } |
|
| 62 | 65 | return $item; |
| 63 | 66 | } |
| 64 | 67 | |
@@ -66,8 +69,9 @@ discard block |
||
| 66 | 69 | if ($this->_equalWidth) { |
| 67 | 70 | $count=$this->count(); |
| 68 | 71 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
| 69 | - } else |
|
| 70 | - $this->addToProperty("class", "fields"); |
|
| 72 | + } else { |
|
| 73 | + $this->addToProperty("class", "fields"); |
|
| 74 | + } |
|
| 71 | 75 | return parent::compile($js, $view); |
| 72 | 76 | } |
| 73 | 77 | |
@@ -108,8 +112,9 @@ discard block |
||
| 108 | 112 | $fields[]=$itemO; |
| 109 | 113 | } |
| 110 | 114 | $radios=new HtmlFormFields("fields-".$name, $fields); |
| 111 | - if (isset($label)) |
|
| 112 | - $radios->setLabel($label)->setProperty("for", $name); |
|
| 115 | + if (isset($label)) { |
|
| 116 | + $radios->setLabel($label)->setProperty("for", $name); |
|
| 117 | + } |
|
| 113 | 118 | return $radios; |
| 114 | 119 | } |
| 115 | 120 | |
@@ -124,8 +129,9 @@ discard block |
||
| 124 | 129 | $fields[]=$itemO; |
| 125 | 130 | } |
| 126 | 131 | $radios=new HtmlFormFields("fields-".$name, $fields); |
| 127 | - if (isset($label)) |
|
| 128 | - $radios->setLabel($label)->setProperty("for", $name); |
|
| 132 | + if (isset($label)) { |
|
| 133 | + $radios->setLabel($label)->setProperty("for", $name); |
|
| 134 | + } |
|
| 129 | 135 | return $radios; |
| 130 | 136 | } |
| 131 | 137 | |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | * @see \Ajax\common\SimpleComponent::compileEvents() |
| 10 | 10 | */ |
| 11 | 11 | protected function compileEvents() { |
| 12 | - foreach ( $this->events as $event => $jsCode ) { |
|
| 12 | + foreach ($this->events as $event => $jsCode) { |
|
| 13 | 13 | if ($event==="buttonClick") { |
| 14 | 14 | $this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});"; |
| 15 | 15 | } else { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $title=@$content[1]; |
| 18 | 18 | $desc=@$content[2]; |
| 19 | 19 | $status=@$content[3]; |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $title=@$content["title"]; |
| 23 | 23 | $desc=@$content["description"]; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | if(isset($title)===true){ |
| 33 | 33 | $this->setTitle($title,$desc); |
| 34 | 34 | } |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | $this->setContent($content); |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -9,27 +9,27 @@ |
||
| 9 | 9 | class HtmlMenuItem extends HtmlSemDoubleElement { |
| 10 | 10 | use MenuItemTrait; |
| 11 | 11 | public function __construct($identifier, $content) { |
| 12 | - parent::__construct($identifier,"div","item",$content); |
|
| 12 | + parent::__construct($identifier, "div", "item", $content); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - protected function initContent($content){ |
|
| 16 | - if(\is_array($content)){ |
|
| 17 | - if(JArray::isAssociative($content)===false){ |
|
| 15 | + protected function initContent($content) { |
|
| 16 | + if (\is_array($content)) { |
|
| 17 | + if (JArray::isAssociative($content)===false) { |
|
| 18 | 18 | $icon=@$content[0]; |
| 19 | 19 | $title=@$content[1]; |
| 20 | 20 | $desc=@$content[2]; |
| 21 | - }else{ |
|
| 21 | + } else { |
|
| 22 | 22 | $icon=@$content["icon"]; |
| 23 | 23 | $title=@$content["title"]; |
| 24 | 24 | $desc=@$content["description"]; |
| 25 | 25 | } |
| 26 | - if(isset($icon)){ |
|
| 26 | + if (isset($icon)) { |
|
| 27 | 27 | $this->addIcon($icon); |
| 28 | 28 | } |
| 29 | - if(isset($title)){ |
|
| 30 | - $this->setTitle($title,$desc); |
|
| 29 | + if (isset($title)) { |
|
| 30 | + $this->setTitle($title, $desc); |
|
| 31 | 31 | } |
| 32 | - }else{ |
|
| 32 | + } else { |
|
| 33 | 33 | $this->setContent($content); |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -1,39 +1,39 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Ajax\php\ci; |
| 3 | 3 | |
| 4 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 4 | +class JsUtils extends \Ajax\JsUtils { |
|
| 5 | 5 | protected $ci; |
| 6 | - protected $_my_controller_paths= array(); |
|
| 7 | - protected $_my_controllers= array(); |
|
| 6 | + protected $_my_controller_paths=array(); |
|
| 7 | + protected $_my_controllers=array(); |
|
| 8 | 8 | |
| 9 | - public function __construct($params=array(),$injected=NULL){ |
|
| 10 | - parent::__construct($params,$injected); |
|
| 11 | - $this->_my_controller_paths = array(APPPATH); |
|
| 9 | + public function __construct($params=array(), $injected=NULL) { |
|
| 10 | + parent::__construct($params, $injected); |
|
| 11 | + $this->_my_controller_paths=array(APPPATH); |
|
| 12 | 12 | } |
| 13 | - public function getUrl($url){ |
|
| 13 | + public function getUrl($url) { |
|
| 14 | 14 | return site_url($url); |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public function getCi(){ |
|
| 18 | - if(isset($this->ci)===false){ |
|
| 19 | - $this->ci =& get_instance(); |
|
| 17 | + public function getCi() { |
|
| 18 | + if (isset($this->ci)===false) { |
|
| 19 | + $this->ci=& get_instance(); |
|
| 20 | 20 | $this->ci->load->helper('url'); |
| 21 | 21 | } |
| 22 | 22 | return $this->ci; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function addViewElement($identifier,$content,&$view){ |
|
| 26 | - if(\array_key_exists("q", $view)===false){ |
|
| 25 | + public function addViewElement($identifier, $content, &$view) { |
|
| 26 | + if (\array_key_exists("q", $view)===false) { |
|
| 27 | 27 | $view["q"]=array(); |
| 28 | 28 | } |
| 29 | 29 | $view["q"][$identifier]=$content; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 32 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 33 | 33 | $view[$view_var]=$output; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
| 36 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
| 37 | 37 | $ci=$this->getCi(); |
| 38 | 38 | $controllerName=strtolower($controllerName); |
| 39 | 39 | $this->controller($controllerName); |
@@ -44,64 +44,64 @@ discard block |
||
| 44 | 44 | return $result; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 47 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 48 | 48 | return $initialControllerInstance->load->view($viewName, $params, true); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function fromDispatcher($dispatcher){ |
|
| 51 | + public function fromDispatcher($dispatcher) { |
|
| 52 | 52 | return array_values($dispatcher->uri->segment_array()); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function controller($controller, $name = '', $db_conn = FALSE){ |
|
| 56 | - if (is_array($controller)){ |
|
| 57 | - foreach ($controller as $babe){ |
|
| 55 | + public function controller($controller, $name='', $db_conn=FALSE) { |
|
| 56 | + if (is_array($controller)) { |
|
| 57 | + foreach ($controller as $babe) { |
|
| 58 | 58 | $this->controller($babe); |
| 59 | 59 | } |
| 60 | 60 | return; |
| 61 | 61 | } |
| 62 | - if ($controller == ''){ |
|
| 62 | + if ($controller=='') { |
|
| 63 | 63 | return; |
| 64 | 64 | } |
| 65 | - $path = ''; |
|
| 65 | + $path=''; |
|
| 66 | 66 | // Is the controller in a sub-folder? If so, parse out the filename and path. |
| 67 | - if (($last_slash = strrpos($controller, '/')) !== FALSE){ |
|
| 67 | + if (($last_slash=strrpos($controller, '/'))!==FALSE) { |
|
| 68 | 68 | // The path is in front of the last slash |
| 69 | - $path = substr($controller, 0, $last_slash + 1); |
|
| 69 | + $path=substr($controller, 0, $last_slash+1); |
|
| 70 | 70 | // And the controller name behind it |
| 71 | - $controller = substr($controller, $last_slash + 1); |
|
| 71 | + $controller=substr($controller, $last_slash+1); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if ($name == ''){ |
|
| 75 | - $name = $controller; |
|
| 74 | + if ($name=='') { |
|
| 75 | + $name=$controller; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - if (in_array($name, $this->_my_controllers, TRUE)){ |
|
| 78 | + if (in_array($name, $this->_my_controllers, TRUE)) { |
|
| 79 | 79 | return; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - $CI =$this->getCi(); |
|
| 83 | - if (isset($CI->$name)){ |
|
| 82 | + $CI=$this->getCi(); |
|
| 83 | + if (isset($CI->$name)) { |
|
| 84 | 84 | show_error('The controller name you are loading is the name of a resource that is already being used: '.$name); |
| 85 | 85 | } |
| 86 | - $controller = strtolower($controller); |
|
| 87 | - foreach ($this->_my_controller_paths as $mod_path){ |
|
| 88 | - if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){ |
|
| 86 | + $controller=strtolower($controller); |
|
| 87 | + foreach ($this->_my_controller_paths as $mod_path) { |
|
| 88 | + if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) { |
|
| 89 | 89 | continue; |
| 90 | 90 | } |
| 91 | - if ($db_conn !== FALSE AND ! class_exists('CI_DB')){ |
|
| 92 | - if ($db_conn === TRUE){ |
|
| 93 | - $db_conn = ''; |
|
| 91 | + if ($db_conn!==FALSE AND !class_exists('CI_DB')) { |
|
| 92 | + if ($db_conn===TRUE) { |
|
| 93 | + $db_conn=''; |
|
| 94 | 94 | } |
| 95 | 95 | $CI->load->database($db_conn, FALSE, TRUE); |
| 96 | 96 | } |
| 97 | - if ( ! class_exists('CI_Controller')){ |
|
| 97 | + if (!class_exists('CI_Controller')) { |
|
| 98 | 98 | load_class('Controller', 'core'); |
| 99 | 99 | } |
| 100 | 100 | require_once($mod_path.'controllers/'.$path.$controller.'.php'); |
| 101 | - $controller = ucfirst($controller); |
|
| 102 | - $CI->$name = new $controller(); |
|
| 101 | + $controller=ucfirst($controller); |
|
| 102 | + $CI->$name=new $controller(); |
|
| 103 | 103 | |
| 104 | - $this->_my_controllers[] = $name; |
|
| 104 | + $this->_my_controllers[]=$name; |
|
| 105 | 105 | return; |
| 106 | 106 | } |
| 107 | 107 | show_error('Unable to locate the controller you have specified: '.$controller); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $viewVars=$view->viewVars; |
| 14 | 14 | if (isset($viewVars["q"]) === false) { |
| 15 | 15 | $controls=array (); |
| 16 | - }else{ |
|
| 16 | + } else{ |
|
| 17 | 17 | $controls=$viewVars["q"]; |
| 18 | 18 | } |
| 19 | 19 | $controls[$identifier]=$content; |
@@ -8,23 +8,23 @@ discard block |
||
| 8 | 8 | use Cake\Network\Response; |
| 9 | 9 | use Cake\Core\App; |
| 10 | 10 | |
| 11 | -class _JsUtils extends \Ajax\JsUtils{ |
|
| 12 | - public function getUrl($url){ |
|
| 11 | +class _JsUtils extends \Ajax\JsUtils { |
|
| 12 | + public function getUrl($url) { |
|
| 13 | 13 | return Router::url($url); |
| 14 | 14 | } |
| 15 | - public function addViewElement($identifier,$content,&$view){ |
|
| 15 | + public function addViewElement($identifier, $content, &$view) { |
|
| 16 | 16 | $viewVars=$view->viewVars; |
| 17 | - if (isset($viewVars["q"]) === false) { |
|
| 18 | - $controls=array (); |
|
| 19 | - }else{ |
|
| 17 | + if (isset($viewVars["q"])===false) { |
|
| 18 | + $controls=array(); |
|
| 19 | + } else { |
|
| 20 | 20 | $controls=$viewVars["q"]; |
| 21 | 21 | } |
| 22 | 22 | $controls[$identifier]=$content; |
| 23 | 23 | $view->set("q", $controls); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 27 | - $view->set($view_var,$output); |
|
| 26 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 27 | + $view->set($view_var, $output); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -34,18 +34,18 @@ discard block |
||
| 34 | 34 | * @param array $params |
| 35 | 35 | * @see \Ajax\JsUtils::forward() |
| 36 | 36 | */ |
| 37 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
| 37 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
| 38 | 38 | \ob_start(); |
| 39 | - if(isset($params) && \is_array($params)===false){ |
|
| 39 | + if (isset($params) && \is_array($params)===false) { |
|
| 40 | 40 | $params=[$params]; |
| 41 | 41 | } |
| 42 | 42 | $url=h(Router::url(\array_merge([ |
| 43 | 43 | 'controller' => $controllerName, |
| 44 | - 'action' => $actionName],$params),false |
|
| 44 | + 'action' => $actionName], $params), false |
|
| 45 | 45 | )); |
| 46 | 46 | $base=Router::url("/"); |
| 47 | - if (substr($url, 0, strlen($base)) == $base) { |
|
| 48 | - $url = substr($url, strlen($base)); |
|
| 47 | + if (substr($url, 0, strlen($base))==$base) { |
|
| 48 | + $url=substr($url, strlen($base)); |
|
| 49 | 49 | } |
| 50 | 50 | $initialControllerInstance->requestAction($url); |
| 51 | 51 | $result=\ob_get_contents(); |
@@ -53,17 +53,17 @@ discard block |
||
| 53 | 53 | return $result; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 57 | - $view = new View(Router::getRequest(true), new Response()); |
|
| 58 | - if(\is_array($params)){ |
|
| 59 | - foreach ($params as $k=>$v){ |
|
| 56 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 57 | + $view=new View(Router::getRequest(true), new Response()); |
|
| 58 | + if (\is_array($params)) { |
|
| 59 | + foreach ($params as $k=>$v) { |
|
| 60 | 60 | $view->set($k, $v); |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | return $view->render($viewName); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - public function fromDispatcher($dispatcher){ |
|
| 66 | + public function fromDispatcher($dispatcher) { |
|
| 67 | 67 | return \explode("/", Router::getRequest(true)->url); |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | \ No newline at end of file |
@@ -11,10 +11,10 @@ |
||
| 11 | 11 | * @var Ajax\php\cakephp\_JsUtils |
| 12 | 12 | */ |
| 13 | 13 | public $jquery; |
| 14 | - public function initialize(array $config){ |
|
| 14 | + public function initialize(array $config) { |
|
| 15 | 15 | \extract($config); |
| 16 | 16 | $this->jquery=new _JsUtils(); |
| 17 | - if(isset($semantic)){ |
|
| 17 | + if (isset($semantic)) { |
|
| 18 | 18 | $this->jquery->semantic(new Semantic()); |
| 19 | 19 | } |
| 20 | 20 | } |
@@ -4,34 +4,34 @@ |
||
| 4 | 4 | |
| 5 | 5 | use micro\controllers\Startup; |
| 6 | 6 | use micro\utils\RequestUtils; |
| 7 | -class JsUtils extends \Ajax\JsUtils{ |
|
| 7 | +class JsUtils extends \Ajax\JsUtils { |
|
| 8 | 8 | |
| 9 | - public function getUrl($url){ |
|
| 9 | + public function getUrl($url) { |
|
| 10 | 10 | return RequestUtils::getUrl($url); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public function addViewElement($identifier,$content,&$view){ |
|
| 13 | + public function addViewElement($identifier, $content, &$view) { |
|
| 14 | 14 | $controls=$view->getVar("q"); |
| 15 | - if (isset($controls) === false) { |
|
| 16 | - $controls=array (); |
|
| 15 | + if (isset($controls)===false) { |
|
| 16 | + $controls=array(); |
|
| 17 | 17 | } |
| 18 | 18 | $controls[$identifier]=$content; |
| 19 | 19 | $view->setVar("q", $controls); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
| 23 | - $view->setVar($view_var,$output); |
|
| 22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
| 23 | + $view->setVar($view_var, $output); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
| 27 | - return $initialController->forward($controller,$action,$params,true,true,true); |
|
| 26 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
| 27 | + return $initialController->forward($controller, $action, $params, true, true, true); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
| 31 | - return $initialControllerInstance->loadView($viewName,$params,true); |
|
| 30 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
| 31 | + return $initialControllerInstance->loadView($viewName, $params, true); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function fromDispatcher($dispatcher){ |
|
| 34 | + public function fromDispatcher($dispatcher) { |
|
| 35 | 35 | return Startup::$urlParts; |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $title=@$content[1]; |
| 18 | 18 | $desc=@$content[2]; |
| 19 | 19 | $status=@$content[3]; |
| 20 | - }else{ |
|
| 20 | + } else{ |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $title=@$content["title"]; |
| 23 | 23 | $desc=@$content["description"]; |
@@ -32,16 +32,17 @@ discard block |
||
| 32 | 32 | if(isset($title)===true){ |
| 33 | 33 | $this->setTitle($title,$desc); |
| 34 | 34 | } |
| 35 | - }else{ |
|
| 35 | + } else{ |
|
| 36 | 36 | $this->setContent($content); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function setActive($value=true){ |
| 41 | - if($value) |
|
| 42 | - $this->setStatus(StepStatus::ACTIVE); |
|
| 43 | - else |
|
| 44 | - $this->setStatus(StepStatus::NONE); |
|
| 41 | + if($value) { |
|
| 42 | + $this->setStatus(StepStatus::ACTIVE); |
|
| 43 | + } else { |
|
| 44 | + $this->setStatus(StepStatus::NONE); |
|
| 45 | + } |
|
| 45 | 46 | return $this; |
| 46 | 47 | } |
| 47 | 48 | |
@@ -8,52 +8,52 @@ |
||
| 8 | 8 | class HtmlStepItem extends HtmlAbsractItem { |
| 9 | 9 | |
| 10 | 10 | public function __construct($identifier, $content) { |
| 11 | - parent::__construct($identifier,"step",$content); |
|
| 11 | + parent::__construct($identifier, "step", $content); |
|
| 12 | 12 | } |
| 13 | - protected function initContent($content){ |
|
| 14 | - if(\is_array($content)){ |
|
| 15 | - if(JArray::isAssociative($content)===false){ |
|
| 13 | + protected function initContent($content) { |
|
| 14 | + if (\is_array($content)) { |
|
| 15 | + if (JArray::isAssociative($content)===false) { |
|
| 16 | 16 | $icon=@$content[0]; |
| 17 | 17 | $title=@$content[1]; |
| 18 | 18 | $desc=@$content[2]; |
| 19 | 19 | $status=@$content[3]; |
| 20 | - }else{ |
|
| 20 | + } else { |
|
| 21 | 21 | $icon=@$content["icon"]; |
| 22 | 22 | $title=@$content["title"]; |
| 23 | 23 | $desc=@$content["description"]; |
| 24 | 24 | $status=@$content["status"]; |
| 25 | 25 | } |
| 26 | - if(isset($icon)){ |
|
| 26 | + if (isset($icon)) { |
|
| 27 | 27 | $this->setIcon($icon); |
| 28 | 28 | } |
| 29 | - if(isset($status)){ |
|
| 29 | + if (isset($status)) { |
|
| 30 | 30 | $this->setStatus($status); |
| 31 | 31 | } |
| 32 | - if(isset($title)){ |
|
| 33 | - $this->setTitle($title,$desc); |
|
| 32 | + if (isset($title)) { |
|
| 33 | + $this->setTitle($title, $desc); |
|
| 34 | 34 | } |
| 35 | - }else{ |
|
| 35 | + } else { |
|
| 36 | 36 | $this->setContent($content); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function setActive($value=true){ |
|
| 41 | - if($value) |
|
| 40 | + public function setActive($value=true) { |
|
| 41 | + if ($value) |
|
| 42 | 42 | $this->setStatus(StepStatus::ACTIVE); |
| 43 | 43 | else |
| 44 | 44 | $this->setStatus(StepStatus::NONE); |
| 45 | 45 | return $this; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public function setCompleted(){ |
|
| 48 | + public function setCompleted() { |
|
| 49 | 49 | return $this->setStatus(StepStatus::COMPLETED); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - public function setStatus($status){ |
|
| 52 | + public function setStatus($status) { |
|
| 53 | 53 | return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants()); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - public function removeStatus(){ |
|
| 56 | + public function removeStatus() { |
|
| 57 | 57 | $this->removePropertyValues("class", StepStatus::getConstants()); |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | \ No newline at end of file |