TechWilk / rota

public/old/fb-signup.php

Spacing +3 added lines, -3 removed lines

@@ -41,10 +41,10 @@ 
     // Returns a `Facebook\FacebookResponse` object
     $response = $fb->get('/me?fields=id,name,email', $accessToken);
 } catch (Facebook\Exceptions\FacebookResponseException $e) {
-    echo 'Graph returned an error: '.$e->getMessage();
+    echo 'Graph returned an error: ' . $e->getMessage();
     exit;
 } catch (Facebook\Exceptions\FacebookSDKException $e) {
-    echo 'Facebook SDK returned an error: '.$e->getMessage();
+    echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
 }
 
@@ -91,7 +91,7 @@ 
             <label class="fa fa-envelope-o" for="email"><span class="hidden">Email address</span></label>
             <input name="email" id="email" type="text" class="form__input" placeholder="Email address" value="<?php echo $user->getEmail(); ?>" required>
           </div>
-					<?php if (!empty($message)): echo '<p>'.$message.'</p>'; endif; ?>
+					<?php if (!empty($message)): echo '<p>' . $message . '</p>'; endif; ?>
           <div class="form__field">
             <input type="submit" value="Request access">
           </div>

public/old/roles.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -34,7 +34,7 @@ 
 if ($role && $assignTo) {
     $sql = "UPDATE cr_roles r SET r.groupId = '$assignTo' WHERE r.id = '$role'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     header('Location: roles.php');
     exit;
@@ -70,7 +70,7 @@ 
         $sql = "INSERT INTO cr_roles (name, description, rehersalId, groupId)
             VALUES ('$newrole', '$newrole', $rehersal, $groupId)";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } elseif ($method == 'newgroup') {
         $groupId = $_POST['groups'];
@@ -86,7 +86,7 @@ 
         $sql = "INSERT INTO cr_groups (name, description)
             VALUES ('$newgroup', '$newgroup')";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         // Handle renaming of the roles
@@ -119,11 +119,11 @@ 
     $i = 1;
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         if ($type == 'option') {
-            $list = $list."<option value='".$row['id']."'>".$row['name'].'</option>';
+            $list = $list . "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
         } elseif ($type == 'li') {
-            $list = $list.'<li>'.$row['name'].'</li>';
+            $list = $list . '<li>' . $row['name'] . '</li>';
         } elseif ($type == 'li-a') {
-            $list = $list."<li><a href='roles.php?role=".$roleId.'&assignto='.$row['id']."'>".$row['name'].'</a></li>';
+            $list = $list . "<li><a href='roles.php?role=" . $roleId . '&assignto=' . $row['id'] . "'>" . $row['name'] . '</a></li>';
         }
         $i++;
     }
@@ -189,7 +189,7 @@ 
             $group = $row['groupId'];
             $down = $group + 1;
             $up = $group - 1;
-            echo '<div><strong>'.$groupname.'</strong><br />';
+            echo '<div><strong>' . $groupname . '</strong><br />';
         }
         // Print text input box if a role exists for the group.
         // Allows user to update role names and move roles between groups

public/old/discussion.php

Spacing +10 added lines, -10 removed lines

@@ -52,10 +52,10 @@ 
 
 if ($subscribe == 'true') {
     subscribeto($userID, $areaid, 0);
-    header('Location: discussion.php?categoryid='.$areaid);
+    header('Location: discussion.php?categoryid=' . $areaid);
 } elseif ($subscribe == 'false') {
     unsubscribefrom($subscription);
-    header('Location: discussion.php?categoryid='.$areaid);
+    header('Location: discussion.php?categoryid=' . $areaid);
 }
 
 // If the form has been sent, we need to handle the data.
@@ -66,7 +66,7 @@ 
 
     $sql = ("INSERT INTO cr_discussionCategories(name, description, parent) VALUES ('$categoryname', '$categorydescription', '$categoryparent')");
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 
     // After we have inserted the data, we want to head back to the main page
@@ -90,7 +90,7 @@ 
         $categoryName = $row['name'];
 
         // The following function lists the parents here to save a SQL query later
-        $listParents = $listParents."<option value='".$categoryID."'>".$categoryName.'</option>'; ?>
+        $listParents = $listParents . "<option value='" . $categoryID . "'>" . $categoryName . '</option>'; ?>
 		<div class="elementBackground highlight">
 			<h2><a href="discussion.php?categoryid=<?php echo $categoryID; ?>"><?php echo $row['name']; ?></a> <?php 
             if (isAdmin()) {
@@ -110,7 +110,7 @@ 
                 } else {
                     $topicName = $row['topicName'];
                 } ?>
-			<p><strong>Latest post:</strong> <?php echo $topicName.' <strong>by</strong> '.$row['firstName']; ?></p>
+			<p><strong>Latest post:</strong> <?php echo $topicName . ' <strong>by</strong> ' . $row['firstName']; ?></p>
             <?php
             } ?>
 		
@@ -144,7 +144,7 @@ 
 		<div class="elementBackground">
 			<h2><a href="discussiontopic.php?id=<?php echo $row['id']; ?>&parentid=<?php echo $categoryID; ?>"><?php echo $row['topicName']; ?></a>
 			<?php if (isAdmin()) {
-            echo "<a href='discussion.php?discussionremove=true&categoryid=".$row['id']."'><img src='graphics/close.png' /></a>";
+            echo "<a href='discussion.php?discussionremove=true&categoryid=" . $row['id'] . "'><img src='graphics/close.png' /></a>";
         } ?></h2>
 			<p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p>
 			 <?php 
@@ -161,7 +161,7 @@ 
 
         while ($latestpostrow = mysqli_fetch_array($latestpostresult, MYSQLI_ASSOC)) {
             ?>
-			<p><strong>Latest post:</strong> <?php echo $latestpostrow['firstName'].' <strong>on</strong> '.$latestpostrow['topicDate']; ?></p>
+			<p><strong>Latest post:</strong> <?php echo $latestpostrow['firstName'] . ' <strong>on</strong> ' . $latestpostrow['topicDate']; ?></p>
             <?php
         } ?>	
 		</div>
@@ -178,10 +178,10 @@ 
         }
 
         if ($isSubscribed != '') {
-            $subscribe = '<div class="item"><a href="discussion.php?subscribe=false&subscription='.$isSubscribed.'&categoryid='.
-                    $areaid.'">Unsubscribe from this area</a></div>';
+            $subscribe = '<div class="item"><a href="discussion.php?subscribe=false&subscription=' . $isSubscribed . '&categoryid=' .
+                    $areaid . '">Unsubscribe from this area</a></div>';
         } else {
-            $subscribe = '<div class="item"><a href="discussion.php?subscribe=true&categoryid='.$areaid.'">Subscribe to this area</a></div>';
+            $subscribe = '<div class="item"><a href="discussion.php?subscribe=true&categoryid=' . $areaid . '">Subscribe to this area</a></div>';
         }
     } ?>
 	<?php

public/old/fb-callback.php

Spacing +8 added lines, -8 removed lines

@@ -26,21 +26,21 @@ 
     $accessToken = $helper->getAccessToken();
 } catch (Facebook\Exceptions\FacebookResponseException $e) {
     // When Graph returns an error
-    echo 'Graph returned an error: '.$e->getMessage();
+    echo 'Graph returned an error: ' . $e->getMessage();
     exit;
 } catch (Facebook\Exceptions\FacebookSDKException $e) {
     // When validation fails or other local issues
-    echo 'Facebook SDK returned an error: '.$e->getMessage();
+    echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
 }
 
 if (!isset($accessToken)) {
     if ($helper->getError()) {
         header('HTTP/1.0 401 Unauthorized');
-        echo 'Error: '.$helper->getError()."\n";
-        echo 'Error Code: '.$helper->getErrorCode()."\n";
-        echo 'Error Reason: '.$helper->getErrorReason()."\n";
-        echo 'Error Description: '.$helper->getErrorDescription()."\n";
+        echo 'Error: ' . $helper->getError() . "\n";
+        echo 'Error Code: ' . $helper->getErrorCode() . "\n";
+        echo 'Error Reason: ' . $helper->getErrorReason() . "\n";
+        echo 'Error Description: ' . $helper->getErrorDescription() . "\n";
     } else {
         header('HTTP/1.0 400 Bad Request');
         echo 'Bad request';
@@ -65,7 +65,7 @@ 
     try {
         $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
     } catch (Facebook\Exceptions\FacebookSDKException $e) {
-        echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
+        echo '<p>Error getting long-lived access token: ' . $helper->getMessage() . "</p>\n\n";
         exit;
     }
 }
@@ -78,7 +78,7 @@ 
 } else {
     $redirUrl = 'fb-signup.php';
 }
-header('Location: '.$redirUrl);
+header('Location: ' . $redirUrl);
 
 // User is logged in with a long-lived access token.
 // You can redirect them to a members-only page.

public/old/locations.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -39,7 +39,7 @@ 
             $sql = "UPDATE cr_locations SET name = '$name' WHERE id = '$editid'";
         }
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         $newlocation = $_POST['newlocation'];
@@ -50,7 +50,7 @@ 
 
         $sql = ("INSERT INTO cr_locations (name) VALUES ('$newlocation')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main users page
@@ -95,8 +95,8 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $locationID = $row['id'];
-        echo "<span id='".$locationID."' class='edit'>".$row['name'].'</span> ';
-        echo " <a href='locations.php?locationremove=true&locationID=".$locationID."'><i class='fa fa-close'></i></a><br />";
+        echo "<span id='" . $locationID . "' class='edit'>" . $row['name'] . '</span> ';
+        echo " <a href='locations.php?locationremove=true&locationID=" . $locationID . "'><i class='fa fa-close'></i></a><br />";
     } ?>
  </div><!-- /.box-body -->
 </div><!-- /.box -->

public/old/notification.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 } else {
     $notificationId = getQueryStringForKey('id');
     $referer = getQueryStringForKey('click');
-    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/notification.php?id='.$notificationId.'&click='.$referer;
+    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/notification.php?id=' . $notificationId . '&click=' . $referer;
     header('Location: login.php');
     exit;
 }
@@ -60,7 +60,7 @@ 
     // redir if notification has URL
     $redir = notificationLink($notificationId);
     if (!empty($redir)) {
-        header('Location: '.$redir);
+        header('Location: ' . $redir);
     }
 
     // find notification

api-classes/User.php

Spacing +6 added lines, -6 removed lines

@@ -24,12 +24,12 @@
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->datetime) || empty($this->series) || empty($this->type) || empty($this->sub_type) || empty($this->location)) {
-            $message = 'Series name ('.$this->name.')';
-            $message .= ' or date ('.$this->datetime.')';
-            $message .= ' or series ('.$this->series.')';
-            $message .= ' or type ('.$this->type.')';
-            $message .= ' or sub_type ('.$this->sub_type.')';
-            $message .= ' or location ('.$this->location.')';
+            $message = 'Series name (' . $this->name . ')';
+            $message .= ' or date (' . $this->datetime . ')';
+            $message .= ' or series (' . $this->series . ')';
+            $message .= ' or type (' . $this->type . ')';
+            $message .= ' or sub_type (' . $this->sub_type . ')';
+            $message .= ' or location (' . $this->location . ')';
             $message .= ' cannot be empty.';
 
             throw new Exception($message);

api-classes/Database.php

Spacing +7 added lines, -7 removed lines

@@ -180,10 +180,10 @@ 
             if ($first) {
                 $first = false;
                 $fields .= $item['field'];
-                $valuesPlaceholder .= ':'.$item['field'];
+                $valuesPlaceholder .= ':' . $item['field'];
             } else {
-                $fields .= ', '.$item['field'];
-                $valuesPlaceholder .= ', :'.$item['field'];
+                $fields .= ', ' . $item['field'];
+                $valuesPlaceholder .= ', :' . $item['field'];
             }
 
             if ($item['type'] == 's' || $item['type'] == 'string') {
@@ -201,9 +201,9 @@ 
             }
         }
 
-        $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')');
+        $statement = $this->db_connection->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $valuesPlaceholder . ')');
         foreach ($data as $item) {
-            $statement->bindParam(':'.$item['field'], $item['value']);
+            $statement->bindParam(':' . $item['field'], $item['value']);
         }
 
         if ($statement->execute()) {
@@ -248,7 +248,7 @@ 
 
     private function addPrefix($table)
     {
-        $table = $this->db_prefix.$table;
+        $table = $this->db_prefix . $table;
 
         return $table;
     }
@@ -272,7 +272,7 @@ 
     public function count($table, $column, $where = null)
     {
         $columns = [
-      'COUNT('.$column.') AS count',
+      'COUNT(' . $column . ') AS count',
      ];
         $statement = $this->selectStatement($table, $columns, $where);
 

api-classes/Event.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
     {
         foreach ($rehersals as $rehersal) {
             if (!is_a($rehersal, 'Rehersal')) {
-                throw new Exception('Rehersal is not a Rehersal object: '.$rehersal, 1);
+                throw new Exception('Rehersal is not a Rehersal object: ' . $rehersal, 1);
             }
         }
         $this->rehersals = $rehersals;
@@ -117,12 +117,12 @@ 
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->datetime) || empty($this->series) || empty($this->type) || empty($this->subType) || empty($this->location)) {
-            $message = 'Series name ('.$this->name.')';
-            $message .= ' or date ('.$this->datetime.')';
-            $message .= ' or series ('.$this->series.')';
-            $message .= ' or type ('.$this->type.')';
-            $message .= ' or sub_type ('.$this->subType.')';
-            $message .= ' or location ('.$this->location.')';
+            $message = 'Series name (' . $this->name . ')';
+            $message .= ' or date (' . $this->datetime . ')';
+            $message .= ' or series (' . $this->series . ')';
+            $message .= ' or type (' . $this->type . ')';
+            $message .= ' or sub_type (' . $this->subType . ')';
+            $message .= ' or location (' . $this->location . ')';
             $message .= ' cannot be empty.';
 
             throw new Exception($message);
@@ -180,7 +180,7 @@ 
     ];
 
         $where = [
-      'id = '.$id,
+      'id = ' . $id,
     ];
 
         $result = $db->selectSingle('Event', $this->db_table, $columns, $where);