@@ -20,8 +20,9 @@ discard block |
||
20 | 20 | public function __construct($identifier, $width=NULL) { |
21 | 21 | parent::__construct($identifier, "div"); |
22 | 22 | $this->setClass("column"); |
23 | - if (isset($width)) |
|
24 | - $this->setWidth($width); |
|
23 | + if (isset($width)) { |
|
24 | + $this->setWidth($width); |
|
25 | + } |
|
25 | 26 | } |
26 | 27 | |
27 | 28 | /** |
@@ -48,10 +49,11 @@ discard block |
||
48 | 49 | |
49 | 50 | public function addDivider($vertical=true, $content=NULL) { |
50 | 51 | $divider=new HtmlDivider("", $content); |
51 | - if ($vertical) |
|
52 | - $divider->setVertical(); |
|
53 | - else |
|
54 | - $divider->setHorizontal(); |
|
52 | + if ($vertical) { |
|
53 | + $divider->setVertical(); |
|
54 | + } else { |
|
55 | + $divider->setHorizontal(); |
|
56 | + } |
|
55 | 57 | $this->wrap($divider,""); |
56 | 58 | return $divider; |
57 | 59 | } |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function setWidth($width) { |
32 | 32 | if (\is_int($width)) { |
33 | - $width=Wide::getConstants()["W" . $width]; |
|
33 | + $width=Wide::getConstants()["W".$width]; |
|
34 | 34 | } |
35 | 35 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
36 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
36 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function setValue($value) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $divider->setVertical(); |
52 | 52 | else |
53 | 53 | $divider->setHorizontal(); |
54 | - $this->wrap($divider,""); |
|
54 | + $this->wrap($divider, ""); |
|
55 | 55 | return $divider; |
56 | 56 | } |
57 | 57 | } |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | use Ajax\semantic\traits\SemanticWidgetsTrait; |
12 | 12 | |
13 | 13 | class Semantic extends BaseGui { |
14 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
15 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait; |
|
14 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
15 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait; |
|
16 | 16 | |
17 | 17 | private $language; |
18 | 18 | |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | - public function setLanguage($language){ |
|
25 | - if($language!==$this->language){ |
|
24 | + public function setLanguage($language) { |
|
25 | + if ($language!==$this->language) { |
|
26 | 26 | $file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js"); |
27 | - if(\file_exists($file)){ |
|
27 | + if (\file_exists($file)) { |
|
28 | 28 | $script=\file_get_contents($file); |
29 | - $this->js->exec($script,true); |
|
29 | + $this->js->exec($script, true); |
|
30 | 30 | $this->language=$language; |
31 | 31 | } |
32 | 32 | } |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getParam($key) { |
41 | 41 | $value=null; |
42 | - if (array_key_exists($key, $this->params)) |
|
43 | - $value=$this->params [$key]; |
|
42 | + if (array_key_exists($key, $this->params)) { |
|
43 | + $value=$this->params [$key]; |
|
44 | + } |
|
44 | 45 | return $value; |
45 | 46 | } |
46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
49 | 50 | } |
50 | 51 | |
51 | 52 | public function compile(JsUtils $js=NULL) { |
52 | - if ($js==NULL) |
|
53 | - $js=$this->js; |
|
53 | + if ($js==NULL) { |
|
54 | + $js=$this->js; |
|
55 | + } |
|
54 | 56 | $script=$this->getScript(); |
55 | 57 | $js->addToCompile($script); |
56 | 58 | } |
57 | 59 | |
58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
59 | 61 | if (\is_array($typeCtrl)) { |
60 | - if (array_search($value, $typeCtrl)===false) |
|
61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
62 | + if (array_search($value, $typeCtrl)===false) { |
|
63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
64 | + } |
|
62 | 65 | } else { |
63 | 66 | if (!$typeCtrl($value)) { |
64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
70 | 73 | public function setParams($params) { |
71 | 74 | foreach ( $params as $k => $v ) { |
72 | 75 | $method="set".ucfirst($k); |
73 | - if (method_exists($this, $method)) |
|
74 | - $this->$method($v); |
|
75 | - else { |
|
76 | + if (method_exists($this, $method)) { |
|
77 | + $this->$method($v); |
|
78 | + } else { |
|
76 | 79 | $this->setParam($k, $v); |
77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
78 | 81 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | * @version 1.001 |
11 | 11 | */ |
12 | 12 | abstract class BaseComponent { |
13 | - public $jquery_code_for_compile=array (); |
|
14 | - protected $params=array (); |
|
13 | + public $jquery_code_for_compile=array(); |
|
14 | + protected $params=array(); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setParams($params) { |
71 | - foreach ( $params as $k => $v ) { |
|
71 | + foreach ($params as $k => $v) { |
|
72 | 72 | $method="set".ucfirst($k); |
73 | 73 | if (method_exists($this, $method)) |
74 | 74 | $this->$method($v); |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | return $this; |
82 | 82 | } |
83 | 83 | |
84 | - public function addParams($params){ |
|
85 | - foreach ($params as $k=>$v){ |
|
84 | + public function addParams($params) { |
|
85 | + foreach ($params as $k=>$v) { |
|
86 | 86 | $this->setParam($k, $v); |
87 | 87 | } |
88 | 88 | return $this; |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | |
91 | 91 | abstract public function getScript(); |
92 | 92 | |
93 | - public function setDebug($value){ |
|
93 | + public function setDebug($value) { |
|
94 | 94 | return $this->setParam("debug", $value); |
95 | 95 | } |
96 | 96 | |
97 | - public function setVerbose($value){ |
|
97 | + public function setVerbose($value) { |
|
98 | 98 | return $this->setParam("verbose", $value); |
99 | 99 | } |
100 | 100 | } |
@@ -12,18 +12,21 @@ |
||
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
16 | - $this->setRows($rows); |
|
15 | + if(isset($rows)) { |
|
16 | + $this->setRows($rows); |
|
17 | + } |
|
17 | 18 | } |
18 | 19 | public function setValue($value) { |
19 | - if(isset($value)) |
|
20 | - $this->setContent($value); |
|
20 | + if(isset($value)) { |
|
21 | + $this->setContent($value); |
|
22 | + } |
|
21 | 23 | return $this; |
22 | 24 | } |
23 | 25 | |
24 | 26 | public function setPlaceholder($value){ |
25 | - if(JString::isNotNull($value)) |
|
26 | - $this->setProperty("placeholder", $value); |
|
27 | + if(JString::isNotNull($value)) { |
|
28 | + $this->setProperty("placeholder", $value); |
|
29 | + } |
|
27 | 30 | return $this; |
28 | 31 | } |
29 | 32 |
@@ -7,27 +7,27 @@ |
||
7 | 7 | |
8 | 8 | class HtmlTextarea extends HtmlDoubleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) { |
|
10 | + public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) { |
|
11 | 11 | parent::__construct($identifier, "textarea"); |
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
15 | + if (isset($rows)) |
|
16 | 16 | $this->setRows($rows); |
17 | 17 | } |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
19 | + if (isset($value)) |
|
20 | 20 | $this->setContent($value); |
21 | 21 | return $this; |
22 | 22 | } |
23 | 23 | |
24 | - public function setPlaceholder($value){ |
|
25 | - if(JString::isNotNull($value)) |
|
24 | + public function setPlaceholder($value) { |
|
25 | + if (JString::isNotNull($value)) |
|
26 | 26 | $this->setProperty("placeholder", $value); |
27 | 27 | return $this; |
28 | 28 | } |
29 | 29 | |
30 | - public function setRows($count){ |
|
30 | + public function setRows($count) { |
|
31 | 31 | $this->setProperty("rows", $count); |
32 | 32 | } |
33 | 33 | } |
@@ -7,20 +7,20 @@ discard block |
||
7 | 7 | use Ajax\semantic\html\base\constants\Sens; |
8 | 8 | use Ajax\JsUtils; |
9 | 9 | |
10 | -class HtmlSegmentGroups extends HtmlSemCollection{ |
|
10 | +class HtmlSegmentGroups extends HtmlSemCollection { |
|
11 | 11 | |
12 | 12 | |
13 | - public function __construct( $identifier, $items=array()){ |
|
14 | - parent::__construct( $identifier, "div","ui segments"); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, "div", "ui segments"); |
|
15 | 15 | $this->addItems($items); |
16 | 16 | } |
17 | 17 | |
18 | 18 | |
19 | - protected function createItem($value){ |
|
20 | - return new HtmlSegment("segment-".$this->count(),$value); |
|
19 | + protected function createItem($value) { |
|
20 | + return new HtmlSegment("segment-".$this->count(), $value); |
|
21 | 21 | } |
22 | 22 | |
23 | - protected function createCondition($value){ |
|
23 | + protected function createCondition($value) { |
|
24 | 24 | return !($value instanceof HtmlSegment); |
25 | 25 | } |
26 | 26 | |
@@ -29,21 +29,21 @@ discard block |
||
29 | 29 | * @param string $type one of "raised","stacked","piled" default : "" |
30 | 30 | * @return \Ajax\semantic\html\elements\HtmlSegmentGroups |
31 | 31 | */ |
32 | - public function setType($type){ |
|
32 | + public function setType($type) { |
|
33 | 33 | return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants()); |
34 | 34 | } |
35 | 35 | |
36 | - public function setSens($sens=Sens::VERTICAL){ |
|
36 | + public function setSens($sens=Sens::VERTICAL) { |
|
37 | 37 | return $this->addToPropertyCtrl("class", $sens, Sens::getConstants()); |
38 | 38 | } |
39 | 39 | |
40 | - public function run(JsUtils $js){ |
|
41 | - $result= parent::run($js); |
|
40 | + public function run(JsUtils $js) { |
|
41 | + $result=parent::run($js); |
|
42 | 42 | return $result->setItemSelector(".ui.segment"); |
43 | 43 | } |
44 | 44 | |
45 | - public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){ |
|
46 | - $group=new HtmlSegmentGroups($identifier,$items); |
|
45 | + public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) { |
|
46 | + $group=new HtmlSegmentGroups($identifier, $items); |
|
47 | 47 | $group->setSens($sens); |
48 | 48 | return $group->setType($type); |
49 | 49 | } |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | public function setValue($value) { |
20 | - if(isset($value)) |
|
21 | - $this->setProperty("value", $value); |
|
20 | + if(isset($value)) { |
|
21 | + $this->setProperty("value", $value); |
|
22 | + } |
|
22 | 23 | return $this; |
23 | 24 | } |
24 | 25 | |
@@ -27,16 +28,18 @@ discard block |
||
27 | 28 | } |
28 | 29 | |
29 | 30 | public function setPlaceholder($value){ |
30 | - if(JString::isNotNull($value)) |
|
31 | - $this->_placeholder=$value; |
|
31 | + if(JString::isNotNull($value)) { |
|
32 | + $this->_placeholder=$value; |
|
33 | + } |
|
32 | 34 | return $this; |
33 | 35 | } |
34 | 36 | |
35 | 37 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
36 | 38 | $value=$this->_placeholder; |
37 | 39 | if(JString::isNull($value)){ |
38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
39 | - $value=\ucfirst($this->getProperty("name")); |
|
40 | + if(JString::isNotNull($this->getProperty("name"))) { |
|
41 | + $value=\ucfirst($this->getProperty("name")); |
|
42 | + } |
|
40 | 43 | } |
41 | 44 | $this->setProperty("placeholder", $value); |
42 | 45 | return parent::compile($js,$view); |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | |
9 | 9 | class HtmlInput extends HtmlSingleElement { |
10 | 10 | protected $_placeholder; |
11 | - public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) { |
|
11 | + public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) { |
|
12 | 12 | parent::__construct($identifier, "input"); |
13 | 13 | $this->setProperty("name", $identifier); |
14 | 14 | $this->setValue($value); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | public function setValue($value) { |
20 | - if(isset($value)) |
|
20 | + if (isset($value)) |
|
21 | 21 | $this->setProperty("value", $value); |
22 | 22 | return $this; |
23 | 23 | } |
@@ -26,19 +26,19 @@ discard block |
||
26 | 26 | return $this->setProperty("type", $value); |
27 | 27 | } |
28 | 28 | |
29 | - public function setPlaceholder($value){ |
|
30 | - if(JString::isNotNull($value)) |
|
29 | + public function setPlaceholder($value) { |
|
30 | + if (JString::isNotNull($value)) |
|
31 | 31 | $this->_placeholder=$value; |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
35 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
36 | 36 | $value=$this->_placeholder; |
37 | - if(JString::isNull($value)){ |
|
38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
37 | + if (JString::isNull($value)) { |
|
38 | + if (JString::isNotNull($this->getProperty("name"))) |
|
39 | 39 | $value=\ucfirst($this->getProperty("name")); |
40 | 40 | } |
41 | 41 | $this->setProperty("placeholder", $value); |
42 | - return parent::compile($js,$view); |
|
42 | + return parent::compile($js, $view); |
|
43 | 43 | } |
44 | 44 | } |
@@ -186,8 +186,9 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
188 | 188 | $result=$this->addInToolbar($caption,$callback); |
189 | - if(isset($icon)) |
|
190 | - $result->addIcon($icon); |
|
189 | + if(isset($icon)) { |
|
190 | + $result->addIcon($icon); |
|
191 | + } |
|
191 | 192 | return $result; |
192 | 193 | } |
193 | 194 | |
@@ -201,7 +202,7 @@ discard block |
||
201 | 202 | foreach ($items as $icon=>$item){ |
202 | 203 | $this->addItemInToolbar($item,$icon,$callback); |
203 | 204 | } |
204 | - }else{ |
|
205 | + } else{ |
|
205 | 206 | foreach ($items as $item){ |
206 | 207 | $this->addItemInToolbar($item,null,$callback); |
207 | 208 | } |
@@ -352,8 +353,9 @@ discard block |
||
352 | 353 | protected function _compileForm(){ |
353 | 354 | if(isset($this->_form)){ |
354 | 355 | $noValidate=""; |
355 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
356 | - $noValidate="novalidate"; |
|
356 | + if(\sizeof($this->_form->getValidationParams())>0) { |
|
357 | + $noValidate="novalidate"; |
|
358 | + } |
|
357 | 359 | $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
358 | 360 | } |
359 | 361 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | use Ajax\semantic\html\modules\HtmlModal; |
21 | 21 | |
22 | 22 | abstract class Widget extends HtmlDoubleElement { |
23 | - use FieldAsTrait,FormTrait; |
|
23 | + use FieldAsTrait, FormTrait; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @var string classname |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | protected $_generated; |
54 | 54 | |
55 | 55 | |
56 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
56 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
57 | 57 | parent::__construct($identifier); |
58 | 58 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
59 | 59 | $this->setModel($model); |
60 | - if(isset($modelInstance)){ |
|
60 | + if (isset($modelInstance)) { |
|
61 | 61 | $this->show($modelInstance); |
62 | 62 | } |
63 | 63 | $this->_generated=false; |
64 | 64 | } |
65 | 65 | |
66 | - protected function _init($instanceViewer,$contentKey,$content,$edition){ |
|
66 | + protected function _init($instanceViewer, $contentKey, $content, $edition) { |
|
67 | 67 | $this->_instanceViewer=$instanceViewer; |
68 | 68 | $this->content=[$contentKey=>$content]; |
69 | 69 | $this->_self=$content; |
@@ -75,31 +75,31 @@ discard block |
||
75 | 75 | * @param int|string $fieldName |
76 | 76 | * @return int|string |
77 | 77 | */ |
78 | - protected function _getIndex($fieldName){ |
|
78 | + protected function _getIndex($fieldName) { |
|
79 | 79 | $index=$fieldName; |
80 | - if(\is_string($fieldName)){ |
|
80 | + if (\is_string($fieldName)) { |
|
81 | 81 | $fields=$this->_instanceViewer->getVisibleProperties(); |
82 | 82 | $index=\array_search($fieldName, $fields); |
83 | 83 | } |
84 | 84 | return $index; |
85 | 85 | } |
86 | 86 | |
87 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
87 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
88 | 88 | return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier(); |
89 | 89 | } |
90 | 90 | |
91 | - protected function _getFieldName($index){ |
|
91 | + protected function _getFieldName($index) { |
|
92 | 92 | return $this->_instanceViewer->getFieldName($index); |
93 | 93 | } |
94 | 94 | |
95 | - protected function _getFieldCaption($index){ |
|
95 | + protected function _getFieldCaption($index) { |
|
96 | 96 | return $this->_instanceViewer->getCaption($index); |
97 | 97 | } |
98 | 98 | |
99 | - abstract protected function _setToolbarPosition($table,$captions=NULL); |
|
99 | + abstract protected function _setToolbarPosition($table, $captions=NULL); |
|
100 | 100 | |
101 | - public function show($modelInstance){ |
|
102 | - if(\is_array($modelInstance)){ |
|
101 | + public function show($modelInstance) { |
|
102 | + if (\is_array($modelInstance)) { |
|
103 | 103 | $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
104 | 104 | } |
105 | 105 | $this->_modelInstance=$modelInstance; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | abstract public function getHtmlComponent(); |
127 | 127 | |
128 | - public function setAttached($value=true){ |
|
128 | + public function setAttached($value=true) { |
|
129 | 129 | return $this->getHtmlComponent()->setAttached($value); |
130 | 130 | } |
131 | 131 | |
@@ -136,59 +136,59 @@ discard block |
||
136 | 136 | * @param callable $callback function called after the field compilation |
137 | 137 | * @return Widget |
138 | 138 | */ |
139 | - public function afterCompile($index,$callback){ |
|
139 | + public function afterCompile($index, $callback) { |
|
140 | 140 | $index=$this->_getIndex($index); |
141 | 141 | $this->_instanceViewer->afterCompile($index, $callback); |
142 | 142 | return $this; |
143 | 143 | } |
144 | 144 | |
145 | - public function setColor($color){ |
|
145 | + public function setColor($color) { |
|
146 | 146 | return $this->getHtmlComponent()->setColor($color); |
147 | 147 | } |
148 | 148 | |
149 | 149 | |
150 | - public function setCaptions($captions){ |
|
150 | + public function setCaptions($captions) { |
|
151 | 151 | $this->_instanceViewer->setCaptions($captions); |
152 | 152 | return $this; |
153 | 153 | } |
154 | 154 | |
155 | - public function setCaption($index,$caption){ |
|
155 | + public function setCaption($index, $caption) { |
|
156 | 156 | $this->_instanceViewer->setCaption($this->_getIndex($index), $caption); |
157 | 157 | return $this; |
158 | 158 | } |
159 | 159 | |
160 | - public function setFields($fields){ |
|
160 | + public function setFields($fields) { |
|
161 | 161 | $this->_instanceViewer->setVisibleProperties($fields); |
162 | 162 | return $this; |
163 | 163 | } |
164 | 164 | |
165 | - public function addField($field){ |
|
165 | + public function addField($field) { |
|
166 | 166 | $this->_instanceViewer->addField($field); |
167 | 167 | return $this; |
168 | 168 | } |
169 | 169 | |
170 | - public function addFields($fields){ |
|
170 | + public function addFields($fields) { |
|
171 | 171 | $this->_instanceViewer->addFields($fields); |
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | |
175 | - public function addMessage($attributes=NULL,$fieldName="message"){ |
|
175 | + public function addMessage($attributes=NULL, $fieldName="message") { |
|
176 | 176 | $this->_instanceViewer->addField($fieldName); |
177 | 177 | $count=$this->_instanceViewer->visiblePropertiesCount(); |
178 | - return $this->fieldAsMessage($count-1,$attributes); |
|
178 | + return $this->fieldAsMessage($count-1, $attributes); |
|
179 | 179 | } |
180 | 180 | |
181 | - public function addErrorMessage(){ |
|
182 | - return $this->addMessage(["error"=>true],"message"); |
|
181 | + public function addErrorMessage() { |
|
182 | + return $this->addMessage(["error"=>true], "message"); |
|
183 | 183 | } |
184 | 184 | |
185 | - public function insertField($index,$field){ |
|
185 | + public function insertField($index, $field) { |
|
186 | 186 | $index=$this->_getIndex($index); |
187 | 187 | $this->_instanceViewer->insertField($index, $field); |
188 | 188 | return $this; |
189 | 189 | } |
190 | 190 | |
191 | - public function insertInField($index,$field){ |
|
191 | + public function insertInField($index, $field) { |
|
192 | 192 | $index=$this->_getIndex($index); |
193 | 193 | $this->_instanceViewer->insertInField($index, $field); |
194 | 194 | return $this; |
@@ -200,13 +200,13 @@ discard block |
||
200 | 200 | * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index |
201 | 201 | * @return Widget |
202 | 202 | */ |
203 | - public function setValueFunction($index,$callback){ |
|
203 | + public function setValueFunction($index, $callback) { |
|
204 | 204 | $index=$this->_getIndex($index); |
205 | 205 | $this->_instanceViewer->setValueFunction($index, $callback); |
206 | 206 | return $this; |
207 | 207 | } |
208 | 208 | |
209 | - public function setIdentifierFunction($callback){ |
|
209 | + public function setIdentifierFunction($callback) { |
|
210 | 210 | $this->_instanceViewer->setIdentifierFunction($callback); |
211 | 211 | return $this; |
212 | 212 | } |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | /** |
215 | 215 | * @return \Ajax\semantic\html\collections\menus\HtmlMenu |
216 | 216 | */ |
217 | - public function getToolbar(){ |
|
218 | - if(isset($this->_toolbar)===false){ |
|
217 | + public function getToolbar() { |
|
218 | + if (isset($this->_toolbar)===false) { |
|
219 | 219 | $this->_toolbar=new HtmlMenu("toolbar-".$this->identifier); |
220 | 220 | } |
221 | 221 | return $this->_toolbar; |
@@ -227,15 +227,15 @@ discard block |
||
227 | 227 | * @param callable $callback function to call on $element |
228 | 228 | * @return \Ajax\common\html\HtmlDoubleElement |
229 | 229 | */ |
230 | - public function addInToolbar($element,$callback=NULL){ |
|
230 | + public function addInToolbar($element, $callback=NULL) { |
|
231 | 231 | $tb=$this->getToolbar(); |
232 | - if($element instanceof BaseWidget){ |
|
233 | - if($element->getIdentifier()===""){ |
|
232 | + if ($element instanceof BaseWidget) { |
|
233 | + if ($element->getIdentifier()==="") { |
|
234 | 234 | $element->setIdentifier("tb-item-".$this->identifier."-".$tb->count()); |
235 | 235 | } |
236 | 236 | } |
237 | - if(isset($callback)){ |
|
238 | - if(\is_callable($callback)){ |
|
237 | + if (isset($callback)) { |
|
238 | + if (\is_callable($callback)) { |
|
239 | 239 | $callback($element); |
240 | 240 | } |
241 | 241 | } |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | * @param callable $callback function($element) |
249 | 249 | * @return \Ajax\common\html\HtmlDoubleElement |
250 | 250 | */ |
251 | - public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
|
252 | - $result=$this->addInToolbar($caption,$callback); |
|
253 | - if(isset($icon)) |
|
251 | + public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) { |
|
252 | + $result=$this->addInToolbar($caption, $callback); |
|
253 | + if (isset($icon)) |
|
254 | 254 | $result->addIcon($icon); |
255 | 255 | return $result; |
256 | 256 | } |
@@ -260,14 +260,14 @@ discard block |
||
260 | 260 | * @param callable $callback function($element) |
261 | 261 | * @return \Ajax\common\Widget |
262 | 262 | */ |
263 | - public function addItemsInToolbar(array $items,$callback=NULL){ |
|
264 | - if(JArray::isAssociative($items)){ |
|
265 | - foreach ($items as $icon=>$item){ |
|
266 | - $this->addItemInToolbar($item,$icon,$callback); |
|
263 | + public function addItemsInToolbar(array $items, $callback=NULL) { |
|
264 | + if (JArray::isAssociative($items)) { |
|
265 | + foreach ($items as $icon=>$item) { |
|
266 | + $this->addItemInToolbar($item, $icon, $callback); |
|
267 | 267 | } |
268 | - }else{ |
|
269 | - foreach ($items as $item){ |
|
270 | - $this->addItemInToolbar($item,null,$callback); |
|
268 | + } else { |
|
269 | + foreach ($items as $item) { |
|
270 | + $this->addItemInToolbar($item, null, $callback); |
|
271 | 271 | } |
272 | 272 | } |
273 | 273 | return $this; |
@@ -279,12 +279,12 @@ discard block |
||
279 | 279 | * @param callable $callback function($element) |
280 | 280 | * @return \Ajax\common\html\HtmlDoubleElement |
281 | 281 | */ |
282 | - public function addDropdownInToolbar($value,$items,$callback=NULL){ |
|
282 | + public function addDropdownInToolbar($value, $items, $callback=NULL) { |
|
283 | 283 | $dd=$value; |
284 | 284 | if (\is_string($value)) { |
285 | - $dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items); |
|
285 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items); |
|
286 | 286 | } |
287 | - return $this->addInToolbar($dd,$callback); |
|
287 | + return $this->addInToolbar($dd, $callback); |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | /** |
@@ -293,9 +293,9 @@ discard block |
||
293 | 293 | * @param callable $callback function($element) |
294 | 294 | * @return \Ajax\common\html\HtmlDoubleElement |
295 | 295 | */ |
296 | - public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){ |
|
297 | - $bt=new HtmlButton("bt-".$caption,$caption,$cssStyle); |
|
298 | - return $this->addInToolbar($bt,$callback); |
|
296 | + public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) { |
|
297 | + $bt=new HtmlButton("bt-".$caption, $caption, $cssStyle); |
|
298 | + return $this->addInToolbar($bt, $callback); |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
@@ -304,9 +304,9 @@ discard block |
||
304 | 304 | * @param callable $callback function($element) |
305 | 305 | * @return \Ajax\common\html\HtmlDoubleElement |
306 | 306 | */ |
307 | - public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){ |
|
308 | - $bts=new HtmlButtonGroups("",$captions,$asIcon); |
|
309 | - return $this->addInToolbar($bts,$callback); |
|
307 | + public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) { |
|
308 | + $bts=new HtmlButtonGroups("", $captions, $asIcon); |
|
309 | + return $this->addInToolbar($bts, $callback); |
|
310 | 310 | } |
311 | 311 | |
312 | 312 | /** |
@@ -316,15 +316,15 @@ discard block |
||
316 | 316 | * @param boolean $labeled |
317 | 317 | * @return \Ajax\common\html\HtmlDoubleElement |
318 | 318 | */ |
319 | - public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){ |
|
320 | - $bt=new HtmlButton("",$caption); |
|
321 | - $bt->addIcon($icon,$before,$labeled); |
|
319 | + public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) { |
|
320 | + $bt=new HtmlButton("", $caption); |
|
321 | + $bt->addIcon($icon, $before, $labeled); |
|
322 | 322 | return $this->addInToolbar($bt); |
323 | 323 | } |
324 | 324 | |
325 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
326 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
327 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters); |
|
325 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
326 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
327 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters); |
|
328 | 328 | return $this->addInToolbar($button); |
329 | 329 | } |
330 | 330 | |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model |
355 | 355 | * @return \Ajax\common\Widget |
356 | 356 | */ |
357 | - public function setDefaultValueFunction($defaultValueFunction){ |
|
357 | + public function setDefaultValueFunction($defaultValueFunction) { |
|
358 | 358 | $this->_instanceViewer->setDefaultValueFunction($defaultValueFunction); |
359 | 359 | return $this; |
360 | 360 | } |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | * @param string|boolean $disable |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function jsDisabled($disable=true){ |
|
366 | + public function jsDisabled($disable=true) { |
|
367 | 367 | return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");"; |
368 | 368 | } |
369 | 369 | |
@@ -372,12 +372,12 @@ discard block |
||
372 | 372 | * @param callable $callback function($element) |
373 | 373 | * @return \Ajax\common\html\HtmlDoubleElement |
374 | 374 | */ |
375 | - public function addEditButtonInToolbar($caption,$callback=NULL){ |
|
376 | - $bt=new HtmlButton($this->identifier."-editBtn",$caption); |
|
375 | + public function addEditButtonInToolbar($caption, $callback=NULL) { |
|
376 | + $bt=new HtmlButton($this->identifier."-editBtn", $caption); |
|
377 | 377 | $bt->setToggle(); |
378 | 378 | $bt->setActive($this->_edition); |
379 | 379 | $bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')"))); |
380 | - return $this->addInToolbar($bt,$callback); |
|
380 | + return $this->addInToolbar($bt, $callback); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | public function setToolbar(HtmlMenu $_toolbar) { |
@@ -391,35 +391,35 @@ discard block |
||
391 | 391 | } |
392 | 392 | |
393 | 393 | public function getForm() { |
394 | - if(!isset($this->_form)){ |
|
394 | + if (!isset($this->_form)) { |
|
395 | 395 | $this->_form=new HtmlForm("frm-".$this->identifier); |
396 | 396 | $this->setEdition(true); |
397 | 397 | } |
398 | 398 | return $this->_form; |
399 | 399 | } |
400 | 400 | |
401 | - public function run(JsUtils $js){ |
|
401 | + public function run(JsUtils $js) { |
|
402 | 402 | $result=parent::run($js); |
403 | - if(isset($this->_form)){ |
|
403 | + if (isset($this->_form)) { |
|
404 | 404 | $result=$this->runForm($js); |
405 | 405 | } |
406 | 406 | return $result; |
407 | 407 | } |
408 | 408 | |
409 | - protected function runForm(JsUtils $js){ |
|
409 | + protected function runForm(JsUtils $js) { |
|
410 | 410 | $fields=$this->getContentInstances(HtmlFormField::class); |
411 | - foreach ($fields as $field){ |
|
411 | + foreach ($fields as $field) { |
|
412 | 412 | $this->_form->addField($field); |
413 | 413 | } |
414 | 414 | return $this->_form->run($js); |
415 | 415 | } |
416 | 416 | |
417 | - protected function _compileForm(){ |
|
418 | - if(isset($this->_form)){ |
|
417 | + protected function _compileForm() { |
|
418 | + if (isset($this->_form)) { |
|
419 | 419 | $noValidate=""; |
420 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
420 | + if (\sizeof($this->_form->getValidationParams())>0) |
|
421 | 421 | $noValidate="novalidate"; |
422 | - $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
|
422 | + $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>"); |
|
423 | 423 | } |
424 | 424 | } |
425 | 425 | |
@@ -428,32 +428,32 @@ discard block |
||
428 | 428 | return $this; |
429 | 429 | } |
430 | 430 | |
431 | - public function moveFieldTo($from,$to){ |
|
431 | + public function moveFieldTo($from, $to) { |
|
432 | 432 | return $this->_instanceViewer->moveFieldTo($from, $to); |
433 | 433 | } |
434 | 434 | |
435 | - public function swapFields($index1,$index2){ |
|
435 | + public function swapFields($index1, $index2) { |
|
436 | 436 | $index1=$this->_getIndex($index1); |
437 | 437 | $index2=$this->_getIndex($index2); |
438 | 438 | return $this->_instanceViewer->swapFields($index1, $index2); |
439 | 439 | } |
440 | 440 | |
441 | - public function removeField($index){ |
|
441 | + public function removeField($index) { |
|
442 | 442 | $index=$this->_getIndex($index); |
443 | 443 | $this->_instanceViewer->removeField($index); |
444 | 444 | return $this; |
445 | 445 | } |
446 | 446 | |
447 | - public function asModal($header=null){ |
|
448 | - $modal=new HtmlModal("modal-".$this->identifier,$header); |
|
447 | + public function asModal($header=null) { |
|
448 | + $modal=new HtmlModal("modal-".$this->identifier, $header); |
|
449 | 449 | $modal->setContent($this); |
450 | - if(isset($this->_form)){ |
|
450 | + if (isset($this->_form)) { |
|
451 | 451 | $this->_form->onSuccess($modal->jsHide()); |
452 | 452 | } |
453 | 453 | return $modal; |
454 | 454 | } |
455 | 455 | |
456 | 456 | public function addToProperty($name, $value, $separator=" ") { |
457 | - return $this->getHtmlComponent()->addToProperty($name,$value,$separator); |
|
457 | + return $this->getHtmlComponent()->addToProperty($name, $value, $separator); |
|
458 | 458 | } |
459 | 459 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @return HtmlButtongroups default : "" |
40 | 40 | */ |
41 | 41 | public function setSize($size) { |
42 | - foreach ( $this->elements as $element ) { |
|
42 | + foreach ($this->elements as $element) { |
|
43 | 43 | $element->setSize($size); |
44 | 44 | } |
45 | 45 | if (is_int($size)) { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
52 | + foreach ($this->elements as $element) |
|
53 | 53 | $element->setStyle($value); |
54 | 54 | } |
55 | 55 | |
@@ -69,29 +69,29 @@ discard block |
||
69 | 69 | public function addElement($element) { |
70 | 70 | $result=$element; |
71 | 71 | $iid=sizeof($this->elements)+1; |
72 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
72 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
73 | 73 | $this->addExistingDropDown($element); |
74 | 74 | } elseif (\is_array($element)) { |
75 | - $result=$this->_addArrayElement($element,$iid); |
|
75 | + $result=$this->_addArrayElement($element, $iid); |
|
76 | 76 | } elseif (is_string($element)) { |
77 | - $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
|
77 | + $result=new HtmlButton($this->identifier."-button-".$iid, $element); |
|
78 | 78 | } |
79 | - if($result instanceof HtmlButton) |
|
79 | + if ($result instanceof HtmlButton) |
|
80 | 80 | $this->elements[]=$result; |
81 | 81 | return $result; |
82 | 82 | } |
83 | 83 | |
84 | - private function _addArrayElement(array $element,$iid){ |
|
84 | + private function _addArrayElement(array $element, $iid) { |
|
85 | 85 | if (array_key_exists("glyph", $element)) |
86 | 86 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
87 | 87 | elseif (array_key_exists("btnCaption", $element)) { |
88 | 88 | if (array_key_exists("split", $element)) |
89 | 89 | $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
90 | - else{ |
|
90 | + else { |
|
91 | 91 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 92 | $this->dropdownAsButton($bt); |
93 | 93 | } |
94 | - } else{ |
|
94 | + } else { |
|
95 | 95 | $bt=new HtmlButton($this->identifier."-button-".$iid); |
96 | 96 | $bt->fromArray($element); |
97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | public function addElements($elements) { |
102 | - foreach ( $elements as $element ) { |
|
102 | + foreach ($elements as $element) { |
|
103 | 103 | $this->addElement($element); |
104 | 104 | } |
105 | 105 | return $this; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } else |
120 | 120 | $value="btn-group-".$value; |
121 | 121 | if (strstr($value, "justified")) { |
122 | - foreach ( $this->elements as $element ) { |
|
122 | + foreach ($this->elements as $element) { |
|
123 | 123 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
124 | 124 | } |
125 | 125 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
151 | 151 | */ |
152 | 152 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
153 | - foreach ( $this->elements as $element ) { |
|
153 | + foreach ($this->elements as $element) { |
|
154 | 154 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
155 | 155 | } |
156 | 156 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
53 | - $element->setStyle($value); |
|
52 | + foreach ( $this->elements as $element ) { |
|
53 | + $element->setStyle($value); |
|
54 | + } |
|
54 | 55 | } |
55 | 56 | |
56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
76 | 77 | } elseif (is_string($element)) { |
77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
78 | 79 | } |
79 | - if($result instanceof HtmlButton) |
|
80 | - $this->elements[]=$result; |
|
80 | + if($result instanceof HtmlButton) { |
|
81 | + $this->elements[]=$result; |
|
82 | + } |
|
81 | 83 | return $result; |
82 | 84 | } |
83 | 85 | |
84 | 86 | private function _addArrayElement(array $element,$iid){ |
85 | - if (array_key_exists("glyph", $element)) |
|
86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
88 | - if (array_key_exists("split", $element)) |
|
89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
90 | - else{ |
|
87 | + if (array_key_exists("glyph", $element)) { |
|
88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
90 | + if (array_key_exists("split", $element)) { |
|
91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
92 | + } else{ |
|
91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 94 | $this->dropdownAsButton($bt); |
93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
116 | 118 | public function setAlignment($value) { |
117 | 119 | if (is_int($value)) { |
118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
119 | - } else |
|
120 | - $value="btn-group-".$value; |
|
121 | + } else { |
|
122 | + $value="btn-group-".$value; |
|
123 | + } |
|
121 | 124 | if (strstr($value, "justified")) { |
122 | 125 | foreach ( $this->elements as $element ) { |
123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
132 | 135 | * @return HtmlButton |
133 | 136 | */ |
134 | 137 | public function getElement($index) { |
135 | - if (is_int($index)) |
|
136 | - return $this->elements[$index]; |
|
137 | - else { |
|
138 | + if (is_int($index)) { |
|
139 | + return $this->elements[$index]; |
|
140 | + } else { |
|
138 | 141 | $elm=$this->getElementById($index, $this->elements); |
139 | 142 | return $elm; |
140 | 143 | } |
@@ -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 && ! class_exists('CI_DB')){ |
|
92 | - if ($db_conn === TRUE){ |
|
93 | - $db_conn = ''; |
|
91 | + if ($db_conn!==FALSE && !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); |