AnuTiger / F3

helpers/Model.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 		);
 
 	public function __construct() {
-		if(property_exists($this, 'fields')) {
+		if (property_exists($this, 'fields')) {
 			$this->fieldConf = array_merge($this->fields, $this->fieldConf);
 		}
 

app.php

Indentation +119 added lines, -119 removed lines

@@ -1,145 +1,145 @@
 <?php
 
 class App extends Prefab{
-    public $db;
+	public $db;
 	public $app;
-    public $session;
-    public $authenticatedUser;
+	public $session;
+	public $authenticatedUser;
 
 	public function __construct() {
-	    $this->app = $this->app ?: Base::instance();
+		$this->app = $this->app ?: Base::instance();
 	}
 
-    static public function singleton() {
-        if (Registry::exists('APP'))
-            $app = Registry::get('APP');
-        else {
-            $app = new self;
-            Registry::set('APP',$app);
-        }
-        return $app;
-    }
+	static public function singleton() {
+		if (Registry::exists('APP'))
+			$app = Registry::get('APP');
+		else {
+			$app = new self;
+			Registry::set('APP',$app);
+		}
+		return $app;
+	}
 
-    public function db() {
-        return $this->db ?: $this->app->DB;
-    }
+	public function db() {
+		return $this->db ?: $this->app->DB;
+	}
 
-    public function session() {
-        return $this->session ?: $this->app->SESSION;
-    }
+	public function session() {
+		return $this->session ?: $this->app->SESSION;
+	}
 
 	public function user() {
 		return $this->authenticatedUser = $this->app->get('SESSION.USER')?:false;
 	}
 
-    public function initialized($def = null) {
-        return null !== $def ? $this->app->set('INITIALIZED', $def) : $this->app->get('INITIALIZED');
-    }
+	public function initialized($def = null) {
+		return null !== $def ? $this->app->set('INITIALIZED', $def) : $this->app->get('INITIALIZED');
+	}
 
-    public function config($key = null) {
-        return $this->app->get($key?:'CONFIG') ;
-    }
+	public function config($key = null) {
+		return $this->app->get($key?:'CONFIG') ;
+	}
 
-    public function status() {
-        return $this->app->IS_LIVE;
-    }
+	public function status() {
+		return $this->app->IS_LIVE;
+	}
 
-    public function run() {
-        $this->loadConfig();
-        $this->loadRoutes();
-        $this->checkForMaintenance();
-        $this->configureDebug();
-	    $this->configureDB();
-	    $this->configureSession();
-        $this->configureAssets();
+	public function run() {
+		$this->loadConfig();
+		$this->loadRoutes();
+		$this->checkForMaintenance();
+		$this->configureDebug();
+		$this->configureDB();
+		$this->configureSession();
+		$this->configureAssets();
 		$this->registerErrorHandler();
-	    $this->initialized(true);
+		$this->initialized(true);
 		$this->app->run();
-    }
-
-    public function loadRoutes($file = null){
-        $this->_load('routes', $file);
-    }
-
-    public function loadConfig($file = null){
-        $this->_load('config', $file);
-    }
-
-    private function _load($path, $file = null) {
-        if($file) {
-            $this->app->config(base_path("{path}/{$file}"));
-        }else{
-            foreach(glob(base_path("{$path}/*.ini")) as $file) {
-                $this->app->config($file);
-            }
-        }
-    }
+	}
+
+	public function loadRoutes($file = null){
+		$this->_load('routes', $file);
+	}
+
+	public function loadConfig($file = null){
+		$this->_load('config', $file);
+	}
+
+	private function _load($path, $file = null) {
+		if($file) {
+			$this->app->config(base_path("{path}/{$file}"));
+		}else{
+			foreach(glob(base_path("{$path}/*.ini")) as $file) {
+				$this->app->config($file);
+			}
+		}
+	}
 
 	public function checkForMaintenance() {
 		if(!$this->status()) {
-	       	template('maintenance');
-		    exit();
-        }
-	}
-
-    public function configureDebug() {
-	    if(!$this->app->DEV) {
-	        $this->app->set('DEBUG', 0);
-        }
-    }
-
-    public function configureDB() {
-        $type = strtolower($this->app->DB_TYPE);
-
-        if($type == 'jig'){
-            $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
-            $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
-            $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
-        }
-        $this->app->set('DB', $this->db);
-    }
-
-    public function configureSession() {
-        $type = strtolower($this->app->SESSION);
-
-        if($type) {
-            if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
-                $this->configureCSRF($type);
-            }else if($this->app->CSRF){
-                $this->session = new Session(null, 'CSRF');
-            }else{
-                if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
-                    $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
-                    $this->session = new $session($this->app->DB);
-                }else{
-                    $this->session = new Session();
-                }
-            }
-            $this->app->set('SESSION', $this->session);
-        }
-    }
-
-    public function configureCSRF($type) {
-        $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
-        $this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
-    }
-
-    private function _getDBType($type) {
-        if($type == 'jig' || $type == 'mongo'){
-            return ucfirst($type);
-        }else if($type == 'sql') {
-            return strtoupper($type);
-        }
-    }
-
-    public function configureAssets() {
-        $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound',function($file) {
-            echo 'file not found: '.$file;
-        });
-    }
+		   	template('maintenance');
+			exit();
+		}
+	}
+
+	public function configureDebug() {
+		if(!$this->app->DEV) {
+			$this->app->set('DEBUG', 0);
+		}
+	}
+
+	public function configureDB() {
+		$type = strtolower($this->app->DB_TYPE);
+
+		if($type == 'jig'){
+			$this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
+		}else if($type == 'sql'){
+			$this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
+		}else if($type == 'mongo'){
+			$this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
+		}
+		$this->app->set('DB', $this->db);
+	}
+
+	public function configureSession() {
+		$type = strtolower($this->app->SESSION);
+
+		if($type) {
+			if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
+				$this->configureCSRF($type);
+			}else if($this->app->CSRF){
+				$this->session = new Session(null, 'CSRF');
+			}else{
+				if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
+					$session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
+					$this->session = new $session($this->app->DB);
+				}else{
+					$this->session = new Session();
+				}
+			}
+			$this->app->set('SESSION', $this->session);
+		}
+	}
+
+	public function configureCSRF($type) {
+		$session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
+		$this->session = new $session($this->app->DB, 'sessions', null, 'CSRF');
+	}
+
+	private function _getDBType($type) {
+		if($type == 'jig' || $type == 'mongo'){
+			return ucfirst($type);
+		}else if($type == 'sql') {
+			return strtoupper($type);
+		}
+	}
+
+	public function configureAssets() {
+		$assets = Assets::instance();
+		$this->app->set('ASSETS.onFileNotFound',function($file) {
+			echo 'file not found: '.$file;
+		});
+	}
 
 	public function registerErrorHandler() {
 		if($this->app->DEV) {

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class App extends Prefab{
+class App extends Prefab {
     public $db;
 	public $app;
     public $session;
@@ -15,7 +15,7 @@ 
             $app = Registry::get('APP');
         else {
             $app = new self;
-            Registry::set('APP',$app);
+            Registry::set('APP', $app);
         }
         return $app;
     }
@@ -29,7 +29,7 @@ 
     }
 
 	public function user() {
-		return $this->authenticatedUser = $this->app->get('SESSION.USER')?:false;
+		return $this->authenticatedUser = $this->app->get('SESSION.USER') ?: false;
 	}
 
     public function initialized($def = null) {
@@ -37,7 +37,7 @@ 
     }
 
     public function config($key = null) {
-        return $this->app->get($key?:'CONFIG') ;
+        return $this->app->get($key ?: 'CONFIG');
     }
 
     public function status() {
@@ -57,33 +57,33 @@ 
 		$this->app->run();
     }
 
-    public function loadRoutes($file = null){
+    public function loadRoutes($file = null) {
         $this->_load('routes', $file);
     }
 
-    public function loadConfig($file = null){
+    public function loadConfig($file = null) {
         $this->_load('config', $file);
     }
 
     private function _load($path, $file = null) {
-        if($file) {
+        if ($file) {
             $this->app->config(base_path("{path}/{$file}"));
-        }else{
-            foreach(glob(base_path("{$path}/*.ini")) as $file) {
+        }else {
+            foreach (glob(base_path("{$path}/*.ini")) as $file) {
                 $this->app->config($file);
             }
         }
     }
 
 	public function checkForMaintenance() {
-		if(!$this->status()) {
+		if (!$this->status()) {
 	       	template('maintenance');
 		    exit();
         }
 	}
 
     public function configureDebug() {
-	    if(!$this->app->DEV) {
+	    if (!$this->app->DEV) {
 	        $this->app->set('DEBUG', 0);
         }
     }
@@ -91,11 +91,11 @@ 
     public function configureDB() {
         $type = strtolower($this->app->DB_TYPE);
 
-        if($type == 'jig'){
+        if ($type == 'jig') {
             $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
+        }else if ($type == 'sql') {
             $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
+        }else if ($type == 'mongo') {
             $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
         }
         $this->app->set('DB', $this->db);
@@ -104,16 +104,16 @@ 
     public function configureSession() {
         $type = strtolower($this->app->SESSION);
 
-        if($type) {
-            if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
+        if ($type) {
+            if ($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
                 $this->configureCSRF($type);
-            }else if($this->app->CSRF){
+            }else if ($this->app->CSRF) {
                 $this->session = new Session(null, 'CSRF');
-            }else{
-                if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
+            }else {
+                if ($type == 'jig' || $type == 'mongo' || $type == 'sql') {
                     $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
                     $this->session = new $session($this->app->DB);
-                }else{
+                }else {
                     $this->session = new Session();
                 }
             }
@@ -127,24 +127,24 @@ 
     }
 
     private function _getDBType($type) {
-        if($type == 'jig' || $type == 'mongo'){
+        if ($type == 'jig' || $type == 'mongo') {
             return ucfirst($type);
-        }else if($type == 'sql') {
+        }else if ($type == 'sql') {
             return strtoupper($type);
         }
     }
 
     public function configureAssets() {
         $assets = Assets::instance();
-        $this->app->set('ASSETS.onFileNotFound',function($file) {
+        $this->app->set('ASSETS.onFileNotFound', function($file) {
             echo 'file not found: '.$file;
         });
     }
 
 	public function registerErrorHandler() {
-		if($this->app->DEV) {
+		if ($this->app->DEV) {
 			Falsum\Run::handler($this->app->DEBUG != 3);
-		}else{
+		}else {
 			$this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
 		}
 	}

Braces +11 added lines, -11 removed lines

@@ -11,9 +11,9 @@ 
 	}
 
     static public function singleton() {
-        if (Registry::exists('APP'))
-            $app = Registry::get('APP');
-        else {
+        if (Registry::exists('APP')) {
+                    $app = Registry::get('APP');
+        } else {
             $app = new self;
             Registry::set('APP',$app);
         }
@@ -68,7 +68,7 @@ 
     private function _load($path, $file = null) {
         if($file) {
             $this->app->config(base_path("{path}/{$file}"));
-        }else{
+        } else{
             foreach(glob(base_path("{$path}/*.ini")) as $file) {
                 $this->app->config($file);
             }
@@ -93,9 +93,9 @@ 
 
         if($type == 'jig'){
             $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON);
-        }else if($type == 'sql'){
+        } else if($type == 'sql'){
             $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD);
-        }else if($type == 'mongo'){
+        } else if($type == 'mongo'){
             $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER);
         }
         $this->app->set('DB', $this->db);
@@ -107,13 +107,13 @@ 
         if($type) {
             if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) {
                 $this->configureCSRF($type);
-            }else if($this->app->CSRF){
+            } else if($this->app->CSRF){
                 $this->session = new Session(null, 'CSRF');
-            }else{
+            } else{
                 if($type == 'jig' || $type == 'mongo' || $type == 'sql'){
                     $session = str_ireplace('/', '', 'DB\/'.$this->_getDBType($type).'\Session');
                     $this->session = new $session($this->app->DB);
-                }else{
+                } else{
                     $this->session = new Session();
                 }
             }
@@ -129,7 +129,7 @@ 
     private function _getDBType($type) {
         if($type == 'jig' || $type == 'mongo'){
             return ucfirst($type);
-        }else if($type == 'sql') {
+        } else if($type == 'sql') {
             return strtoupper($type);
         }
     }
@@ -144,7 +144,7 @@ 
 	public function registerErrorHandler() {
 		if($this->app->DEV) {
 			Falsum\Run::handler($this->app->DEBUG != 3);
-		}else{
+		} else{
 			$this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init');
 		}
 	}

bootstrap/helpers.php

Spacing +25 added lines, -25 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 
-function f3($get=null){$f3=Base::instance();return $get?$f3->get($get):$f3;}
+function f3($get = null) {$f3 = Base::instance(); return $get ? $f3->get($get) : $f3; }
 
-function base_path($inner = ''){return realpath(__DIR__.'/../').'/'.$inner;}
-function storage_path($inner = ''){return base_path('storage/').'/'.$inner;}
-function db_path($db = ''){return storage_path('db/').$db;}
-function lang_path($lang = ''){return base_path('resources/lang/').'/'.$lang;}
-function views_path(){return base_path('resources/views/');}
-function config_path($config = ''){return base_path('config/').'/'.$config;}
+function base_path($inner = '') {return realpath(__DIR__.'/../').'/'.$inner; }
+function storage_path($inner = '') {return base_path('storage/').'/'.$inner; }
+function db_path($db = '') {return storage_path('db/').$db; }
+function lang_path($lang = '') {return base_path('resources/lang/').'/'.$lang; }
+function views_path() {return base_path('resources/views/'); }
+function config_path($config = '') {return base_path('config/').'/'.$config; }
 
-function abort(){f3()->abort();}
-function status($code=404){f3()->error($code);}
-function reroute($where){f3()->reroute($where);}
-function is_api($path){if(is_string($path)) {return explode('/', $path)[1] === 'api';}return false;}
+function abort() {f3()->abort(); }
+function status($code = 404) {f3()->error($code); }
+function reroute($where) {f3()->reroute($where); }
+function is_api($path) {if (is_string($path)) {return explode('/', $path)[1] === 'api'; }return false; }
 
 function template($template, array $params = [], $mime = 'text/html') {
 	$f3 = f3();
-	if(!empty($params)) {
+	if (!empty($params)) {
 		$f3->mset($params);
 	}
-	if(is_array($template)){
+	if (is_array($template)) {
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	}else {
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -31,23 +31,23 @@ 
 	echo Template::instance()->render($layout, $mime);
 }
 
-function str_contains($haystack,$needles){foreach((array)$needles as $needle){if($needle!=''&&mb_strpos($haystack,$needle)!==false){return true;}}return false;}
-function extension($file,$default='json'){return $file.'.'.(pathinfo($file,PATHINFO_EXTENSION)?:$default);}
-function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type);}
-function trans($key,$params=null){return f3()->format(f3()->get($key),($params?:''));}
+function str_contains($haystack, $needles) {foreach ((array) $needles as $needle) {if ($needle != '' && mb_strpos($haystack, $needle) !== false) {return true; }}return false; }
+function extension($file, $default = 'json') {return $file.'.'.(pathinfo($file, PATHINFO_EXTENSION) ?: $default); }
+function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type); }
+function trans($key, $params = null) {return f3()->format(f3()->get($key), ($params ?: '')); }
 function error($error) {
-	if(null === $error) {return;}
-	if(is_array($error)) {
-		foreach($error as $err) {
-			if(is_array($err)) {
-				foreach($err as $e) {
+	if (null === $error) {return; }
+	if (is_array($error)) {
+		foreach ($error as $err) {
+			if (is_array($err)) {
+				foreach ($err as $e) {
 					flash($e, 'danger');
 				}
-			}else{
+			}else {
 				flash($err, 'danger');
 			}
 		}
-	}else{
+	}else {
 		flash($error, 'danger');
 	}
 }
\ No newline at end of file

Braces +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	if(is_array($template)){
 		$layout = $template[0];
 		$view = $template[1];
-	}else{
+	} else{
 		$layout = 'layouts/app.htm';
 		$view = $template;
 	}
@@ -43,11 +43,11 @@ 
 				foreach($err as $e) {
 					flash($e, 'danger');
 				}
-			}else{
+			} else{
 				flash($err, 'danger');
 			}
 		}
-	}else{
+	} else{
 		flash($error, 'danger');
 	}
 }
\ No newline at end of file