Completed
Pull Request — master (#1)
by Jacob
15:50
created
utility/content/SmartTrimContent.class.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
utility/content/FixPhotoContent.class.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
utility/Mail.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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}>";
Please login to merge, or discard this patch.
controller/home/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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}>";
Please login to merge, or discard this patch.
controller/waterfalls/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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}>";
Please login to merge, or discard this patch.
controller/site/ContactController.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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}>";
Please login to merge, or discard this patch.
bootstrap.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
utility/Header.class.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	private static function start_gzipping()
153 153
 	{
154 154
 		if(!ob_start('ob_gzhandler'))
155
-            ob_start();
155
+			ob_start();
156 156
 	}
157 157
 
158 158
 }
Please login to merge, or discard this patch.
controller/Error404Controller.class.inc.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -32,37 +32,37 @@
 block discarded – undo
32 32
 
33 33
 	private function get_sites()
34 34
 	{
35
-    return [
36
-      [
37
-        'url' => 'http://home.jacobemerick.com/',
38
-        'title' => "Jacob Emerick's Home",
39
-        'name' => 'Home'
40
-      ],
41
-      [
42
-        'url' => 'http://blog.jacobemerick.com/',
43
-        'title' => "Jacob Emerick's Blog",
44
-        'name' => 'Blog'
45
-      ],
46
-      [
47
-        'url' => 'http://lifestream.jacobemerick.com/',
48
-        'title' => "Jacob Emerick's Lifestream",
49
-        'name' => 'Lifestream'
50
-      ],
51
-      [
52
-        'url' => 'http://map.jacobemerick.com/',
53
-        'title' => "Jacob Emerick's Hiking Map",
54
-        'name' => 'Map'
55
-      ],
56
-      [
57
-        'url' => 'http://portfolio.jacobemerick.com/',
58
-        'title' => "Jacob Emerick's Portfolio",
59
-        'name' => 'Portfolio',
60
-      ],
61
-      [
62
-        'url' => 'http://www.waterfallsofthekeweenaw.com/',
63
-        'title' => 'Waterfalls of the Keweenaw',
64
-        'name' => 'Waterfalls'
65
-      ]
35
+	return [
36
+	  [
37
+		'url' => 'http://home.jacobemerick.com/',
38
+		'title' => "Jacob Emerick's Home",
39
+		'name' => 'Home'
40
+	  ],
41
+	  [
42
+		'url' => 'http://blog.jacobemerick.com/',
43
+		'title' => "Jacob Emerick's Blog",
44
+		'name' => 'Blog'
45
+	  ],
46
+	  [
47
+		'url' => 'http://lifestream.jacobemerick.com/',
48
+		'title' => "Jacob Emerick's Lifestream",
49
+		'name' => 'Lifestream'
50
+	  ],
51
+	  [
52
+		'url' => 'http://map.jacobemerick.com/',
53
+		'title' => "Jacob Emerick's Hiking Map",
54
+		'name' => 'Map'
55
+	  ],
56
+	  [
57
+		'url' => 'http://portfolio.jacobemerick.com/',
58
+		'title' => "Jacob Emerick's Portfolio",
59
+		'name' => 'Portfolio',
60
+	  ],
61
+	  [
62
+		'url' => 'http://www.waterfallsofthekeweenaw.com/',
63
+		'title' => 'Waterfalls of the Keweenaw',
64
+		'name' => 'Waterfalls'
65
+	  ]
66 66
   ];
67 67
 	}
68 68
 
Please login to merge, or discard this patch.