@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -if($config['settings']['debug'] && $config['settings']['tracy']['active']) { |
|
2 | +if ($config['settings']['debug'] && $config['settings']['tracy']['active']) { |
|
3 | 3 | $app->add(new RunTracy\Middlewares\TracyMiddleware($app)); |
4 | 4 | } |
5 | 5 |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | -define('__APP_ROOT__',__DIR__ . '/../') ; |
|
3 | -require __APP_ROOT__.'bootstrap/bootstrap.php'; |
|
4 | -require __APP_ROOT__.'vendor/autoload.php'; |
|
5 | -require __APP_ROOT__.'config/settings.php'; |
|
2 | +define('__APP_ROOT__', __DIR__ . '/../'); |
|
3 | +require __APP_ROOT__ . 'bootstrap/bootstrap.php'; |
|
4 | +require __APP_ROOT__ . 'vendor/autoload.php'; |
|
5 | +require __APP_ROOT__ . 'config/settings.php'; |
|
6 | 6 | |
7 | -require __APP_ROOT__.'core/Functions/general_helpers.php'; |
|
7 | +require __APP_ROOT__ . 'core/Functions/general_helpers.php'; |
|
8 | 8 | |
9 | 9 | |
10 | 10 | $app = new \Core\App($config); |
11 | 11 | |
12 | -if($config['settings']['debug'] && !$config['settings']['tracy']['active']){ |
|
12 | +if ($config['settings']['debug'] && !$config['settings']['tracy']['active']) { |
|
13 | 13 | ini_set('display_errors', 1); |
14 | 14 | ini_set('display_startup_errors', 1); |
15 | 15 | error_reporting(E_ALL); |
@@ -18,18 +18,18 @@ discard block |
||
18 | 18 | |
19 | 19 | use SlimFacades\Facade; |
20 | 20 | // get container app |
21 | -require __APP_ROOT__.'bootstrap/dependencies.php'; |
|
21 | +require __APP_ROOT__ . 'bootstrap/dependencies.php'; |
|
22 | 22 | |
23 | -require __APP_ROOT__.'bootstrap/routes.php'; |
|
24 | -require __APP_ROOT__.'core/Functions/helpers.php'; |
|
23 | +require __APP_ROOT__ . 'bootstrap/routes.php'; |
|
24 | +require __APP_ROOT__ . 'core/Functions/helpers.php'; |
|
25 | 25 | |
26 | -if(php_sapi_name() != 'cli') { |
|
27 | - if($config['settings']['debug'] && $config['settings']['tracy']['active']){ |
|
26 | +if (php_sapi_name() != 'cli') { |
|
27 | + if ($config['settings']['debug'] && $config['settings']['tracy']['active']) { |
|
28 | 28 | Tracy\Debugger::enable(Tracy\Debugger::DEVELOPMENT, $config['settings']['tracy']['path']); |
29 | 29 | } |
30 | 30 | Facade::setFacadeApplication($app); |
31 | 31 | |
32 | - require __APP_ROOT__.'bootstrap/middlewares.php'; |
|
32 | + require __APP_ROOT__ . 'bootstrap/middlewares.php'; |
|
33 | 33 | |
34 | 34 | $app->run(); |
35 | 35 |
@@ -15,7 +15,7 @@ |
||
15 | 15 | /** |
16 | 16 | * @param Core\Services\AuthService\AuthService |
17 | 17 | * @return AuthService |
18 | - */ |
|
18 | + */ |
|
19 | 19 | protected static function getFacadeAccessor() |
20 | 20 | { |
21 | 21 | return 'AuthService'; |
@@ -2,22 +2,22 @@ discard block |
||
2 | 2 | |
3 | 3 | |
4 | 4 | |
5 | -function route(string $name ,array $params = []) |
|
5 | +function route(string $name, array $params = []) |
|
6 | 6 | { |
7 | 7 | $url = new \Core\Helpers\Url($GLOBALS['container']); |
8 | - return $url->get($name , $params); |
|
8 | + return $url->get($name, $params); |
|
9 | 9 | } |
10 | 10 | |
11 | -function url(string $name ,array $params = []) |
|
11 | +function url(string $name, array $params = []) |
|
12 | 12 | { |
13 | 13 | $url = new \Core\Helpers\Url($GLOBALS['container']); |
14 | - return $url->get($name , $params); |
|
14 | + return $url->get($name, $params); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | // translate |
18 | -function trans($key , $replace = []){ |
|
18 | +function trans($key, $replace = []) { |
|
19 | 19 | $container = $GLOBALS['container']; |
20 | - return $container->translator->trans($key,$replace); |
|
20 | + return $container->translator->trans($key, $replace); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | function public_path(string $uri = '') { |
@@ -27,13 +27,13 @@ discard block |
||
27 | 27 | |
28 | 28 | $url = new \Core\Helpers\Url($container); |
29 | 29 | |
30 | - $url_asset = $url->getBasePath($request) .'/'. $uri; |
|
30 | + $url_asset = $url->getBasePath($request) . '/' . $uri; |
|
31 | 31 | return $url_asset; |
32 | 32 | } |
33 | 33 | |
34 | 34 | function asset(string $uri = '') { |
35 | 35 | $url = public_path(); |
36 | - $url_asset = $url.'assets/'.$uri; |
|
36 | + $url_asset = $url . 'assets/' . $uri; |
|
37 | 37 | return $url_asset; |
38 | 38 | } |
39 | 39 |
@@ -15,11 +15,13 @@ |
||
15 | 15 | { |
16 | 16 | public function get($key = null) |
17 | 17 | { |
18 | - if(!isset($_SESSION)) return []; |
|
18 | + if(!isset($_SESSION)) { |
|
19 | + return []; |
|
20 | + } |
|
19 | 21 | |
20 | 22 | if(!$key){ |
21 | 23 | return $_SESSION; |
22 | - }else{ |
|
24 | + } else{ |
|
23 | 25 | $keys = explode('.',$key); |
24 | 26 | $sessionVal = $this->getRecursiveSessionKey($_SESSION,$keys); |
25 | 27 | return $sessionVal; |
@@ -34,12 +34,12 @@ |
||
34 | 34 | |
35 | 35 | public function exists($key,$val) |
36 | 36 | { |
37 | - $keySession = $this->get($key); |
|
37 | + $keySession = $this->get($key); |
|
38 | 38 | |
39 | - if($keySession){ |
|
40 | - return true; |
|
41 | - } |
|
42 | - return false; |
|
39 | + if($keySession){ |
|
40 | + return true; |
|
41 | + } |
|
42 | + return false; |
|
43 | 43 | } |
44 | 44 | |
45 | 45 |
@@ -15,28 +15,28 @@ |
||
15 | 15 | { |
16 | 16 | public function get($key = null) |
17 | 17 | { |
18 | - if(!isset($_SESSION)) return []; |
|
18 | + if (!isset($_SESSION)) return []; |
|
19 | 19 | |
20 | - if(!$key){ |
|
20 | + if (!$key) { |
|
21 | 21 | return $_SESSION; |
22 | - }else{ |
|
23 | - $keys = explode('.',$key); |
|
24 | - $sessionVal = $this->getRecursiveSessionKey($_SESSION,$keys); |
|
22 | + }else { |
|
23 | + $keys = explode('.', $key); |
|
24 | + $sessionVal = $this->getRecursiveSessionKey($_SESSION, $keys); |
|
25 | 25 | return $sessionVal; |
26 | 26 | } |
27 | 27 | } |
28 | 28 | |
29 | - public function set($key,$val) |
|
29 | + public function set($key, $val) |
|
30 | 30 | { |
31 | - $_SESSION = $this->setArr($key,$val); |
|
31 | + $_SESSION = $this->setArr($key, $val); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
35 | - public function exists($key,$val) |
|
35 | + public function exists($key, $val) |
|
36 | 36 | { |
37 | 37 | $keySession = $this->get($key); |
38 | 38 | |
39 | - if($keySession){ |
|
39 | + if ($keySession) { |
|
40 | 40 | return true; |
41 | 41 | } |
42 | 42 | return false; |
@@ -17,7 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | $namespace = 'Core\\Handlers\\Session\\'; |
19 | 19 | |
20 | - $className = $namespace.ucfirst($driver).'Handler'; |
|
20 | + $className = $namespace . ucfirst($driver) . 'Handler'; |
|
21 | 21 | $this->handler = new $className(); |
22 | 22 | |
23 | 23 | return $this->handler; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | class AbstractSession |
13 | 13 | { |
14 | 14 | |
15 | - public function getRecursiveSessionKey($data , $keyArr){ |
|
15 | + public function getRecursiveSessionKey($data , $keyArr){ |
|
16 | 16 | $arrayFound = isset($data[$keyArr[0]]) ? $data[$keyArr[0]] : ''; |
17 | 17 | if($arrayFound){ |
18 | 18 | unset($keyArr[0]); |
@@ -12,16 +12,16 @@ discard block |
||
12 | 12 | class AbstractSession |
13 | 13 | { |
14 | 14 | |
15 | - public function getRecursiveSessionKey($data , $keyArr){ |
|
16 | - $arrayFound = isset($data[$keyArr[0]]) ? $data[$keyArr[0]] : ''; |
|
17 | - if($arrayFound){ |
|
15 | + public function getRecursiveSessionKey($data, $keyArr) { |
|
16 | + $arrayFound = isset($data[$keyArr[0]]) ? $data[$keyArr[0]] : ''; |
|
17 | + if ($arrayFound) { |
|
18 | 18 | unset($keyArr[0]); |
19 | 19 | $keyArr = array_values($keyArr); |
20 | - if(isset($keyArr[0])){ |
|
21 | - return $this->getRecursiveSessionKey($arrayFound,$keyArr); |
|
20 | + if (isset($keyArr[0])) { |
|
21 | + return $this->getRecursiveSessionKey($arrayFound, $keyArr); |
|
22 | 22 | } |
23 | 23 | } |
24 | - return $arrayFound ; |
|
24 | + return $arrayFound; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $sourceRef = &$source; |
34 | 34 | } |
35 | 35 | $keyName = trim($keyName); |
36 | - $sourceRef = &$sourceRef[$keyName]; |
|
36 | + $sourceRef = &$sourceRef[$keyName]; |
|
37 | 37 | } |
38 | 38 | $sourceRef = $value; |
39 | 39 | unset($sourceRef); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected $moduleInstances = []; |
33 | 33 | |
34 | - public function __construct($app, $modules=array()) |
|
34 | + public function __construct($app, $modules = array()) |
|
35 | 35 | { |
36 | 36 | $this->app = $app; |
37 | 37 | // build an class map of [[module => moduleClassPath], ..] |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | $allSettings['modules'] = array_merge_recursive($allSettings['modules'], $this->getModuleConfig()); |
95 | - $container['settings']->__construct( $allSettings ); |
|
95 | + $container['settings']->__construct($allSettings); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -22,13 +22,13 @@ discard block |
||
22 | 22 | |
23 | 23 | public function hasRole($roleName) |
24 | 24 | { |
25 | - if(!self::check()){ |
|
25 | + if (!self::check()) { |
|
26 | 26 | return false; |
27 | 27 | } |
28 | - $userRoles = UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0); |
|
28 | + $userRoles = UserDataAccess::getUserRoles(isset($_SESSION['user']['user_id']) ? $_SESSION['user']['user_id'] : 0); |
|
29 | 29 | $hasAccess = false; |
30 | - foreach ($userRoles as $role){ |
|
31 | - if($role->name == $roleName){ |
|
30 | + foreach ($userRoles as $role) { |
|
31 | + if ($role->name == $roleName) { |
|
32 | 32 | $hasAccess = true; |
33 | 33 | break; |
34 | 34 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | return isset($_SESSION['user']['user_id']); |
43 | 43 | } |
44 | 44 | |
45 | - public function attempt(string $loginField,string $password) |
|
45 | + public function attempt(string $loginField, string $password) |
|
46 | 46 | { |
47 | 47 | $user = UserDataAccess::getUserLoginField($loginField); |
48 | 48 | if (!$user) { |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | ]; |
53 | 53 | } |
54 | 54 | $setting = Config::get('settings.auth'); |
55 | - if($setting['2step']){ |
|
56 | - return $this->twoStepAuth($loginField,$password); |
|
57 | - }else{ |
|
58 | - if ($this->checkPass($password,$user->password)) { |
|
55 | + if ($setting['2step']) { |
|
56 | + return $this->twoStepAuth($loginField, $password); |
|
57 | + }else { |
|
58 | + if ($this->checkPass($password, $user->password)) { |
|
59 | 59 | $_SESSION['user']['user_id'] = $user->id; |
60 | 60 | $_SESSION['user']['mobile'] = $user->mobile; |
61 | 61 | return [ |
62 | 62 | 'type'=>'success', |
63 | 63 | 'message'=> 'Logined', |
64 | 64 | ]; |
65 | - }else{ |
|
65 | + }else { |
|
66 | 66 | return [ |
67 | 67 | 'type'=>'error', |
68 | 68 | 'message'=> 'password mismatch', |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | |
78 | 78 | |
79 | 79 | |
80 | - public function checkPass($password,$database_pass) |
|
80 | + public function checkPass($password, $database_pass) |
|
81 | 81 | { |
82 | - if($database_pass == $password){ |
|
82 | + if ($database_pass == $password) { |
|
83 | 83 | return true; |
84 | 84 | } |
85 | 85 | return false; |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | |
90 | - public function twoStepAuth(string $loginField,string $password) |
|
90 | + public function twoStepAuth(string $loginField, string $password) |
|
91 | 91 | { |
92 | 92 | $user = UserDataAccess::getUserLoginField($loginField); |
93 | 93 | |
94 | - if(UserDataAccess::checkToken($password,$loginField)){ |
|
94 | + if (UserDataAccess::checkToken($password, $loginField)) { |
|
95 | 95 | $_SESSION['user']['user_id'] = $user->id; |
96 | 96 | $_SESSION['user']['mobile'] = $user->mobile; |
97 | 97 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | 'type'=>'success', |
101 | 101 | 'message'=> 'Logined', |
102 | 102 | ]; |
103 | - }else{ |
|
103 | + }else { |
|
104 | 104 | return [ |
105 | 105 | 'type'=>'error', |
106 | 106 | 'message'=> 'problem!', |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $setting = Config::get('settings.auth'); |
55 | 55 | if($setting['2step']){ |
56 | 56 | return $this->twoStepAuth($loginField,$password); |
57 | - }else{ |
|
57 | + } else{ |
|
58 | 58 | if ($this->checkPass($password,$user->password)) { |
59 | 59 | $_SESSION['user']['user_id'] = $user->id; |
60 | 60 | $_SESSION['user']['mobile'] = $user->mobile; |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | 'type'=>'success', |
63 | 63 | 'message'=> 'Logined', |
64 | 64 | ]; |
65 | - }else{ |
|
65 | + } else{ |
|
66 | 66 | return [ |
67 | 67 | 'type'=>'error', |
68 | 68 | 'message'=> 'password mismatch', |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | 'type'=>'success', |
101 | 101 | 'message'=> 'Logined', |
102 | 102 | ]; |
103 | - }else{ |
|
103 | + } else{ |
|
104 | 104 | return [ |
105 | 105 | 'type'=>'error', |
106 | 106 | 'message'=> 'problem!', |