@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -class App extends Prefab{ |
|
| 3 | +class App extends Prefab { |
|
| 4 | 4 | public $db; |
| 5 | 5 | public $app; |
| 6 | 6 | public $session; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $app = Registry::get('APP'); |
| 15 | 15 | else { |
| 16 | 16 | $app = new self; |
| 17 | - Registry::set('APP',$app); |
|
| 17 | + Registry::set('APP', $app); |
|
| 18 | 18 | } |
| 19 | 19 | return $app; |
| 20 | 20 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function user() { |
| 31 | - return $this->authenticatedUser = $this->app->get('SESSION.USER')?:false; |
|
| 31 | + return $this->authenticatedUser = $this->app->get('SESSION.USER') ?: false; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function initialized($def = null) { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function config($key = null) { |
| 39 | - return $this->app->get($key?:'CONFIG') ; |
|
| 39 | + return $this->app->get($key ?: 'CONFIG'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function status() { |
@@ -56,35 +56,35 @@ discard block |
||
| 56 | 56 | $this->app->run(); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function loadRoutes($file = null){ |
|
| 60 | - if($file) { |
|
| 59 | + public function loadRoutes($file = null) { |
|
| 60 | + if ($file) { |
|
| 61 | 61 | $this->app->config(base_path('routes/'.$file)); |
| 62 | - }else{ |
|
| 63 | - foreach(glob(base_path('routes/*.ini')) as $file) { |
|
| 62 | + }else { |
|
| 63 | + foreach (glob(base_path('routes/*.ini')) as $file) { |
|
| 64 | 64 | $this->app->config($file); |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function loadConfig($file = null){ |
|
| 70 | - if($file) { |
|
| 69 | + public function loadConfig($file = null) { |
|
| 70 | + if ($file) { |
|
| 71 | 71 | $this->app->config(base_path('config/'.$file)); |
| 72 | - }else{ |
|
| 73 | - foreach(glob(base_path('config/*.ini')) as $file) { |
|
| 72 | + }else { |
|
| 73 | + foreach (glob(base_path('config/*.ini')) as $file) { |
|
| 74 | 74 | $this->app->config($file); |
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function checkForMaintenance() { |
| 80 | - if(!$this->status()) { |
|
| 80 | + if (!$this->status()) { |
|
| 81 | 81 | template('maintenance'); |
| 82 | 82 | exit(); |
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public function configureDebug() { |
| 87 | - if(!$this->app->DEV) { |
|
| 87 | + if (!$this->app->DEV) { |
|
| 88 | 88 | $this->app->set('DEBUG', 0); |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -92,11 +92,11 @@ discard block |
||
| 92 | 92 | public function configureDB() { |
| 93 | 93 | $type = strtolower($this->app->DB_TYPE); |
| 94 | 94 | |
| 95 | - if($type == 'jig'){ |
|
| 95 | + if ($type == 'jig') { |
|
| 96 | 96 | $this->db = new DB\Jig($this->app->DB_PATH, DB\Jig::FORMAT_JSON); |
| 97 | - }else if($type == 'sql'){ |
|
| 97 | + }else if ($type == 'sql') { |
|
| 98 | 98 | $this->db = new DB\SQL($this->app->DB, $this->app->DB_USER, $this->app->DB_PSWD); |
| 99 | - }else if($type == 'mongo'){ |
|
| 99 | + }else if ($type == 'mongo') { |
|
| 100 | 100 | $this->db = new DB\Mongo($this->app->DB, $this->app->DB_USER); |
| 101 | 101 | } |
| 102 | 102 | $this->app->set('DB', $this->db); |
@@ -105,21 +105,21 @@ discard block |
||
| 105 | 105 | public function configureSession() { |
| 106 | 106 | $type = strtolower($this->app->SESSION); |
| 107 | 107 | |
| 108 | - if($type) { |
|
| 109 | - if($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) { |
|
| 108 | + if ($type) { |
|
| 109 | + if ($this->app->CSRF && ('jig' == $type || 'sql' == $type || 'mongo' == $type)) { |
|
| 110 | 110 | $this->configureCSRF($type); |
| 111 | - }else if($this->app->CSRF){ |
|
| 111 | + }else if ($this->app->CSRF) { |
|
| 112 | 112 | $this->session = new Session(null, 'CSRF'); |
| 113 | - }else{ |
|
| 114 | - if($type == 'jig' || $type == 'mongo' || $type == 'sql'){ |
|
| 115 | - if($type == 'jig' || $type == 'mongo'){ |
|
| 113 | + }else { |
|
| 114 | + if ($type == 'jig' || $type == 'mongo' || $type == 'sql') { |
|
| 115 | + if ($type == 'jig' || $type == 'mongo') { |
|
| 116 | 116 | $type = ucfirst($type); |
| 117 | - }else if($type == 'sql') { |
|
| 117 | + }else if ($type == 'sql') { |
|
| 118 | 118 | $type = strtoupper($type); |
| 119 | 119 | } |
| 120 | 120 | $session = str_ireplace('/', '', 'DB\/'.$type.'\Session'); |
| 121 | 121 | $this->session = new $session($this->app->DB); |
| 122 | - }else{ |
|
| 122 | + }else { |
|
| 123 | 123 | $this->session = new Session(); |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | public function configureCSRF($type) { |
| 131 | - if($type == 'jig' || $type == 'mongo'){ |
|
| 131 | + if ($type == 'jig' || $type == 'mongo') { |
|
| 132 | 132 | $type = ucfirst($type); |
| 133 | - }else if($type == 'sql') { |
|
| 133 | + }else if ($type == 'sql') { |
|
| 134 | 134 | $type = strtoupper($type); |
| 135 | 135 | } |
| 136 | 136 | $session = str_ireplace('/', '', 'DB\/'.$type.'\Session'); |
@@ -139,15 +139,15 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | public function configureAssets() { |
| 141 | 141 | $assets = Assets::instance(); |
| 142 | - $this->app->set('ASSETS.onFileNotFound',function($file) use ($f3){ |
|
| 142 | + $this->app->set('ASSETS.onFileNotFound', function($file) use ($f3){ |
|
| 143 | 143 | echo 'file not found: '.$file; |
| 144 | 144 | }); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | public function registerErrorHandler() { |
| 148 | - if($this->app->DEV) { |
|
| 148 | + if ($this->app->DEV) { |
|
| 149 | 149 | Falsum\Run::handler($this->app->DEBUG != 3); |
| 150 | - }else{ |
|
| 150 | + }else { |
|
| 151 | 151 | $this->app->set('ONERROR', 'App\Core\Controllers\ErrorController->init'); |
| 152 | 152 | } |
| 153 | 153 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | private $app; |
| 5 | 5 | |
| 6 | 6 | public function __construct() { |
| 7 | - if($this->app == null) { |
|
| 7 | + if ($this->app == null) { |
|
| 8 | 8 | $this->app = f3(); |
| 9 | 9 | } |
| 10 | 10 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | public function has($route) { |
| 21 | - if(str_contains($route, '/')){ |
|
| 21 | + if (str_contains($route, '/')) { |
|
| 22 | 22 | return array_key_exists($route, $this->getRoutes()); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getRouteName($route) { |
| 41 | 41 | $response = null; |
| 42 | - foreach($this->getNamedRoutes() as $name => $url) { |
|
| 43 | - if($url == $route) { |
|
| 42 | + foreach ($this->getNamedRoutes() as $name => $url) { |
|
| 43 | + if ($url == $route) { |
|
| 44 | 44 | $response[] = $name; |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -29,36 +29,36 @@ |
||
| 29 | 29 | * Captcha::instance()->render(array('type'=>'img','length'=>4,'class'=>array('img'=>'captcha-img','input'=>'captcha-input'))); |
| 30 | 30 | */ |
| 31 | 31 | public function render($param, $url) { |
| 32 | - if(is_array($param)){ |
|
| 32 | + if (is_array($param)) { |
|
| 33 | 33 | $func = null; |
| 34 | 34 | $length = null; |
| 35 | 35 | $imgClass = null; |
| 36 | 36 | $inputClass = null; |
| 37 | - foreach($param as $key => $val) { |
|
| 38 | - if('type' == $key) { |
|
| 37 | + foreach ($param as $key => $val) { |
|
| 38 | + if ('type' == $key) { |
|
| 39 | 39 | $func = $key; |
| 40 | 40 | } |
| 41 | - if('length' == $key) { |
|
| 41 | + if ('length' == $key) { |
|
| 42 | 42 | $length = $key; |
| 43 | 43 | } |
| 44 | - if('class' == $key && is_array($key)) { |
|
| 45 | - if(array_key_exists('img', $key)){ |
|
| 44 | + if ('class' == $key && is_array($key)) { |
|
| 45 | + if (array_key_exists('img', $key)) { |
|
| 46 | 46 | $imgClass = $key['img']; |
| 47 | - }else if(array_key_exists('input', $key)){ |
|
| 47 | + }else if (array_key_exists('input', $key)) { |
|
| 48 | 48 | $inputClass = $key['input']; |
| 49 | 49 | } |
| 50 | - }else{ |
|
| 50 | + }else { |
|
| 51 | 51 | $imgClass = $inputClass = $key; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | - if(method_exists($this, $func)) { |
|
| 54 | + if (method_exists($this, $func)) { |
|
| 55 | 55 | $response = $this->$key($length, $imgClass).$this->input($inputClass); |
| 56 | - }else{ |
|
| 56 | + }else { |
|
| 57 | 57 | throw new Exception("Error Processing Captcha Method", 1); |
| 58 | 58 | } |
| 59 | - }else if(is_numeric($param)){ |
|
| 59 | + }else if (is_numeric($param)) { |
|
| 60 | 60 | $response = $this->img($param).$this->input(); |
| 61 | - }else{ |
|
| 61 | + }else { |
|
| 62 | 62 | throw new Exception("Error Processing Captcha Parameters", 1); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | ); |
| 20 | 20 | |
| 21 | 21 | public function __construct() { |
| 22 | - if(property_exists($this, 'fields')) { |
|
| 22 | + if (property_exists($this, 'fields')) { |
|
| 23 | 23 | $this->fieldConf = array_merge($this->fields, $this->fieldConf); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -30,16 +30,16 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | private function validate($caller, $parent) { |
| 32 | 32 | $valid = true; |
| 33 | - foreach($this->getFieldConfiguration() as $field => $conf) { |
|
| 34 | - if(isset($conf['type']) && !isset($conf['relType'])){ |
|
| 33 | + foreach ($this->getFieldConfiguration() as $field => $conf) { |
|
| 34 | + if (isset($conf['type']) && !isset($conf['relType'])) { |
|
| 35 | 35 | $val = $this->get($field); |
| 36 | - $model = strtolower(str_replace('\\','.',$class)); |
|
| 36 | + $model = strtolower(str_replace('\\', '.', $class)); |
|
| 37 | 37 | // check required fields |
| 38 | 38 | if ($valid && isset($conf['required'])) |
| 39 | - $valid = \Validation::instance()->required($val,$field,'error.'.$model.'.'.$field); |
|
| 39 | + $valid = \Validation::instance()->required($val, $field, 'error.'.$model.'.'.$field); |
|
| 40 | 40 | // check unique |
| 41 | 41 | if ($valid && isset($conf['unique'])) |
| 42 | - $valid = \Validation::instance()->unique($self,$val,$field,'error.'.$model.'.'.$field); |
|
| 42 | + $valid = \Validation::instance()->unique($self, $val, $field, 'error.'.$model.'.'.$field); |
|
| 43 | 43 | if (!$valid) |
| 44 | 44 | break; |
| 45 | 45 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | public static function words($value, $words = 100, $end = '...') { |
| 98 | 98 | preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches); |
| 99 | 99 | |
| 100 | - if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) { |
|
| 100 | + if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) { |
|
| 101 | 101 | return $value; |
| 102 | 102 | } |
| 103 | 103 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | return static::$snakeCache[$key][$delimiter]; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - if (! ctype_lower($value)) { |
|
| 196 | + if (!ctype_lower($value)) { |
|
| 197 | 197 | $value = preg_replace('/\s+/u', '', ucwords($value)); |
| 198 | 198 | |
| 199 | 199 | $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value)); |
@@ -1,27 +1,27 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -function f3($get=null){$f3=Base::instance();return $get?$f3->get($get):$f3;} |
|
| 3 | +function f3($get = null) {$f3 = Base::instance(); return $get ? $f3->get($get) : $f3; } |
|
| 4 | 4 | |
| 5 | -function base_path($inner = ''){return realpath(__DIR__.'/../').'/'.$inner;} |
|
| 6 | -function storage_path($inner = ''){return base_path('storage/').'/'.$inner;} |
|
| 7 | -function db_path($db = ''){return storage_path('db/').$db;} |
|
| 8 | -function lang_path($lang = ''){return base_path('resources/lang/').'/'.$lang;} |
|
| 9 | -function views_path(){return base_path('resources/views/');} |
|
| 10 | -function config_path($config = ''){return base_path('config/').'/'.$config;} |
|
| 5 | +function base_path($inner = '') {return realpath(__DIR__.'/../').'/'.$inner; } |
|
| 6 | +function storage_path($inner = '') {return base_path('storage/').'/'.$inner; } |
|
| 7 | +function db_path($db = '') {return storage_path('db/').$db; } |
|
| 8 | +function lang_path($lang = '') {return base_path('resources/lang/').'/'.$lang; } |
|
| 9 | +function views_path() {return base_path('resources/views/'); } |
|
| 10 | +function config_path($config = '') {return base_path('config/').'/'.$config; } |
|
| 11 | 11 | |
| 12 | -function abort(){f3()->abort();} |
|
| 13 | -function status($code=404){f3()->error($code);} |
|
| 14 | -function reroute($where){f3()->reroute($where);} |
|
| 15 | -function is_api($path){if(is_string($path)) {return explode('/', $path)[1] === 'api';}return false;} |
|
| 12 | +function abort() {f3()->abort(); } |
|
| 13 | +function status($code = 404) {f3()->error($code); } |
|
| 14 | +function reroute($where) {f3()->reroute($where); } |
|
| 15 | +function is_api($path) {if (is_string($path)) {return explode('/', $path)[1] === 'api'; }return false; } |
|
| 16 | 16 | |
| 17 | 17 | function view($template, array $params = [], $mime = 'text/html') { |
| 18 | - if(!empty($params)) { |
|
| 18 | + if (!empty($params)) { |
|
| 19 | 19 | f3()->mset($params); |
| 20 | 20 | } |
| 21 | - if(is_array($template)){ |
|
| 21 | + if (is_array($template)) { |
|
| 22 | 22 | $layout = $template[0]; |
| 23 | 23 | $view = $template[1]; |
| 24 | - }else{ |
|
| 24 | + }else { |
|
| 25 | 25 | $layout = 'layouts/app.htm'; |
| 26 | 26 | $view = $template; |
| 27 | 27 | } |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | function template($template, array $params = [], $mime = 'text/html') { |
| 33 | 33 | $f3 = f3(); |
| 34 | - if(!empty($params)) { |
|
| 34 | + if (!empty($params)) { |
|
| 35 | 35 | $f3->mset($params); |
| 36 | 36 | } |
| 37 | - if(is_array($template)){ |
|
| 37 | + if (is_array($template)) { |
|
| 38 | 38 | $layout = $template[0]; |
| 39 | 39 | $view = $template[1]; |
| 40 | - }else{ |
|
| 40 | + }else { |
|
| 41 | 41 | $layout = 'layouts/app.htm'; |
| 42 | 42 | $view = $template; |
| 43 | 43 | } |
@@ -46,23 +46,23 @@ discard block |
||
| 46 | 46 | echo Template::instance()->render($layout, $mime); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | -function str_contains($haystack,$needles){foreach((array)$needles as $needle){if($needle!=''&&mb_strpos($haystack,$needle)!==false){return true;}}return false;} |
|
| 50 | -function extension($file,$default='json'){return $file.'.'.(pathinfo($file,PATHINFO_EXTENSION)?:$default);} |
|
| 51 | -function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type);} |
|
| 52 | -function trans($key,$params=null){return f3()->format(f3()->get($key),($params?:''));} |
|
| 49 | +function str_contains($haystack, $needles) {foreach ((array) $needles as $needle) {if ($needle != '' && mb_strpos($haystack, $needle) !== false) {return true; }}return false; } |
|
| 50 | +function extension($file, $default = 'json') {return $file.'.'.(pathinfo($file, PATHINFO_EXTENSION) ?: $default); } |
|
| 51 | +function flash($message, $type = 'success') {Flash::instance()->addMessage($message, $type); } |
|
| 52 | +function trans($key, $params = null) {return f3()->format(f3()->get($key), ($params ?: '')); } |
|
| 53 | 53 | function error($error) { |
| 54 | - if(null === $error) {return;} |
|
| 55 | - if(is_array($error)) { |
|
| 56 | - foreach($error as $err) { |
|
| 57 | - if(is_array($err)) { |
|
| 58 | - foreach($err as $e) { |
|
| 54 | + if (null === $error) {return; } |
|
| 55 | + if (is_array($error)) { |
|
| 56 | + foreach ($error as $err) { |
|
| 57 | + if (is_array($err)) { |
|
| 58 | + foreach ($err as $e) { |
|
| 59 | 59 | flash($e, 'danger'); |
| 60 | 60 | } |
| 61 | - }else{ |
|
| 61 | + }else { |
|
| 62 | 62 | flash($err, 'danger'); |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | - }else{ |
|
| 65 | + }else { |
|
| 66 | 66 | flash($error, 'danger'); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | \ No newline at end of file |