mdaniels5757 / waca

includes/DataObjects/Request.php

Spacing +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
             . '|' . $this->forwardedip  // } private data not known to those without access
             . '|' . $this->useragent    // }
             . '|' . $this->email        // }
-            . '|' . $this->status;      // to rudimentarily invalidate the token on status change
+            . '|' . $this->status; // to rudimentarily invalidate the token on status change
 
         return hash('sha256', $data);
     }

Braces +2 added lines, -4 removed lines

@@ -67,12 +67,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `request` SET

includes/Pages/PageEditComment.php

Braces +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
             SessionAlert::success("Comment has been saved successfully");
 
             $this->redirect('viewRequest', null, array('id' => $comment->getRequest()));
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->assign('comment', $comment);
             $this->assign('request', $request);

includes/Pages/PageViewRequest.php

Braces +3 added lines, -5 removed lines

@@ -94,8 +94,7 @@ 
                 $this->setTemplate('view-request/main-with-checkuser-data.tpl');
                 $this->setupCheckUserData($request);
             }
-        }
-        else {
+        } else {
             $this->setTemplate('view-request/main.tpl');
         }
     }
@@ -109,8 +108,7 @@ 
         if ($request->getStatus() === 'Closed') {
             if ($request->getWasCreated()) {
                 $statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
-            }
-            else {
+            } else {
                 $statusSymbol = self::STATUS_SYMBOL_REJECTED;
             }
         }
@@ -207,7 +205,7 @@ 
 
                 $entryComment = $entry->getComment();
 
-                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
+                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
                     $data = unserialize($entry->getComment());
                     /** @var JobQueue $job */
                     $job = JobQueue::getById($data['job'], $database);

Spacing +2 added lines, -2 removed lines

@@ -177,7 +177,7 @@ 
                 $requestLogs[] = array(
                     'type'     => 'comment',
                     'security' => $entry->getVisibility(),
-                    'user'     => $entry->getVisibility() == 'requester' ? $request->getName() :$nameCache[$entry->getUser()]->getUsername(),
+                    'user'     => $entry->getVisibility() == 'requester' ? $request->getName() : $nameCache[$entry->getUser()]->getUsername(),
                     'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
                     'entry'    => null,
                     'time'     => $entry->getTime(),
@@ -193,7 +193,7 @@ 
 
                 $entryComment = $entry->getComment();
 
-                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
+                if ($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
                     $data = unserialize($entry->getComment());
                     /** @var JobQueue $job */
                     $job = JobQueue::getById($data['job'], $database);

includes/DataObjects/Comment.php

Braces +3 added lines, -6 removed lines

@@ -41,8 +41,7 @@ 
     {
         if ($showAll) {
             $statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
-        }
-        else {
+        } else {
             $statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE request = :target AND (visibility = 'user' OR visibility = 'requester' OR user = :userid);
@@ -84,12 +83,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment

includes/Pages/Request/PageRequestAccount.php

Braces +2 added lines, -4 removed lines

@@ -59,12 +59,10 @@
             // actually save the request to the database
             if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
                 $this->saveAsEmailConfirmation($request, $comment);
-            }
-            else {
+            } else {
                 $this->saveWithoutEmailConfirmation($request, $comment);
             }
-        }
-        else {
+        } else {
             // set the form values from the session context
             $context = WebRequest::getSessionContext('accountReq');
             if ($context !== null && is_array($context)) {