alfs18 / ramverk1-projekt

src/DatabaseActiveRecord/ActiveRecordModel.php

Indentation +19 added lines, -19 removed lines

@@ -135,11 +135,11 @@ 
         $this->checkDb();
         $params = is_array($value) ? $value : [$value];
         $this->db->connect()
-                 ->select()
-                 ->from($this ->tableName)
-                 ->where($where)
-                 ->execute($params)
-                 ->fetchInto($this);
+                    ->select()
+                    ->from($this ->tableName)
+                    ->where($where)
+                    ->execute($params)
+                    ->fetchInto($this);
         return $this;
     }
 
@@ -242,8 +242,8 @@ 
         $values  = array_values($properties);
 
         $this->db->connect()
-                 ->insert($this->tableName, $columns)
-                 ->execute($values);
+                    ->insert($this->tableName, $columns)
+                    ->execute($values);
 
         $this->{$this->tableIdColumn} = $this->db->lastInsertId();
     }
@@ -265,9 +265,9 @@ 
         $values[] = $this->{$this->tableIdColumn};
 
         $this->db->connect()
-                 ->update($this->tableName, $columns)
-                 ->where("{$this->tableIdColumn} = ?")
-                 ->execute($values);
+                    ->update($this->tableName, $columns)
+                    ->where("{$this->tableIdColumn} = ?")
+                    ->execute($values);
     }
 
 
@@ -299,9 +299,9 @@ 
         $values = array_merge($values, $values1);
 
         $this->db->connect()
-                 ->update($this->tableName, $columns)
-                 ->where($where)
-                 ->execute($values);
+                    ->update($this->tableName, $columns)
+                    ->where($where)
+                    ->execute($values);
     }
 
 
@@ -321,9 +321,9 @@ 
         $id = $id ?: $this->{$this->tableIdColumn};
 
         $this->db->connect()
-                 ->deleteFrom($this->tableName)
-                 ->where("{$this->tableIdColumn} = ?")
-                 ->execute([$id]);
+                    ->deleteFrom($this->tableName)
+                    ->where("{$this->tableIdColumn} = ?")
+                    ->execute([$id]);
 
         $this->{$this->tableIdColumn} = null;
     }
@@ -352,8 +352,8 @@ 
         $values = is_array($value) ? $value : [$value];
 
         $this->db->connect()
-                 ->deleteFrom($this->tableName)
-                 ->where($where)
-                 ->execute($values);
+                    ->deleteFrom($this->tableName)
+                    ->where($where)
+                    ->execute($values);
     }
 }

src/DatabaseQueryBuilder/QueryBuilderTrait.php

Indentation +12 added lines, -12 removed lines

@@ -466,12 +466,12 @@ 
 
 
     /**
-    * Build the group by part.
-    *
-    * @param string $condition for building the group by part of the query.
-    *
-    * @return $this
-    */
+     * Build the group by part.
+     *
+     * @param string $condition for building the group by part of the query.
+     *
+     * @return $this
+     */
     public function groupBy($condition)
     {
         $this->groupby = "GROUP BY " . $condition;
@@ -482,12 +482,12 @@ 
 
 
     /**
-    * Build the order by part.
-    *
-    * @param string $condition for building the where part of the query.
-    *
-    * @return $this
-    */
+     * Build the order by part.
+     *
+     * @param string $condition for building the where part of the query.
+     *
+     * @return $this
+     */
     public function orderBy($condition)
     {
         $this->orderby = "ORDER BY " . $condition;

src/User/HTMLForm/UserLoginForm.php

Indentation +7 added lines, -7 removed lines

@@ -82,18 +82,18 @@
         $db = $this->di->get("dbqb");
         $db->connect();
         $user = $db->select("password")
-                   ->from("User")
-                   ->where("acronym = ?")
-                   ->execute([$acronym])
-                   ->fetch();
+                    ->from("User")
+                    ->where("acronym = ?")
+                    ->execute([$acronym])
+                    ->fetch();
 
         // $user is null if user is not found
         if (!$user || !password_verify($password, $user->password)) {
             var_dump($acronym);
             var_dump($password);
-           $this->form->rememberValues();
-           $this->form->addOutput("User $acronym or password $password did not match.");
-           return false;
+            $this->form->rememberValues();
+            $this->form->addOutput("User $acronym or password $password did not match.");
+            return false;
         }
 
         // $_SESSION["status"] = "Logga ut";

src/User/Functions.php

Indentation +47 added lines, -47 removed lines

@@ -24,10 +24,10 @@ 
         // $user = $db->select("id, question, tags")

         //            ->from("Question")

         $user = $db->select($rows)

-                   ->from($table)

-                   ->where("acronym = ?")

-                   ->execute([$acronym])

-                   ->fetchAll();

+                    ->from($table)

+                    ->where("acronym = ?")

+                    ->execute([$acronym])

+                    ->fetchAll();

 

         // var_dump($user);

         return $user;

@@ -49,10 +49,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $post = $db->select($rows)

-                   ->from($table)

-                   ->where("id = ?")

-                   ->execute([$id])

-                   ->fetchAll();

+                    ->from($table)

+                    ->where("id = ?")

+                    ->execute([$id])

+                    ->fetchAll();

 

         // var_dump($post);

         return $post;

@@ -114,9 +114,9 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $users = $db->select("acronym")

-                   ->from("User")

-                   ->execute()

-                   ->fetchAll();

+                    ->from("User")

+                    ->execute()

+                    ->fetchAll();

 

         return $users;

     }

@@ -315,10 +315,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $questions = $db->select("id, acronym, question, tags")

-                   ->from("Question")

-                   ->where("tags LIKE ?")

-                   ->execute(["%$res%"])

-                   ->fetchAll();

+                    ->from("Question")

+                    ->where("tags LIKE ?")

+                    ->execute(["%$res%"])

+                    ->fetchAll();

 

         // var_dump($questions);

         return $questions;

@@ -337,10 +337,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $questions = $db->select("*")

-                   ->from("Question")

-                   ->where("id = ?")

-                   ->execute([$res])

-                   ->fetchAll();

+                    ->from("Question")

+                    ->where("id = ?")

+                    ->execute([$res])

+                    ->fetchAll();

 

         // var_dump($questions);

         return $questions;

@@ -360,10 +360,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("*")

-                   ->from("Comments")

-                   ->where("questionId = ?")

-                   ->execute([$questionId])

-                   ->fetchAll();

+                    ->from("Comments")

+                    ->where("questionId = ?")

+                    ->execute([$questionId])

+                    ->fetchAll();

 

         // var_dump($res);

         return $res;

@@ -383,10 +383,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("*")

-                   ->from("Comments")

-                   ->where("id = ?")

-                   ->execute([$id])

-                   ->fetchAll();

+                    ->from("Comments")

+                    ->where("id = ?")

+                    ->execute([$id])

+                    ->fetchAll();

 

         return $res;

     }

@@ -405,10 +405,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("*")

-                   ->from("AnswerComments")

-                   ->where("answerId = ?")

-                   ->execute([$answerId])

-                   ->fetchAll();

+                    ->from("AnswerComments")

+                    ->where("answerId = ?")

+                    ->execute([$answerId])

+                    ->fetchAll();

 

         // var_dump($res);

         return $res;

@@ -448,10 +448,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("answer")

-                   ->from("Answers")

-                   ->where("questionId = ?")

-                   ->execute([$questionId])

-                   ->fetch();

+                    ->from("Answers")

+                    ->where("questionId = ?")

+                    ->execute([$questionId])

+                    ->fetch();

 

         $answered = "Nej";

         if ($res ?? null) {

@@ -474,10 +474,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("*")

-                   ->from("Answers")

-                   ->where("questionId = ?")

-                   ->execute([$questionId])

-                   ->fetchAll();

+                    ->from("Answers")

+                    ->where("questionId = ?")

+                    ->execute([$questionId])

+                    ->fetchAll();

 

         // var_dump($res);

         return $res;

@@ -514,10 +514,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("points")

-                   ->from($table)

-                   ->where("id = ?")

-                   ->execute([$id])

-                   ->fetch();

+                    ->from($table)

+                    ->where("id = ?")

+                    ->execute([$id])

+                    ->fetch();

 

         return $res;

     }

@@ -624,10 +624,10 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $res = $db->select("name")

-                   ->from("Pictures")

-                   ->where("acronym = ? OR acronym = ?")

-                   ->execute(["default", $acronym])

-                   ->fetchAll();

+                    ->from("Pictures")

+                    ->where("acronym = ? OR acronym = ?")

+                    ->execute(["default", $acronym])

+                    ->fetchAll();

 

         return $res;

     }

src/User/UserController.php

Indentation +14 added lines, -14 removed lines

@@ -301,46 +301,46 @@
             // Check if image file is a actual image or fake image
             if(isset($_POST["submit"])) {
                 var_dump("smask");
-             $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
-              if($check !== false) {
+                $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
+                if($check !== false) {
                 echo "File is an image - " . $check["mime"] . ".";
                 $uploadOk = 1;
-              } else {
+                } else {
                 echo "File is not an image.";
                 $uploadOk = 0;
-              }
+                }
             }
             // Check if file already exists
             if (file_exists($target_file)) {
-              echo "Sorry, file already exists.";
-              $uploadOk = 0;
+                echo "Sorry, file already exists.";
+                $uploadOk = 0;
             }
 
             // Check file size
             if ($_FILES["fileToUpload"]["size"] > 500000) {
-              echo "Sorry, your file is too large.";
-              $uploadOk = 0;
+                echo "Sorry, your file is too large.";
+                $uploadOk = 0;
             }
 
             // Allow certain file formats
             if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
             && $imageFileType != "gif" ) {
-              echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
-              $uploadOk = 0;
+                echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
+                $uploadOk = 0;
             }
 
             // Check if $uploadOk is set to 0 by an error
             if ($uploadOk == 0) {
-              echo "Sorry, your file was not uploaded.";
+                echo "Sorry, your file was not uploaded.";
             // if everything is ok, try to upload file
             } else {
-              if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
+                if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
                 echo "The file ". htmlspecialchars( basename( $_FILES["fileToUpload"]["name"])). " has been uploaded.";
                 $res->setProfilePicture($this->di, $acronym, $_FILES["fileToUpload"]);
                 $res->addProfilePicture($this->di, $acronym, $_FILES["fileToUpload"]);
-              } else {
+                } else {
                 echo "Sorry, there was an error uploading your file.";
-              }
+                }
             }
         }
 

src/User/User.php

Indentation +4 added lines, -4 removed lines

@@ -56,10 +56,10 @@
         $db = $di->get("dbqb");
         $db->connect();
         $res = $db->select("name")
-                   ->from("Pictures")
-                   ->where("acronym = ?")
-                   ->execute(["default"])
-                   ->fetchAll();
+                    ->from("Pictures")
+                    ->where("acronym = ?")
+                    ->execute(["default"])
+                    ->fetchAll();
 
         $array = [];
         foreach ($res as $val) {