mahm17 / ramverk1-projekt

view/anax/v2/layout/dbwebb_se.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 // Show incoming variables and view helper functions
 //echo showEnvironment(get_defined_vars(), get_defined_functions());
 
-$htmlClass = $htmlClass ?? [];
+$htmlClass = $htmlClass ?? [ ];
 $lang = $lang ?? "sv";
 $charset = $charset ?? "utf-8";
 $title = ($title ?? "No title") . ($baseTitle ?? " | No base title defined");
@@ -22,33 +22,33 @@ 
 $session = $di->get("session");
 if ($request->getGet("style")) {
     $session->set("redirect", currentUrl());
-    redirect("style/update/" . rawurlencode($_GET["style"]));
+    redirect("style/update/" . rawurlencode($_GET[ "style" ]));
 }
 
 // Get the active stylesheet, if any.
 $activeStyle = $session->get(StyleChooserController::getSessionKey(), null);
 if ($activeStyle) {
-    $stylesheets = [];
-    $stylesheets[] = $activeStyle;
+    $stylesheets = [ ];
+    $stylesheets[ ] = $activeStyle;
 }
 
 // Get hgrid & vgrid
 if ($request->hasGet("hgrid")) {
-    $htmlClass[] = "hgrid";
+    $htmlClass[ ] = "hgrid";
 }
 if ($request->hasGet("vgrid")) {
-    $htmlClass[] = "vgrid";
+    $htmlClass[ ] = "vgrid";
 }
 
 // Show regions
 if ($request->hasGet("regions")) {
-    $htmlClass[] = "regions";
+    $htmlClass[ ] = "regions";
 }
 
 // Get flash message if any and add to region flash-message
 $flashMessage = $session->getOnce("flashmessage");
 if ($flashMessage) {
-    $di->get("view")->add(__DIR__ . "/../flashmessage/default", ["message" => $flashMessage], "flash-message");
+    $di->get("view")->add(__DIR__ . "/../flashmessage/default", [ "message" => $flashMessage ], "flash-message");
 }
 
 // Get current route to make as body class
@@ -211,7 +211,7 @@ 
 $sidebarLeft  = regionHasContent("sidebar-left");
 $sidebarRight = regionHasContent("sidebar-right");
 $class = "";
-$class .= $sidebarLeft  ? "has-sidebar-left "  : "";
+$class .= $sidebarLeft ? "has-sidebar-left " : "";
 $class .= $sidebarRight ? "has-sidebar-right " : "";
 $class .= empty($class) ? "" : "has-sidebar";
 ?>

view/anax/v2/article/default.php

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 //echo showEnvironment(get_defined_vars(), get_defined_functions());
 
 // Prepare classes
-$classes[] = "article";
+$classes[ ] = "article";
 if (isset($class)) {
-    $classes[] = $class;
+    $classes[ ] = $class;
 }
 
 

view/anax/v2/block/default.php

Spacing +3 added lines, -3 removed lines

@@ -10,9 +10,9 @@ 
 //echo showEnvironment(get_defined_vars(), get_defined_functions());
 
 // Prepare classes
-$classes[] = "block";
+$classes[ ] = "block";
 if (isset($class)) {
-    $classes[] = $class;
+    $classes[ ] = $class;
 }
 
 // Load content details from route
@@ -21,7 +21,7 @@ 
 }
 
 // Prepare title
-$title = isset($title) && !empty($title)? $title : null;
+$title = isset($title) && !empty($title) ? $title : null;
 $header = isset($header) ? $header : $title;
 
 // Prepare content into text

src/User/User.php

Indentation +20 added lines, -20 removed lines

@@ -6,15 +6,15 @@ 
 class User extends ActiveRecordModel
 {
     /**
-    * @var string $tableName name of the database table.
-    */
+     * @var string $tableName name of the database table.
+     */
     protected $tableName = "User";
 
     /**
-    * Columns in the table.
-    *
-    * @var integer $id primary key auto incremented.
-    */
+     * Columns in the table.
+     *
+     * @var integer $id primary key auto incremented.
+     */
     public $id;
     public $username;
     public $password;
@@ -27,26 +27,26 @@ 
      * A database driven model.
      */
     /**
-    * Set the password.
-    *
-    * @param string $password the password to use.
-    *
-    * @return void
-    */
+     * Set the password.
+     *
+     * @param string $password the password to use.
+     *
+     * @return void
+     */
     public function setPassword($password)
     {
         $this->password = password_hash($password, PASSWORD_DEFAULT);
     }
 
     /**
-    * Verify the acronym and the password, if successful the object contains
-    * all details from the database row.
-    *
-    * @param string $acronym  acronym to check.
-    * @param string $password the password to use.
-    *
-    * @return boolean true if acronym and password matches, else false.
-    */
+     * Verify the acronym and the password, if successful the object contains
+     * all details from the database row.
+     *
+     * @param string $acronym  acronym to check.
+     * @param string $password the password to use.
+     *
+     * @return boolean true if acronym and password matches, else false.
+     */
     public function verifyPassword($username, $password)
     {
         $this->find("username", $username);

src/User/HTMLForm/UserLoginForm.php

Indentation +3 added lines, -3 removed lines

@@ -83,9 +83,9 @@
         $session->set("login", $user->id);
 
         if (!$res) {
-           $this->form->rememberValues();
-           $this->form->addOutput("User or password did not match.");
-           return false;
+            $this->form->rememberValues();
+            $this->form->addOutput("User or password did not match.");
+            return false;
         }
         $this->form->addOutput("User " . $user->username . " logged in.");
         return true;

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Login",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );
@@ -57,8 +57,8 @@ 
     public function callbackSubmit()
     {
         // Get values from the submitted form
-        $username       = $this->form->value("username");
-        $password      = $this->form->value("password");
+        $username = $this->form->value("username");
+        $password = $this->form->value("password");
 
         // Try to login
         // $db = $this->di->get("dbqb");

src/User/HTMLForm/EditUserForm.php

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
      *
      * @return boolean true if okey, false if something went wrong.
      */
-     public function callbackSubmit()
+        public function callbackSubmit()
     {
         // Get values from the submitted form
         $user = new User();

Spacing +7 added lines, -7 removed lines

@@ -26,20 +26,20 @@ 
             [
                 "id" => [
                     "type"        => "text",
-                    "validation" => ["not_empty"],
+                    "validation" => [ "not_empty" ],
                     "readonly" => "readonly",
                     "value" => $user->id,
                 ],
 
                 "username" => [
                     "type"        => "text",
-                    "validation" => ["not_empty"],
+                    "validation" => [ "not_empty" ],
                     "value" => $user->username,
                 ],
 
                 "password" => [
                     "type"        => "password",
-                    "validation" => ["not_empty"],
+                    "validation" => [ "not_empty" ],
                 ],
 
                 "password-again" => [
@@ -51,14 +51,14 @@ 
 
                 "email" => [
                     "type"        => "email",
-                    "validation" => ["not_empty"],
+                    "validation" => [ "not_empty" ],
                     "value" => $user->email,
                 ],
 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Create user",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );
@@ -97,14 +97,14 @@ 
         $email = $this->form->value("email");
 
         // Check password matches
-        if ($password !== $passwordAgain ) {
+        if ($password !== $passwordAgain) {
             $this->form->rememberValues();
             $this->form->addOutput("Password did not match.");
             return false;
         }
 
         $user->find("id", $this->form->value("id"));
-        $user->username  = $this->form->value("username");
+        $user->username = $this->form->value("username");
         $user->password = $this->form->value("password");
         $user->email = $this->form->value("email");
         $user->save();

src/User/HTMLForm/CreateUserForm.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      *
      * @return boolean true if okey, false if something went wrong.
      */
-     public function callbackSubmit()
+        public function callbackSubmit()
     {
         // Get values from the submitted form
         $username      = $this->form->value("username");

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
                 "submit" => [
                     "type" => "submit",
                     "value" => "Create user",
-                    "callback" => [$this, "callbackSubmit"]
+                    "callback" => [ $this, "callbackSubmit" ]
                 ],
             ]
         );
@@ -70,7 +70,7 @@ 
         $email = $this->form->value("email");
 
         // Check password matches
-        if ($password !== $passwordAgain ) {
+        if ($password !== $passwordAgain) {
             $this->form->rememberValues();
             $this->form->addOutput("Password did not match.");
             return false;

src/Controller/ErrorHandlerController.php

Indentation -1 removed lines

@@ -22,7 +22,6 @@
      * @param string $message with details.
      *
      * @throws Anax\Route\Exception\NotFoundException
-
      * @return object as the response.
      */
     public function catchAll() : object

Spacing +3 added lines, -3 removed lines

@@ -52,13 +52,13 @@
         $page->add(
             "anax/v2/error/default",
             [
-                "header" => $pages[$path][0],
-                "text" => $pages[$path][1],
+                "header" => $pages[ $path ][ 0 ],
+                "text" => $pages[ $path ][ 1 ],
             ]
         );
 
         return $page->render([
-            "title" => $pages[$path][0] . $title
+            "title" => $pages[ $path ][ 0 ] . $title
         ], $path);
     }
 }

src/Controller/SampleJsonController.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
         $json = [
             "message" => __METHOD__ . ", \$db is {$this->db}",
         ];
-        return [$json];
+        return [ $json ];
     }
 
 
@@ -77,7 +77,7 @@ 
             "message" => __METHOD__ . "<p>\$di contains: $services",
             "di" => $this->di->getServices(),
         ];
-        return [$json];
+        return [ $json ];
     }
 
 
@@ -94,6 +94,6 @@ 
         $json = [
             "message" => __METHOD__ . ", forbidden to access.",
         ];
-        return [$json, 403];
+        return [ $json, 403 ];
     }
 }