Completed
Push — master ( 5c8fbd...2c9aff )
by Jacob
03:19
created
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.
controller/waterfalls/DefaultPageController.class.inc.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 	protected static $WATERFALL_SITE_ID = 5;
12 12
 
13
-    protected $parent_navigation_item = '';
13
+	protected $parent_navigation_item = '';
14 14
 
15 15
 	protected function set_head_data()
16 16
 	{
@@ -19,45 +19,45 @@  discard block
 block discarded – undo
19 19
 		$this->add_css('waterfalls');
20 20
 	}
21 21
 
22
-    protected function add_waterfall_js()
23
-    {
24
-        $this->add_js('jquery');
25
-        $this->add_js('imagelightbox');
26
-        $this->add_js('waterfalls');
27
-    }
22
+	protected function add_waterfall_js()
23
+	{
24
+		$this->add_js('jquery');
25
+		$this->add_js('imagelightbox');
26
+		$this->add_js('waterfalls');
27
+	}
28 28
 
29 29
 	protected function set_body_data($page_type = 'normal')
30 30
 	{
31 31
 		$this->set_body('activity_array', $this->get_recent_activity());
32 32
 
33
-        $this->set_body('main_navigation', array(
34
-                (object) array(
35
-                    'uri' => '/falls/',
36
-                    'anchor' => 'Falls',
37
-                    'is_active' => $this->parent_navigation_item === 'falls',
38
-                ),
39
-                (object) array(
40
-                    'uri' => '/map/',
41
-                    'anchor' => 'Map',
42
-                    'is_active' => $this->parent_navigation_item === 'map',
43
-                ),
44
-                (object) array(
45
-                    'uri' => '/journal/',
46
-                    'anchor' => 'Journal',
47
-                    'is_active' => $this->parent_navigation_item === 'journal',
48
-                ),
49
-                (object) array(
50
-                    'uri' => '/about/',
51
-                    'anchor' => 'About',
52
-                    'is_active' => $this->parent_navigation_item === 'about',
53
-                )
54
-        ));
55
-
56
-        if ($page_type == 'wide') {
57
-            $this->set_body_view('WidePage');
58
-        } else {
59
-            $this->set_body_view('Page');
60
-        }
61
-    }
33
+		$this->set_body('main_navigation', array(
34
+				(object) array(
35
+					'uri' => '/falls/',
36
+					'anchor' => 'Falls',
37
+					'is_active' => $this->parent_navigation_item === 'falls',
38
+				),
39
+				(object) array(
40
+					'uri' => '/map/',
41
+					'anchor' => 'Map',
42
+					'is_active' => $this->parent_navigation_item === 'map',
43
+				),
44
+				(object) array(
45
+					'uri' => '/journal/',
46
+					'anchor' => 'Journal',
47
+					'is_active' => $this->parent_navigation_item === 'journal',
48
+				),
49
+				(object) array(
50
+					'uri' => '/about/',
51
+					'anchor' => 'About',
52
+					'is_active' => $this->parent_navigation_item === 'about',
53
+				)
54
+		));
55
+
56
+		if ($page_type == 'wide') {
57
+			$this->set_body_view('WidePage');
58
+		} else {
59
+			$this->set_body_view('Page');
60
+		}
61
+	}
62 62
 
63 63
 }
Please login to merge, or discard this patch.
utility/URLDecode.class.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 		
25 25
 		self::$array['host'] = $host;
26 26
 		
27
-    if (
28
-      $host == 'www.waterfallsofthekeweenaw.com' ||
29
-      $host == 'waterfallsofthekeweenaw.com'
30
-    ) {
27
+	if (
28
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
29
+	  $host == 'waterfallsofthekeweenaw.com'
30
+	) {
31 31
 			self::$array['site'] = 'waterfalls';
32 32
 		} else {
33 33
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));
Please login to merge, or discard this patch.
controller/portfolio/PieceController.class.inc.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
 		
41 41
 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
42 42
 
43
-    $image_path = "portfolio/{$portfolio_image_result[0]->name}";
44
-    $image_path = Loader::getImagePath('image', $image_path);
45
-    $image_size = getimagesize($image_path);
43
+	$image_path = "portfolio/{$portfolio_image_result[0]->name}";
44
+	$image_path = Loader::getImagePath('image', $image_path);
45
+	$image_size = getimagesize($image_path);
46 46
 
47 47
 		$main_image = new stdclass();
48 48
 		$main_image->id = $portfolio_image_result[0]->id;
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 			$thumb_array = explode('.', $thumb);
58 58
 			$thumb = "{$thumb_array[0]}_clip.{$thumb_array[1]}";
59 59
 
60
-      $image_path = "portfolio/{$thumb}";
61
-      $image_path = Loader::getImagePath('image', $image_path);
62
-      $image_size = getimagesize($image_path);
60
+	  $image_path = "portfolio/{$thumb}";
61
+	  $image_path = Loader::getImagePath('image', $image_path);
62
+	  $image_size = getimagesize($image_path);
63 63
 
64 64
 			$image_obj = new stdclass();
65 65
 			$image_obj->id = $portfolio_image->id;
Please login to merge, or discard this patch.
controller/ajax/GetPortfolioImageController.class.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 		
13 13
 		$portfolio_result = PortfolioCollector::getImageById($id);
14 14
 
15
-    $image_path = "portfolio/{$portfolio_result->name}";
16
-    $image_path = Loader::getImagePath('image', $image_path);
17
-    $image_size = getimagesize($image_path);
15
+	$image_path = "portfolio/{$portfolio_result->name}";
16
+	$image_path = Loader::getImagePath('image', $image_path);
17
+	$image_size = getimagesize($image_path);
18 18
 
19 19
 		$main_image = new stdclass();
20 20
 		$main_image->id = $portfolio_result->id;
Please login to merge, or discard this patch.
router/Router.class.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
81 81
 			$redirect_uri .= '/';
82 82
 		
83
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85
-        }
83
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85
+		}
86 86
         
87 87
 		if($redirect_uri == URLDecode::getURI())
88 88
 			return;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			URLDecode::getExtension() != 'json' &&
148 148
 			URLDecode::getExtension() != 'jpg' &&
149 149
 			URLDecode::getExtension() != 'png' &&
150
-            strstr(URLDecode::getURI(), '#') === false);
150
+			strstr(URLDecode::getURI(), '#') === false);
151 151
 	}
152 152
 
153 153
 }
Please login to merge, or discard this patch.
src/Domain/Portfolio/Piece/MysqlPieceRepository.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -7,36 +7,36 @@
 block discarded – undo
7 7
 class MysqlPieceRepository implements PieceRepositoryInterface
8 8
 {
9 9
 
10
-    /** @var  Aura\Sql\ConnectionLocator */
11
-    protected $connections;
12
-
13
-    /**
14
-     * @param Aura\Sql\ConnectionLocator $connections
15
-     */
16
-    public function __construct(ConnectionLocator $connections)
17
-    {
18
-        $this->connections = $connections;
19
-    }
20
-
21
-    public function getPieces($limit = null, $offset = 0)
22
-    {
23
-        $query = "
10
+	/** @var  Aura\Sql\ConnectionLocator */
11
+	protected $connections;
12
+
13
+	/**
14
+	 * @param Aura\Sql\ConnectionLocator $connections
15
+	 */
16
+	public function __construct(ConnectionLocator $connections)
17
+	{
18
+		$this->connections = $connections;
19
+	}
20
+
21
+	public function getPieces($limit = null, $offset = 0)
22
+	{
23
+		$query = "
24 24
             SELECT `id`, `title`, `title_url`, `category`
25 25
             FROM `jpemeric_portfolio`.`piece`
26 26
             WHERE `display` = :is_active
27 27
             ORDER BY `date` DESC";
28
-        if ($limit != null) {
29
-            $query .= "
28
+		if ($limit != null) {
29
+			$query .= "
30 30
             LIMIT {$offset}, {$limit}";
31
-        }
31
+		}
32 32
 
33
-        $bindings = [
34
-            'is_active' => 1,
35
-        ];
33
+		$bindings = [
34
+			'is_active' => 1,
35
+		];
36 36
 
37
-        return $this
38
-            ->connections
39
-            ->getRead()
40
-            ->fetchAll($query, $bindings);
41
-    }
37
+		return $this
38
+			->connections
39
+			->getRead()
40
+			->fetchAll($query, $bindings);
41
+	}
42 42
 }
Please login to merge, or discard this patch.
src/Domain/Portfolio/Piece/PieceRepositoryInterface.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 interface PieceRepositoryInterface
6 6
 {
7
-    public function getPieces($limit = null, $offset= 0);
7
+	public function getPieces($limit = null, $offset= 0);
8 8
 }
Please login to merge, or discard this patch.