@@ -2,6 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace TechWilk\Rota; |
| 4 | 4 | |
| 5 | -ini_set('display_errors', false); // set on for development, off for production |
|
| 5 | +ini_set('display_errors', false); // set on for development, off for production |
|
| 6 | 6 | ini_set('log_errors', true); |
| 7 | 7 | error_reporting(E_ALL); |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace TechWilk\Rota; |
| 4 | 4 | |
| 5 | -include __DIR__.'/../../../config/database.php'; |
|
| 6 | -include __DIR__.'/../../../config/auth.php'; |
|
| 7 | -include __DIR__.'/../../../config/email.php'; |
|
| 8 | -include __DIR__.'/../../../config/recording.php'; |
|
| 5 | +include __DIR__ . '/../../../config/database.php'; |
|
| 6 | +include __DIR__ . '/../../../config/auth.php'; |
|
| 7 | +include __DIR__ . '/../../../config/email.php'; |
|
| 8 | +include __DIR__ . '/../../../config/recording.php'; |
|
| 9 | 9 | |
| 10 | 10 | // -- Setup database -- |
| 11 | 11 | |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | // Connect to the database server |
| 20 | -$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or die('Connection to '.$config['db']['host']." with login '".$config['db']['user']."'/'$pwdMasked' failed."); |
|
| 20 | +$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or die('Connection to ' . $config['db']['host'] . " with login '" . $config['db']['user'] . "'/'$pwdMasked' failed."); |
|
| 21 | 21 | |
| 22 | 22 | // Choose the right database |
| 23 | -$db = @mysqli_select_db($dbh, $config['db']['dbname']) or die("Connection made, but database '".$config['db']['dbname']."' was not found."); |
|
| 23 | +$db = @mysqli_select_db($dbh, $config['db']['dbname']) or die("Connection made, but database '" . $config['db']['dbname'] . "' was not found."); |
|
| 24 | 24 | |
| 25 | 25 | // allow config to be fetched in functions |
| 26 | 26 | |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | break; |
| 48 | 48 | case 'unlink': |
| 49 | 49 | removeSocialAuthFromUserWithId($id, $platform); |
| 50 | - 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'); |
|
| 50 | + 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'); |
|
| 51 | 51 | break; |
| 52 | 52 | |
| 53 | 53 | default: |
@@ -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,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include __DIR__.'/../config/database.php'; |
|
| 3 | +include __DIR__ . '/../config/database.php'; |
|
| 4 | 4 | $serviceContainer = \Propel\Runtime\Propel::getServiceContainer(); |
| 5 | 5 | $serviceContainer->checkVersion('2.0.0-dev'); |
| 6 | 6 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); |
| 9 | 9 | $manager->setConfiguration([ |
| 10 | 10 | 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', |
| 11 | - 'dsn' => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'], |
|
| 11 | + 'dsn' => 'mysql:host=' . $config['db']['host'] . ';dbname=' . $config['db']['dbname'], |
|
| 12 | 12 | 'user' => $config['db']['user'], |
| 13 | 13 | 'password' => $config['db']['pass'], |
| 14 | 14 | 'attributes' => [ |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | |
| 39 | 39 | $id = urlencode($id); |
| 40 | 40 | |
| 41 | -$url = 'http://localhost/api/v1/series/'.$id; |
|
| 41 | +$url = 'http://localhost/api/v1/series/' . $id; |
|
| 42 | 42 | $response = file_get_contents($url); |
| 43 | 43 | |
| 44 | -echo 'URL: '.$url; |
|
| 44 | +echo 'URL: ' . $url; |
|
| 45 | 45 | |
| 46 | 46 | $responseData = json_decode($response, true); |
| 47 | 47 | $data = $responseData['data']; |
| 48 | 48 | |
| 49 | 49 | echo var_dump($responseData); |
| 50 | 50 | |
| 51 | -echo 'series '.$id.': id = '.$data['id'].', name = '.$data['name'].', description = '.$data['description']; |
|
| 51 | +echo 'series ' . $id . ': id = ' . $data['id'] . ', name = ' . $data['name'] . ', description = ' . $data['description']; |
|
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | public function createInDb(Database $db) |
| 17 | 17 | { |
| 18 | 18 | if (empty($this->name) || empty($this->description)) { |
| 19 | - throw new Exception('Series name ('.$this->name.') or description ('.$this->description.') cannot be empty.'); |
|
| 19 | + throw new Exception('Series name (' . $this->name . ') or description (' . $this->description . ') cannot be empty.'); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | $data = [ |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $id = $this->id; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - $whereCondition = 'id = '.$id; |
|
| 40 | + $whereCondition = 'id = ' . $id; |
|
| 41 | 41 | $where = [ |
| 42 | 42 | $whereCondition, |
| 43 | 43 | ]; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | 'description', |
| 65 | 65 | ]; |
| 66 | 66 | |
| 67 | - $whereCondition = 'id = '.$id; |
|
| 67 | + $whereCondition = 'id = ' . $id; |
|
| 68 | 68 | $where = [ |
| 69 | 69 | $whereCondition, |
| 70 | 70 | ]; |