Completed
Branch master (a049c8)
by Christopher
12:07
created
public/old/series.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 if ($method == 'remove') {
26 26
     removeSeries($seriesId);
27 27
     header('Location: series.php'); // Remove query string from URL
28
- exit;
28
+    exit;
29 29
 }
30 30
 
31 31
 // If the form has been submitted, then we need to handle the data.
@@ -142,10 +142,10 @@  discard block
 block discarded – undo
142 142
 	</form>
143 143
 </div><!-- /.box -->
144 144
   <?php
145
-  if (isAdmin()) {
146
-      ?>
145
+    if (isAdmin()) {
146
+        ?>
147 147
   <div id="right">
148 148
   		<div class="item"><a href="settings.php">Back to settings</a></div>
149 149
 <?php
150
-  } ?>
150
+    } ?>
151 151
 <?php include 'includes/footer.php'; ?>
Please login to merge, or discard this patch.
public/old/pendingAccounts.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,24 +30,24 @@
 block discarded – undo
30 30
     switch ($_POST['action']) {
31 31
     case 'approve':
32 32
       $userId = approvePendingUser($id);
33
-      mailNewUser($userId);
34
-      header('Location: addUser.php?action=edit&user='.$userId);
35
-      break;
33
+        mailNewUser($userId);
34
+        header('Location: addUser.php?action=edit&user='.$userId);
35
+        break;
36 36
     case 'merge':
37 37
       $existingUserId = $_POST['existingUser'];
38
-      $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
39
-      mergePendingUserWithUserId($id, $existingUserId);
40
-      mailNewUser($existingUserId);
41
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
42
-      break;
38
+        $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
39
+        mergePendingUserWithUserId($id, $existingUserId);
40
+        mailNewUser($existingUserId);
41
+        header('Location: addUser.php?action=edit&user='.$existingUserId);
42
+        break;
43 43
     case 'decline':
44 44
       declinePendingUser($id);
45
-      break;
45
+        break;
46 46
 
47 47
     default:
48 48
       // code...
49 49
       break;
50
-  }
50
+    }
51 51
 }
52 52
 
53 53
 if (empty($id)) {
Please login to merge, or discard this patch.
public/old/roles.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -191,10 +191,10 @@  discard block
 block discarded – undo
191 191
             $up = $group - 1;
192 192
             echo '<div><strong>'.$groupname.'</strong><br />';
193 193
         }
194
-      // Print text input box if a role exists for the group.
195
-      // Allows user to update role names and move roles between groups
196
-      if ($roleId) {
197
-          ?>
194
+        // Print text input box if a role exists for the group.
195
+        // Allows user to update role names and move roles between groups
196
+        if ($roleId) {
197
+            ?>
198 198
         <div class='input-group'>
199 199
     		  <input type="hidden" name="roleId[<?php echo $row['roleId'] ?>]" value="<?php echo $row['roleId'] ?>" />
200 200
           <input class='form-control' name='roleName[]' value="<?php echo $row['roleName'] ?>" maxlength="15" />
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
           </div>
210 210
         </div><!-- /.input-group -->
211 211
         <?php
212
-      } else {
213
-          echo "<p>No roles (<a href='roles.php?method=delete&group=$group'>Delete group</a>)</p>";
214
-      }
212
+        } else {
213
+            echo "<p>No roles (<a href='roles.php?method=delete&group=$group'>Delete group</a>)</p>";
214
+        }
215 215
     } ?>
216 216
     </div>
217 217
        </fieldset>
Please login to merge, or discard this patch.
public/old/fb-callback.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
 session_start();
16 16
 
17 17
 $fb = new Facebook\Facebook([
18
-  'app_id'                => $config['auth']['facebook']['appId'],
19
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
20
-  'default_graph_version' => 'v2.2',
21
-  ]);
18
+    'app_id'                => $config['auth']['facebook']['appId'],
19
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
20
+    'default_graph_version' => 'v2.2',
21
+    ]);
22 22
 
23 23
 $helper = $fb->getRedirectLoginHelper();
24 24
 
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
     $accessToken = $helper->getAccessToken();
27 27
 } catch (Facebook\Exceptions\FacebookResponseException $e) {
28 28
     // When Graph returns an error
29
-  echo 'Graph returned an error: '.$e->getMessage();
29
+    echo 'Graph returned an error: '.$e->getMessage();
30 30
     exit;
31 31
 } catch (Facebook\Exceptions\FacebookSDKException $e) {
32 32
     // When validation fails or other local issues
33
-  echo 'Facebook SDK returned an error: '.$e->getMessage();
33
+    echo 'Facebook SDK returned an error: '.$e->getMessage();
34 34
     exit;
35 35
 }
36 36
 
@@ -62,12 +62,12 @@  discard block
 block discarded – undo
62 62
 
63 63
 if (!$accessToken->isLongLived()) {
64 64
     // Exchanges a short-lived access token for a long-lived one
65
-  try {
66
-      $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
67
-  } catch (Facebook\Exceptions\FacebookSDKException $e) {
68
-      echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
69
-      exit;
70
-  }
65
+    try {
66
+        $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
67
+    } catch (Facebook\Exceptions\FacebookSDKException $e) {
68
+        echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
69
+        exit;
70
+    }
71 71
 }
72 72
 
73 73
 $_SESSION['fb_access_token'] = (string) $accessToken;
Please login to merge, or discard this patch.
public/old/discussion.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     }
71 71
 
72 72
     // After we have inserted the data, we want to head back to the main page
73
-     header('Location: discussion.php');
73
+        header('Location: discussion.php');
74 74
     exit;
75 75
 }
76 76
     include 'includes/header.php';
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
         } ?></h2>
149 149
 			<p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p>
150 150
 			 <?php 
151
-             $latestpostsql = "SELECT *, 
151
+                $latestpostsql = "SELECT *, 
152 152
 		(SELECT CONCAT(`firstname`, ' ', `lastname`) FROM cr_users WHERE `cr_users`.id = `cr_discussion`.`userID` ) AS `name`, 
153 153
 		(SELECT id FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC LIMIT 0,1) AS `postid`,
154 154
 		(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 @@  discard block
 block discarded – undo
212 212
 </div>
213 213
 <?php
214 214
     } // End the admin loop
215
- ?>
215
+    ?>
216 216
 <div id="right">
217 217
 		<?php echo $subscribe;
218 218
 
Please login to merge, or discard this patch.
public/old/includes/functions.discussion.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
         '#(http://(www.)?youtube.com)?/(v/|watch\?v\=)([-|~_0-9A-Za-z]+)&?.*?#i',
47 47
         '<iframe title="YouTube Video" width="560" height="340" src="http://www.youtube.com/embed/$4" frameborder="0" allowfullscreen></iframe>',
48 48
     $string
49
-  );
49
+    );
50 50
 
51 51
     return $string;
52 52
 }
Please login to merge, or discard this patch.
public/old/includes/functions.facebook.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
 function facebook()
17 17
 {
18 18
     $fb = new Facebook\Facebook([
19
-      'app_id'                => siteConfig()['auth']['facebook']['appId'],
20
-      'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
21
-      'default_graph_version' => 'v2.2',
22
-      ]);
19
+        'app_id'                => siteConfig()['auth']['facebook']['appId'],
20
+        'app_secret'            => siteConfig()['auth']['facebook']['appSecret'],
21
+        'default_graph_version' => 'v2.2',
22
+        ]);
23 23
 
24 24
     return $fb;
25 25
 }
@@ -59,17 +59,17 @@  discard block
 block discarded – undo
59 59
         }
60 60
         exit;
61 61
     }
62
-  // The OAuth 2.0 client handler helps us manage access tokens
63
-  $oAuth2Client = $fb->getOAuth2Client();
62
+    // The OAuth 2.0 client handler helps us manage access tokens
63
+    $oAuth2Client = $fb->getOAuth2Client();
64 64
 
65
-  // Get the access token metadata from /debug_token
66
-  $tokenMetadata = $oAuth2Client->debugToken($accessToken);
65
+    // Get the access token metadata from /debug_token
66
+    $tokenMetadata = $oAuth2Client->debugToken($accessToken);
67 67
 
68
-  // Validation (these will throw FacebookSDKException's when they fail)
69
-  $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
70
-  // If you know the user ID this access token belongs to, you can validate it here
71
-  //$tokenMetadata->validateUserId('123');
72
-  $tokenMetadata->validateExpiration();
68
+    // Validation (these will throw FacebookSDKException's when they fail)
69
+    $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
70
+    // If you know the user ID this access token belongs to, you can validate it here
71
+    //$tokenMetadata->validateUserId('123');
72
+    $tokenMetadata->validateExpiration();
73 73
 
74 74
     if (!$accessToken->isLongLived()) {
75 75
         // Exchanges a short-lived access token for a long-lived one
Please login to merge, or discard this patch.
public/old/includes/functions.notifications.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     7 => 'swap-pending',
16 16
     8 => 'swap-approved',
17 17
     9 => 'email',
18
-  ];
18
+    ];
19 19
 }
20 20
 
21 21
 function createNotificationForUser($userId, $summary, $body, $typeName, $link = null)
Please login to merge, or discard this patch.
public/old/editPassword.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -87,21 +87,21 @@
 block discarded – undo
87 87
 	<section class="content">
88 88
 
89 89
     <?php switch ($status) {
90
-      case 'success': ?>
90
+        case 'success': ?>
91 91
       <div class="alert alert-success alert-dismissable">
92 92
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
93 93
         <h4><i class="icon fa fa-info"></i> Password Changed</h4>
94 94
         <p>Your password has been successfully changed.</p>
95 95
       </div>
96 96
       <?php  break;
97
-      case 'new_passwords_not_match': ?>
97
+        case 'new_passwords_not_match': ?>
98 98
       <div class="alert alert-danger alert-dismissable">
99 99
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
100 100
         <h4><i class="icon fa fa-info"></i> Password not changed</h4>
101 101
         <p>New passwords don't match, please try again.</p>
102 102
       </div>
103 103
       <?php  break;
104
-      case 'old_password_incorrect': ?>
104
+        case 'old_password_incorrect': ?>
105 105
       <div class="alert alert-danger alert-dismissable">
106 106
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
107 107
         <h4><i class="icon fa fa-info"></i> Password not changed</h4>
Please login to merge, or discard this patch.