TechWilk / rota

public/old/linkSocialAuth.php

Switch Indentation +11 added lines, -11 removed lines

@@ -37,22 +37,22 @@
     $platform = strtolower($_POST['platform']);
 
     switch ($_POST['action']) {
-    case 'link':
-      switch ($platform) {
+        case 'link':
+          switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
           header('Location: fb-login.php');
           exit;
-      }
-      break;
-    case 'unlink':
-      removeSocialAuthFromUserWithId($id, $platform);
-      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');
-      break;
-
-    default:
-      // code...
+          }
       break;
+        case 'unlink':
+          removeSocialAuthFromUserWithId($id, $platform);
+          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');
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
       break;
     case 'unlink':
       removeSocialAuthFromUserWithId($id, $platform);
-      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');
+      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');
       break;
 
     default:

Braces +5 added lines, -2 removed lines

@@ -106,14 +106,17 @@
       <input type="hidden" name="action" value="unlink" />
       <button class="btn btn-danger">Unlink</button>
     </form>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
       <input type="hidden" name="action" value="link" />
       <button class="btn btn-primary">Link</button>
     </form>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
   </div>
 </div>
 <?php endforeach; ?>

Indentation +7 added lines, -7 removed lines

@@ -41,19 +41,19 @@
       switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
-          header('Location: fb-login.php');
-          exit;
-      }
-      break;
+            header('Location: fb-login.php');
+            exit;
+        }
+        break;
     case 'unlink':
       removeSocialAuthFromUserWithId($id, $platform);
-      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');
-      break;
+        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');
+        break;
 
     default:
       // code...
       break;
-  }
+    }
 }
 
 // list of possible social account links (names used as platform names in database)

public/index.php

Spacing +7 added lines, -7 removed lines

@@ -6,31 +6,31 @@
     // To help the built-in PHP dev server, check if the request was actually for
     // something which should probably be served as a static file
     $url = parse_url($_SERVER['REQUEST_URI']);
-    $file = __DIR__.$url['path'];
+    $file = __DIR__ . $url['path'];
     if (is_file($file)) {
         return false;
     }
 }
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 // setup Propel (autoload configured though composer)
-require_once __DIR__.'/../generated-conf/config.php';
+require_once __DIR__ . '/../generated-conf/config.php';
 
 session_start();
 
 // Instantiate the app
-$settings = require __DIR__.'/../src/settings.php';
+$settings = require __DIR__ . '/../src/settings.php';
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__.'/../src/dependencies.php';
+require __DIR__ . '/../src/dependencies.php';
 
 // Register middleware
-require __DIR__.'/../src/middleware.php';
+require __DIR__ . '/../src/middleware.php';
 
 // Register routes
-require __DIR__.'/../src/routes.php';
+require __DIR__ . '/../src/routes.php';
 
 // Run app
 $app->run();

generated-migrations/PropelMigration_1494860053.php

Indentation +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function getUpSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;
@@ -172,7 +172,7 @@ 
     public function getDownSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;

generated-classes/TechWilk/Rota/Document.php

Spacing +3 added lines, -3 removed lines

@@ -22,16 +22,16 @@
         }
         //$acceptedFileExtensions = ['jpg', 'png', 'jpeg', 'gif', 'docx', 'pdf', 'xlsx', 'pptx'];
         $acceptedFileTypes = ['image/gif', 'image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/excel'];
-        $target_dir = __DIR__.'/../documents/';
+        $target_dir = __DIR__ . '/../documents/';
         $this->setUrl($file->getClientFilename());
         //$fileExtension = pathinfo(basename($file->getName()),PATHINFO_EXTENSION);
 
         // Allow certain file formats only
         if (!in_array($file->getClientMediaType(), $acceptedFileTypes)) {
-            throw new InvalidArgumentException('Sorry, only '.implode(', ', $acceptedFileTypes).' files are allowed.');
+            throw new InvalidArgumentException('Sorry, only ' . implode(', ', $acceptedFileTypes) . ' files are allowed.');
         }
         $this->save();
-        $target_file = $target_dir.$this->getId();
+        $target_file = $target_dir . $this->getId();
 
         // Check if file already exists
         if (file_exists($target_file)) {

generated-classes/TechWilk/Rota/Group.php

Indentation +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     {
         return EventQuery::create()
             ->useEventPersonQuery()
-              ->useUserRoleQuery()
+                ->useUserRoleQuery()
                 ->useRoleQuery()
-                  ->filterByGroup($this)
+                    ->filterByGroup($this)
+                ->endUse()
                 ->endUse()
-              ->endUse()
             ->endUse()
             ->orderByDate('desc')
             ->findOne();

generated-conf/config.php

Indentation +14 added lines, -14 removed lines

@@ -7,18 +7,18 @@ 
 $serviceContainer->setAdapterClass('default', 'mysql');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
-  'user'       => $config['db']['user'],
-  'password'   => $config['db']['pass'],
-  'attributes' => [
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+    'user'       => $config['db']['user'],
+    'password'   => $config['db']['pass'],
+    'attributes' => [
     'ATTR_EMULATE_PREPARES' => false,
     'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
+    ],
+    'model_paths' => [
     0 => 'src',
     1 => 'vendor',
-  ],
+    ],
 ]);
 $manager->setName('default');
 $serviceContainer->setConnectionManager('default', $manager);
@@ -26,16 +26,16 @@ 
 $serviceContainer->setAdapterClass('test', 'sqlite');
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
-  'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'sqlite:/var/tmp/test.db',
-  'attributes' => [
+    'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
+    'dsn'        => 'sqlite:/var/tmp/test.db',
+    'attributes' => [
     'ATTR_EMULATE_PREPARES' => false,
     'ATTR_TIMEOUT'          => 30,
-  ],
-  'model_paths' => [
+    ],
+    'model_paths' => [
     0 => 'src',
     1 => 'vendor',
-  ],
+    ],
 ]);
 $manager->setName('test');
 $serviceContainer->setConnectionManager('test', $manager);

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require __DIR__.'/../config/database.php';
+require __DIR__ . '/../config/database.php';
 $serviceContainer = \Propel\Runtime\Propel::getServiceContainer();
 $serviceContainer->checkVersion('2.0.0-dev');
 
@@ -8,7 +8,7 @@ 
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
   'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
-  'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+  'dsn'        => 'mysql:host=' . $config['db']['host'] . ';dbname=' . $config['db']['dbname'],
   'user'       => $config['db']['user'],
   'password'   => $config['db']['pass'],
   'attributes' => [

src/config.php

Spacing +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-require __DIR__.'/../config/database.php';
-require __DIR__.'/../config/auth.php';
-require __DIR__.'/../config/email.php';
-require __DIR__.'/../config/recording.php';
+require __DIR__ . '/../config/database.php';
+require __DIR__ . '/../config/auth.php';
+require __DIR__ . '/../config/email.php';
+require __DIR__ . '/../config/recording.php';
 
 function getConfig()
 {

src/settings.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__.'/config.php';
+require_once __DIR__ . '/config.php';
 
 $config = getConfig();
 
@@ -12,13 +12,13 @@ 
 
         // Renderer settings
         'renderer' => [
-            'template_path' => __DIR__.'/../templates/',
+            'template_path' => __DIR__ . '/../templates/',
         ],
 
         // Monolog settings
         'logger' => [
             'name'  => 'rota',
-            'path'  => __DIR__.'/../logs/app.log',
+            'path'  => __DIR__ . '/../logs/app.log',
             'level' => \Monolog\Logger::DEBUG,
         ],
 

src/classes/Site.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $hostname = $_SERVER['HTTP_HOST'];
 
         return [
-            'base'     => $http.'://'.$hostname,
+            'base'     => $http . '://' . $hostname,
             'protocol' => $http,
             'host'     => $hostname,
         ];