Completed
Push — master ( eebc54...730195 )
by Afshin
03:20
created
core/Services/AuthService.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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!',
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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!',
Please login to merge, or discard this patch.
bootstrap/dependencies.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 /* database connection */
7 7
 
8 8
 
9
-$container['db'] = function ($container) {
9
+$container['db'] = function($container) {
10 10
     $db = $container['settings']['db'];
11 11
     $pdo = new PDO("mysql:host=" . $db['host'] . ";dbname=" . $db['database'],
12 12
         $db['username'], $db['password']);
@@ -26,19 +26,19 @@  discard block
 block discarded – undo
26 26
 //
27 27
 
28 28
 
29
-$container['generalErrorHandler'] = function ($container) {
29
+$container['generalErrorHandler'] = function($container) {
30 30
     return new \Core\Handlers\GeneralErrorHandler($container);
31 31
 };
32 32
 
33 33
 
34 34
 
35 35
 // Service factory for the ORM
36
-$container['validator'] = function () {
36
+$container['validator'] = function() {
37 37
     return new App\Validation\Validator();
38 38
 };
39 39
 
40 40
 
41
-$container['eloquent'] = function ($container) {
41
+$container['eloquent'] = function($container) {
42 42
     $capsule = new \Illuminate\Database\Capsule\Manager;
43 43
     $capsule->addConnection($container['settings']['db']);
44 44
     $capsule->setAsGlobal();
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 
58 58
 // monolog
59
-$container['logger'] = function ($c) {
59
+$container['logger'] = function($c) {
60 60
     $settings = $c->get('settings')['logger'];
61 61
     $logger = new Monolog\Logger($settings['name']);
62 62
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 };
66 66
 
67 67
 // not found handler
68
-$container['notFoundHandler'] = function ($container) {
69
-    return function (\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
68
+$container['notFoundHandler'] = function($container) {
69
+    return function(\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
70 70
         return $container['view']->render($response->withStatus(404), '404');
71 71
     };
72 72
 };
@@ -76,23 +76,23 @@  discard block
 block discarded – undo
76 76
 $translator = new \Core\Translator\Translator($container);
77 77
 $translator->init();
78 78
 
79
-$container['translator'] = function () use ($translator) {
79
+$container['translator'] = function() use ($translator) {
80 80
     return $translator;
81 81
 };
82 82
 
83 83
 
84 84
 // Register provider
85
-$container['flash'] = function () {
85
+$container['flash'] = function() {
86 86
     return new \Slim\Flash\Messages();
87 87
 };
88 88
 
89 89
 
90 90
 //
91
-$container['session'] = function ($container)  {
91
+$container['session'] = function($container) {
92 92
     $setting_session_driver = $container['settings']['session']['driver'] ?? 'session';
93 93
 
94 94
     $sessionOBJ = new \Core\Services\Session();
95
-    $session = $sessionOBJ->init($setting_session_driver) ;
95
+    $session = $sessionOBJ->init($setting_session_driver);
96 96
     return $session;
97 97
 };
98 98
 
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
 
105 105
 
106 106
 // Register Blade View helper
107
-$container['view'] = function ($container) {
107
+$container['view'] = function($container) {
108 108
     $messages = $container->flash->getMessages();
109 109
 
110 110
     $viewSettings = $container['settings']['view'];
111 111
 
112 112
     return new \Slim\Views\Blade(
113
-        [$viewSettings['blade_template_path'].$viewSettings['template']],
113
+        [$viewSettings['blade_template_path'] . $viewSettings['template']],
114 114
         $viewSettings['blade_cache_path'],
115 115
         null,
116 116
         [
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 };
123 123
 
124 124
 // Register Blade View helper
125
-$container['json'] = function ($container) {
125
+$container['json'] = function($container) {
126 126
     return new \Core\Handlers\JsonHandler();
127 127
 };
128 128
 
129
-$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function(){
129
+$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function() {
130 130
 
131 131
     return "<?php echo 'Hello Directive'; ?>";
132 132
 });
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
 
141 141
 
142 142
 /*Dynamic containers in services*/
143
-$dir = scandir(__APP_ROOT__.'/core/Services/');
143
+$dir = scandir(__APP_ROOT__ . '/core/Services/');
144 144
 $ex_folders = array('..', '.');
145
-$filesInServices =  array_diff($dir,$ex_folders);
145
+$filesInServices = array_diff($dir, $ex_folders);
146 146
 
147
-foreach($filesInServices as $service){
148
-    $content = preg_replace('/.php/','',$service);
149
-    $container[$content] = function () use ($content){
150
-        $class =  '\\Core\\Services\\'.$content ;
147
+foreach ($filesInServices as $service) {
148
+    $content = preg_replace('/.php/', '', $service);
149
+    $container[$content] = function() use ($content){
150
+        $class = '\\Core\\Services\\' . $content;
151 151
         return new $class();
152 152
     };
153 153
 }
Please login to merge, or discard this patch.