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);

api/v1/users.php

Doc Comments +16 added lines

@@ -43,6 +43,9 @@ 
     }
 }
 
+/**
+ * @param boolean $message
+ */
 function validateCanCreateUser($proposedUser, $auth, &$message)
 {
     $user = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$proposedUser->mail));
@@ -103,6 +106,9 @@ 
     return ($uid === 'me' || $uid === $app->user->uid);
 }
 
+/**
+ * @param string $uid
+ */
 function getUserByUIDReadOnly($app, $uid)
 {
     if(userIsMe($app, $uid))
@@ -185,6 +191,9 @@ 
     }
 }
 
+/**
+ * @param Exception $e
+ */
 function exceptionCodeToHttpCode($e)
 {
     if($e->getCode() === 3)
@@ -194,6 +203,9 @@ 
     return 500;
 }
 
+/**
+ * @param string $uid
+ */
 function getUser($app, $uid, $payload)
 {
     if(!$app->user)
@@ -323,6 +335,10 @@ 
     echo json_encode(array('success'=>true));
 }
 
+/**
+ * @param Data\Filter $filter
+ * @param boolean $pending
+ */
 function getAllUsersByFilter($filter, &$pending)
 {
     $auth = AuthProvider::getInstance();

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     {
         return false;
     }
-    $domain = substr($email, $pos+1);
+    $domain = substr($email, $pos + 1);
     if(checkdnsrr($domain, 'MX') === false)
     {
         return false;

test/UserTest.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     {
         return false;
     }
-    $domain = substr($email, $pos+1);
+    $domain = substr($email, $pos + 1);
     if(checkdnsrr($domain, 'MX') === false)
     {
         return false;

oauth2callback.php

Switch Indentation +39 added lines, -39 removed lines

@@ -24,18 +24,18 @@ 
 
 switch($src)
 {
-    case 'google':
-        $google = $auth->getMethodByName('Auth\GoogleAuthenticator');
-        if(!isset($_GET['code']))
-        {
-            $google->redirect();
-            die();
-        }
-        else
-        {
-            $res = $google->authenticate($_GET['code'], $current_user);
-            switch($res)
+        case 'google':
+            $google = $auth->getMethodByName('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->uid);
                     die();
-            }
+                }
         }
         break;
-    case 'twitter':
-        $twitter = $auth->getMethodByName('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->getMethodByName('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->uid);
                     die();
-            }
+                }
         }
         break;
-    case 'gitlab':
-        $gitlab = $auth->getMethodByName('Auth\OAuth2\GitLabAuthenticator');
-        if(!isset($_GET['code']))
-        {
-            $google->redirect();
-            die();
-        }
-        else
-        {
-            $res = $gitlab->authenticate($_GET['code'], $current_user);
-            switch($res)
+        case 'gitlab':
+            $gitlab = $auth->getMethodByName('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->uid);
                     die();
-            }
+                }
         }
     //Generic OAuth...
-    default:
-        print_r($_SERVER);
-        break;
+        default:
+            print_r($_SERVER);
+            break;
 }
 ?>

api/v1/index.php

Indentation +6 added lines, -6 removed lines

@@ -6,14 +6,14 @@ 
 
 // array holding allowed Origin domains
 $allowedOrigins = array(
-  $settings->getGlobalSetting('www_url', 'https://www.burningflipside.com/'),
-  $settings->getGlobalSetting('wiki_url', 'https://wiki.burningflipside.com/'),
-  $settings->getGlobalSetting('profiles_url', 'https://profiles.burningflipside.com/'),
-  $settings->getGlobalSetting('secure_url', 'https://secure.burningflipside.com/')
+    $settings->getGlobalSetting('www_url', 'https://www.burningflipside.com/'),
+    $settings->getGlobalSetting('wiki_url', 'https://wiki.burningflipside.com/'),
+    $settings->getGlobalSetting('profiles_url', 'https://profiles.burningflipside.com/'),
+    $settings->getGlobalSetting('secure_url', 'https://secure.burningflipside.com/')
 );
 
 if (isset($_SERVER['HTTP_ORIGIN']) && $_SERVER['HTTP_ORIGIN'] != '') {
-  foreach ($allowedOrigins as $allowedOrigin) {
+    foreach ($allowedOrigins as $allowedOrigin) {
     if (preg_match('#' . $allowedOrigin . '#', $_SERVER['HTTP_ORIGIN'])) {
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Methods: GET, PUT, POST, DELETE, OPTIONS');
@@ -21,7 +21,7 @@ 
         header('Access-Control-Allow-Headers: Authorization,Cookie,apikey');
         break;
     }
-  }
+    }
 }
 
 require_once('class.FlipREST.php');

Spacing +4 added lines, -4 removed lines

@@ -12,10 +12,10 @@
   $settings->getGlobalSetting('secure_url', 'https://secure.burningflipside.com/')
 );
 
-if (isset($_SERVER['HTTP_ORIGIN']) && $_SERVER['HTTP_ORIGIN'] != '') {
-  foreach ($allowedOrigins as $allowedOrigin) {
-    if (preg_match('#' . $allowedOrigin . '#', $_SERVER['HTTP_ORIGIN'])) {
-        header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
+if(isset($_SERVER['HTTP_ORIGIN']) && $_SERVER['HTTP_ORIGIN'] != '') {
+  foreach($allowedOrigins as $allowedOrigin) {
+    if(preg_match('#'.$allowedOrigin.'#', $_SERVER['HTTP_ORIGIN'])) {
+        header('Access-Control-Allow-Origin: '.$_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Methods: GET, PUT, POST, DELETE, OPTIONS');
         header('Access-Control-Allow-Credentials: true');
         header('Access-Control-Allow-Headers: Authorization,Cookie,apikey');

Braces +6 added lines, -3 removed lines

@@ -12,9 +12,12 @@
   $settings->getGlobalSetting('secure_url', 'https://secure.burningflipside.com/')
 );
 
-if (isset($_SERVER['HTTP_ORIGIN']) && $_SERVER['HTTP_ORIGIN'] != '') {
-  foreach ($allowedOrigins as $allowedOrigin) {
-    if (preg_match('#' . $allowedOrigin . '#', $_SERVER['HTTP_ORIGIN'])) {
+if (isset($_SERVER['HTTP_ORIGIN']) && $_SERVER['HTTP_ORIGIN'] != '')
+{
+  foreach ($allowedOrigins as $allowedOrigin)
+  {
+    if (preg_match('#' . $allowedOrigin . '#', $_SERVER['HTTP_ORIGIN']))
+    {
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Methods: GET, PUT, POST, DELETE, OPTIONS');
         header('Access-Control-Allow-Credentials: true');

lead/class.ProfilesLeadPage.php

Indentation +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@
 
     function add_links()
     {
-         $dirMenu = array(
-             'All' => 'directory.php',
-             'AAR' => 'directory.php?filter=aar',
-             'AFs' => 'directory.php?filter=af',
-             'CC'  => 'directory.php?filter=cc',
-             '360/24/7 Department' => 'directory.php?filter=360',
-             'Art' => 'directory.php?filter=Art',
-             'City Planning' => 'directory.php?filter=CityPlanning',
-             'Communications' => 'directory.php?filter=Comm',
-             'Genesis' => 'directory.php?filter=Genesis',
-             'Safety' => 'directory.php?filter=Safety',
-             'Site-Ops' => 'directory.php?filter=site-ops',
-             'Site Prep' => 'directory.php?filter=siteprep',
-             'Site Sign-Off' => 'directory.php?filter=sign-off',
-             'Volunteer Coordinator' => 'directory.php?filter=vc'
-         );
-         $this->addLink('<span class="fa fa-dashboard"></span> Dashboard', 'index.php');
-         $this->addLink('<span class="fa fa-th-list"></span> Directory', false, $dirMenu);
+            $dirMenu = array(
+                'All' => 'directory.php',
+                'AAR' => 'directory.php?filter=aar',
+                'AFs' => 'directory.php?filter=af',
+                'CC'  => 'directory.php?filter=cc',
+                '360/24/7 Department' => 'directory.php?filter=360',
+                'Art' => 'directory.php?filter=Art',
+                'City Planning' => 'directory.php?filter=CityPlanning',
+                'Communications' => 'directory.php?filter=Comm',
+                'Genesis' => 'directory.php?filter=Genesis',
+                'Safety' => 'directory.php?filter=Safety',
+                'Site-Ops' => 'directory.php?filter=site-ops',
+                'Site Prep' => 'directory.php?filter=siteprep',
+                'Site Sign-Off' => 'directory.php?filter=sign-off',
+                'Volunteer Coordinator' => 'directory.php?filter=vc'
+            );
+            $this->addLink('<span class="fa fa-dashboard"></span> Dashboard', 'index.php');
+            $this->addLink('<span class="fa fa-th-list"></span> Directory', false, $dirMenu);
     }
     
     public function isAdmin()