TechWilk / rota

public/old/install.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 } catch (\Exception $e) {
 }
 
-$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 $url = substr($url, 0, -12); // remove "/install.php" from url
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -48,7 +48,7 @@ 
         //exit;
         $conn->exec($sql);
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding tables to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding tables to database: ' . $e->getMessage();
         exit;
     }
 
@@ -58,7 +58,7 @@ 
     $lastname = $_POST['lastname'];
     $lastname = trim(strip_tags($lastname));
 
-    $username = strtolower($firstname).'.'.strtolower($lastname);
+    $username = strtolower($firstname) . '.' . strtolower($lastname);
 
     $password = $_POST['password'];
 
@@ -82,7 +82,7 @@ 
     try {
         $user->save();
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding user to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding user to database: ' . $e->getMessage();
         exit;
     }
 
@@ -179,7 +179,7 @@ 
 
     $settings->save();
 
-    header('Location: login.php?username='.$username); // Move to the home page of the admin section
+    header('Location: login.php?username=' . $username); // Move to the home page of the admin section
     exit;
 }
 

public/old/includes/errors.php

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 
 namespace TechWilk\Rota;
 
-ini_set('display_errors', false);    // set on for development, off for production
+ini_set('display_errors', false); // set on for development, off for production
 ini_set('log_errors', true);
 error_reporting(E_ALL);

public/old/email.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     case 'everyone':
       echo '<p>Function not complete, please wait while we finish writing it.</p><p>Apologies for any inconvinence.</p>';
         break;
-  default:
+    default:
     echo '<p>Error: Insufficient parameters.</p>';
     echo '<p>Please inform the system administrator</p>';
     break;

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:

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/old/logout.php

Indentation +7 added lines, -7 removed lines

@@ -5,18 +5,18 @@
 include 'includes/config.php';
 include 'includes/functions.php';
 
- // you have to open the session first
- session_start();
+    // you have to open the session first
+    session_start();
 
     //if ($debug) notifyInfo(__FILE__,"logout",$_SESSION['userid']);	//only_for_testing//
     if ($debug) {
         insertStatistics('user', __FILE__, 'logout');
     }
 
- //remove all the variables in the session
- session_unset();
+    //remove all the variables in the session
+    session_unset();
 
- // destroy the session
- session_destroy();
+    // destroy the session
+    session_destroy();
 
- header('Location: login.php');
+    header('Location: login.php');

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

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()
 {