Completed
Pull Request — master (#218)
by Christopher
67:05 queued 62:34
created
public/old/settings.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -342,17 +342,17 @@
 block discarded – undo
342 342
 					<label for="skin">Application skin:</label>
343 343
 					<select name="skin" id="skin" class="form-control">
344 344
 						<?php $skinOptions = ['skin-blue-light'                                           => 'Blue &amp; Light',
345
-						    'skin-blue'                                                                   => 'Blue &amp; Dark',
346
-						    'skin-yellow-light'                                                           => 'Yellow &amp; Light',
347
-						    'skin-yellow'                                                                 => 'Yellow &amp; Dark',
348
-						    'skin-green-light'                                                            => 'Green &amp; Light',
349
-						    'skin-green'                                                                  => 'Green &amp; Dark',
350
-						    'skin-purple-light'                                                           => 'Purple &amp; Light',
351
-						    'skin-purple'                                                                 => 'Purple &amp; Dark',
352
-						    'skin-red-light'                                                              => 'Red &amp; Light',
353
-						    'skin-red'                                                                    => 'Red &amp; Dark',
354
-						    'skin-black-light'                                                            => 'Black &amp; Light',
355
-						    'skin-black'                                                                  => 'Black &amp; Dark', ];
345
+                            'skin-blue'                                                                   => 'Blue &amp; Dark',
346
+                            'skin-yellow-light'                                                           => 'Yellow &amp; Light',
347
+                            'skin-yellow'                                                                 => 'Yellow &amp; Dark',
348
+                            'skin-green-light'                                                            => 'Green &amp; Light',
349
+                            'skin-green'                                                                  => 'Green &amp; Dark',
350
+                            'skin-purple-light'                                                           => 'Purple &amp; Light',
351
+                            'skin-purple'                                                                 => 'Purple &amp; Dark',
352
+                            'skin-red-light'                                                              => 'Red &amp; Light',
353
+                            'skin-red'                                                                    => 'Red &amp; Dark',
354
+                            'skin-black-light'                                                            => 'Black &amp; Light',
355
+                            'skin-black'                                                                  => 'Black &amp; Dark', ];
356 356
 
357 357
     foreach ($skinOptions as $skinName => $skinDescription) { ?>
358 358
 						<option value="<?php echo $skinName ?>" <?php echo ($skinName == $row['skin']) ? 'selected' : '' ?>><?php echo $skinDescription ?></option>
Please login to merge, or discard this patch.
public/old/includes/functions.facebook.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,10 +66,10 @@
 block discarded – undo
66 66
     $tokenMetadata = $oAuth2Client->debugToken($accessToken);
67 67
 
68 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();
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/statistics.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -141,12 +141,12 @@
 block discarded – undo
141 141
     		<tbody>
142 142
     		<?php
143 143
                 $sql = "SELECT s.date,s.detail1,s.detail2,s.detail3,s.type,trim(concat(u.firstName,' ',u.lastName)) AS name FROM statistics s INNER JOIN users u ON u.id = s.userid";
144
-          if (!isAdmin()) {
145
-              $sql .= 'WHERE u.ID=s.userID';
146
-              if (!$debug) {
147
-                  $sql .= " AND s.type = 'system'";
148
-              }
149
-          }
144
+            if (!isAdmin()) {
145
+                $sql .= 'WHERE u.ID=s.userID';
146
+                if (!$debug) {
147
+                    $sql .= " AND s.type = 'system'";
148
+                }
149
+            }
150 150
                 $sql .= ' ORDER BY date desc '.$limit;
151 151
                 $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
152 152
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
Please login to merge, or discard this patch.