phpMv / phpMv-UI

Ajax/php/symfony/JsUtils.php

Spacing +17 added lines, -17 removed lines

@@ -6,27 +6,27 @@ 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Ajax\service\JString;
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		//$request = Request::createFromGlobals();
 		$router=$this->getInjected();
-		if(isset($router)===true){
+		if (isset($router)===true) {
 			try {
 			$url=$router->generate($url);
-			}catch (\Exception $e){
+			}catch (\Exception $e) {
 				return $router->getContext()->getBaseUrl();
 			}
 		}
 		return $url;
 	}
-	public function addViewElement($identifier,$content,&$view){
-		if(\array_key_exists("q", $view)===false){
+	public function addViewElement($identifier, $content, &$view) {
+		if (\array_key_exists("q", $view)===false) {
 			$view["q"]=array();
 		}
 		$view["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view[$view_var]=$output;
 	}
 
@@ -37,17 +37,17 @@ 
 	 * @param array $params
 	 * @see \Ajax\JsUtils::forward()
 	 */
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		$path=$params;
-		$request = $initialControllerInstance->get('request_stack')->getCurrentRequest();
-		$path['_forwarded'] = $request->attributes;
-		$path['_controller'] = $controllerName.":".$actionName;
-		$subRequest = $request->duplicate([], null, $path);
-		$response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
+		$request=$initialControllerInstance->get('request_stack')->getCurrentRequest();
+		$path['_forwarded']=$request->attributes;
+		$path['_controller']=$controllerName.":".$actionName;
+		$subRequest=$request->duplicate([], null, $path);
+		$response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
 		return $response->getContent();
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
         if ($initialControllerInstance->has('templating')) {
             return $initialControllerInstance->get('templating')->render($viewName, $params);
         }
@@ -59,10 +59,10 @@ 
         return $initialControllerInstance->get('twig')->render($viewName, $params);
 	}
 
-	public function fromDispatcher($dispatcher){
-		$request = $dispatcher->get('request_stack')->getCurrentRequest();
+	public function fromDispatcher($dispatcher) {
+		$request=$dispatcher->get('request_stack')->getCurrentRequest();
 		$uri=$request->getPathInfo();
-		if(JString::startswith($uri, "/")){
+		if (JString::startswith($uri, "/")) {
 			$uri=\substr($uri, 1);
 		}
 		return \explode("/", $uri);

Ajax/php/phalcon/JsUtils.php

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\Controller;
 
-class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface{
+class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface {
 	protected $_di;
 	public function setDi(DiInterface $di) {
 		$this->_di=$di;
@@ -18,50 +18,50 @@ 
 		return $this->_di;
 	}
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return $this->_di->get("url")->get($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable(&$view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action,$params=array()){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($initialController, $controller, $action, $params=array()) {
+		$dispatcher=$initialController->dispatcher;
 		$dispatcher->setControllerName($controller);
 		$dispatcher->setActionName($action);
 		$dispatcher->dispatch();
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		list($controller,$action)=\explode("@", $viewName);
-		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function ($view) {
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		list($controller, $action)=\explode("@", $viewName);
+		$template=$initialControllerInstance->view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$params=$dispatcher->getParams();
 		$action=$dispatcher->getActionName();
 		$items=array($dispatcher->getControllerName());
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
 			$items[]=$action;
-			foreach ($params as $p){
-				if(\is_object($p)===false)
+			foreach ($params as $p) {
+				if (\is_object($p)===false)
 					$items[]=$p;
 			}
 		}

Ajax/php/yii/JsUtils.php

Spacing +9 added lines, -9 removed lines

@@ -4,14 +4,14 @@ 
 
 use yii\helpers\Url;
 
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
-		if($url==="")
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
+		if ($url==="")
 			$url="/";
 		return Url::toRoute($url);
 	}
 
-	public function addViewElement($identifier,$content,&$view){
+	public function addViewElement($identifier, $content, &$view) {
 		$params=$view->params;
 		if (\array_key_exists("q", $params)==false) {
 			$view->params["q"]=array();
@@ -19,11 +19,11 @@ 
 		$view->params["q"][$identifier]=$content;
 	}
 
-	public function createScriptVariable(&$view,$view_var, $output){
+	public function createScriptVariable(&$view, $view_var, $output) {
 		$view->params[$view_var]=$output;
 	}
 
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) {
 		\ob_start();
 		$ctrInfo=\yii::$app->createController($controllerName."/".$actionName);
 		$ctrInfo[0]->{$ctrInfo[1]}($params);
@@ -32,11 +32,11 @@ 
 		return $result;
 	}
 
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
-		return \yii::$app->view->render($viewName,$params);
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
+		return \yii::$app->view->render($viewName, $params);
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$uri=new \Ajax\php\yii\URI();
 		return $uri->segment_array();
 	}

Ajax/lib/CDN.php

Spacing +21 added lines, -21 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-return array (
-		"JQuery" => array (
-				"MaxCDN" => array (
+return array(
+		"JQuery" => array(
+				"MaxCDN" => array(
 						"url" => "http://code.jquery.com/jquery-%version%.min.js",
-						"versions" => array (
+						"versions" => array(
 								"2.2.3",
 								"2.2.1",
 								"2.1.4",
@@ -11,9 +11,9 @@ 
 								"1.11.2"
 						)
 				),
-				"Google" => array (
+				"Google" => array(
 						"url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js",
-						"versions" => array (
+						"versions" => array(
 								"2.2.2",
 								"2.2.1",
 								"2.2.0",
@@ -25,17 +25,17 @@ 
 						)
 				)
 		),
-		"JQueryUI" => array (
-				"MaxCDN" => array (
+		"JQueryUI" => array(
+				"MaxCDN" => array(
 						"core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js",
 						"css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css",
-						"versions" => array (
+						"versions" => array(
 								"1.11.4",
 								"1.11.3",
 								"1.11.2",
 								"1.10.4"
 						),
-						"themes" => array (
+						"themes" => array(
 								"black-tie",
 								"blitzer",
 								"cupertino",
@@ -62,10 +62,10 @@ 
 								"vader"
 						)
 				),
-				"Google" => array (
+				"Google" => array(
 						"core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js",
 						"css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css",
-						"versions" => array (
+						"versions" => array(
 								"1.11.4",
 								"1.11.3",
 								"1.11.2",
@@ -74,7 +74,7 @@ 
 								"1.10.4",
 								"1.10.0"
 						),
-						"themes" => array (
+						"themes" => array(
 								"black-tie",
 								"blitzer",
 								"cupertino",
@@ -102,25 +102,25 @@ 
 						)
 				)
 		),
-		"Bootstrap" => array (
-				"MaxCDN" => array (
+		"Bootstrap" => array(
+				"MaxCDN" => array(
 						"core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js",
 						"css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css",
-						"versions" => array (
+						"versions" => array(
 								"3.3.6",
 								"3.3.5"
 						),
-						"themes" => array ()
+						"themes" => array()
 				)
 		),
-		"Semantic" => array (
-				"cdnjs" => array (
+		"Semantic" => array(
+				"cdnjs" => array(
 						"core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js",
 						"css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.css",
-						"versions" => array (
+						"versions" => array(
 								"2.1.8"
 						),
-						"themes" => array ()
+						"themes" => array()
 				)
 		)
 );
\ No newline at end of file

Ajax/lib/CDNCoreCss.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	protected $localCss;
 	protected $framework;
 
-	public function __construct($framework,$version, $provider="MaxCDN") {
+	public function __construct($framework, $version, $provider="MaxCDN") {
 		parent::__construct($version, $provider);
 		$this->framework=$framework;
 		$this->data=$this->data [$framework];

Ajax/lib/CDNBase.php

Spacing +2 added lines, -2 removed lines

@@ -60,10 +60,10 @@
 
 	protected function replaceVersionAndTheme($url, $version, $theme) {
 		if (isset($theme))
-			return str_ireplace(array (
+			return str_ireplace(array(
 					"%theme%",
 					"%version%" 
-			), array (
+			), array(
 					$theme,
 					$version 
 			), $url);

Ajax/Jquery.php

Spacing +25 added lines, -25 removed lines

@@ -17,21 +17,21 @@ 
  * jQuery Class
  */
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $jsUtils;
 
-	protected $jquery_events=array (
-			"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"
+	protected $jquery_events=array(
+			"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"
 	);
 
 	public function ui($ui=NULL) {
@@ -55,9 +55,9 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
@@ -125,12 +125,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -142,7 +142,7 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
@@ -161,7 +161,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -179,8 +179,8 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
@@ -212,7 +212,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -226,7 +226,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -266,7 +266,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -281,13 +281,13 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!==NULL){
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		if ($view!==NULL) {
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		}
 		return $output;
 	}
@@ -302,7 +302,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -311,12 +311,12 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -330,7 +330,7 @@ 
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -348,14 +348,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/bootstrap/components/Collapse.php

Spacing +1 added lines, -1 removed lines

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

Ajax/php/ci/JsUtils.php

Spacing +39 added lines, -39 removed lines

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