Passed
Push — Security_and_bug_fixes ( d592f0...4af87e )
by Stone
02:45
created
Core/Model.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
             $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace
140 140
             //since our models all end with Model, we should remove it.
141 141
             $table = $this->removeFromEnd($table, 'Model');
142
-            $table = $table . 's'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s
142
+            $table = $table.'s'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s
143 143
             $table = strtolower($table); //the database names are in lowercase
144 144
         }
145 145
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         }
163 163
 
164 164
         //if we are here, then table doesn't exist, check for view
165
-        $view = 'v_' . $table;
165
+        $view = 'v_'.$table;
166 166
         $stmt->bindValue(':table', $view, PDO::PARAM_STR);
167 167
         $stmt->execute();
168 168
         $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     protected function getTablePrefix($table)
187 187
     {
188 188
         if (Config::TABLE_PREFIX != '') {
189
-            $table = Config::TABLE_PREFIX . '_' . $table;
189
+            $table = Config::TABLE_PREFIX.'_'.$table;
190 190
         }
191 191
         return $table;
192 192
     }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
     protected function getRowById($rowId, $table = null)
256 256
     {
257 257
         $tableName = $this->getTable($table);
258
-        $idName = 'id' . $tableName;
258
+        $idName = 'id'.$tableName;
259 259
         $sql = "SELECT * FROM $tableName WHERE $idName = :rowId";
260 260
         $this->query($sql);
261 261
         $this->bind(':rowId', $rowId);
Please login to merge, or discard this patch.
App/Controllers/Admin/Category.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 
104 104
         //checking result and redirecting
105 105
         if ($categoryUpdate) {
106
-            $this->alertBox->setAlert("Category " . $categoryName . " updated");
106
+            $this->alertBox->setAlert("Category ".$categoryName." updated");
107 107
             $this->container->getResponse()->redirect("/admin/category/list/");
108 108
         }
109
-        $this->alertBox->setAlert("Error updating " . $categoryName, "error");
109
+        $this->alertBox->setAlert("Error updating ".$categoryName, "error");
110 110
         $this->container->getResponse()->redirect("/admin/category/list/");
111 111
     }
112 112
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $removedCategory = $this->categoryModel->delete($categoryId);
124 124
 
125 125
         if ($removedCategory) {
126
-            $this->alertBox->setAlert("Category " . $categoryName . " deleted");
126
+            $this->alertBox->setAlert("Category ".$categoryName." deleted");
127 127
         }
128 128
 
129 129
         $this->response->redirect("/admin/category/list/");
@@ -168,10 +168,10 @@  discard block
 block discarded – undo
168 168
 
169 169
         //checking result and redirecting
170 170
         if ($categoryNew) {
171
-            $this->alertBox->setAlert("Category " . $categoryName . " created");
171
+            $this->alertBox->setAlert("Category ".$categoryName." created");
172 172
             $this->container->getResponse()->redirect("/admin/category/list/");
173 173
         }
174
-        $this->alertBox->setAlert("Error creating " . $categoryName, "error");
174
+        $this->alertBox->setAlert("Error creating ".$categoryName, "error");
175 175
         $this->container->getResponse()->redirect("/admin/category/list/");
176 176
     }
177 177
 }
178 178
\ No newline at end of file
Please login to merge, or discard this patch.
App/Controllers/Admin/Tag.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
 
90 90
         //checking result and redirecting
91 91
         if ($tagUpdate) {
92
-            $this->alertBox->setAlert("Tag " . $tagName . " updated");
92
+            $this->alertBox->setAlert("Tag ".$tagName." updated");
93 93
             $this->response->redirect("/admin/tag/list/");
94 94
         }
95
-        $this->alertBox->setAlert("Error updating " . $tagName, "error");
95
+        $this->alertBox->setAlert("Error updating ".$tagName, "error");
96 96
         $this->response->redirect("/admin/tag/list/");
97 97
     }
98 98
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
         $removedTag = $this->tagModel->delete($tagId);
110 110
 
111 111
         if ($removedTag) {
112
-            $this->alertBox->setAlert("Tag " . $tagName . " deleted");
112
+            $this->alertBox->setAlert("Tag ".$tagName." deleted");
113 113
         }
114 114
 
115 115
         $this->response->redirect("/admin/tag/list/");
@@ -145,10 +145,10 @@  discard block
 block discarded – undo
145 145
 
146 146
         //checking result and redirecting
147 147
         if ($tagNew) {
148
-            $this->alertBox->setAlert("Tag " . $tagName . " created");
148
+            $this->alertBox->setAlert("Tag ".$tagName." created");
149 149
             $this->response->redirect("/admin/tag/list/");
150 150
         }
151
-        $this->alertBox->setAlert("Error creating " . $tagName, "error");
151
+        $this->alertBox->setAlert("Error creating ".$tagName, "error");
152 152
         $this->response->redirect("/admin/tag/list/");
153 153
     }
154 154
 }
155 155
\ No newline at end of file
Please login to merge, or discard this patch.
Core/Modules/AlertBox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
         //make sure we have the right type or throw an error
30 30
 
31 31
         if (!in_array($type, $this->allowedTypes)) {
32
-            throw new \Exception("Invalid toastr alert type " . $type);
32
+            throw new \Exception("Invalid toastr alert type ".$type);
33 33
         }
34 34
 
35 35
         $message = htmlspecialchars($message); //avoid any injection
Please login to merge, or discard this patch.
App/Controllers/Ajax/ImageUpload.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -44,24 +44,24 @@  discard block
 block discarded – undo
44 44
     private function getFilename(string $folder, string $file): string
45 45
     {
46 46
         //slugify the file name to avoid security errors or bugs with special characters.
47
-        $fileName = pathinfo($file, PATHINFO_FILENAME );
48
-        $fileExtension = pathinfo($file, PATHINFO_EXTENSION );
47
+        $fileName = pathinfo($file, PATHINFO_FILENAME);
48
+        $fileExtension = pathinfo($file, PATHINFO_EXTENSION);
49 49
         $slugify = new Slugify();
50 50
         $fileName = $slugify->slugify($fileName);
51 51
         //if the filename has only special chars, the slugify will be empty, create a unique ID
52
-        if($fileName ==="")
52
+        if ($fileName === "")
53 53
         {
54 54
             $fileName = uniqid();
55 55
         }
56 56
         $file = $fileName.".".$fileExtension;
57
-        $fileUrl = $folder . $file;
57
+        $fileUrl = $folder.$file;
58 58
         $docRoot = $this->request->getDocumentRoot();
59
-        $filePath = $docRoot . "/public/" . $fileUrl;
59
+        $filePath = $docRoot."/public/".$fileUrl;
60 60
         if (file_exists($filePath) !== 1) {
61 61
             $fileNum = 0;
62 62
             while (file_exists($filePath)) {
63
-                $fileUrl = $folder . $fileNum . "_" . $file;
64
-                $filePath = $docRoot . "/public/" . $fileUrl;
63
+                $fileUrl = $folder.$fileNum."_".$file;
64
+                $filePath = $docRoot."/public/".$fileUrl;
65 65
                 $fileNum += 1;
66 66
             }
67 67
         }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
             // Respond to the successful upload with JSON.
87 87
             echo json_encode(array('location' => $filetowrite));
88
-        } else {
88
+        }else {
89 89
             // Notify editor that the upload failed
90 90
             echo json_encode(array('error' => 'Upload failed, file might be too big'));
91 91
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
             // Respond to the successful upload with JSON.
121 121
             echo json_encode(array('location' => $filetowrite));
122
-        } else {
122
+        }else {
123 123
             // Notify editor that the upload failed
124 124
             header("HTTP/1.1 500 Server Error");
125 125
         }
Please login to merge, or discard this patch.
App/Models/Remembered_loginModel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
     {
28 28
         if ($token_value) {
29 29
             $this->token = $token_value;
30
-        } else {
30
+        }else {
31 31
             $this->token = $this->generateToken();
32 32
         }
33 33
     }
Please login to merge, or discard this patch.
Core/Controller.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -109,12 +109,12 @@  discard block
 block discarded – undo
109 109
         $loadModuleObj = $this->getModuleNamespace($loadModule);
110 110
         //Modules must be children of the Module template
111 111
         if (!is_subclass_of($loadModuleObj, 'Core\Modules\Module')) {
112
-            throw new \ErrorException('Module ' . $loadModuleName . ' must be a sub class of module');
112
+            throw new \ErrorException('Module '.$loadModuleName.' must be a sub class of module');
113 113
         }
114 114
         $loadedModule = new $loadModuleObj($this->container);
115 115
         //we are not allowed to create public modules, they must be a placeholder ready
116 116
         if (!property_exists($this, $loadModuleName)) {
117
-            throw new \ErrorException('the protected or private variable of ' . $loadModuleName . ' is not present');
117
+            throw new \ErrorException('the protected or private variable of '.$loadModuleName.' is not present');
118 118
         }
119 119
         $this->$loadModuleName = $loadedModule;
120 120
     }
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
         $childClass = new \ReflectionClass(get_class($this));
132 132
         $childClassNamespace = $childClass->getNamespaceName();
133 133
         //check in classNameSpace
134
-        if (class_exists($childClassNamespace . '\\Modules\\' . $loadModule)) {
135
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', $childClassNamespace . '\\' . $loadModule);
136
-            return $childClassNamespace . '\\' . $loadModule;
134
+        if (class_exists($childClassNamespace.'\\Modules\\'.$loadModule)) {
135
+            $this->addToDevHelper('module '.$loadModule.' loaded', $childClassNamespace.'\\'.$loadModule);
136
+            return $childClassNamespace.'\\'.$loadModule;
137 137
         }
138 138
         //check in app
139
-        if (class_exists('App\\Modules\\' . $loadModule)) {
140
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', 'App\\Modules\\' . $loadModule);
141
-            return 'App\\Modules\\' . $loadModule;
139
+        if (class_exists('App\\Modules\\'.$loadModule)) {
140
+            $this->addToDevHelper('module '.$loadModule.' loaded', 'App\\Modules\\'.$loadModule);
141
+            return 'App\\Modules\\'.$loadModule;
142 142
         }
143 143
         //check in core, send error popup if overcharged
144
-        if (class_exists('Core\\Modules\\' . $loadModule)) {
145
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', 'Core\\Modules\\' . $loadModule);
146
-            return 'Core\\Modules\\' . $loadModule;
144
+        if (class_exists('Core\\Modules\\'.$loadModule)) {
145
+            $this->addToDevHelper('module '.$loadModule.' loaded', 'Core\\Modules\\'.$loadModule);
146
+            return 'Core\\Modules\\'.$loadModule;
147 147
         }
148 148
 
149 149
         //if we are here then no module found
150
-        throw new \ErrorException('module ' . $loadModule . ' does not exist or not loaded');
150
+        throw new \ErrorException('module '.$loadModule.' does not exist or not loaded');
151 151
 
152 152
     }
153 153
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     public function getView($template)
173 173
     {
174 174
         $twig = $this->container->getTemplate();
175
-        return $twig->render($template . '.twig', $this->data);
175
+        return $twig->render($template.'.twig', $this->data);
176 176
     }
177 177
 
178 178
     /**
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         }
199 199
 
200 200
         $twig = $this->container->getTemplate();
201
-        $twig->display($template . '.twig', $this->data);
201
+        $twig->display($template.'.twig', $this->data);
202 202
     }
203 203
 
204 204
     /**
Please login to merge, or discard this patch.
App/Modules/SiteConfig.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         $categories = $categoryModel->getCategories();
51 51
         foreach ($categories as $category) {
52 52
             $data += [
53
-                $category->category_name => '/category/posts/' . $category->categories_slug
53
+                $category->category_name => '/category/posts/'.$category->categories_slug
54 54
             ];
55 55
         }
56 56
         return $data;
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
         $session = $this->container->getSession();
69 69
 
70 70
         $userToken = $cookie->getCookie("rememberMe");
71
-        if($userToken && $this->isHexa($userToken))
71
+        if ($userToken && $this->isHexa($userToken))
72 72
         {
73 73
             //we have a rememberMe Hash, login
74 74
             $rememberedLogin = $rememberedLoginModel->findByToken($userToken);
75
-            if($rememberedLogin){
75
+            if ($rememberedLogin) {
76 76
                 //we have a hash, login
77 77
                 $user = $userModel->getUserDetailsById($rememberedLogin->users_idusers);
78 78
                 $session->regenerateSessionId(); //regenerate the ID to avoid session ghosting
Please login to merge, or discard this patch.
App/Controllers/Ajax/Category.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             $send[$item->name] = $item->value;
41 41
         }
42 42
 
43
-        if(!$this->slug->isSlugValid($send["categories_slug"]))
43
+        if (!$this->slug->isSlugValid($send["categories_slug"]))
44 44
         {
45 45
             $result["success"] = false;
46 46
             $result["errorMessage"] = "Invalid Slug";
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         foreach ($categoryUpdate as $item) {
74 74
             $send[$item->name] = $item->value;
75 75
         }
76
-        if(!$this->slug->isSlugValid($send["categories_slug"]))
76
+        if (!$this->slug->isSlugValid($send["categories_slug"]))
77 77
         {
78 78
             $result["success"] = false;
79 79
             $result["errorMessage"] = "Invalid Slug";
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             die();
82 82
         }
83 83
 
84
-        if(!$this->isInt($send["idcategories"])){
84
+        if (!$this->isInt($send["idcategories"])) {
85 85
             $result["success"] = false;
86 86
             $result["errorMessage"] = "Invalid ID";
87 87
             echo json_encode($result);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             $send[$item->name] = $item->value;
118 118
         }
119 119
 
120
-        if(!$this->isInt($send["idcategories"])){
120
+        if (!$this->isInt($send["idcategories"])) {
121 121
             $result["success"] = false;
122 122
             $result["errorMessage"] = "Invalid ID";
123 123
             echo json_encode($result);
Please login to merge, or discard this patch.