Completed
Push — master ( bc53b5...fc9cad )
by Jean-Christophe
03:58
created
Ajax/lib/CDNCoreCss.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 	protected $localCss;
10 10
 	protected $framework;
11 11
 
12
-	public function __construct($framework,$version, $provider="MaxCDN") {
12
+	public function __construct($framework, $version, $provider="MaxCDN") {
13 13
 		parent::__construct($version, $provider);
14 14
 		$this->framework=$framework;
15 15
 		$this->data=$this->data [$framework];
Please login to merge, or discard this patch.
Ajax/lib/CDNBase.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,10 +60,10 @@
 block discarded – undo
60 60
 
61 61
 	protected function replaceVersionAndTheme($url, $version, $theme) {
62 62
 		if (isset($theme))
63
-			return str_ireplace(array (
63
+			return str_ireplace(array(
64 64
 					"%theme%",
65 65
 					"%version%" 
66
-			), array (
66
+			), array(
67 67
 					$theme,
68 68
 					$version 
69 69
 			), $url);
Please login to merge, or discard this patch.
Braces   +16 added lines, -12 removed lines patch added patch discarded remove patch
@@ -33,11 +33,13 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	protected function getUrlOrCss($element, $key) {
36
-		if (isset($element))
37
-			return $element;
36
+		if (isset($element)) {
37
+					return $element;
38
+		}
38 39
 		$version=$this->version;
39
-		if (array_search($version, $this->getVersions())===false)
40
-			$version=$this->getLastVersion();
40
+		if (array_search($version, $this->getVersions())===false) {
41
+					$version=$this->getLastVersion();
42
+		}
41 43
 		return $this->replaceVersion($this->data [$this->provider] [$key], $version);
42 44
 	}
43 45
 
@@ -59,16 +61,17 @@  discard block
 block discarded – undo
59 61
 	}
60 62
 
61 63
 	protected function replaceVersionAndTheme($url, $version, $theme) {
62
-		if (isset($theme))
63
-			return str_ireplace(array (
64
+		if (isset($theme)) {
65
+					return str_ireplace(array (
64 66
 					"%theme%",
65 67
 					"%version%" 
66 68
 			), array (
67 69
 					$theme,
68 70
 					$version 
69 71
 			), $url);
70
-		else
71
-			return $this->replaceVersion($url, $version);
72
+		} else {
73
+					return $this->replaceVersion($url, $version);
74
+		}
72 75
 	}
73 76
 
74 77
 	public function getProviders() {
@@ -76,10 +79,11 @@  discard block
 block discarded – undo
76 79
 	}
77 80
 
78 81
 	public function getVersions($provider=NULL) {
79
-		if (isset($provider))
80
-			return $this->data [$provider] ["versions"];
81
-		else
82
-			return $this->data [$this->provider] ["versions"];
82
+		if (isset($provider)) {
83
+					return $this->data [$provider] ["versions"];
84
+		} else {
85
+					return $this->data [$this->provider] ["versions"];
86
+		}
83 87
 	}
84 88
 
85 89
 	public function getLastVersion($provider=NULL) {
Please login to merge, or discard this patch.
Ajax/lib/CDNGuiGen.php 1 patch
Braces   +22 added lines, -16 removed lines patch added patch discarded remove patch
@@ -14,10 +14,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Ajax/Jquery.php 3 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -17,21 +17,21 @@  discard block
 block discarded – undo
17 17
  * jQuery Class
18 18
  */
19 19
 class Jquery {
20
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
20
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
21 21
 	protected $_ui;
22 22
 	protected $_bootstrap;
23 23
 	protected $_semantic;
24 24
 	protected $libraryFile;
25 25
 	protected $_javascript_folder='js';
26
-	protected $jquery_code_for_load=array ();
27
-	protected $jquery_code_for_compile=array ();
26
+	protected $jquery_code_for_load=array();
27
+	protected $jquery_code_for_compile=array();
28 28
 	protected $jquery_corner_active=FALSE;
29 29
 	protected $jquery_table_sorter_active=FALSE;
30 30
 	protected $jquery_table_sorter_pager_active=FALSE;
31 31
 	protected $jsUtils;
32 32
 
33
-	protected $jquery_events=array (
34
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
33
+	protected $jquery_events=array(
34
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
35 35
 	);
36 36
 
37 37
 	public function ui($ui=NULL) {
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 		return $this->_semantic;
56 56
 	}
57 57
 
58
-	public function __construct($params,$jsUtils) {
58
+	public function __construct($params, $jsUtils) {
59 59
 		$this->params=array();
60
-		foreach ( $params as $key => $val ) {
60
+		foreach ($params as $key => $val) {
61 61
 				$this->params[$key]=$params[$key];
62 62
 		}
63 63
 		$this->jsUtils=$jsUtils;
@@ -125,12 +125,12 @@  discard block
 block discarded – undo
125 125
 	 */
126 126
 	public function _output($array_js='') {
127 127
 		if (!is_array($array_js)) {
128
-			$array_js=array (
128
+			$array_js=array(
129 129
 					$array_js
130 130
 			);
131 131
 		}
132 132
 
133
-		foreach ( $array_js as $js ) {
133
+		foreach ($array_js as $js) {
134 134
 			$this->jquery_code_for_compile[]="\t$js\n";
135 135
 		}
136 136
 	}
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param string $param
143 143
 	 * @param boolean $immediatly delayed if false
144 144
 	 */
145
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
145
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
146 146
 		$element=$this->_prep_element($element);
147 147
 		if (isset($param)) {
148 148
 			$param=$this->_prep_value($param);
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	 * @param boolean $immediatly delayed if false
162 162
 	 * @return string
163 163
 	 */
164
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
164
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
165 165
 		$to=$this->_prep_element($to);
166 166
 		$element=$this->_prep_element($element);
167 167
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 	 */
180 180
 	public function sortable($element, $options=array()) {
181 181
 		if (count($options)>0) {
182
-			$sort_options=array ();
183
-			foreach ( $options as $k => $v ) {
182
+			$sort_options=array();
183
+			foreach ($options as $k => $v) {
184 184
 				$sort_options[]="\n\t\t".$k.': '.$v."";
185 185
 			}
186 186
 			$sort_options=implode(",", $sort_options);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
213 213
 	 * @return string
214 214
 	 */
215
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
215
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
216 216
 		if (is_array($js)) {
217 217
 			$js=implode("\n\t\t", $js);
218 218
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
227 227
 		else
228 228
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
229
-		if($immediatly)
229
+		if ($immediatly)
230 230
 			$this->jquery_code_for_compile[]=$event;
231 231
 		return $event;
232 232
 	}
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 
267 267
 		// External references
268 268
 		$external_scripts=implode('', $this->jquery_code_for_load);
269
-		extract(array (
269
+		extract(array(
270 270
 				'library_src' => $external_scripts
271 271
 		));
272 272
 
@@ -281,13 +281,13 @@  discard block
 block discarded – undo
281 281
 		$script.='});';
282 282
 
283 283
 		$this->jquery_code_for_compile=array();
284
-		if($this->params["debug"]==false){
284
+		if ($this->params["debug"]==false) {
285 285
 			$script=$this->minify($script);
286 286
 		}
287 287
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
288 288
 
289
-		if ($view!==NULL){
290
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
289
+		if ($view!==NULL) {
290
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
291 291
 		}
292 292
 		return $output;
293 293
 	}
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 	 * @return void
303 303
 	 */
304 304
 	public function _clear_compile() {
305
-		$this->jquery_code_for_compile=array ();
305
+		$this->jquery_code_for_compile=array();
306 306
 	}
307 307
 
308 308
 	/**
@@ -311,12 +311,12 @@  discard block
 block discarded – undo
311 311
 	 */
312 312
 	public function _document_ready($js) {
313 313
 		if (!is_array($js)) {
314
-			$js=array (
314
+			$js=array(
315 315
 					$js
316 316
 			);
317 317
 		}
318 318
 
319
-		foreach ( $js as $script ) {
319
+		foreach ($js as $script) {
320 320
 			$this->jquery_code_for_compile[]=$script;
321 321
 		}
322 322
 	}
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	 * @return string
331 331
 	 */
332 332
 	public function _prep_element($element) {
333
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
333
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
334 334
 			$element='"'.addslashes($element).'"';
335 335
 		}
336 336
 		return $element;
@@ -348,14 +348,14 @@  discard block
 block discarded – undo
348 348
 		if (is_array($value)) {
349 349
 			$value=implode(",", $value);
350 350
 		}
351
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
351
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
352 352
 			$value='"'.$value.'"';
353 353
 		}
354 354
 		return $value;
355 355
 	}
356 356
 
357 357
 	private function minify($input) {
358
-	if(trim($input) === "") return $input;
358
+	if (trim($input)==="") return $input;
359 359
 	return preg_replace(
360 360
 			array(
361 361
 					// Remove comment(s)
Please login to merge, or discard this patch.
Braces   +20 added lines, -13 removed lines patch added patch discarded remove patch
@@ -147,10 +147,12 @@  discard block
 block discarded – undo
147 147
 		if (isset($param)) {
148 148
 			$param=$this->_prep_value($param);
149 149
 			$str="$({$element}).{$jQueryCall}({$param});";
150
-		} else
151
-			$str="$({$element}).{$jQueryCall}();";
152
-			if ($immediatly)
153
-				$this->jquery_code_for_compile[]=$str;
150
+		} else {
151
+					$str="$({$element}).{$jQueryCall}();";
152
+		}
153
+			if ($immediatly) {
154
+							$this->jquery_code_for_compile[]=$str;
155
+			}
154 156
 			return $str;
155 157
 	}
156 158
 	/**
@@ -165,8 +167,9 @@  discard block
 block discarded – undo
165 167
 		$to=$this->_prep_element($to);
166 168
 		$element=$this->_prep_element($element);
167 169
 		$str="$({$to}).{$jQueryCall}({$element});";
168
-		if ($immediatly)
169
-			$this->jquery_code_for_compile[]=$str;
170
+		if ($immediatly) {
171
+					$this->jquery_code_for_compile[]=$str;
172
+		}
170 173
 			return $str;
171 174
 	}
172 175
 
@@ -222,12 +225,14 @@  discard block
 block discarded – undo
222 225
 		if ($stopPropagation===true) {
223 226
 			$js="event.stopPropagation();\n".$js;
224 227
 		}
225
-		if (array_search($event, $this->jquery_events)===false)
226
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
227
-		else
228
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
229
-		if($immediatly)
230
-			$this->jquery_code_for_compile[]=$event;
228
+		if (array_search($event, $this->jquery_events)===false) {
229
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
230
+		} else {
231
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
232
+		}
233
+		if($immediatly) {
234
+					$this->jquery_code_for_compile[]=$event;
235
+		}
231 236
 		return $event;
232 237
 	}
233 238
 
@@ -355,7 +360,9 @@  discard block
 block discarded – undo
355 360
 	}
356 361
 
357 362
 	private function minify($input) {
358
-	if(trim($input) === "") return $input;
363
+	if(trim($input) === "") {
364
+		return $input;
365
+	}
359 366
 	return preg_replace(
360 367
 			array(
361 368
 					// Remove comment(s)
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 	 *
176 176
 	 * @param string $element
177 177
 	 * @param array $options
178
-	 * @return void
178
+	 * @return string
179 179
 	 */
180 180
 	public function sortable($element, $options=array()) {
181 181
 		if (count($options)>0) {
@@ -354,6 +354,9 @@  discard block
 block discarded – undo
354 354
 		return $value;
355 355
 	}
356 356
 
357
+	/**
358
+	 * @param string $input
359
+	 */
357 360
 	private function minify($input) {
358 361
 	if(trim($input) === "") return $input;
359 362
 	return preg_replace(
Please login to merge, or discard this patch.
Ajax/bootstrap/components/Collapse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
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 {
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.
Ajax/php/cakephp/_JsUtils.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@
 block discarded – undo
48 48
 	}
49 49
 
50 50
 	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
51
-        if ($initialControllerInstance->has('templating')) {
52
-            return $initialControllerInstance->get('templating')->render($viewName, $params);
53
-        }
51
+		if ($initialControllerInstance->has('templating')) {
52
+			return $initialControllerInstance->get('templating')->render($viewName, $params);
53
+		}
54 54
 
55
-        if (!$initialControllerInstance->has('twig')) {
56
-            throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.');
57
-        }
55
+		if (!$initialControllerInstance->has('twig')) {
56
+			throw new \LogicException('You can not use the "renderView" method if the Templating Component or the Twig Bundle are not available.');
57
+		}
58 58
 
59
-        return $initialControllerInstance->get('twig')->render($viewName, $params);
59
+		return $initialControllerInstance->get('twig')->render($viewName, $params);
60 60
 	}
61 61
 
62 62
 	public function fromDispatcher($dispatcher){
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -5,23 +5,23 @@  discard block
 block discarded – undo
5 5
 
6 6
 use Ajax\service\JString;
7 7
 use Cake\Routing\Router;
8
-class _JsUtils extends \Ajax\JsUtils{
9
-	public function getUrl($url){
8
+class _JsUtils extends \Ajax\JsUtils {
9
+	public function getUrl($url) {
10 10
 		return Router::url($url);
11 11
 	}
12
-	public function addViewElement($identifier,$content,&$view){
12
+	public function addViewElement($identifier, $content, &$view) {
13 13
 		$viewVars=$view->viewVars;
14
-		if (isset($viewVars["q"]) === false) {
15
-			$controls=array ();
16
-		}else{
14
+		if (isset($viewVars["q"])===false) {
15
+			$controls=array();
16
+		} else {
17 17
 			$controls=$viewVars["q"];
18 18
 		}
19 19
 		$controls[$identifier]=$content;
20 20
 		$view->set("q", $controls);
21 21
 	}
22 22
 
23
-	public function createScriptVariable(&$view,$view_var, $output){
24
-		$view->set($view_var,$output);
23
+	public function createScriptVariable(&$view, $view_var, $output) {
24
+		$view->set($view_var, $output);
25 25
 	}
26 26
 
27 27
 	/**
@@ -31,17 +31,17 @@  discard block
 block discarded – undo
31 31
 	 * @param array $params
32 32
 	 * @see \Ajax\JsUtils::forward()
33 33
 	 */
34
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
34
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
35 35
 		$path=$params;
36
-		$request = $initialControllerInstance->get('request_stack')->getCurrentRequest();
37
-		$path['_forwarded'] = $request->attributes;
38
-		$path['_controller'] = $controllerName.":".$actionName;
39
-		$subRequest = $request->duplicate([], null, $path);
40
-		$response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
36
+		$request=$initialControllerInstance->get('request_stack')->getCurrentRequest();
37
+		$path['_forwarded']=$request->attributes;
38
+		$path['_controller']=$controllerName.":".$actionName;
39
+		$subRequest=$request->duplicate([], null, $path);
40
+		$response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
41 41
 		return $response->getContent();
42 42
 	}
43 43
 
44
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
44
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
45 45
         if ($initialControllerInstance->has('templating')) {
46 46
             return $initialControllerInstance->get('templating')->render($viewName, $params);
47 47
         }
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         return $initialControllerInstance->get('twig')->render($viewName, $params);
54 54
 	}
55 55
 
56
-	public function fromDispatcher($dispatcher){
56
+	public function fromDispatcher($dispatcher) {
57 57
 		return \explode("/", Router::getRequest(true)->url);
58 58
 	}
59 59
 }
60 60
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
Ajax/php/cakephp/JsUtilsComponent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 	public $jquery;
13 13
 		\extract($config);
14 14
 		$this->jquery=new _JsUtils();
15
-		if(isset($semantic)){
15
+		if (isset($semantic)) {
16 16
 			$this->jquery->semantic(new Semantic());
17 17
 		}
18 18
 	}
Please login to merge, or discard this patch.