BurningFlipside / Profiles

api/v1/aws.php

Doc Comments +6 added lines

@@ -12,6 +12,9 @@ 
     $app->post('/test', 'testX');
 }
 
+/**
+ * @param string $function
+ */
 function sendToBackend($function, $payload)
 {
     $context = new ZMQContext();
@@ -72,6 +75,9 @@ 
     }
 }
 
+/**
+ * @param string $test
+ */
 function endswith($string, $test)
 {
     $strlen = strlen($string);

Spacing +10 added lines, -10 removed lines

@@ -38,28 +38,28 @@ 
     global $app;
     $array = $app->getJSONBody(true);
 
-    try{
+    try {
         $message = Message::fromArray($array);
 
         // Validate the message
         $validator = new MessageValidator();
         $validator->validate($message);
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
         $app->notFound();
     }
 
     $type = $message->get('Type');
-    switch($type)
+    switch ($type)
     {
         case 'SubscriptionConfirmation':
             (new Client)->get($message->get('SubscribeURL'))->send();
             break;
         case 'Notification':
             $arn = $message->get('TopicArn');
-            if($arn !== false)
+            if ($arn !== false)
             {
                 $pos = strpos($arn, 'Listserv');
-                if($pos !== false)
+                if ($pos !== false)
                 {
                     sendToBackend('processListServMessage', $message->get('Message'));
                     echo 'true';
@@ -82,7 +82,7 @@ 
 
 function getDestinationsForID($id)
 {
-    if(strcasecmp($id,'pboyd') === 0)
+    if (strcasecmp($id, 'pboyd') === 0)
     {
         return array('pboyd04@gmail.com');
     }
@@ -96,16 +96,16 @@ 
 {
     $ret = array();
     $count = count($originals);
-    for($i = 0; $i < $count; $i++)
+    for ($i = 0; $i < $count; $i++)
     {
         $dest = $originals[$i];
-        if(endswith($dest, 'burningflipside.com'))
+        if (endswith($dest, 'burningflipside.com'))
         {
             $parts = explode('@', $dest);
-            if(count($parts) === 2)
+            if (count($parts) === 2)
             {
                 $dests = getDestinationsForID($parts[0]);
-                if($dests === false)
+                if ($dests === false)
                 {
                     file_put_contents('/var/www/profiles/tmp/log.log', "getActualDestinations: Invalid destination id $parts[0]\n", FILE_APPEND);
                 }

Braces +6 added lines, -7 removed lines

@@ -76,7 +76,9 @@ 
 {
     $strlen = strlen($string);
     $testlen = strlen($test);
-    if ($testlen > $strlen) return false;
+    if ($testlen > $strlen) {
+        return false;
+    }
     return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0;
 }
 
@@ -85,8 +87,7 @@ 
     if(strcasecmp($id,'pboyd') === 0)
     {
         return array('pboyd04@gmail.com');
-    }
-    else
+    } else
     {
         return false;
     }
@@ -108,13 +109,11 @@ 
                 if($dests === false)
                 {
                     file_put_contents('/var/www/profiles/tmp/log.log', "getActualDestinations: Invalid destination id $parts[0]\n", FILE_APPEND);
-                }
-                else
+                } else
                 {
                     $ret = array_merge($ret, $dests);
                 }
-            }
-            else
+            } else
             {
                 file_put_contents('/var/www/profiles/tmp/log.log', "getActualDestinations: Invalid destination format $dest\n", FILE_APPEND);
             }

register.php

Spacing +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@ 
 ini_set('display_errors', 1);
 error_reporting(E_ALL);
 //Redirect users to https
-if($_SERVER["HTTPS"] != "on")
+if ($_SERVER["HTTPS"] != "on")
 {
-    header("Location: https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
+    header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
     exit();
 }
 require_once('class.FlipsideCAPTCHA.php');
@@ -16,7 +16,7 @@ 
 $captcha = new FlipsideCAPTCHA();
 FlipSession::setVar('captcha', $captcha);
 
-if(isset($_GET['return']))
+if (isset($_GET['return']))
 {
     $return = '<input type="hidden" name="return" value="'.$_GET['return'].'"/>';
 }
@@ -25,7 +25,7 @@ 
     $return = '';
 }
 
-if(FlipSession::isLoggedIn())
+if (FlipSession::isLoggedIn())
 {
     $page->add_notification('You are currently logged in to the system. Are you sure you want to register another account?');
 }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 if(isset($_GET['return']))
 {
     $return = '<input type="hidden" name="return" value="'.$_GET['return'].'"/>';
-}
-else
+} else
 {
     $return = '';
 }

user_exists.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 $provider = $auth->getSuplementalProviderByHost($_GET['src']);
 if($provider !== false)
 {
-   $user = $provider->getUserFromToken(false);
-   $email = $user->getEmail();
+    $user = $provider->getUserFromToken(false);
+    $email = $user->getEmail();
 }
 
 $page->body .= '

Spacing +2 added lines, -2 removed lines

@@ -7,12 +7,12 @@
 
 $auth = AuthProvider::getInstance();
 $email = false;
-if(!isset($_GET['src']))
+if (!isset($_GET['src']))
 {
     die('Error loading page. Authentication source (src) must be specified');
 }
 $provider = $auth->getSuplementalProviderByHost($_GET['src']);
-if($provider !== false)
+if ($provider !== false)
 {
    $user = $provider->getUserFromToken(false);
    $email = $user->getEmail();

index.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
     <p>This system will contain all your private data seperately so as to help prevent unwanted display of your data on www.burningflipside.com.
        Additionally, completing your profile on this site will enable you to complete ticket requests and sign up for volunteer shifts even faster than before.</p>';
 
-if($page->user !== null)
+if ($page->user !== null)
 {
-    if(!$page->user->isProfileComplete())
+    if (!$page->user->isProfileComplete())
     {
         $page->add_notification('Your profile is not yet complete. Click <a href="/profile.php" class="alert-link">here</a> to complete your profile.', $page::NOTIFICATION_WARNING);
     }

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     $page->body .= '<h1>Need to reset your password?</h1>
     <p>You can reset your password <a href="reset.php">here.</a></p>
 </div>';
-}
-else
+} else
 {
     $page->body .= '
     <h1>Need to register for the first time?</h1>

change.php

Spacing +8 added lines, -8 removed lines

@@ -2,9 +2,9 @@ 
 ini_set('display_errors', 1);
 error_reporting(E_ALL);
 //Redirect users to https
-if($_SERVER["HTTPS"] != "on")
+if ($_SERVER["HTTPS"] != "on")
 {
-    header("Location: https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
+    header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
     exit();
 }
 require_once('class.ProfilesPage.php');
@@ -12,19 +12,19 @@ 
 $auth = AuthProvider::getInstance();
 $require_current_pass = true;
 $user = $page->user;
-if($user === false || $user === null)
+if ($user === false || $user === null)
 {
     //We might be reseting a user's forgotten password...
-    if(isset($_GET['hash']))
+    if (isset($_GET['hash']))
     {
         $user = $auth->getUserByResetHash($_GET['hash']);
         $require_current_pass = false;
     }
 }
 
-if($user === false || $user === null)
+if ($user === false || $user === null)
 {
-    if(isset($_GET['hash']))
+    if (isset($_GET['hash']))
     {
         $page->add_notification('This reset hash is no longer valid. Please select the neweset reset link in your email', FlipPage::NOTIFICATION_FAILED);
     }
@@ -37,8 +37,8 @@ 
 {
     $page->add_js_from_src('js/zxcvbn-async.js');
     $page->add_js_from_src('js/change.js');
-    $current ='';
-    if($require_current_pass)
+    $current = '';
+    if ($require_current_pass)
     {
         $current = '<div class="form-group"><input class="form-control" type="password" id="current" name="current" placeholder="Current Password" required autofocus/></div>';
     }

Braces +3 added lines, -6 removed lines

@@ -27,13 +27,11 @@ 
     if(isset($_GET['hash']))
     {
         $page->add_notification('This reset hash is no longer valid. Please select the neweset reset link in your email', FlipPage::NOTIFICATION_FAILED);
-    }
-    else
+    } else
     {
         $page->add_notification('Please Log in first!', FlipPage::NOTIFICATION_FAILED);
     }
-}
-else
+} else
 {
     $page->add_js_from_src('js/zxcvbn-async.js');
     $page->add_js_from_src('js/change.js');
@@ -41,8 +39,7 @@ 
     if($require_current_pass)
     {
         $current = '<div class="form-group"><input class="form-control" type="password" id="current" name="current" placeholder="Current Password" required autofocus/></div>';
-    }
-    else
+    } else
     {
         $current = '<input type="hidden" id="hash" name="hash" value="'.$_GET['hash'].'"/>';
     }

reset.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 $page->add_js(JS_BOOTBOX);
 $page->add_js_from_src('js/reset.js');
 
-if($page->user !== false && $page->user !== null)
+if ($page->user !== false && $page->user !== null)
 {
     //User is logged in. They can reset their password...
     $page->body = '

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
             <button name="submit" class="btn btn-primary" onclick="change_password();">Change Password</button>
         </div>
     ';
-}
-else
+} else
 {
     $page->body = '
         <div id="content">

oauth/index.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 require_once('class.FlipREST.php');
 require_once('class.AuthProvider.php');
 
-if($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
+if ($_SERVER['REQUEST_URI'][0] == '/' && $_SERVER['REQUEST_URI'][1] == '/')
 {
     $_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 1);
 }
@@ -29,13 +29,13 @@ 
     global $app;
     $auth = AuthProvider::getInstance();
     $provider = $auth->getSuplementalProviderByHost($host);
-    if($provider === false)
+    if ($provider === false)
     {
         $app->notFound();
         return; 
     }
     $res = $provider->authenticate($app->request->get(), $currentUser);
-    switch($res)
+    switch ($res)
     {
         case \Auth\Authenticator::SUCCESS:
             $app->redirect('/');

oauth2callback.php

Switch Indentation +39 added lines, -39 removed lines

@@ -24,18 +24,18 @@ 
 
 switch($src)
 {
-    case 'google':
-        $google = $auth->getAuthenticator('Auth\GoogleAuthenticator');
-        if(!isset($_GET['code']))
-        {
-            $google->redirect();
-            die();
-        }
-        else
-        {
-            $res = $google->authenticate($_GET['code'], $current_user);
-            switch($res)
+        case 'google':
+            $google = $auth->getAuthenticator('Auth\GoogleAuthenticator');
+            if(!isset($_GET['code']))
+            {
+                $google->redirect();
+                die();
+            }
+            else
             {
+                $res = $google->authenticate($_GET['code'], $current_user);
+                switch($res)
+                {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);
                     die();
@@ -46,21 +46,21 @@ 
                 case \Auth\Authenticator::ALREADY_PRESENT:
                     header('Location: user_exists.php?src=google&uid='.$current_user->getUid());
                     die();
-            }
+                }
         }
         break;
-    case 'twitter':
-        $twitter = $auth->getAuthenticator('Auth\TwitterAuthenticator');
-        if(!isset($_GET['oauth_token']) || !isset($_GET['oauth_verifier']))
-        {
-            $twitter->redirect();
-            die();
-        }
-        else
-        {
-            $twitter->authenticate($_GET['oauth_token'], $_GET['oauth_verifier'], $current_user);
-            switch($res)
+        case 'twitter':
+            $twitter = $auth->getAuthenticator('Auth\TwitterAuthenticator');
+            if(!isset($_GET['oauth_token']) || !isset($_GET['oauth_verifier']))
+            {
+                $twitter->redirect();
+                die();
+            }
+            else
             {
+                $twitter->authenticate($_GET['oauth_token'], $_GET['oauth_verifier'], $current_user);
+                switch($res)
+                {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);
                     die();
@@ -71,21 +71,21 @@ 
                 case \Auth\Authenticator::ALREADY_PRESENT:
                     header('Location: user_exists.php?src=twitter&uid='.$current_user->getUid());
                     die();
-            }
+                }
         }
         break;
-    case 'gitlab':
-        $gitlab = $auth->getAuthenticator('Auth\OAuth2\GitLabAuthenticator');
-        if(!isset($_GET['code']))
-        {
-            $google->redirect();
-            die();
-        }
-        else
-        {
-            $res = $gitlab->authenticate($_GET['code'], $current_user);
-            switch($res)
+        case 'gitlab':
+            $gitlab = $auth->getAuthenticator('Auth\OAuth2\GitLabAuthenticator');
+            if(!isset($_GET['code']))
+            {
+                $google->redirect();
+                die();
+            }
+            else
             {
+                $res = $gitlab->authenticate($_GET['code'], $current_user);
+                switch($res)
+                {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);
                     die();
@@ -96,11 +96,11 @@ 
                 case \Auth\Authenticator::ALREADY_PRESENT:
                     header('Location: user_exists.php?src=gitlab&uid='.$current_user->getUid());
                     die();
-            }
+                }
         }
     //Generic OAuth...
-    default:
-        print_r($_SERVER);
-        break;
+        default:
+            print_r($_SERVER);
+            break;
 }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -3,30 +3,30 @@ 
 
 $auth = AuthProvider::getInstance();
 $src  = false;
-if(isset($_GET['src']))
+if (isset($_GET['src']))
 {
     $src = $_GET['src'];
 }
-else if(strstr($_SERVER['HTTP_REFERER'], 'google.com') !== false)
+else if (strstr($_SERVER['HTTP_REFERER'], 'google.com') !== false)
 {
     $src = 'google';
 }
-else if(strstr($_SERVER['HTTP_REFERER'], 'gitlab.com') !== false)
+else if (strstr($_SERVER['HTTP_REFERER'], 'gitlab.com') !== false)
 {
     $src = 'gitlab';
 }
 
 $ref = '.';
-if(isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'google.com') === false)
+if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'google.com') === false)
 {
     $ref = $_SERVER['HTTP_REFERER'];
 }
 
-switch($src)
+switch ($src)
 {
     case 'google':
         $google = $auth->getAuthenticator('Auth\GoogleAuthenticator');
-        if(!isset($_GET['code']))
+        if (!isset($_GET['code']))
         {
             $google->redirect();
             die();
@@ -34,7 +34,7 @@ 
         else
         {
             $res = $google->authenticate($_GET['code'], $current_user);
-            switch($res)
+            switch ($res)
             {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);
@@ -51,7 +51,7 @@ 
         break;
     case 'twitter':
         $twitter = $auth->getAuthenticator('Auth\TwitterAuthenticator');
-        if(!isset($_GET['oauth_token']) || !isset($_GET['oauth_verifier']))
+        if (!isset($_GET['oauth_token']) || !isset($_GET['oauth_verifier']))
         {
             $twitter->redirect();
             die();
@@ -59,7 +59,7 @@ 
         else
         {
             $twitter->authenticate($_GET['oauth_token'], $_GET['oauth_verifier'], $current_user);
-            switch($res)
+            switch ($res)
             {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);
@@ -76,7 +76,7 @@ 
         break;
     case 'gitlab':
         $gitlab = $auth->getAuthenticator('Auth\OAuth2\GitLabAuthenticator');
-        if(!isset($_GET['code']))
+        if (!isset($_GET['code']))
         {
             $google->redirect();
             die();
@@ -84,7 +84,7 @@ 
         else
         {
             $res = $gitlab->authenticate($_GET['code'], $current_user);
-            switch($res)
+            switch ($res)
             {
                 case \Auth\Authenticator::SUCCESS:
                     header('Location: '.$ref);

Braces +5 added lines, -10 removed lines

@@ -6,12 +6,10 @@ 
 if(isset($_GET['src']))
 {
     $src = $_GET['src'];
-}
-else if(strstr($_SERVER['HTTP_REFERER'], 'google.com') !== false)
+} else if(strstr($_SERVER['HTTP_REFERER'], 'google.com') !== false)
 {
     $src = 'google';
-}
-else if(strstr($_SERVER['HTTP_REFERER'], 'gitlab.com') !== false)
+} else if(strstr($_SERVER['HTTP_REFERER'], 'gitlab.com') !== false)
 {
     $src = 'gitlab';
 }
@@ -30,8 +28,7 @@ 
         {
             $google->redirect();
             die();
-        }
-        else
+        } else
         {
             $res = $google->authenticate($_GET['code'], $current_user);
             switch($res)
@@ -55,8 +52,7 @@ 
         {
             $twitter->redirect();
             die();
-        }
-        else
+        } else
         {
             $twitter->authenticate($_GET['oauth_token'], $_GET['oauth_verifier'], $current_user);
             switch($res)
@@ -80,8 +76,7 @@ 
         {
             $google->redirect();
             die();
-        }
-        else
+        } else
         {
             $res = $gitlab->authenticate($_GET['code'], $current_user);
             switch($res)

login.php

Spacing +7 added lines, -7 removed lines

@@ -2,16 +2,16 @@ 
 ini_set('display_errors', 1);
 error_reporting(E_ALL);
 //Redirect users to https
-if($_SERVER["HTTPS"] != "on")
+if ($_SERVER["HTTPS"] != "on")
 {
-    header("Location: https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
+    header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]);
     exit();
 }
 require_once('class.ProfilesPage.php');
 $page = new ProfilesPage('Burning Flipside Profiles Login');
-if($page->user !== false && $page->user !== null)
+if ($page->user !== false && $page->user !== null)
 {
-    if(isset($_GET['return']))
+    if (isset($_GET['return']))
     {
         header('Location: '.$_GET['return']);
     }
@@ -21,7 +21,7 @@ 
     }
 }
 
-if(isset($_GET['return']))
+if (isset($_GET['return']))
 {
     $return = '<input type="hidden" name="return" value="'.$_GET['return'].'"/>';
 }
@@ -29,7 +29,7 @@ 
 {
     $return = '';
 }
-if(isset($_GET['failed']))
+if (isset($_GET['failed']))
 {
     $page->add_notification('Login Failed! <a href="/reset.php" class="alert-link">Click here to reset your password.</a>', $page::NOTIFICATION_FAILED);
 }
@@ -38,7 +38,7 @@ 
 $auth_links = $auth->getSupplementaryLinks();
 $auth_links_str = '';
 $count = count($auth_links);
-for($i = 0; $i < $count; $i++)
+for ($i = 0; $i < $count; $i++)
 {
     $auth_links_str .= $auth_links[$i];
 }

Braces +2 added lines, -4 removed lines

@@ -14,8 +14,7 @@ 
     if(isset($_GET['return']))
     {
         header('Location: '.$_GET['return']);
-    }
-    else
+    } else
     {
         header('Location: /index.php');
     }
@@ -24,8 +23,7 @@ 
 if(isset($_GET['return']))
 {
     $return = '<input type="hidden" name="return" value="'.$_GET['return'].'"/>';
-}
-else
+} else
 {
     $return = '';
 }