@@ -6,31 +6,31 @@ |
||
| 6 | 6 | // To help the built-in PHP dev server, check if the request was actually for |
| 7 | 7 | // something which should probably be served as a static file |
| 8 | 8 | $url = parse_url($_SERVER['REQUEST_URI']); |
| 9 | - $file = __DIR__.$url['path']; |
|
| 9 | + $file = __DIR__ . $url['path']; |
|
| 10 | 10 | if (is_file($file)) { |
| 11 | 11 | return false; |
| 12 | 12 | } |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | -require __DIR__.'/../vendor/autoload.php'; |
|
| 15 | +require __DIR__ . '/../vendor/autoload.php'; |
|
| 16 | 16 | |
| 17 | 17 | // setup Propel (autoload configured though composer) |
| 18 | -require_once __DIR__.'/../generated-conf/config.php'; |
|
| 18 | +require_once __DIR__ . '/../generated-conf/config.php'; |
|
| 19 | 19 | |
| 20 | 20 | session_start(); |
| 21 | 21 | |
| 22 | 22 | // Instantiate the app |
| 23 | -$settings = require __DIR__.'/../src/settings.php'; |
|
| 23 | +$settings = require __DIR__ . '/../src/settings.php'; |
|
| 24 | 24 | $app = new \Slim\App($settings); |
| 25 | 25 | |
| 26 | 26 | // Set up dependencies |
| 27 | -require __DIR__.'/../src/dependencies.php'; |
|
| 27 | +require __DIR__ . '/../src/dependencies.php'; |
|
| 28 | 28 | |
| 29 | 29 | // Register middleware |
| 30 | -require __DIR__.'/../src/middleware.php'; |
|
| 30 | +require __DIR__ . '/../src/middleware.php'; |
|
| 31 | 31 | |
| 32 | 32 | // Register routes |
| 33 | -require __DIR__.'/../src/routes.php'; |
|
| 33 | +require __DIR__ . '/../src/routes.php'; |
|
| 34 | 34 | |
| 35 | 35 | // Run app |
| 36 | 36 | $app->run(); |
@@ -22,16 +22,16 @@ |
||
| 22 | 22 | } |
| 23 | 23 | //$acceptedFileExtensions = ['jpg', 'png', 'jpeg', 'gif', 'docx', 'pdf', 'xlsx', 'pptx']; |
| 24 | 24 | $acceptedFileTypes = ['image/gif', 'image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/excel']; |
| 25 | - $target_dir = __DIR__.'/../documents/'; |
|
| 25 | + $target_dir = __DIR__ . '/../documents/'; |
|
| 26 | 26 | $this->setUrl($file->getClientFilename()); |
| 27 | 27 | //$fileExtension = pathinfo(basename($file->getName()),PATHINFO_EXTENSION); |
| 28 | 28 | |
| 29 | 29 | // Allow certain file formats only |
| 30 | 30 | if (!in_array($file->getClientMediaType(), $acceptedFileTypes)) { |
| 31 | - throw new InvalidArgumentException('Sorry, only '.implode(', ', $acceptedFileTypes).' files are allowed.'); |
|
| 31 | + throw new InvalidArgumentException('Sorry, only ' . implode(', ', $acceptedFileTypes) . ' files are allowed.'); |
|
| 32 | 32 | } |
| 33 | 33 | $this->save(); |
| 34 | - $target_file = $target_dir.$this->getId(); |
|
| 34 | + $target_file = $target_dir . $this->getId(); |
|
| 35 | 35 | |
| 36 | 36 | // Check if file already exists |
| 37 | 37 | if (file_exists($target_file)) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function getName() |
| 79 | 79 | { |
| 80 | - return $this->firstname.' '.$this->lastname; |
|
| 80 | + return $this->firstname . ' ' . $this->lastname; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
@@ -96,16 +96,16 @@ discard block |
||
| 96 | 96 | if ($socialAuth->getPlatform() == 'facebook') { |
| 97 | 97 | switch ($size) { |
| 98 | 98 | case 'small': // 50px x 50px |
| 99 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square'; |
|
| 99 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square'; |
|
| 100 | 100 | break; |
| 101 | 101 | case 'medium': // 200px x 200px |
| 102 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
| 102 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
| 103 | 103 | break; |
| 104 | 104 | case 'large': // 200px x 200px |
| 105 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
| 105 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
| 106 | 106 | break; |
| 107 | 107 | default: |
| 108 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture'; |
|
| 108 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture'; |
|
| 109 | 109 | break; |
| 110 | 110 | } |
| 111 | 111 | } elseif ($socialAuth->getPlatform() == 'onebody') { |
@@ -114,16 +114,16 @@ discard block |
||
| 114 | 114 | $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION); |
| 115 | 115 | switch ($size) { |
| 116 | 116 | case 'small': // 50px x 50px |
| 117 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
| 117 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
| 118 | 118 | break; |
| 119 | 119 | case 'medium': // 150px x 150px |
| 120 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension; |
|
| 120 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension; |
|
| 121 | 121 | break; |
| 122 | 122 | case 'large': // 500px x 500px |
| 123 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension; |
|
| 123 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension; |
|
| 124 | 124 | break; |
| 125 | 125 | default: |
| 126 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
| 126 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
| 127 | 127 | break; |
| 128 | 128 | } |
| 129 | 129 | } |
@@ -132,16 +132,16 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | switch ($size) { |
| 134 | 134 | case 'small': // 50px x 50px |
| 135 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
| 135 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
| 136 | 136 | break; |
| 137 | 137 | case 'medium': // 200px x 200px |
| 138 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm'; |
|
| 138 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm'; |
|
| 139 | 139 | break; |
| 140 | 140 | case 'large': // 500px x 500px |
| 141 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm'; |
|
| 141 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm'; |
|
| 142 | 142 | break; |
| 143 | 143 | default: |
| 144 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
| 144 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
| 145 | 145 | break; |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require __DIR__.'/../config/database.php'; |
|
| 4 | -require __DIR__.'/../config/auth.php'; |
|
| 5 | -require __DIR__.'/../config/email.php'; |
|
| 6 | -require __DIR__.'/../config/recording.php'; |
|
| 3 | +require __DIR__ . '/../config/database.php'; |
|
| 4 | +require __DIR__ . '/../config/auth.php'; |
|
| 5 | +require __DIR__ . '/../config/email.php'; |
|
| 6 | +require __DIR__ . '/../config/recording.php'; |
|
| 7 | 7 | |
| 8 | 8 | function getConfig() |
| 9 | 9 | { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once __DIR__.'/config.php'; |
|
| 3 | +require_once __DIR__ . '/config.php'; |
|
| 4 | 4 | |
| 5 | 5 | $config = getConfig(); |
| 6 | 6 | |
@@ -12,13 +12,13 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | // Renderer settings |
| 14 | 14 | 'renderer' => [ |
| 15 | - 'template_path' => __DIR__.'/../templates/', |
|
| 15 | + 'template_path' => __DIR__ . '/../templates/', |
|
| 16 | 16 | ], |
| 17 | 17 | |
| 18 | 18 | // Monolog settings |
| 19 | 19 | 'logger' => [ |
| 20 | 20 | 'name' => 'rota', |
| 21 | - 'path' => __DIR__.'/../logs/app.log', |
|
| 21 | + 'path' => __DIR__ . '/../logs/app.log', |
|
| 22 | 22 | 'level' => \Monolog\Logger::DEBUG, |
| 23 | 23 | ], |
| 24 | 24 | |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $hostname = $_SERVER['HTTP_HOST']; |
| 40 | 40 | |
| 41 | 41 | return [ |
| 42 | - 'base' => $http.'://'.$hostname, |
|
| 42 | + 'base' => $http . '://' . $hostname, |
|
| 43 | 43 | 'protocol' => $http, |
| 44 | 44 | 'host' => $hostname, |
| 45 | 45 | ]; |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $base_uri = $this->guzzle->getConfig()['base_uri']; |
| 72 | 72 | |
| 73 | 73 | if (strlen($base_uri) > 0) { |
| 74 | - $url = $base_uri.'/account/new?forgot=true'; |
|
| 74 | + $url = $base_uri . '/account/new?forgot=true'; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | return $url; |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | public static function generateInt($min, $max) |
| 33 | 33 | { |
| 34 | 34 | if ($min >= $max) { |
| 35 | - throw new InvalidArgumentException('Invalid constraints - minimum ('.$min.') is above the maximum ('.$max.')'); |
|
| 35 | + throw new InvalidArgumentException('Invalid constraints - minimum (' . $min . ') is above the maximum (' . $max . ')'); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if (function_exists('random_int')) { // use secure random numbers when available |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | public function getAvailabilityForm(ServerRequestInterface $request, ResponseInterface $response, $args) |
| 16 | 16 | { |
| 17 | - $this->logger->info("Fetch user availability GET '/user/".$args['id']."/availability'"); |
|
| 17 | + $this->logger->info("Fetch user availability GET '/user/" . $args['id'] . "/availability'"); |
|
| 18 | 18 | |
| 19 | 19 | $u = UserQuery::create()->findPk($args['id']); |
| 20 | 20 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function postAvailability(ServerRequestInterface $request, ResponseInterface $response, $args) |
| 35 | 35 | { |
| 36 | - $this->logger->info("Update user availability POST '/user/".$args['id']."/availability'"); |
|
| 36 | + $this->logger->info("Update user availability POST '/user/" . $args['id'] . "/availability'"); |
|
| 37 | 37 | |
| 38 | 38 | $u = UserQuery::create() |
| 39 | 39 | ->findPk($args['id']); |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | $a->setAvailable(false); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - if (strlen($data['event'.$eventId.'comment']) > 0) { |
|
| 66 | - $a->setComment($data['event'.$eventId.'comment']); |
|
| 65 | + if (strlen($data['event' . $eventId . 'comment']) > 0) { |
|
| 66 | + $a->setComment($data['event' . $eventId . 'comment']); |
|
| 67 | 67 | } else { |
| 68 | 68 | $a->setComment(null); |
| 69 | 69 | } |