@@ -5,56 +5,56 @@ |
||
| 5 | 5 | final class ImperialUnitContent extends Content |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - protected function execute($type = '') |
|
| 9 | - { |
|
| 10 | - $number = floatval($this->content); |
|
| 11 | - $number *= 39.37; // convert to inches |
|
| 8 | + protected function execute($type = '') |
|
| 9 | + { |
|
| 10 | + $number = floatval($this->content); |
|
| 11 | + $number *= 39.37; // convert to inches |
|
| 12 | 12 | |
| 13 | - if ($type == '') { |
|
| 14 | - if ($number > (12 * 3 * 1760 * 5)) { |
|
| 15 | - $type = 'full miles'; |
|
| 16 | - } else if ($number > (12 * 3 * 1760 * .5)) { |
|
| 17 | - $type = 'tenth miles'; |
|
| 18 | - } else if ($number > (12 * 3 * 150)) { |
|
| 19 | - $type = 'yards'; |
|
| 20 | - } else if ($number > (12 * 10)) { |
|
| 21 | - $type = 'feet'; |
|
| 22 | - } else { |
|
| 23 | - $type = 'inches'; |
|
| 24 | - } |
|
| 25 | - } |
|
| 13 | + if ($type == '') { |
|
| 14 | + if ($number > (12 * 3 * 1760 * 5)) { |
|
| 15 | + $type = 'full miles'; |
|
| 16 | + } else if ($number > (12 * 3 * 1760 * .5)) { |
|
| 17 | + $type = 'tenth miles'; |
|
| 18 | + } else if ($number > (12 * 3 * 150)) { |
|
| 19 | + $type = 'yards'; |
|
| 20 | + } else if ($number > (12 * 10)) { |
|
| 21 | + $type = 'feet'; |
|
| 22 | + } else { |
|
| 23 | + $type = 'inches'; |
|
| 24 | + } |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - switch ($type) { |
|
| 28 | - case 'full miles' : |
|
| 29 | - $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles'; |
|
| 30 | - break; |
|
| 31 | - case 'tenth miles' : |
|
| 32 | - $this->content = round($number / (12 * 3 * 1760), 1) . ' miles'; |
|
| 33 | - break; |
|
| 34 | - case 'yards' : |
|
| 35 | - $this->content = number_format(round($number / (12 * 3))) . ' yards'; |
|
| 36 | - break; |
|
| 37 | - case 'feet' : |
|
| 38 | - $this->content = number_format(round($number / 12)) . "'"; |
|
| 39 | - break; |
|
| 40 | - case 'inches' : |
|
| 41 | - $feet = floor($number / 12); |
|
| 27 | + switch ($type) { |
|
| 28 | + case 'full miles' : |
|
| 29 | + $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles'; |
|
| 30 | + break; |
|
| 31 | + case 'tenth miles' : |
|
| 32 | + $this->content = round($number / (12 * 3 * 1760), 1) . ' miles'; |
|
| 33 | + break; |
|
| 34 | + case 'yards' : |
|
| 35 | + $this->content = number_format(round($number / (12 * 3))) . ' yards'; |
|
| 36 | + break; |
|
| 37 | + case 'feet' : |
|
| 38 | + $this->content = number_format(round($number / 12)) . "'"; |
|
| 39 | + break; |
|
| 40 | + case 'inches' : |
|
| 41 | + $feet = floor($number / 12); |
|
| 42 | 42 | |
| 43 | - $inches = $number - $feet * 12; |
|
| 44 | - $inches = round($inches); |
|
| 43 | + $inches = $number - $feet * 12; |
|
| 44 | + $inches = round($inches); |
|
| 45 | 45 | |
| 46 | - if ($inches == 12) { |
|
| 47 | - $feet++; |
|
| 48 | - $inches = 0; |
|
| 49 | - } |
|
| 46 | + if ($inches == 12) { |
|
| 47 | + $feet++; |
|
| 48 | + $inches = 0; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - $this->content = ''; |
|
| 52 | - $this->content .= number_format($feet) . "'"; |
|
| 53 | - if (isset($inches) && $inches > 0) { |
|
| 54 | - $this->content .= " {$inches}\""; |
|
| 55 | - } |
|
| 56 | - break; |
|
| 57 | - } |
|
| 58 | - } |
|
| 51 | + $this->content = ''; |
|
| 52 | + $this->content .= number_format($feet) . "'"; |
|
| 53 | + if (isset($inches) && $inches > 0) { |
|
| 54 | + $this->content .= " {$inches}\""; |
|
| 55 | + } |
|
| 56 | + break; |
|
| 57 | + } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | } |
| 61 | 61 | \ No newline at end of file |
@@ -42,8 +42,8 @@ |
||
| 42 | 42 | |
| 43 | 43 | if($length < strlen($this->content)) |
| 44 | 44 | $this->trim_string($length); |
| 45 | - else |
|
| 46 | - $etc = ''; |
|
| 45 | + else |
|
| 46 | + $etc = ''; |
|
| 47 | 47 | $this->check_exclude_tags(); |
| 48 | 48 | $this->close_tags($etc); |
| 49 | 49 | } |
@@ -44,9 +44,9 @@ |
||
| 44 | 44 | $width = $file_size[0]; |
| 45 | 45 | $description = $photo_result->description; |
| 46 | 46 | |
| 47 | - if ($description == '') { |
|
| 48 | - Debugger::logMessage("No description for {$category}/{$photo}"); |
|
| 49 | - } |
|
| 47 | + if ($description == '') { |
|
| 48 | + Debugger::logMessage("No description for {$category}/{$photo}"); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | $domain = '/'; |
| 52 | 52 | if($is_absolute) |
@@ -20,21 +20,21 @@ |
||
| 20 | 20 | private static $USER_MENTION_LINK = '<a href="https://twitter.com/%1$s" rel="nofollow" target="_blank" title="%2$s (%1$s) on Twitter">@%1$s</a>'; |
| 21 | 21 | private static $MEDIA_LINK = '<a class="photo" href="%s" rel="nofollow" target="_blank" title="%s"><img src="%s:%s" alt="%s" height="%s" width="%s" /></a>'; |
| 22 | 22 | |
| 23 | - private $consumer_key; |
|
| 24 | - private $consumer_secret; |
|
| 25 | - private $access_token; |
|
| 26 | - private $access_secret; |
|
| 23 | + private $consumer_key; |
|
| 24 | + private $consumer_secret; |
|
| 25 | + private $access_token; |
|
| 26 | + private $access_secret; |
|
| 27 | 27 | |
| 28 | 28 | private $json; |
| 29 | 29 | |
| 30 | 30 | public function __construct() |
| 31 | 31 | { |
| 32 | - global $config; |
|
| 32 | + global $config; |
|
| 33 | 33 | |
| 34 | - $this->consumer_key = $config->twitter->consumer_key; |
|
| 35 | - $this->consumer_secret = $config->twitter->consumer_secret; |
|
| 36 | - $this->access_token = $config->twitter->access_token; |
|
| 37 | - $this->access_secret = $config->twitter->access_secret; |
|
| 34 | + $this->consumer_key = $config->twitter->consumer_key; |
|
| 35 | + $this->consumer_secret = $config->twitter->consumer_secret; |
|
| 36 | + $this->access_token = $config->twitter->access_token; |
|
| 37 | + $this->access_secret = $config->twitter->access_secret; |
|
| 38 | 38 | |
| 39 | 39 | $json = $this->get_data(); |
| 40 | 40 | |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function __construct() |
| 14 | 14 | { |
| 15 | - global $config; |
|
| 15 | + global $config; |
|
| 16 | 16 | $this->headers['From'] = self::$FROM; |
| 17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
| 18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function __construct() |
| 14 | 14 | { |
| 15 | - global $config; |
|
| 15 | + global $config; |
|
| 16 | 16 | $this->headers['From'] = self::$FROM; |
| 17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
| 18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function __construct() |
| 14 | 14 | { |
| 15 | - global $config; |
|
| 15 | + global $config; |
|
| 16 | 16 | $this->headers['From'] = self::$FROM; |
| 17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
| 18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public function __construct() |
| 14 | 14 | { |
| 15 | - global $config; |
|
| 15 | + global $config; |
|
| 16 | 16 | $this->headers['From'] = self::$FROM; |
| 17 | 17 | $this->headers['Reply-To'] = "Jacob <{$config->admin_email}>"; |
| 18 | 18 | $this->headers['Bcc'] = "Jacob <{$config->admin_email}>"; |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | $handle = @fopen($config_path, 'r'); |
| 9 | 9 | if ($handle === false) { |
| 10 | - throw new RuntimeException("Could not load config"); |
|
| 10 | + throw new RuntimeException("Could not load config"); |
|
| 11 | 11 | } |
| 12 | 12 | $config = fread($handle, filesize($config_path)); |
| 13 | 13 | fclose($handle); |
@@ -15,40 +15,40 @@ discard block |
||
| 15 | 15 | $config = json_decode($config); |
| 16 | 16 | $last_json_error = json_last_error(); |
| 17 | 17 | if ($last_json_error !== JSON_ERROR_NONE) { |
| 18 | - throw new RuntimeException("Could not parse config - JSON error detected"); |
|
| 18 | + throw new RuntimeException("Could not parse config - JSON error detected"); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | // configure the db connections holder |
| 22 | 22 | $db_connections = new Aura\Sql\ConnectionLocator(); |
| 23 | 23 | $db_connections->setDefault(function () use ($config) { |
| 24 | - $connection = $config->database->slave; |
|
| 25 | - return new Aura\Sql\ExtendedPdo( |
|
| 26 | - "mysql:host={$connection->host}", |
|
| 27 | - $connection->user, |
|
| 28 | - $connection->password |
|
| 29 | - ); |
|
| 24 | + $connection = $config->database->slave; |
|
| 25 | + return new Aura\Sql\ExtendedPdo( |
|
| 26 | + "mysql:host={$connection->host}", |
|
| 27 | + $connection->user, |
|
| 28 | + $connection->password |
|
| 29 | + ); |
|
| 30 | 30 | }); |
| 31 | 31 | $db_connections->setWrite('master', function () use ($config) { |
| 32 | - $connection = $config->database->master; |
|
| 33 | - return new Aura\Sql\ExtendedPdo( |
|
| 34 | - "mysql:host={$connection->host}", |
|
| 35 | - $connection->user, |
|
| 36 | - $connection->password |
|
| 37 | - ); |
|
| 32 | + $connection = $config->database->master; |
|
| 33 | + return new Aura\Sql\ExtendedPdo( |
|
| 34 | + "mysql:host={$connection->host}", |
|
| 35 | + $connection->user, |
|
| 36 | + $connection->password |
|
| 37 | + ); |
|
| 38 | 38 | }); |
| 39 | 39 | $db_connections->setRead('slave', function () use ($config) { |
| 40 | - $connection = $config->database->slave; |
|
| 41 | - $pdo = new Aura\Sql\ExtendedPdo( |
|
| 42 | - "mysql:host={$connection->host}", |
|
| 43 | - $connection->user, |
|
| 44 | - $connection->password |
|
| 45 | - ); |
|
| 46 | - |
|
| 47 | - $profiler = new Aura\Sql\Profiler(); |
|
| 48 | - $profiler->setActive(true); |
|
| 49 | - $pdo->setProfiler($profiler); |
|
| 50 | - |
|
| 51 | - return $pdo; |
|
| 40 | + $connection = $config->database->slave; |
|
| 41 | + $pdo = new Aura\Sql\ExtendedPdo( |
|
| 42 | + "mysql:host={$connection->host}", |
|
| 43 | + $connection->user, |
|
| 44 | + $connection->password |
|
| 45 | + ); |
|
| 46 | + |
|
| 47 | + $profiler = new Aura\Sql\Profiler(); |
|
| 48 | + $profiler->setActive(true); |
|
| 49 | + $pdo->setProfiler($profiler); |
|
| 50 | + |
|
| 51 | + return $pdo; |
|
| 52 | 52 | }); |
| 53 | 53 | |
| 54 | 54 | // setup the service locator |