TechWilk / rota

public/old/fb-link.php

Indentation +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
     ini_set('log_errors', true);
     error_reporting(E_ALL);
 
-  date_default_timezone_set('Europe/London');
+    date_default_timezone_set('Europe/London');
 
 // Include files, including the database connection
 include 'includes/config.php';
@@ -24,10 +24,10 @@ 
 } require_once 'vendor/autoload.php';
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $accessToken = $_SESSION['fb_access_token'];
 

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 use Facebook;
 
-ini_set('display_errors', false);    // set on for development, off for production
+ini_set('display_errors', false); // set on for development, off for production
     ini_set('log_errors', true);
     error_reporting(E_ALL);
 
@@ -37,10 +37,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;
 }
 

public/old/tableView.php

Spacing +16 added lines, -16 removed lines

@@ -111,7 +111,7 @@ 
 									 FROM cr_eventTypes et
 									 WHERE id IN (SELECT e.type
 										 						FROM cr_events e
-																WHERE '.$whereTwoMonth.'
+																WHERE '.$whereTwoMonth . '
 																AND e.removed = 0)
 									 ORDER BY name';
         $result = mysqli_query(db(), $filter_sql) or die(mysqli_error(db()));
@@ -132,7 +132,7 @@ 
 <tr>
 	<td ><strong>Event</strong></td>
 	<?php
-    $sql = 'SELECT * FROM cr_groups g ORDER BY '.$group_sorting_name;
+    $sql = 'SELECT * FROM cr_groups g ORDER BY ' . $group_sorting_name;
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
@@ -163,7 +163,7 @@ 
 
     if ($filter == '') {
         $sql .= '
-							AND '.$whereTwoMonth.'
+							AND '.$whereTwoMonth . '
 						ORDER BY
 							e.date';
     } elseif ($filter == 'all') {
@@ -173,7 +173,7 @@ 
     } elseif ($filter != '') {
         $sql .= "
 							AND e.type = '$filter'
-							AND ".$whereTwoMonth.'
+							AND " . $whereTwoMonth . '
 						ORDER BY
 							e.date';
     }
@@ -188,34 +188,34 @@ 
         echo '<tr>';
         echo '<td >';
         setlocale(LC_TIME, $lang_locale); //de_DE
-        echo '<a href="event.php?id='.$row['id'].'">';
+        echo '<a href="event.php?id=' . $row['id'] . '">';
         echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V
         echo '</a>';
 
         //$row['sundayDate']
         if (!empty($row['eventType'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventType'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventType'] . '</em>';
         }
         if (!empty($row['eventSubType'])) {
-            echo ' - <em>'.$row['eventSubType'].'</em>';
+            echo ' - <em>' . $row['eventSubType'] . '</em>';
         }
         if (!empty($row['eventLocation'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventLocation'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventLocation'] . '</em>';
         }
         if (!empty($row['name'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['name'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['name'] . '</em>';
         }
         if (!empty($row['eventGroup'])) {
-            echo '<br /><strong>&nbsp;&nbsp;&nbsp;'.$row['eventGroup'].'</strong>';
+            echo '<br /><strong>&nbsp;&nbsp;&nbsp;' . $row['eventGroup'] . '</strong>';
         }
         if (!empty($row['sermonTitle'])) {
-            echo ': '.$row['sermonTitle'];
+            echo ': ' . $row['sermonTitle'];
         }
         if (!empty($row['bibleVerse'])) {
-            echo ' <em>('.$row['bibleVerse'].')</em>';
+            echo ' <em>(' . $row['bibleVerse'] . ')</em>';
         }
         if (!empty($row['comment'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;('.$row['comment'].')</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;(' . $row['comment'] . ')</em>';
         }
         echo '</td>';
 
@@ -247,16 +247,16 @@ 
                     if ($previousName == '') {
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } elseif ($previousName != $name) {
                         echo ')</em>';
                         echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : '';
                         echo '<br />'; // line break from previous name
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } else {
-                        echo ', '.$viewPeople['role'];
+                        echo ', ' . $viewPeople['role'];
                     }
 
                     $peopleInEvent = true;

public/old/includes/functions.password.php

Spacing +2 added lines, -2 removed lines

@@ -42,12 +42,12 @@
 
     $ret = '';
 
-    $chars = 26 * 2 + 10;   //26 (a-z) + 26 (A-Z) + 10 (0-9)
+    $chars = 26 * 2 + 10; //26 (a-z) + 26 (A-Z) + 10 (0-9)
     //a-z = 97-122
     //A-Z = 65-90
     //0-9 = 48-57
 
-    srand(make_seed());     //Seed with microseconds
+    srand(make_seed()); //Seed with microseconds
     //if you don't need this, you can just use srand(time());
 
     for ($i = 1; $i <= $length; $i++) {

public/old/includes/functions.facebook.php

Indentation +8 added lines, -8 removed lines

@@ -16,10 +16,10 @@ 
 function facebook()
 {
     $fb = new Facebook\Facebook([
-      'app_id'                => siteConfig()['auth']['facebook']['appId'],
-      'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
-      'default_graph_version' => 'v2.2',
-      ]);
+        'app_id'                => siteConfig()['auth']['facebook']['appId'],
+        'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
+        'default_graph_version' => 'v2.2',
+        ]);
 
     return $fb;
 }
@@ -66,10 +66,10 @@ 
     $tokenMetadata = $oAuth2Client->debugToken($accessToken);
 
     // Validation (these will throw FacebookSDKException's when they fail)
-  $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
-  // If you know the user ID this access token belongs to, you can validate it here
-  //$tokenMetadata->validateUserId('123');
-  $tokenMetadata->validateExpiration();
+    $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
+    // If you know the user ID this access token belongs to, you can validate it here
+    //$tokenMetadata->validateUserId('123');
+    $tokenMetadata->validateExpiration();
 
     if (!$accessToken->isLongLived()) {
         // Exchanges a short-lived access token for a long-lived one

Spacing +8 added lines, -8 removed lines

@@ -38,21 +38,21 @@ 
         echo var_dump($accessToken);
     } 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';
@@ -76,7 +76,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;
         }
     }
@@ -120,7 +120,7 @@ 
 
         return false;
     }
-    $sendNotif = $fb->post('/'.$facebookUserId.'/notifications', ['href' => $url, 'template' => $message], $appAccessToken);
+    $sendNotif = $fb->post('/' . $facebookUserId . '/notifications', ['href' => $url, 'template' => $message], $appAccessToken);
 
     if ($sendNotif->getHttpStatusCode() == 200) {
         return true;

public/old/emailEvent.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $statusMessage = 'Sent successfully';
     } else {
         foreach ($sent as $errorMessage) {
-            $statusMessage .= '<p>'.$errorMessage.'</p>';
+            $statusMessage .= '<p>' . $errorMessage . '</p>';
         }
     }
 

public/old/fb-signup.php

Indentation +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@
 }
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $accessToken = $_SESSION['fb_access_token'];
 $_SESSION['foo'] = 'bar';

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

Indentation +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
         } ?></h2>
 			<p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p>
 			 <?php 
-             $latestpostsql = "SELECT *, 
+                $latestpostsql = "SELECT *, 
 		(SELECT CONCAT(`firstname`, ' ', `lastname`) FROM cr_users WHERE `cr_users`.id = `cr_discussion`.`userID` ) AS `name`, 
 		(SELECT id FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC LIMIT 0,1) AS `postid`,
 		(SELECT DATE_FORMAT(date,'%W, %M %e @ %h:%i %p') FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC 
@@ -212,7 +212,7 @@ 
 </div>
 <?php
     } // End the admin loop
- ?>
+    ?>
 <div id="right">
 		<?php echo $subscribe;
 

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

Indentation +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 session_start();
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $helper = $fb->getRedirectLoginHelper();
 

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.