Starbugstone / blogoc

Core/Traits/StringFunctions.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
         //Searching for the page break tag
         $breakTagPosition = strpos($text, "<!-- EndOfExcerptBlogOc -->");
-        if($breakTagPosition > 0){
+        if ($breakTagPosition > 0) {
             return $this->completeDom(substr($text, 0, $breakTagPosition));
         }
 
@@ -92,7 +92,7 @@ 
         $string = preg_split('/(<img[^>]+\>)|(<p[^>]+\>)|(<span[^>]+\>)|\s/', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
         //The preg split can return false, probably will never happen but just in case.
-        if(!$string)
+        if (!$string)
         {
             throw new \Error("excerpt generation failed");
         }
@@ -105,7 +105,7 @@ 
             $trimed .= $string[$wordCounter];
             if ($wordCounter < $count - 1) {
                 $trimed .= " ";
-            } else {
+            }else {
                 $trimed .= "[...]";
             }
         }

App/Controllers/Ajax/PostVerification.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $postSlug = $this->request->getData("postSlug");
 
         $data = false;
-        if($this->isAlphaNum($postSlug))
+        if ($this->isAlphaNum($postSlug))
         {
             $slugModel = new SlugModel($this->container);
 

App/Controllers/Ajax/ImageUpload.php

Spacing +5 added lines, -5 removed lines

@@ -43,13 +43,13 @@ 
     private function getFilename(string $folder, string $file):string
     {
 
-        $fileUrl = $folder . $file;
+        $fileUrl = $folder.$file;
         $docRoot = $this->request->getDocumentRoot();
         $filePath = $docRoot."/public/".$fileUrl;
-        if(file_exists($filePath) !== 1)
+        if (file_exists($filePath) !== 1)
         {
             $fileNum = 0;
-            while(file_exists($filePath))
+            while (file_exists($filePath))
             {
                 $fileUrl = $folder.$fileNum."_".$file;
                 $filePath = $docRoot."/public/".$fileUrl;
@@ -76,7 +76,7 @@ 
 
             // Respond to the successful upload with JSON.
             echo json_encode(array('location' => $filetowrite));
-        } else {
+        }else {
             // Notify editor that the upload failed
             echo json_encode(array('error' => 'Upload failed, file might be too big'));
 
@@ -110,7 +110,7 @@ 
 
             // Respond to the successful upload with JSON.
             echo json_encode(array('location' => $filetowrite));
-        } else {
+        }else {
             // Notify editor that the upload failed
             header("HTTP/1.1 500 Server Error");
         }

App/Controllers/Post.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 use Core\Controller;
 use Core\Container;
 
-class Post extends Controller{
+class Post extends Controller {
 
     protected $siteConfig;
 
@@ -26,7 +26,7 @@ 
      * @throws \Twig_Error_Runtime
      * @throws \Twig_Error_Syntax
      */
-    public function viewPost(string $slug){
+    public function viewPost(string $slug) {
 
         $tagModel = new TagModel($this->container);
         $postModel = new PostModel($this->container);

App/Models/UserModel.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Core\Model;
 
-class UserModel extends Model{
+class UserModel extends Model {
 
     public function getAuthorDetails(int $authorId)
     {

App/Models/TagModel.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $this->query($sql);
         $this->bind(":tag", $tag);
         $this->execute();
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
 
     }
 

Core/Model.php

Spacing +7 added lines, -7 removed lines

@@ -101,7 +101,7 @@ 
      * fetches the result from an executed query
      * @return array
      */
-    protected function fetchAll(){
+    protected function fetchAll() {
         return $this->stmt->fetchAll();
     }
 
@@ -109,7 +109,7 @@ 
      * returns a single line from the executed query
      * @return mixed
      */
-    protected function fetch(){
+    protected function fetch() {
         return $this->stmt->fetch();
     }
 
@@ -136,7 +136,7 @@ 
             $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace
             //since our models all end with Model, we should remove it.
             $table = $this->removeFromEnd($table, 'Model');
-            $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
+            $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
             $table = strtolower($table); //the database names are in lowercase
         }
 
@@ -155,7 +155,7 @@ 
         }
 
         //if we are here, then table doesn't exist, check for view
-        $view = 'v_' . $table;
+        $view = 'v_'.$table;
         $stmt->bindValue(':table', $view, PDO::PARAM_STR);
         $stmt->execute();
         $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant
@@ -176,8 +176,8 @@ 
      * @param $table string the table name
      * @return string
      */
-    protected function getTablePrefix($table){
-        if(Config::TABLE_PREFIX != '')
+    protected function getTablePrefix($table) {
+        if (Config::TABLE_PREFIX != '')
         {
             $table = Config::TABLE_PREFIX.'_'.$table;
         }
@@ -248,7 +248,7 @@ 
     protected function getRowById($rowId, $table = null)
     {
         $tableName = $this->getTable($table);
-        $idName = 'id' . $tableName;
+        $idName = 'id'.$tableName;
         $sql = "SELECT * FROM $tableName WHERE $idName = :rowId";
         $this->query($sql);
         $this->bind(':rowId', $rowId);

App/Modules/Pagination.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             throw new \Exception("Pagination Error", "404");
         }
         $pageNo = $this->removeFromBeginning($page, "page-");
-        if(!filter_var($pageNo, FILTER_VALIDATE_INT)){
+        if (!filter_var($pageNo, FILTER_VALIDATE_INT)) {
             throw new \Exception("Invalid page number");
         }
         $offset = ($pageNo - 1) * $rowsPerPage;

App/Controllers/Admin/Post.php

Spacing +8 added lines, -8 removed lines

@@ -116,7 +116,7 @@ 
         $onFrontpage = $posts["isOnFrontPage"];
         $idUser = $userSessionId;
 
-        if(!is_int($idUser) || $idUser === null)
+        if (!is_int($idUser) || $idUser === null)
         {
             throw new \Error("Invalid userID");
         }
@@ -150,10 +150,10 @@ 
 
         //checking result and redirecting
         if ($postId != null) {
-            $this->alertBox->setAlert("Post " . $title . " Created");
-            $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug);
+            $this->alertBox->setAlert("Post ".$title." Created");
+            $this->container->getResponse()->redirect("admin/post/modify/".$postSlug);
         }
-        $this->alertBox->setAlert("Error creating " . $title, "error");
+        $this->alertBox->setAlert("Error creating ".$title, "error");
         $this->container->getResponse()->redirect("admin/post/new");
 
     }
@@ -222,10 +222,10 @@ 
 
         //checking result and redirecting
         if ($postUpdate) {
-            $this->alertBox->setAlert("Post " . $title . " Updated");
-            $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug);
+            $this->alertBox->setAlert("Post ".$title." Updated");
+            $this->container->getResponse()->redirect("admin/post/modify/".$postSlug);
         }
-        $this->alertBox->setAlert("Error updating " . $title, "error");
-        $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug);
+        $this->alertBox->setAlert("Error updating ".$title, "error");
+        $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug);
     }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -196,10 +196,12 @@
             $this->alertBox->setAlert("empty slug not allowed", "error");
         }
 
-        if ($postSlug != $originalPostSlug) //if the slug has been updated
+        if ($postSlug != $originalPostSlug) {
+            //if the slug has been updated
         {
             if (!$this->slugModel->isUnique($postSlug, "posts", "posts_slug")) {
                 $error = true;
+        }
                 $originalPostSlug = $this->slugModel->getSlugFromId($postId, "posts", "idposts", "posts_slug");
                 $this->alertBox->setAlert("Slug not unique", "error");
             }