Completed
Push — master ( c28ce4...f8f581 )
by Christopher
14:59 queued 07:10
created
generated-conf/config.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -7,18 +7,18 @@  discard block
 block discarded – undo
7 7
 $serviceContainer->setAdapterClass('default', 'mysql');
8 8
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
9 9
 $manager->setConfiguration([
10
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
11
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
12
-  'user'       => $config['db']['user'],
13
-  'password'   => $config['db']['pass'],
14
-  'attributes' => [
10
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
11
+    'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
12
+    'user'       => $config['db']['user'],
13
+    'password'   => $config['db']['pass'],
14
+    'attributes' => [
15 15
     'ATTR_EMULATE_PREPARES' => false,
16 16
     'ATTR_TIMEOUT'          => 30,
17
-  ],
18
-  'model_paths' => [
17
+    ],
18
+    'model_paths' => [
19 19
     0 => 'src',
20 20
     1 => 'vendor',
21
-  ],
21
+    ],
22 22
 ]);
23 23
 $manager->setName('default');
24 24
 $serviceContainer->setConnectionManager('default', $manager);
@@ -26,16 +26,16 @@  discard block
 block discarded – undo
26 26
 $serviceContainer->setAdapterClass('test', 'sqlite');
27 27
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
28 28
 $manager->setConfiguration([
29
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
30
-  'dsn'        => 'sqlite:/var/tmp/test.db',
31
-  'attributes' => [
29
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
30
+    'dsn'        => 'sqlite:/var/tmp/test.db',
31
+    'attributes' => [
32 32
     'ATTR_EMULATE_PREPARES' => false,
33 33
     'ATTR_TIMEOUT'          => 30,
34
-  ],
35
-  'model_paths' => [
34
+    ],
35
+    'model_paths' => [
36 36
     0 => 'src',
37 37
     1 => 'vendor',
38
-  ],
38
+    ],
39 39
 ]);
40 40
 $manager->setName('test');
41 41
 $serviceContainer->setConnectionManager('test', $manager);
Please login to merge, or discard this patch.
api-classes/Person.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
         $currentTimestamp = $date = strftime('%F %T', time());
29 29
 
30 30
         $data = [
31
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
32
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
33
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
34
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
35
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
36
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
37
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
31
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
32
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
33
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
34
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
35
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
36
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
37
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
38 38
     ];
39 39
 
40 40
         if (isset($this->notes)) {
Please login to merge, or discard this patch.
api-classes/Type.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         }
21 21
 
22 22
         $data = [
23
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
23
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
25 25
     ];
26 26
 
27 27
         $db->insert($this->db_table, $data);
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
         $whereCondition = 'id = '.$id;
41 41
         $where = [
42
-      $whereCondition,
42
+        $whereCondition,
43 43
     ];
44 44
 
45 45
         if ($db->delete($this->db_table, $where)) {
@@ -59,14 +59,14 @@  discard block
 block discarded – undo
59 59
         }
60 60
 
61 61
         $columns = [
62
-      'id',
63
-      'name',
64
-      'description',
62
+        'id',
63
+        'name',
64
+        'description',
65 65
     ];
66 66
 
67 67
         $whereCondition = 'id = '.$id;
68 68
         $where = [
69
-      $whereCondition,
69
+        $whereCondition,
70 70
     ];
71 71
 
72 72
         $result = $db->selectSingle('Type', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
api-classes/SubType.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         }
21 21
 
22 22
         $data = [
23
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
23
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
25 25
     ];
26 26
 
27 27
         $db->insert($this->db_table, $data);
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
         $whereCondition = 'id = '.$id;
44 44
         $where = [
45
-      $whereCondition,
45
+        $whereCondition,
46 46
     ];
47 47
 
48 48
         if ($db->delete($this->db_table, $where)) {
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
         }
63 63
 
64 64
         $columns = [
65
-      'id',
66
-      'name',
67
-      'description',
65
+        'id',
66
+        'name',
67
+        'description',
68 68
     ];
69 69
 
70 70
         $whereCondition = 'id = '.$id;
71 71
         $where = [
72
-      $whereCondition,
72
+        $whereCondition,
73 73
     ];
74 74
 
75 75
         $result = $db->selectSingle('SubType', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
api-classes/Location.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         }
21 21
 
22 22
         $data = [
23
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
-      ['field' => 'address', 'type' => 'string', 'value' => $this->address],
23
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
24
+        ['field' => 'address', 'type' => 'string', 'value' => $this->address],
25 25
     ];
26 26
 
27 27
         $db->insert($this->db_table, $data);
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
         $whereCondition = 'id = '.$id;
41 41
         $where = [
42
-      $whereCondition,
42
+        $whereCondition,
43 43
     ];
44 44
 
45 45
         if ($db->delete($this->db_table, $where)) {
@@ -59,14 +59,14 @@  discard block
 block discarded – undo
59 59
         }
60 60
 
61 61
         $columns = [
62
-      'id',
63
-      'name',
64
-      'address',
62
+        'id',
63
+        'name',
64
+        'address',
65 65
     ];
66 66
 
67 67
         $whereCondition = 'id = '.$id;
68 68
         $where = [
69
-      $whereCondition,
69
+        $whereCondition,
70 70
     ];
71 71
 
72 72
         $result = $db->selectSingle('Location', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
api-classes/Series.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
         }
37 37
 
38 38
         $data = [
39
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
40
-      ['field' => 'description', 'type' => 'string', 'value' => $this->description],
39
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
40
+        ['field' => 'description', 'type' => 'string', 'value' => $this->description],
41 41
     ];
42 42
 
43 43
         $db->insert($this->db_table, $data);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         $whereCondition = 'id = '.$id;
57 57
         $where = [
58
-      $whereCondition,
58
+        $whereCondition,
59 59
     ];
60 60
 
61 61
         if ($db->delete($this->db_table, $where)) {
@@ -75,14 +75,14 @@  discard block
 block discarded – undo
75 75
         }
76 76
 
77 77
         $columns = [
78
-      'id',
79
-      'name',
80
-      'description',
78
+        'id',
79
+        'name',
80
+        'description',
81 81
     ];
82 82
 
83 83
         $whereCondition = 'id = '.$id;
84 84
         $where = [
85
-      $whereCondition,
85
+        $whereCondition,
86 86
     ];
87 87
 
88 88
         $result = $db->selectSingle('Series', $this->db_table, $columns, $where);
@@ -105,14 +105,14 @@  discard block
 block discarded – undo
105 105
         }
106 106
 
107 107
         $columns = [
108
-      'id',
109
-      'name',
110
-      'description',
108
+        'id',
109
+        'name',
110
+        'description',
111 111
     ];
112 112
 
113 113
         $whereCondition = 'name = '.$db->addQuotes($name);
114 114
         $where = [
115
-      $whereCondition,
115
+        $whereCondition,
116 116
     ];
117 117
 
118 118
         $result = $db->selectSingle('Series', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
public/old/linkSocialAuth.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,19 +41,19 @@
 block discarded – undo
41 41
       switch ($platform) {
42 42
         case 'facebook':
43 43
           $_SESSION['fb-callback-url'] = 'fb-link.php';
44
-          header('Location: fb-login.php');
45
-          exit;
46
-      }
47
-      break;
44
+            header('Location: fb-login.php');
45
+            exit;
46
+        }
47
+        break;
48 48
     case 'unlink':
49 49
       removeSocialAuthFromUserWithId($id, $platform);
50
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
-      break;
50
+        createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
+        break;
52 52
 
53 53
     default:
54 54
       // code...
55 55
       break;
56
-  }
56
+    }
57 57
 }
58 58
 
59 59
 // list of possible social account links (names used as platform names in database)
Please login to merge, or discard this patch.
public/old/includes/functions.facebook.php 1 patch
Indentation   +8 added lines, -8 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
 }
@@ -66,10 +66,10 @@  discard block
 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/series.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -142,10 +142,10 @@
 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.