alfs18 / ramverk1-projekt

view/view-question.php

Spacing +11 added lines, -11 removed lines

@@ -24,16 +24,16 @@ 
 

 <!-- Show the question -->

 <div class="main-question">

-    <?php echo $filter->parse($res[0]->question, ["markdown"])->text ?>

-    - <a href="<?= url("user/viewProfile/{$res[0]->acronym}"); ?>"><?php echo $res[0]->acronym ?></a>

+    <?php echo $filter->parse($res[ 0 ]->question, [ "markdown" ])->text ?>

+    - <a href="<?= url("user/viewProfile/{$res[ 0 ]->acronym}"); ?>"><?php echo $res[ 0 ]->acronym ?></a>

     <br>

-    <?php echo $res[0]->created ?>

-    <?php if ($user == $res[0]->acronym) :?>

-        <br><a href="../../user/editPost/<?= $res[0]->id ?>/Question"> Ändra </a>

+    <?php echo $res[ 0 ]->created ?>

+    <?php if ($user == $res[ 0 ]->acronym) :?>

+        <br><a href="../../user/editPost/<?= $res[ 0 ]->id ?>/Question"> Ändra </a>

     <?php endif; ?>

     <br><br><a class="img-button" href="<?= url("user/points/Question/{$qId}/{$qId}/1"); ?>"> <?= $up ?> </a>

     <a class="img-button" href="<?= url("user/points/Question/{$qId}/{$qId}/-1"); ?>"> <?= $down ?> </a>

-    Poäng: <?= $res[0]->points ?>

+    Poäng: <?= $res[ 0 ]->points ?>

 </div>

 

 <!-- Show comments connected to question -->

@@ -46,13 +46,13 @@ 
             <a class="img-button" href="<?= url("user/points/Comments/{$qId}/{$com->id}/-1"); ?>"> <?= $down ?> </a>

         </div>

         <div class="q-comments">

-            <?php echo $filter->parse($com->comment, ["markdown"])->text ?>

+            <?php echo $filter->parse($com->comment, [ "markdown" ])->text ?>

             - <a href="<?= url("user/viewProfile/{$com->acronym}"); ?>"><?php echo $com->acronym ?></a>

             <?php echo $com->created ?>

             <?php if ($user == $com->acronym) :?>

                 <br><br><a href="../../user/editPost/<?= $com->id ?>/Comments"> Ändra </a>

             <?php endif; ?>

-            <?php if ($user == $res[0]->acronym) :?>

+            <?php if ($user == $res[ 0 ]->acronym) :?>

                 <p><a class="answer-button" href="<?= url("user/acceptAnswer/{$qId}/{$com->id}"); ?>"> Godkänn som svar </a></p>

             <?php endif; ?>

         </div>

@@ -68,7 +68,7 @@ 
     <div class="answer">

         <h4 class="answer-h4">Svar</h4>

         <!-- <?= $row->id ?><br> -->

-        <?php echo $filter->parse($row->answer, ["markdown"])->text ?><br>

+        <?php echo $filter->parse($row->answer, [ "markdown" ])->text ?><br>

         - <a href="<?= url("user/viewProfile/{$row->acronym}"); ?>"><?php echo $row->acronym ?></a><br>

         <?= $row->created ?>

         <?php if ($user == $row->acronym) :?>

@@ -88,13 +88,13 @@ 
             <a class="img-button" href="<?= url("user/points/AnswerComments/{$qId}/{$comment->id}/-1"); ?>"> <?= $down ?> </a>

         </div>

         <div class="a-comments">

-        <?php echo $filter->parse($comment->comment, ["markdown"])->text ?>

+        <?php echo $filter->parse($comment->comment, [ "markdown" ])->text ?>

         - <a href="<?= url("user/viewProfile/{$comment->acronym}"); ?>"><?php echo $comment->acronym ?></a>

         <?= $comment->created ?><br>

         <?php if ($user == $comment->acronym) :?>

             <a href="../../user/editPost/<?= $comment->id ?>/AnswerComments"> Ändra </a>

         <?php endif; ?>

-        <!-- <?php if ($user == $res[0]->acronym) :?>

+        <!-- <?php if ($user == $res[ 0 ]->acronym) :?>

             <p><a class="answer-button" href="<?= url("user/acceptAnswer/{$qId}/{$comment->id}"); ?>"> Godkänn som svar </a></p>

         <?php endif; ?> -->

     </div>

src/User/Functions.php

Spacing +43 added lines, -43 removed lines

@@ -26,7 +26,7 @@ 
         $user = $db->select($rows)

                    ->from($table)

                    ->where("acronym = ?")

-                   ->execute([$acronym])

+                   ->execute([ $acronym ])

                    ->fetchAll();

 

         // var_dump($user);

@@ -51,7 +51,7 @@ 
         $post = $db->select($rows)

                    ->from($table)

                    ->where("id = ?")

-                   ->execute([$id])

+                   ->execute([ $id ])

                    ->fetchAll();

 

         // var_dump($post);

@@ -74,9 +74,9 @@ 
     {

         $db = $di->get("dbqb");

         $db->connect()

-            ->update($table, [$rows])

+            ->update($table, [ $rows ])

             ->where("id = ?")

-            ->execute([$res, $id]);

+            ->execute([ $res, $id ]);

 

         return "Saved";

     }

@@ -96,7 +96,7 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $sql = "DELETE FROM $table WHERE id = ?;";

-        $db->execute($sql, [$id]);

+        $db->execute($sql, [ $id ]);

         return "Deleted";

     }

 

@@ -115,7 +115,7 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $sql = "DELETE FROM $table WHERE questionId = ?;";

-        $db->execute($sql, [$id]);

+        $db->execute($sql, [ $id ]);

 

         return "Deleted";

     }

@@ -135,7 +135,7 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $sql = "DELETE FROM AnswerComments WHERE answerId = ?;";

-        $db->execute($sql, [$id]);

+        $db->execute($sql, [ $id ]);

 

         return "Deleted";

     }

@@ -174,14 +174,14 @@ 
     public function getUserStatus($di, $users)

     {

         // get all answers made by $acronym

-        $answers = [];

+        $answers = [ ];

         foreach ($users as $acronym) {

             $db = $di->get("dbqb");

             $db->connect();

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

                         ->from("Answers")

                         ->where("acronym = ?")

-                        ->execute([$acronym])

+                        ->execute([ $acronym ])

                         ->fetchAll();

         }

 

@@ -225,7 +225,7 @@ 
         $questions = $db->select("*")

                         ->from("Question")

                         ->where("tags LIKE ?")

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

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

                         ->fetchAll();

 

         return $questions;

@@ -285,7 +285,7 @@ 
      */

     public function getTagsOnce($tagsArray)

     {

-        $tags = [];

+        $tags = [ ];

         foreach ($tagsArray as $val) {

             if (!in_array($val, $tags)) {

                 array_push($tags, $val);

@@ -306,12 +306,12 @@ 
     public function countTagsFrequency($tagsArray)

     {

         // var_dump($tagsArray);

-        $tags = [];

+        $tags = [ ];

         foreach ($tagsArray as $val) {

             if (!array_key_exists($val, $tags)) {

-                $tags[$val] = 0;

+                $tags[ $val ] = 0;

             }

-            $tags[$val] += 1;

+            $tags[ $val ] += 1;

         }

 

         return $tags;

@@ -357,7 +357,7 @@ 
         $questions = $db->select("id, acronym, question, tags")

                    ->from("Question")

                    ->where("tags LIKE ?")

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

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

                    ->fetchAll();

 

         // var_dump($questions);

@@ -379,7 +379,7 @@ 
         $questions = $db->select("*")

                    ->from("Question")

                    ->where("id = ?")

-                   ->execute([$res])

+                   ->execute([ $res ])

                    ->fetchAll();

 

         // var_dump($questions);

@@ -402,7 +402,7 @@ 
         $res = $db->select("*")

                    ->from("Comments")

                    ->where("questionId = ?")

-                   ->execute([$questionId])

+                   ->execute([ $questionId ])

                    ->fetchAll();

 

         // var_dump($res);

@@ -425,7 +425,7 @@ 
         $res = $db->select("*")

                    ->from("Comments")

                    ->where("id = ?")

-                   ->execute([$id])

+                   ->execute([ $id ])

                    ->fetchAll();

 

         return $res;

@@ -447,7 +447,7 @@ 
         $res = $db->select("*")

                    ->from("AnswerComments")

                    ->where("answerId = ?")

-                   ->execute([$answerId])

+                   ->execute([ $answerId ])

                    ->fetchAll();

 

         // var_dump($res);

@@ -469,7 +469,7 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $sql = "SELECT * FROM Answers WHERE questionId = ? ORDER BY $column;";

-        $res = $db->executeFetchAll($sql, [$questionId]);

+        $res = $db->executeFetchAll($sql, [ $questionId ]);

 

         return $res;

     }

@@ -490,7 +490,7 @@ 
         $res = $db->select("answer")

                    ->from("Answers")

                    ->where("questionId = ?")

-                   ->execute([$questionId])

+                   ->execute([ $questionId ])

                    ->fetch();

 

         $answered = "Nej";

@@ -516,7 +516,7 @@ 
         $res = $db->select("*")

                    ->from("Answers")

                    ->where("questionId = ?")

-                   ->execute([$questionId])

+                   ->execute([ $questionId ])

                    ->fetchAll();

 

         // var_dump($res);

@@ -533,7 +533,7 @@ 
      */

     public function userCheck($acronym)

     {

-        $user = $_SESSION["acronym"];

+        $user = $_SESSION[ "acronym" ];

         if ($user == $acronym) {

             return true;

         }

@@ -556,7 +556,7 @@ 
         $res = $db->select("points")

                    ->from($table)

                    ->where("id = ?")

-                   ->execute([$id])

+                   ->execute([ $id ])

                    ->fetch();

 

         return $res;

@@ -578,9 +578,9 @@ 
         // var_dump($points);

         $db = $di->get("dbqb");

         $db->connect()

-            ->update($table, ["points"])

+            ->update($table, [ "points" ])

             ->where("id = ?")

-            ->execute([$points, $id]);

+            ->execute([ $points, $id ]);

 

         return "Saved";

     }

@@ -600,9 +600,9 @@ 
         // var_dump($points);

         $db = $di->get("dbqb");

         $db->connect()

-            ->update("User", ["picture"])

+            ->update("User", [ "picture" ])

             ->where("acronym = ?")

-            ->execute([$picture, $acronym]);

+            ->execute([ $picture, $acronym ]);

 

         return "Saved";

     }

@@ -621,9 +621,9 @@ 
     {

         $db = $di->get("dbqb");

         $db->connect()

-            ->update("User", ["info"])

+            ->update("User", [ "info" ])

             ->where("acronym = ?")

-            ->execute([$info, $acronym]);

+            ->execute([ $info, $acronym ]);

 

         return "Saved";

     }

@@ -643,8 +643,8 @@ 
         // var_dump($points);

         $db = $di->get("dbqb");

         $db->connect()

-            ->insert("Pictures", ["acronym", "name"])

-            ->execute([$acronym, $name]);

+            ->insert("Pictures", [ "acronym", "name" ])

+            ->execute([ $acronym, $name ]);

 

         return "Saved";

     }

@@ -666,7 +666,7 @@ 
         $res = $db->select("name")

                    ->from("Pictures")

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

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

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

                    ->fetchAll();

 

         return $res;

@@ -689,8 +689,8 @@ 
 

         $db = $di->get("dbqb");

         $db->connect()

-            ->insert("Answers", ["questionId", "acronym", "answer", "points", "created"])

-            ->execute([$questionId, $acronym, $answer, $points, $created]);

+            ->insert("Answers", [ "questionId", "acronym", "answer", "points", "created" ])

+            ->execute([ $questionId, $acronym, $answer, $points, $created ]);

 

         return "Saved";

     }

@@ -709,7 +709,7 @@ 
         $db = $di->get("dbqb");

         $db->connect();

         $sql = "DELETE FROM Comments WHERE id = ?;";

-        $db->execute($sql, [$id]);

+        $db->execute($sql, [ $id ]);

     }

 

 

@@ -721,9 +721,9 @@ 
      */

     function sessionDestroy()

     {

-        $style = $_SESSION['AnaxStyleChooser'] ?? "css/mine.css";

+        $style = $_SESSION[ 'AnaxStyleChooser' ] ?? "css/mine.css";

         // Unset all of the session variables.

-        $_SESSION = [];

+        $_SESSION = [ ];

 

         // If it's desired to kill the session, also delete the session cookie.

         // Note: This will destroy the session, and not just the session data!

@@ -733,17 +733,17 @@ 
                 session_name(),

                 '',

                 time() - 42000,

-                $params["path"],

-                $params["domain"],

-                $params["secure"],

-                $params["httponly"]

+                $params[ "path" ],

+                $params[ "domain" ],

+                $params[ "secure" ],

+                $params[ "httponly" ]

             );

         }

 

         // Finally, destroy the session.

         session_destroy();

 

-        $_SESSION['AnaxStyleChooser'] = $style;

+        $_SESSION[ 'AnaxStyleChooser' ] = $style;

 

         // $_SESSION["status"] = null;

         // $_SESSION["acronym"] = null;

src/User/UserController.php

Spacing +39 added lines, -39 removed lines

@@ -50,7 +50,7 @@ 
         // var_dump($page);
         $route = $request->getRoute();
         // var_dump($route);
-        $acronym = $_SESSION["acronym"] ?? null;
+        $acronym = $_SESSION[ "acronym" ] ?? null;
         // var_dump($_SESSION);
 
         if ($route == "user/login" || $route == "user/create") {
@@ -136,7 +136,7 @@ 
 
         // var_dump($_SESSION);
 
-        if ($_SESSION["acronym"] ?? null) {
+        if ($_SESSION[ "acronym" ] ?? null) {
             $response = $this->di->get("response");
             return $response->redirect("user/questions");
         }
@@ -153,7 +153,7 @@ 
             "content" => "<img src='../../htdocs/image/garden2.jpg' width='1000px'></img>",
         ];
 
-        $page->add("login-side", [], "sidebar-right");
+        $page->add("login-side", [ ], "sidebar-right");
         $page->add("anax/v2/article/default", $pic, "flash");
 
         return $page->render([
@@ -177,7 +177,7 @@ 
         $request = $this->di->get("request");
 
         $res = new Functions();
-        $acronym = $_SESSION["acronym"];
+        $acronym = $_SESSION[ "acronym" ];
         $rows = "id, question, tags";
         $questions = $res->getProfileInfo($acronym, $this->di, "Question", $rows);
         $rows2 = "id, questionId, answer";
@@ -188,7 +188,7 @@ 
         $user = $res->getProfileInfo($acronym, $this->di, "User", $rows4);
         // var_dump($comments);
 
-        $form = new FormElementFile("img", ["image/*"]);
+        $form = new FormElementFile("img", [ "image/*" ]);
         $baseURL = $request->getBaseUrl();
         // var_dump($baseURL);
 
@@ -238,8 +238,8 @@ 
         $user = $res->getProfileInfo($acronym, $this->di, "User", $rows);
         $pictures = $res->getAllProfilePictures($this->di, $acronym);
 
-        $info = $_POST["info"] ?? null;
-        $picture = $_POST["picture"] ?? null;
+        $info = $_POST[ "info" ] ?? null;
+        $picture = $_POST[ "picture" ] ?? null;
         if ($info) {
             var_dump($info);
             $res->setProfileInfo($this->di, $acronym, $info);
@@ -295,15 +295,15 @@ 
         if ($post) {
             // $res->setProfilePicture($this->di, $acronym, $post);
             $target_dir = "C:/cygwin64/home/Lichn/dbwebb-kurser/ramverk1/me/kmom10/module/htdocs/img/profile/";
-            $target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
+            $target_file = $target_dir . basename($_FILES[ "fileToUpload" ][ "name" ]);
             $uploadOk = 1;
-            $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+            $imageFileType = strtolower(pathinfo($target_file, PATHINFO_EXTENSION));
             // Check if image file is a actual image or fake image
-            if(isset($_POST["submit"])) {
+            if (isset($_POST[ "submit" ])) {
                 var_dump("smask");
-             $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
-              if($check !== false) {
-                echo "File is an image - " . $check["mime"] . ".";
+             $check = getimagesize($_FILES[ "fileToUpload" ][ "tmp_name" ]);
+              if ($check !== false) {
+                echo "File is an image - " . $check[ "mime" ] . ".";
                 $uploadOk = 1;
               } else {
                 echo "File is not an image.";
@@ -317,14 +317,14 @@ 
             }
 
             // Check file size
-            if ($_FILES["fileToUpload"]["size"] > 500000) {
+            if ($_FILES[ "fileToUpload" ][ "size" ] > 500000) {
               echo "Sorry, your file is too large.";
               $uploadOk = 0;
             }
 
             // Allow certain file formats
-            if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
-            && $imageFileType != "gif" ) {
+            if ($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
+            && $imageFileType != "gif") {
               echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
               $uploadOk = 0;
             }
@@ -334,10 +334,10 @@ 
               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)) {
-                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"]);
+              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 {
                 echo "Sorry, there was an error uploading your file.";
               }
@@ -417,7 +417,7 @@ 
     {
         $page = $this->di->get("page");
         // $acronym = $_SESSION["acronym"];
-        $acronym = $_SESSION["acronym"];
+        $acronym = $_SESSION[ "acronym" ];
         // var_dump($_SESSION);
         $form = new CreateQuestionForm($this->di, $acronym);
         $form->check();
@@ -434,8 +434,8 @@ 
         //     "content" => "<img src='../../htdocs/image/car.png' width='1000px'></img>",
         // ];
 
-        $page->add("ask-tip", [], "sidebar-right");
-        $page->add("ask-tag", [], "sidebar-right");
+        $page->add("ask-tip", [ ], "sidebar-right");
+        $page->add("ask-tag", [ ], "sidebar-right");
         // $page->add("anax/v2/article/default", $pic, "flash");
 
         return $page->render([
@@ -518,7 +518,7 @@ 
 
         // Get list of all users.
         $users = $res->getAllUsers($this->di);
-        $sums = [];
+        $sums = [ ];
         foreach ($users as $user) {
             $acronym = $user->acronym;
             // get all questions made by user
@@ -528,7 +528,7 @@ 
             // get all answers made by user
             $ans = $res->getProfileInfo($acronym, $this->di, "Answers", "answer");
             // sum up everything
-            $sums[$acronym] = sizeof($quests) + sizeof($com) + sizeof($ans);
+            $sums[ $acronym ] = sizeof($quests) + sizeof($com) + sizeof($ans);
         }
 
         arsort($sums);
@@ -631,9 +631,9 @@ 
         $comment = $res->getOneQuestionComment($this->di, $commentId);
         var_dump($comment);
 
-        $acronym = $comment[0]->acronym;
-        $answer = $comment[0]->comment;
-        $created = $comment[0]->created;
+        $acronym = $comment[ 0 ]->acronym;
+        $answer = $comment[ 0 ]->comment;
+        $created = $comment[ 0 ]->created;
 
         // Save as answer.
         $res->saveAnswer($this->di, $questionId, $acronym, $answer, $created);
@@ -641,7 +641,7 @@ 
         // Delete comment.
         $res->deleteComment($this->di, $commentId);
 
-        var_dump($comment[0]->comment);
+        var_dump($comment[ 0 ]->comment);
 
         // $page->add("anax/v2/article/default", [
         //     "content" => "Hello",
@@ -692,7 +692,7 @@ 
             // get profile picture of the user who made a question
             $picture = $res->getProfileInfo($acronym, $this->di, "User", "picture");
 
-            $question->picture = "<img src='{$baseURL}/image/profile/{$picture[0]->picture}{$size}'></img>";
+            $question->picture = "<img src='{$baseURL}/image/profile/{$picture[ 0 ]->picture}{$size}'></img>";
             // get all answers
             $question->answers = $res->getQuestionAnswers($this->di, $questionId);
         }
@@ -705,9 +705,9 @@ 
 
         // get variables from posted checkbox form
         $items = $request->getPost();
-        if ($items["items"] ?? null) {
+        if ($items[ "items" ] ?? null) {
             // visa endast info gällande de ikryssade taggarna
-            foreach ($items["items"] as $val) {
+            foreach ($items[ "items" ] as $val) {
                 // var_dump($val);
                 $questions = $res->getSomeQuestionsTags($this->di, $val);
                 // var_dump($questions);
@@ -778,9 +778,9 @@ 
         // var_dump($answers);
 
         // var_dump($comments);
-        $qId = $question[0]->id;
+        $qId = $question[ 0 ]->id;
         // var_dump($qId);
-        $acronym = $_SESSION["acronym"];
+        $acronym = $_SESSION[ "acronym" ];
         // var_dump($acronym);
 
         $form = new CreateCommentsForm($this->di, $acronym, $qId);
@@ -795,7 +795,7 @@ 
         $up = "<img src='../../../htdocs/image/up.png' width='30px'></img>";
         $down = "<img src='../../../htdocs/image/down.png' width='30px'></img>";
 
-        $user = $_SESSION["acronym"];
+        $user = $_SESSION[ "acronym" ];
 
         $page->add("view-question", [
             "res" => $question,
@@ -812,7 +812,7 @@ 
             "qId" => $id,
         ]);
 
-        $tags = $question[0]->tags ?? "Grönsaker, Plantor";
+        $tags = $question[ 0 ]->tags ?? "Grönsaker, Plantor";
         $tagsArray = explode("; ", $tags);
 
         $page->add("show-tags", [
@@ -831,7 +831,7 @@ 
             "content" => $content,
         ], "sidebar-right");
 
-        $page->add("ask-tip", [], "sidebar-right");
+        $page->add("ask-tip", [ ], "sidebar-right");
 
         return $page->render([
             "title" => "View question",
@@ -951,14 +951,14 @@ 
             // get profile picture of the user who made a question
             $picture = $res->getProfileInfo($acronym, $this->di, "User", "picture");
 
-            $question->picture = "<img src='{$baseURL}/image/profile/{$picture[0]->picture}{$size}'></img>";
+            $question->picture = "<img src='{$baseURL}/image/profile/{$picture[ 0 ]->picture}{$size}'></img>";
             // get all answers
             $question->answers = $res->getQuestionAnswers($this->di, $questionId);
         }
 
         $filter = new \Anax\TextFilter\TextFilter();
 
-        $user = $_SESSION["acronym"];
+        $user = $_SESSION[ "acronym" ];
 
         $page->add("view-tag-questions", [
             "questions" => $questions,