Passed
Push — master ( 54a455...4a9da3 )
by refat
11:01 queued 07:26
created
App/Middleware/Admin/PermissionsMiddleware.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
 
8 8
 class PermissionsMiddleware implements Middleware
9 9
 {
10
-  public function handle(Application $app, $next)
11
-  {
10
+    public function handle(Application $app, $next)
11
+    {
12 12
 
13
-  }
13
+    }
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
App/Middleware/Admin/AjaxMiddleware.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
 
8 8
 class AjaxMiddleware implements Middleware
9 9
 {
10
-  public function handle(Application $app, $next)
11
-  {
10
+    public function handle(Application $app, $next)
11
+    {
12 12
     // if(empty($_SERVER['HTTP_X_REQUESTED_WITH'])) $this->url->redirectTo('error');
13
-  }
13
+    }
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
Core/System/Session.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
   {
16 16
     ini_set('session.use_only_cookies', 1);
17 17
 
18
-    if (! session_id()) {
18
+    if (!session_id()) {
19 19
       session_start();
20 20
     }
21 21
   }
Please login to merge, or discard this patch.
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -4,60 +4,60 @@
 block discarded – undo
4 4
 
5 5
 class Session
6 6
 {
7
-  private $app;
7
+    private $app;
8 8
 
9
-  public function __construct(Application $app)
10
-  {
9
+    public function __construct(Application $app)
10
+    {
11 11
     $this->app = $app;
12
-  }
12
+    }
13 13
 
14
-  public function start()
15
-  {
14
+    public function start()
15
+    {
16 16
     ini_set('session.use_only_cookies', 1);
17 17
 
18 18
     if (! session_id()) {
19
-      session_start();
19
+        session_start();
20
+    }
20 21
     }
21
-  }
22 22
 
23
-  public function set($key, $value)
24
-  {
23
+    public function set($key, $value)
24
+    {
25 25
     $_SESSION[$key] = $value;
26
-  }
26
+    }
27 27
 
28
-  public function get($key, $default = null)
29
-  {
28
+    public function get($key, $default = null)
29
+    {
30 30
     return array_get($_SESSION, $key, $default);
31
-  }
31
+    }
32 32
 
33
-  public function pull($key)
34
-  {
33
+    public function pull($key)
34
+    {
35 35
     $value = $this->get($key);
36 36
 
37 37
     $this->remove($key);
38 38
 
39 39
     return $value;
40
-  }
40
+    }
41 41
 
42
-  public function has($key)
43
-  {
42
+    public function has($key)
43
+    {
44 44
     return isset($_SESSION[$key]);
45
-  }
45
+    }
46 46
 
47
-  public function all()
48
-  {
47
+    public function all()
48
+    {
49 49
     return $_SESSION;
50
-  }
50
+    }
51 51
 
52
-  public function remove($key)
53
-  {
52
+    public function remove($key)
53
+    {
54 54
     unset($_SESSION[$key]);
55
-  }
55
+    }
56 56
 
57
-  public function destroy()
58
-  {
57
+    public function destroy()
58
+    {
59 59
     session_destroy();
60 60
 
61 61
     unset($_SESSION);
62
-  }
62
+    }
63 63
 }
64 64
\ No newline at end of file
Please login to merge, or discard this patch.
Core/System/Cookie.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
     setcookie($key, $value, $expireTime, $this->path, '', false, true);
23 23
   }
24 24
 
25
-  public function get($key , $default = null)
25
+  public function get($key, $default = null)
26 26
   {
27 27
     return array_get($_COOKIE, $key, $default);
28 28
   }
Please login to merge, or discard this patch.
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -4,50 +4,50 @@
 block discarded – undo
4 4
 
5 5
 class Cookie
6 6
 {
7
-  private $app;
7
+    private $app;
8 8
 
9
-  private $path;
9
+    private $path;
10 10
 
11
-  public function __construct(Application $app)
12
-  {
11
+    public function __construct(Application $app)
12
+    {
13 13
     $this->app = $app;
14 14
 
15 15
     $this->path = dirname($this->app->request->server('SCRIPT_NAME')) ?: '/';
16
-  }
16
+    }
17 17
 
18
-  public function set($key, $value, $hours = 1800)
19
-  {
18
+    public function set($key, $value, $hours = 1800)
19
+    {
20 20
     $expireTime = $hours == -1 ? -1 : time() + $hours * 3600;
21 21
 
22 22
     setcookie($key, $value, $expireTime, $this->path, '', false, true);
23
-  }
23
+    }
24 24
 
25
-  public function get($key , $default = null)
26
-  {
25
+    public function get($key , $default = null)
26
+    {
27 27
     return array_get($_COOKIE, $key, $default);
28
-  }
28
+    }
29 29
 
30
-  public function has($key)
31
-  {
30
+    public function has($key)
31
+    {
32 32
     return array_key_exists($key, $_COOKIE);
33
-  }
33
+    }
34 34
 
35
-  public function remove($key)
36
-  {
35
+    public function remove($key)
36
+    {
37 37
     $this->set($key, null, -1);
38 38
 
39 39
     unset($_COOKIE[$key]);
40
-  }
40
+    }
41 41
 
42
-  public function all()
43
-  {
42
+    public function all()
43
+    {
44 44
     return $_COOKIE;
45
-  }
45
+    }
46 46
 
47
-  public function destroy()
48
-  {
47
+    public function destroy()
48
+    {
49 49
     foreach (array_keys($this->all()) as $key) $this->remove($key);
50 50
 
51 51
     unset($_COOKIE);
52
-  }
52
+    }
53 53
 }
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,9 @@
 block discarded – undo
46 46
 
47 47
   public function destroy()
48 48
   {
49
-    foreach (array_keys($this->all()) as $key) $this->remove($key);
49
+    foreach (array_keys($this->all()) as $key) {
50
+        $this->remove($key);
51
+    }
50 52
 
51 53
     unset($_COOKIE);
52 54
   }
Please login to merge, or discard this patch.
Core/System/Model.php 3 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@  discard block
 block discarded – undo
35 35
 
36 36
   public function get($value, $coulmn = 'id')
37 37
   {
38
-    return $this->where($coulmn . ' = ?' , $value)->fetch($this->table);
38
+    return $this->where($coulmn . ' = ?', $value)->fetch($this->table);
39 39
   }
40 40
 
41 41
   public function getEnable($value, $coulmn = 'id')
42 42
   {
43
-    return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
43
+    return $this->where($coulmn . ' = ? AND enable = ?', [$value, 1])->fetch($this->table);
44 44
   }
45 45
 
46 46
   public function selectTable($coulmn)
@@ -50,23 +50,23 @@  discard block
 block discarded – undo
50 50
 
51 51
   public function exists($value, $key = 'id')
52 52
   {
53
-    return (bool) $this->select($key)->where($key .'=?' , $value)->fetch($this->table);
53
+    return (bool) $this->select($key)->where($key . '=?', $value)->fetch($this->table);
54 54
   }
55 55
 
56 56
   public function delete($id)
57 57
   {
58
-    return $this->where('id = ?' , $id)->delete($this->table);
58
+    return $this->where('id = ?', $id)->delete($this->table);
59 59
   }
60 60
 
61 61
   public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
62 62
   {
63 63
     $join = rtrim($join, 'Model');
64 64
 
65
-    $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
65
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
66 66
 
67 67
     $exists = $this->app->file->exists($file);
68 68
 
69
-    if (! $exists) return $join . ' Not Found';
69
+    if (!$exists) return $join . ' Not Found';
70 70
 
71 71
     $trace = debug_backtrace();
72 72
 
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
   {
82 82
     $join = rtrim($join, 'Model');
83 83
 
84
-    $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
84
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
85 85
 
86 86
     $exists = $this->app->file->exists($file);
87 87
 
88
-    if (! $exists) return $join . ' Not Found';
88
+    if (!$exists) return $join . ' Not Found';
89 89
 
90 90
     $trace = debug_backtrace();
91 91
 
@@ -100,11 +100,11 @@  discard block
 block discarded – undo
100 100
   {
101 101
     $join = rtrim($join, 'Model');
102 102
 
103
-    $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
103
+    $file = $this->app->file->to('App/Models/' . $join . 'Model', '.php');
104 104
 
105 105
     $exists = $this->app->file->exists($file);
106 106
 
107
-    if (! $exists) return $join . ' Not Found';
107
+    if (!$exists) return $join . ' Not Found';
108 108
 
109 109
     $trace = debug_backtrace();
110 110
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,9 @@  discard block
 block discarded – undo
66 66
 
67 67
     $exists = $this->app->file->exists($file);
68 68
 
69
-    if (! $exists) return $join . ' Not Found';
69
+    if (! $exists) {
70
+        return $join . ' Not Found';
71
+    }
70 72
 
71 73
     $trace = debug_backtrace();
72 74
 
@@ -85,7 +87,9 @@  discard block
 block discarded – undo
85 87
 
86 88
     $exists = $this->app->file->exists($file);
87 89
 
88
-    if (! $exists) return $join . ' Not Found';
90
+    if (! $exists) {
91
+        return $join . ' Not Found';
92
+    }
89 93
 
90 94
     $trace = debug_backtrace();
91 95
 
@@ -104,7 +108,9 @@  discard block
 block discarded – undo
104 108
 
105 109
     $exists = $this->app->file->exists($file);
106 110
 
107
-    if (! $exists) return $join . ' Not Found';
111
+    if (! $exists) {
112
+        return $join . ' Not Found';
113
+    }
108 114
 
109 115
     $trace = debug_backtrace();
110 116
 
Please login to merge, or discard this patch.
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -4,62 +4,62 @@  discard block
 block discarded – undo
4 4
 
5 5
 abstract class Model
6 6
 {
7
-  protected $app;
7
+    protected $app;
8 8
 
9
-  protected $table;
9
+    protected $table;
10 10
 
11
-  public function __construct(Application $app)
12
-  {
11
+    public function __construct(Application $app)
12
+    {
13 13
     $this->app = $app;
14
-  }
14
+    }
15 15
 
16
-  public function __get($key)
17
-  {
16
+    public function __get($key)
17
+    {
18 18
     return $this->app->get($key);
19
-  }
19
+    }
20 20
 
21
-  public function __call($method, $args)
22
-  {
21
+    public function __call($method, $args)
22
+    {
23 23
     return call_user_func_array([$this->app->db, $method], $args);
24
-  }
24
+    }
25 25
 
26
-  public function all($limit = null)
27
-  {
26
+    public function all($limit = null)
27
+    {
28 28
     return $this->orderBy('id', 'DESC')->limit($limit)->fetchAll($this->table);
29
-  }
29
+    }
30 30
 
31
-  public function allEnable($limit = null)
32
-  {
31
+    public function allEnable($limit = null)
32
+    {
33 33
     return $this->orderBy('id', 'DESC')->where('enable = ?', 1)->limit($limit)->fetchAll($this->table);
34
-  }
34
+    }
35 35
 
36
-  public function get($value, $coulmn = 'id')
37
-  {
36
+    public function get($value, $coulmn = 'id')
37
+    {
38 38
     return $this->where($coulmn . ' = ?' , $value)->fetch($this->table);
39
-  }
39
+    }
40 40
 
41
-  public function getEnable($value, $coulmn = 'id')
42
-  {
41
+    public function getEnable($value, $coulmn = 'id')
42
+    {
43 43
     return $this->where($coulmn . ' = ? AND enable = ?' , [$value, 1])->fetch($this->table);
44
-  }
44
+    }
45 45
 
46
-  public function selectTable($coulmn)
47
-  {
46
+    public function selectTable($coulmn)
47
+    {
48 48
     return $this->select($coulmn)->fetchAll($this->table);
49
-  }
49
+    }
50 50
 
51
-  public function exists($value, $key = 'id')
52
-  {
51
+    public function exists($value, $key = 'id')
52
+    {
53 53
     return (bool) $this->select($key)->where($key .'=?' , $value)->fetch($this->table);
54
-  }
54
+    }
55 55
 
56
-  public function delete($id)
57
-  {
56
+    public function delete($id)
57
+    {
58 58
     return $this->where('id = ?' , $id)->delete($this->table);
59
-  }
59
+    }
60 60
 
61
-  public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
62
-  {
61
+    public function hasOne($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
62
+    {
63 63
     $join = rtrim($join, 'Model');
64 64
 
65 65
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -75,10 +75,10 @@  discard block
 block discarded – undo
75 75
     $join = $this->load->model($join)->table;
76 76
 
77 77
     return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetch();
78
-  }
78
+    }
79 79
 
80
-  public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
81
-  {
80
+    public function hasMany($join, $id = null, $select = '*', $limit = null, $localId = null, $forginId = null)
81
+    {
82 82
     $join = rtrim($join, 'Model');
83 83
 
84 84
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
     $join = $this->load->model($join)->table;
95 95
 
96 96
     return $this->db->select($select)->from($table)->join($join, $localId, $forginId)->where($table . '.id = ?', $id)->limit($limit)->fetchAll();
97
-  }
97
+    }
98 98
 
99
-  public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
100
-  {
99
+    public function join($join, $limit = null, $enable = null, $localId = null, $forginId = null)
100
+    {
101 101
     $join = rtrim($join, 'Model');
102 102
 
103 103
     $file = $this->app->file->to( 'App/Models/' . $join . 'Model', '.php');
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 
115 115
     if ($enable) {
116 116
 
117
-      return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
117
+        return $this->db->select()->from($table)->join($join, $localId, $forginId)->where('enable = ?', 1)->limit($limit)->fetchAll();
118 118
     }
119 119
 
120 120
     return $this->db->select()->from($table)->join($join, $localId, $forginId)->limit($limit)->fetchAll();
121
-  }
121
+    }
122 122
 }
123 123
\ No newline at end of file
Please login to merge, or discard this patch.
Core/System/Loader.php 2 patches
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -6,56 +6,56 @@  discard block
 block discarded – undo
6 6
 
7 7
 class Loader
8 8
 {
9
-  private $app;
9
+    private $app;
10 10
 
11
-  private $controllers = [];
11
+    private $controllers = [];
12 12
 
13
-  private $models = [];
13
+    private $models = [];
14 14
 
15
-  private $middlewares = [];
15
+    private $middlewares = [];
16 16
 
17
-  public function __construct(Application $app)
18
-  {
17
+    public function __construct(Application $app)
18
+    {
19 19
     $this->app = $app;
20
-  }
20
+    }
21 21
 
22
-  public function action($controller, $method, array $arguments)
23
-  {
22
+    public function action($controller, $method, array $arguments)
23
+    {
24 24
     $object = $this->controller($controller);
25 25
 
26 26
     return call_user_func([$object, $method], $arguments);
27
-  }
27
+    }
28 28
 
29
-  public function controller($controller)
30
-  {
29
+    public function controller($controller)
30
+    {
31 31
     $controller = $this->getControllerName($controller);
32 32
 
33 33
     if (! $this->hasController($controller)) {
34
-      $this->addController($controller);
34
+        $this->addController($controller);
35 35
     }
36 36
 
37 37
     return $this->getController($controller);
38
-  }
38
+    }
39 39
 
40
-  private function hasController($controller)
41
-  {
40
+    private function hasController($controller)
41
+    {
42 42
     return array_key_exists($controller, $this->controllers);
43
-  }
43
+    }
44 44
 
45
-  private function addController($controller)
46
-  {
45
+    private function addController($controller)
46
+    {
47 47
     $object = new $controller($this->app);
48 48
 
49 49
     $this->controllers[$controller] = $object;
50
-  }
50
+    }
51 51
 
52
-  private function getController($controller)
53
-  {
52
+    private function getController($controller)
53
+    {
54 54
     return $this->controllers[$controller];
55
-  }
55
+    }
56 56
 
57
-  private function getControllerName($controller)
58
-  {
57
+    private function getControllerName($controller)
58
+    {
59 59
     $controller .= strpos($controller, 'Controller') ? '' : 'Controller';
60 60
 
61 61
     $controller = str_replace('/', DS, $controller);
@@ -63,38 +63,38 @@  discard block
 block discarded – undo
63 63
     $controller = 'App' . DS .'Controllers' . DS . $controller;
64 64
 
65 65
     return $controller;
66
-  }
66
+    }
67 67
 
68
-  public function model($model)
69
-  {
68
+    public function model($model)
69
+    {
70 70
     $model = $this->getModelName($model);
71 71
 
72 72
     if (! $this->hasModel($model)) {
73
-      $this->addModel($model);
73
+        $this->addModel($model);
74 74
     }
75 75
 
76 76
     return $this->getModel($model);
77
-  }
77
+    }
78 78
 
79
-  private function hasModel($model)
80
-  {
79
+    private function hasModel($model)
80
+    {
81 81
     return array_key_exists($model, $this->models);
82
-  }
82
+    }
83 83
 
84
-  private function addModel($model)
85
-  {
84
+    private function addModel($model)
85
+    {
86 86
     $object = new $model($this->app);
87 87
 
88 88
     $this->models[$model] = $object;
89
-  }
89
+    }
90 90
 
91
-  private function getModel($model)
92
-  {
91
+    private function getModel($model)
92
+    {
93 93
     return $this->models[$model];
94
-  }
94
+    }
95 95
 
96
-  private function getModelName($model)
97
-  {
96
+    private function getModelName($model)
97
+    {
98 98
     $model .= strpos($model, 'Model') ? '' : 'Model';
99 99
 
100 100
     $model = str_replace('/', DS, $model);
@@ -102,5 +102,5 @@  discard block
 block discarded – undo
102 102
     $model = 'App' . DS . 'Models' . DS . $model;
103 103
 
104 104
     return $model;
105
-  }
105
+    }
106 106
 }
107 107
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
   {
31 31
     $controller = $this->getControllerName($controller);
32 32
 
33
-    if (! $this->hasController($controller)) {
33
+    if (!$this->hasController($controller)) {
34 34
       $this->addController($controller);
35 35
     }
36 36
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
     $controller = str_replace('/', DS, $controller);
62 62
 
63
-    $controller = 'App' . DS .'Controllers' . DS . $controller;
63
+    $controller = 'App' . DS . 'Controllers' . DS . $controller;
64 64
 
65 65
     return $controller;
66 66
   }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
   {
70 70
     $model = $this->getModelName($model);
71 71
 
72
-    if (! $this->hasModel($model)) {
72
+    if (!$this->hasModel($model)) {
73 73
       $this->addModel($model);
74 74
     }
75 75
 
Please login to merge, or discard this patch.
Core/System/PugView.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 
30 30
     //File Path
31 31
     $file = str_replace('/', DS, $path);
32
-    $file = $dir . DS . 'template' . DS  . $file . '.pug';
32
+    $file = $dir . DS . 'template' . DS . $file . '.pug';
33 33
 
34 34
     //Css Path
35 35
     $css = $this->app->file->css();
Please login to merge, or discard this patch.
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,21 +6,21 @@  discard block
 block discarded – undo
6 6
 
7 7
 class PugView
8 8
 {
9
-  private $app;
9
+    private $app;
10 10
 
11
-  public function __construct(Application $app)
12
-  {
11
+    public function __construct(Application $app)
12
+    {
13 13
     $this->app = $app;
14
-  }
14
+    }
15 15
 
16
-  public function render($path, array $context)
17
-  {
16
+    public function render($path, array $context)
17
+    {
18 18
     $this->app->file->css();
19 19
     $pug = new Pug(array(
20
-      'pretty' => true,
21
-      'cache' => 'var/cache/pug',
22
-      'basedir' => 'template/',
23
-      'upToDateCheck' => false,
20
+        'pretty' => true,
21
+        'cache' => 'var/cache/pug',
22
+        'basedir' => 'template/',
23
+        'upToDateCheck' => false,
24 24
     ));
25 25
 
26 26
     $link = $this->app->request->link();
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
     $context += $this->app->config['website'];
44 44
 
45 45
     $context += [
46
-      'css' => $css,
47
-      'js'  => $js
46
+        'css' => $css,
47
+        'js'  => $js
48 48
     ];
49 49
 
50 50
     return $pug->render($file, $context);
51
-  }
51
+    }
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
Core/System/Http/Request.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
     if (strpos($requestUri, '?')) list($requestUri, $queryString) = explode('?', $requestUri);
31 31
 
32
-    if (! in_array($script, ['/', '\\'])) {
32
+    if (!in_array($script, ['/', '\\'])) {
33 33
 
34 34
       $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
35 35
     } else {
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
       $isSecure = true;
47 47
 
48 48
     }
49
-    elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
49
+    elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
50 50
       $isSecure = true;
51 51
     }
52 52
 
Please login to merge, or discard this patch.
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,9 @@  discard block
 block discarded – undo
27 27
 
28 28
     $requestUri = $this->server('REQUEST_URI');
29 29
 
30
-    if (strpos($requestUri, '?')) list($requestUri, $queryString) = explode('?', $requestUri);
30
+    if (strpos($requestUri, '?')) {
31
+        list($requestUri, $queryString) = explode('?', $requestUri);
32
+    }
31 33
 
32 34
     if (! in_array($script, ['/', '\\'])) {
33 35
 
@@ -37,7 +39,9 @@  discard block
 block discarded – undo
37 39
       $this->url = $requestUri;
38 40
     }
39 41
 
40
-    if ($this->url !== '/') $this->url = rtrim($this->url, '/');
42
+    if ($this->url !== '/') {
43
+        $this->url = rtrim($this->url, '/');
44
+    }
41 45
 
42 46
     $isSecure = false;
43 47
 
@@ -45,8 +49,7 @@  discard block
 block discarded – undo
45 49
 
46 50
       $isSecure = true;
47 51
 
48
-    }
49
-    elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
52
+    } elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
50 53
       $isSecure = true;
51 54
     }
52 55
 
@@ -100,7 +103,9 @@  discard block
 block discarded – undo
100 103
 
101 104
   public function file($input)
102 105
   {
103
-    if (isset($this->files[$input])) return $this->files[$input];
106
+    if (isset($this->files[$input])) {
107
+        return $this->files[$input];
108
+    }
104 109
 
105 110
     $upoadedFile = new UploadeFile($this->app, $input);
106 111
 
Please login to merge, or discard this patch.
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -6,23 +6,23 @@  discard block
 block discarded – undo
6 6
 
7 7
 class Request
8 8
 {
9
-  private $app;
9
+    private $app;
10 10
 
11
-  private $url;
11
+    private $url;
12 12
 
13
-  private $baseUrl;
13
+    private $baseUrl;
14 14
 
15
-  private $files = [];
15
+    private $files = [];
16 16
 
17
-  private $link;
17
+    private $link;
18 18
 
19
-  public function __construct(Application $app)
20
-  {
19
+    public function __construct(Application $app)
20
+    {
21 21
     $this->app = $app;
22
-  }
22
+    }
23 23
 
24
-  public function prepareUrl()
25
-  {
24
+    public function prepareUrl()
25
+    {
26 26
     $script = dirname($this->server('SCRIPT_NAME'));
27 27
 
28 28
     $requestUri = $this->server('REQUEST_URI');
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 
32 32
     if (! in_array($script, ['/', '\\'])) {
33 33
 
34
-      $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
34
+        $this->url = preg_replace('#^' . $script . '#', '', $requestUri);
35 35
     } else {
36 36
 
37
-      $this->url = $requestUri;
37
+        $this->url = $requestUri;
38 38
     }
39 39
 
40 40
     if ($this->url !== '/') $this->url = rtrim($this->url, '/');
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
43 43
 
44 44
     if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
45 45
 
46
-      $isSecure = true;
46
+        $isSecure = true;
47 47
 
48 48
     }
49 49
     elseif (! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
50
-      $isSecure = true;
50
+        $isSecure = true;
51 51
     }
52 52
 
53 53
     $REQUEST_PROTOCOL = $isSecure ? 'https' : 'http';
@@ -55,51 +55,51 @@  discard block
 block discarded – undo
55 55
     $this->link = $REQUEST_PROTOCOL . '://' . $this->server('HTTP_HOST');
56 56
 
57 57
     $this->baseUrl = $this->link . $requestUri;
58
-  }
58
+    }
59 59
 
60
-  public function get($key)
61
-  {
60
+    public function get($key)
61
+    {
62 62
     $value = array_get($_GET, $key, $default);
63 63
 
64 64
     if (is_array($value)) {
65
-      $value = array_filter($value);
65
+        $value = array_filter($value);
66 66
     } else {
67
-      $value = trim($value);
67
+        $value = trim($value);
68 68
     }
69 69
 
70 70
     return $value;
71
-  }
71
+    }
72 72
 
73
-  public function post($key)
74
-  {
73
+    public function post($key)
74
+    {
75 75
     $value = array_get($_POST, $key, $default);
76 76
 
77 77
     if (is_array($value)) {
78
-      $value = array_filter($value);
78
+        $value = array_filter($value);
79 79
     } else {
80
-      $value = trim($value);
80
+        $value = trim($value);
81 81
     }
82 82
 
83 83
     return $value;
84
-  }
84
+    }
85 85
 
86
-  public function setPost($key, $value)
87
-  {
86
+    public function setPost($key, $value)
87
+    {
88 88
     $_POST[$key] = $value;
89
-  }
89
+    }
90 90
 
91
-  public function posts()
92
-  {
91
+    public function posts()
92
+    {
93 93
     return $_POST;
94
-  }
94
+    }
95 95
 
96
-  public function files()
97
-  {
96
+    public function files()
97
+    {
98 98
     return $_FILES;
99
-  }
99
+    }
100 100
 
101
-  public function file($input)
102
-  {
101
+    public function file($input)
102
+    {
103 103
     if (isset($this->files[$input])) return $this->files[$input];
104 104
 
105 105
     $upoadedFile = new UploadeFile($this->app, $input);
@@ -107,35 +107,35 @@  discard block
 block discarded – undo
107 107
     $this->files[$input] = $upoadedFile;
108 108
 
109 109
     return $this->files[$input];
110
-  }
110
+    }
111 111
 
112
-  public function server($key)
113
-  {
112
+    public function server($key)
113
+    {
114 114
     return array_get($_SERVER, $key);
115
-  }
115
+    }
116 116
 
117
-  public function method()
118
-  {
117
+    public function method()
118
+    {
119 119
     return $this->server('REQUEST_METHOD');
120
-  }
120
+    }
121 121
 
122
-  public function referer()
123
-  {
122
+    public function referer()
123
+    {
124 124
     return $this->server('HTTP_REFERER');
125
-  }
125
+    }
126 126
 
127
-  public function baseUrl()
128
-  {
127
+    public function baseUrl()
128
+    {
129 129
     return $this->baseUrl;
130
-  }
130
+    }
131 131
 
132
-  public function url()
133
-  {
132
+    public function url()
133
+    {
134 134
     return $this->url;
135
-  }
135
+    }
136 136
 
137
-  public function link()
138
-  {
137
+    public function link()
138
+    {
139 139
     return $this->link;
140
-  }
140
+    }
141 141
 }
142 142
\ No newline at end of file
Please login to merge, or discard this patch.
Core/System/Http/UploadeFile.php 3 patches
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -6,35 +6,35 @@  discard block
 block discarded – undo
6 6
 
7 7
 class UploadeFile
8 8
 {
9
-  private $app;
9
+    private $app;
10 10
 
11
-  private $file = [];
11
+    private $file = [];
12 12
 
13
-  private $fileName;
13
+    private $fileName;
14 14
 
15
-  private $nameOnly;
15
+    private $nameOnly;
16 16
 
17
-  private $extension;
17
+    private $extension;
18 18
 
19
-  private $minetype;
19
+    private $minetype;
20 20
 
21
-  private $tempFile;
21
+    private $tempFile;
22 22
 
23
-  private $size;
23
+    private $size;
24 24
 
25
-  private $error;
25
+    private $error;
26 26
 
27
-  private const AllOW_EXTENSION = ['png', 'jpg', 'jpeg', 'gif', 'webp'];
27
+    private const AllOW_EXTENSION = ['png', 'jpg', 'jpeg', 'gif', 'webp'];
28 28
 
29
-  public function __construct(Application $app, $input)
30
-  {
29
+    public function __construct(Application $app, $input)
30
+    {
31 31
     $this->app = $app;
32 32
 
33 33
     $this->getFileInfo($input);
34
-  }
34
+    }
35 35
 
36
-  private function getFileInfo($input)
37
-  {
36
+    private function getFileInfo($input)
37
+    {
38 38
     if (empty($_FILES[$input])) return;
39 39
 
40 40
     $file = $_FILES[$input];
@@ -58,50 +58,50 @@  discard block
 block discarded – undo
58 58
     $this->nameOnly = $fileInfo['filename'];
59 59
 
60 60
     $this->extension = $fileInfo['extension'];
61
-  }
61
+    }
62 62
 
63
-  public function exists()
64
-  {
63
+    public function exists()
64
+    {
65 65
     return ! empty($this->file);
66
-  }
66
+    }
67 67
 
68
-  public function getFileName()
69
-  {
68
+    public function getFileName()
69
+    {
70 70
     return $this->fileName;
71
-  }
71
+    }
72 72
 
73
-  public function getNameOnly()
74
-  {
73
+    public function getNameOnly()
74
+    {
75 75
     return $this->nameOnly;
76
-  }
76
+    }
77 77
 
78
-  public function getExtension()
79
-  {
78
+    public function getExtension()
79
+    {
80 80
     return $this->extension;
81
-  }
81
+    }
82 82
 
83
-  public function getMinetype()
84
-  {
83
+    public function getMinetype()
84
+    {
85 85
     return $this->minetype;
86
-  }
86
+    }
87 87
 
88
-  public function getSize()
89
-  {
88
+    public function getSize()
89
+    {
90 90
     return $this->size;
91
-  }
91
+    }
92 92
 
93
-  public function getTempFile()
94
-  {
93
+    public function getTempFile()
94
+    {
95 95
     return $this->tempFile;
96
-  }
96
+    }
97 97
 
98
-  public function isImage()
99
-  {
98
+    public function isImage()
99
+    {
100 100
     return strpos($this->minetype, 'image/') === 0 && in_array($this->extension, self::AllOW_EXTENSION);
101
-  }
101
+    }
102 102
 
103
-  public function moveTo($target, $newName = null)
104
-  {
103
+    public function moveTo($target, $newName = null)
104
+    {
105 105
     $newName = $newName ?: sha1(rand()) . sha1(rand());
106 106
 
107 107
     $newName .= '.' . $this->extension;
@@ -116,5 +116,5 @@  discard block
 block discarded – undo
116 116
     $uploade = move_uploaded_file($this->tempFile, $filePath);
117 117
 
118 118
     return $uploade;
119
-  }
119
+    }
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
   public function exists()
64 64
   {
65
-    return ! empty($this->file);
65
+    return !empty($this->file);
66 66
   }
67 67
 
68 68
   public function getFileName()
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
     $newName .= '.' . $this->extension;
108 108
 
109
-    if (! is_dir($target)) mkdir($target, 0777, true);
109
+    if (!is_dir($target)) mkdir($target, 0777, true);
110 110
 
111 111
     $filePath = $target . $newName;
112 112
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,13 +35,17 @@  discard block
 block discarded – undo
35 35
 
36 36
   private function getFileInfo($input)
37 37
   {
38
-    if (empty($_FILES[$input])) return;
38
+    if (empty($_FILES[$input])) {
39
+        return;
40
+    }
39 41
 
40 42
     $file = $_FILES[$input];
41 43
 
42 44
     $this->error = $file['error'];
43 45
 
44
-    if ($this->error != UPLOAD_ERR_OK) return;
46
+    if ($this->error != UPLOAD_ERR_OK) {
47
+        return;
48
+    }
45 49
 
46 50
     $this->file = $file;
47 51
 
@@ -106,7 +110,9 @@  discard block
 block discarded – undo
106 110
 
107 111
     $newName .= '.' . $this->extension;
108 112
 
109
-    if (! is_dir($target)) mkdir($target, 0777, true);
113
+    if (! is_dir($target)) {
114
+        mkdir($target, 0777, true);
115
+    }
110 116
 
111 117
     $filePath = $target . $newName;
112 118
 
Please login to merge, or discard this patch.