Completed
Push — master ( 3abce3...7abd10 )
by Jean-Christophe
03:33
created
Ajax/semantic/html/modules/HtmlProgress.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,11 +12,13 @@  discard block
 block discarded – undo
12 12
 
13 13
 	public function __construct($identifier, $value=NULL, $label=NULL, $attributes=array()) {
14 14
 		parent::__construct($identifier, "div", "ui progress");
15
-		if (isset($value))
16
-			$this->setProperty("data-percent", $value);
15
+		if (isset($value)) {
16
+					$this->setProperty("data-percent", $value);
17
+		}
17 18
 		$this->createBar();
18
-		if (isset($label))
19
-			$this->setLabel($label);
19
+		if (isset($label)) {
20
+					$this->setLabel($label);
21
+		}
20 22
 		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
21 23
 		$this->addToProperty("class", $attributes);
22 24
 	}
@@ -111,8 +113,9 @@  discard block
 block discarded – undo
111 113
 	 * @see BaseHtml::run()
112 114
 	 */
113 115
 	public function run(JsUtils $js) {
114
-		if (isset($this->_bsComponent) === false)
115
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
116
+		if (isset($this->_bsComponent) === false) {
117
+					$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
118
+		}
116 119
 		$this->addEventsOnRun($js);
117 120
 		return $this->_bsComponent;
118 121
 	}
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,17 +17,17 @@  discard block
 block discarded – undo
17 17
 		$this->createBar();
18 18
 		if (isset($label))
19 19
 			$this->setLabel($label);
20
-		$this->_states=[ State::SUCCESS,State::WARNING,State::ERROR,State::ACTIVE,State::DISABLED ];
20
+		$this->_states=[State::SUCCESS, State::WARNING, State::ERROR, State::ACTIVE, State::DISABLED];
21 21
 		$this->addToProperty("class", $attributes);
22 22
 	}
23 23
 
24 24
 	public function setLabel($label) {
25
-		$this->content["label"]=new HtmlSemDoubleElement("lbl-" . $this->identifier, "div", "label", $label);
25
+		$this->content["label"]=new HtmlSemDoubleElement("lbl-".$this->identifier, "div", "label", $label);
26 26
 		return $this;
27 27
 	}
28 28
 
29 29
 	private function createBar() {
30
-		$bar=new HtmlSemDoubleElement("bar-" . $this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-" . $this->identifier, "div", "progress"));
30
+		$bar=new HtmlSemDoubleElement("bar-".$this->identifier, "div", "bar", new HtmlSemDoubleElement("progress-".$this->identifier, "div", "progress"));
31 31
 		$this->content["bar"]=$bar;
32 32
 		return $this;
33 33
 	}
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
64 64
 	 */
65 65
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
66
-		$this->content=JArray::sortAssociative($this->content, [ "bar","label" ]);
66
+		$this->content=JArray::sortAssociative($this->content, ["bar", "label"]);
67 67
 		return parent::compile($js, $view);
68 68
 	}
69 69
 
70 70
 	public function jsSetValue($value) {
71
-		return '$("#' . $this->identifier . '").progress({value:' . $value . '});';
71
+		return '$("#'.$this->identifier.'").progress({value:'.$value.'});';
72 72
 	}
73 73
 
74 74
 	public function jsIncValue() {
75
-		return '$("#' . $this->identifier . '").progress("increment");';
75
+		return '$("#'.$this->identifier.'").progress("increment");';
76 76
 	}
77 77
 
78 78
 	public function jsDecValue() {
79
-		return '$("#' . $this->identifier . '").progress("decrement");';
79
+		return '$("#'.$this->identifier.'").progress("decrement");';
80 80
 	}
81 81
 
82 82
 	/**
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
98 98
 			$percent=JArray::getDefaultValue($array, "percent", $percent);
99 99
 			$ratio=JArray::getDefaultValue($array, "ratio", $ratio);
100 100
 		}
101
-		$this->_params["text"]="%{active  : " . \var_export($active, true) . ",error: " . \var_export($error, true) . ",success : " . \var_export($success, true) . ",warning : " . \var_export($warning, true) . ",percent : " . \var_export($percent, true) . ",ratio   : " . \var_export($ratio, true) . "}%";
101
+		$this->_params["text"]="%{active  : ".\var_export($active, true).",error: ".\var_export($error, true).",success : ".\var_export($success, true).",warning : ".\var_export($warning, true).",percent : ".\var_export($percent, true).",ratio   : ".\var_export($ratio, true)."}%";
102 102
 		return $this;
103 103
 	}
104 104
 
105 105
 	public function onChange($jsCode) {
106
-		return $this->_params["onChange"]="%function(percent, value, total){" . $jsCode . "}%";
106
+		return $this->_params["onChange"]="%function(percent, value, total){".$jsCode."}%";
107 107
 	}
108 108
 
109 109
 	/*
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 	 * @see BaseHtml::run()
112 112
 	 */
113 113
 	public function run(JsUtils $js) {
114
-		if (isset($this->_bsComponent) === false)
115
-			$this->_bsComponent=$js->semantic()->progress("#" . $this->identifier, $this->_params);
114
+		if (isset($this->_bsComponent)===false)
115
+			$this->_bsComponent=$js->semantic()->progress("#".$this->identifier, $this->_params);
116 116
 		$this->addEventsOnRun($js);
117 117
 		return $this->_bsComponent;
118 118
 	}
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryEventsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 trait JqueryEventsTrait {
13
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 
15 15
 	/**
16 16
 	 * Blur
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
54 54
 		if (!is_array($js)) {
55
-			$js=array (
55
+			$js=array(
56 56
 					$js
57 57
 			);
58 58
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/IconTrait.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@  discard block
 block discarded – undo
15 15
 	private $_hasIcon=false;
16 16
 
17 17
 	abstract protected function addToPropertyCtrl($name, $value, $typeCtrl);
18
-	abstract public function addContent($content,$before=false);
18
+	abstract public function addContent($content, $before=false);
19 19
 
20
-	public function addIcon($icon,$direction=Direction::LEFT){
21
-		if($this->_hasIcon===false){
20
+	public function addIcon($icon, $direction=Direction::LEFT) {
21
+		if ($this->_hasIcon===false) {
22 22
 			$iconO=$icon;
23
-			if(\is_string($icon)){
23
+			if (\is_string($icon)) {
24 24
 				$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
25 25
 			}
26 26
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
27
-			$this->addContent($iconO,$direction===Direction::LEFT);
27
+			$this->addContent($iconO, $direction===Direction::LEFT);
28 28
 			$this->_hasIcon=true;
29
-		}else{
29
+		} else {
30 30
 			$iconO=$this->getIcon();
31 31
 			$iconO->setIcon($icon);
32 32
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 		return $iconO;
35 35
 	}
36 36
 
37
-	public function getIcon(){
38
-		if(\is_array($this->content)){
39
-			foreach ($this->content as $item){
40
-				if($item instanceof HtmlIcon)
37
+	public function getIcon() {
38
+		if (\is_array($this->content)) {
39
+			foreach ($this->content as $item) {
40
+				if ($item instanceof HtmlIcon)
41 41
 					return $item;
42 42
 			}
43 43
 		}
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
27 27
 			$this->addContent($iconO,$direction===Direction::LEFT);
28 28
 			$this->_hasIcon=true;
29
-		}else{
29
+		} else{
30 30
 			$iconO=$this->getIcon();
31 31
 			$iconO->setIcon($icon);
32 32
 			$this->addToPropertyCtrl("class", $direction." icon", Direction::getConstantValues("icon"));
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 	public function getIcon(){
38 38
 		if(\is_array($this->content)){
39 39
 			foreach ($this->content as $item){
40
-				if($item instanceof HtmlIcon)
41
-					return $item;
40
+				if($item instanceof HtmlIcon) {
41
+									return $item;
42
+				}
42 43
 			}
43 44
 		}
44 45
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/TableElementTrait.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 	}
26 26
 
27 27
 	public function setDisabled($disable=true) {
28
-		if($disable)
28
+		if ($disable)
29 29
 			$this->addState(State::DISABLED);
30 30
 		return $this;
31 31
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@
 block discarded – undo
25 25
 	}
26 26
 
27 27
 	public function setDisabled($disable=true) {
28
-		if($disable)
29
-			$this->addState(State::DISABLED);
28
+		if($disable) {
29
+					$this->addState(State::DISABLED);
30
+		}
30 31
 		return $this;
31 32
 	}
32 33
 }
33 34
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlListItem.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
 	protected $image;
10 10
 
11 11
 	public function __construct($identifier, $content=NULL) {
12
-		parent::__construct($identifier,"item",$content);
12
+		parent::__construct($identifier, "item", $content);
13 13
 	}
14
-	protected function initContent($content){
15
-		if(\is_array($content)){
16
-			if(JArray::isAssociative($content)===false){
14
+	protected function initContent($content) {
15
+		if (\is_array($content)) {
16
+			if (JArray::isAssociative($content)===false) {
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			} else {
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -25,21 +25,21 @@  discard block
 block discarded – undo
25 25
 				$desc=@$content["description"];
26 26
 				$items=@$content["items"];
27 27
 			}
28
-			if(isset($icon)){
28
+			if (isset($icon)) {
29 29
 				$this->setIcon($icon);
30 30
 			}
31
-			if(isset($image)){
31
+			if (isset($image)) {
32 32
 				$this->setImage($image);
33 33
 			}
34
-			if(isset($title)){
35
-				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)){
37
-				$this->setTitle($header,$desc,"header");
34
+			if (isset($title)) {
35
+				$this->setTitle($title, $desc);
36
+			}elseif (isset($header)) {
37
+				$this->setTitle($header, $desc, "header");
38 38
 			}
39
-			if(isset($items)){
39
+			if (isset($items)) {
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		} else {
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 		return $list;
51 51
 	}
52 52
 
53
-	public function getList(){
53
+	public function getList() {
54 54
 		return $this->content["list"];
55 55
 	}
56 56
 
57
-	public function getItem($index){
57
+	public function getItem($index) {
58 58
 		return $this->getList()->getItem($index);
59 59
 	}
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			} else{
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 			}
34 34
 			if(isset($title)){
35 35
 				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)){
36
+			} elseif (isset($header)){
37 37
 				$this->setTitle($header,$desc,"header");
38 38
 			}
39 39
 			if(isset($items)){
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		} else{
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
Please login to merge, or discard this patch.
Ajax/common/html/PropertyWrapper.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 			$output=$input;
13 13
 		}
14 14
 		if (\is_array($input)) {
15
-			if (sizeof($input) > 0) {
16
-				if (self::containsElement($input) === false) {
15
+			if (sizeof($input)>0) {
16
+				if (self::containsElement($input)===false) {
17 17
 					$output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"');
18 18
 				} else {
19 19
 					$output=self::wrapObjects($input, $js, $separator, $valueQuote);
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	}
25 25
 
26 26
 	private static function containsElement($input) {
27
-		foreach ( $input as $v ) {
27
+		foreach ($input as $v) {
28 28
 			if (\is_object($v) || \is_array($v))
29 29
 				return true;
30 30
 		}
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 
34 34
 	public static function wrapStrings($input, $js, $separator=' ', $valueQuote='"') {
35
-		if (JArray::isAssociative($input) === true) {
36
-			$result=implode($separator, array_map(function ($v, $k) use($valueQuote) {
37
-				return $k . '=' . $valueQuote . $v . $valueQuote;
35
+		if (JArray::isAssociative($input)===true) {
36
+			$result=implode($separator, array_map(function($v, $k) use($valueQuote) {
37
+				return $k.'='.$valueQuote.$v.$valueQuote;
38 38
 			}, $input, array_keys($input)));
39 39
 		} else {
40 40
 			$result=implode($separator, array_values($input));
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
46
-		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
46
+		return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) {
47 47
 			if (is_object($v))
48 48
 				return $v->compile($js);
49 49
 			elseif (\is_array($v)) {
Please login to merge, or discard this patch.
Braces   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@  discard block
 block discarded – undo
25 25
 
26 26
 	private static function containsElement($input) {
27 27
 		foreach ( $input as $v ) {
28
-			if (\is_object($v) || \is_array($v))
29
-				return true;
28
+			if (\is_object($v) || \is_array($v)) {
29
+							return true;
30
+			}
30 31
 		}
31 32
 		return false;
32 33
 	}
@@ -44,12 +45,13 @@  discard block
 block discarded – undo
44 45
 
45 46
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
46 47
 		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
47
-			if (is_object($v))
48
-				return $v->compile($js);
49
-			elseif (\is_array($v)) {
48
+			if (is_object($v)) {
49
+							return $v->compile($js);
50
+			} elseif (\is_array($v)) {
50 51
 				return self::wrap($v, $js, $separator, $valueQuote);
51
-			} else
52
-				return $v;
52
+			} else {
53
+							return $v;
54
+			}
53 55
 		}, $input));
54 56
 	}
55 57
 }
56 58
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/HtmlSingleElement.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function setClass($classNames) {
16
-		if(\is_array($classNames)){
16
+		if (\is_array($classNames)) {
17 17
 			$classNames=implode(" ", $classNames);
18 18
 		}
19 19
 		$this->setProperty("class", $classNames);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	public function fromArray($array) {
46 46
 		$array=parent::fromArray($array);
47
-		foreach ( $array as $key => $value ) {
47
+		foreach ($array as $key => $value) {
48 48
 			$this->setProperty($key, $value);
49 49
 		}
50 50
 		return $array;
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlNavzone.php 2 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 		if (\is_array($elements)) {
62 62
 			foreach ( $elements as $key => $element ) {
63 63
 				$iid=$this->getElementsCount()+1;
64
-				if ($element instanceof HtmlDropdownItem)
65
-					$this->elements []=$element;
66
-				else if (\is_array($element)) {
64
+				if ($element instanceof HtmlDropdownItem) {
65
+									$this->elements []=$element;
66
+				} else if (\is_array($element)) {
67 67
 					if (is_string($key)===true) {
68 68
 						$dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid);
69 69
 						$dropdown->addItems($element);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		$li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li");
90 90
 		if($caption instanceof HtmlLink){
91 91
 			$link=$caption;
92
-		}else{
92
+		} else{
93 93
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
94 94
 		}
95 95
 		$li->setContent($link);
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		parent::__construct($identifier);
28 28
 		$this->tagName="ul";
29 29
 		$this->_template='<%tagName% id="%identifier%" class="nav navbar-nav %class%">%elements%</%tagName%>';
30
-		$this->elements=array ();
30
+		$this->elements=array();
31 31
 	}
32 32
 
33 33
 	public function setClass($value) {
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	public function addElement($element) {
42
-		if($element instanceof HtmlLink){
42
+		if ($element instanceof HtmlLink) {
43 43
 			$this->addLink($element);
44 44
 		} else if (is_object($element)) {
45 45
 			$this->elements []=$element;
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 	public function addElements($elements) {
61 61
 		if (\is_array($elements)) {
62
-			foreach ( $elements as $key => $element ) {
62
+			foreach ($elements as $key => $element) {
63 63
 				$iid=$this->getElementsCount()+1;
64 64
 				if ($element instanceof HtmlDropdownItem)
65 65
 					$this->elements []=$element;
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
 	public function addLink($caption, $href="#") {
88 88
 		$iid=$this->getElementsCount()+1;
89 89
 		$li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li");
90
-		if($caption instanceof HtmlLink){
90
+		if ($caption instanceof HtmlLink) {
91 91
 			$link=$caption;
92
-		}else{
92
+		} else {
93 93
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
94 94
 		}
95 95
 		$li->setContent($link);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	}
123 123
 
124 124
 	public function run(JsUtils $js) {
125
-		foreach ( $this->elements as $element ) {
125
+		foreach ($this->elements as $element) {
126 126
 			$element->run($js);
127 127
 		}
128 128
 	}
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @param int $index
144 144
 	 * @return BaseHtml
145 145
 	 */
146
-	public function getElement($index){
146
+	public function getElement($index) {
147 147
 		return $this->elements[$index];
148 148
 	}
149 149
 }
150 150
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/php/ci/JsUtils.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.