@@ -5,54 +5,54 @@ |
||
5 | 5 | class LifestreamRouter extends Router |
6 | 6 | { |
7 | 7 | |
8 | - protected function get_redirect_array() |
|
9 | - { |
|
10 | - return array( |
|
11 | - (object) array( |
|
12 | - 'pattern' => '@/index.(html|htm|php)$@', |
|
13 | - 'replace' => '/'), |
|
14 | - (object) array( |
|
15 | - 'pattern' => '@^/1/$@', |
|
16 | - 'replace' => '/'), |
|
17 | - (object) array( |
|
18 | - 'pattern' => '@/page_([0-9]+)(/?)$@', |
|
19 | - 'replace' => '/page/$1/'), |
|
20 | - (object) array( |
|
21 | - 'pattern' => '@/tag/([a-z]+)/$@', |
|
22 | - 'replace' => '/$1/'), |
|
23 | - (object) array( |
|
24 | - 'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@', |
|
25 | - 'replace' => '/$1/page/$2/'), |
|
26 | - (object) array( |
|
27 | - 'pattern' => '@/tag/([a-z-]+)/$@', |
|
28 | - 'replace' => '/'), |
|
29 | - (object) array( |
|
30 | - 'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@', |
|
31 | - 'replace' => '/')); |
|
32 | - } |
|
8 | + protected function get_redirect_array() |
|
9 | + { |
|
10 | + return array( |
|
11 | + (object) array( |
|
12 | + 'pattern' => '@/index.(html|htm|php)$@', |
|
13 | + 'replace' => '/'), |
|
14 | + (object) array( |
|
15 | + 'pattern' => '@^/1/$@', |
|
16 | + 'replace' => '/'), |
|
17 | + (object) array( |
|
18 | + 'pattern' => '@/page_([0-9]+)(/?)$@', |
|
19 | + 'replace' => '/page/$1/'), |
|
20 | + (object) array( |
|
21 | + 'pattern' => '@/tag/([a-z]+)/$@', |
|
22 | + 'replace' => '/$1/'), |
|
23 | + (object) array( |
|
24 | + 'pattern' => '@/tag/([a-z]+)/page/([0-9]+)/$@', |
|
25 | + 'replace' => '/$1/page/$2/'), |
|
26 | + (object) array( |
|
27 | + 'pattern' => '@/tag/([a-z-]+)/$@', |
|
28 | + 'replace' => '/'), |
|
29 | + (object) array( |
|
30 | + 'pattern' => '@/tag/([a-z-]+)/page/([0-9]+)/$@', |
|
31 | + 'replace' => '/')); |
|
32 | + } |
|
33 | 33 | |
34 | - protected function get_direct_array() |
|
35 | - { |
|
36 | - return array( |
|
37 | - (object) array( |
|
38 | - 'match' => '/', |
|
39 | - 'controller' => 'HomeController'), |
|
40 | - (object) array( |
|
41 | - 'match' => '/about/', |
|
42 | - 'controller' => 'AboutController'), |
|
43 | - (object) array( |
|
44 | - 'match' => '/page/([0-9]+)/', |
|
45 | - 'controller' => 'HomeController'), |
|
46 | - (object) array( |
|
47 | - 'match' => '/([a-z]+)/', |
|
48 | - 'controller' => 'TagController'), |
|
49 | - (object) array( |
|
50 | - 'match' => '/([a-z]+)/page/([0-9]+)/', |
|
51 | - 'controller' => 'TagController'), |
|
52 | - (object) array( |
|
53 | - 'match' => '/([a-z]+)/([0-9]+)/', |
|
54 | - 'controller' => 'PostController')); |
|
55 | - } |
|
34 | + protected function get_direct_array() |
|
35 | + { |
|
36 | + return array( |
|
37 | + (object) array( |
|
38 | + 'match' => '/', |
|
39 | + 'controller' => 'HomeController'), |
|
40 | + (object) array( |
|
41 | + 'match' => '/about/', |
|
42 | + 'controller' => 'AboutController'), |
|
43 | + (object) array( |
|
44 | + 'match' => '/page/([0-9]+)/', |
|
45 | + 'controller' => 'HomeController'), |
|
46 | + (object) array( |
|
47 | + 'match' => '/([a-z]+)/', |
|
48 | + 'controller' => 'TagController'), |
|
49 | + (object) array( |
|
50 | + 'match' => '/([a-z]+)/page/([0-9]+)/', |
|
51 | + 'controller' => 'TagController'), |
|
52 | + (object) array( |
|
53 | + 'match' => '/([a-z]+)/([0-9]+)/', |
|
54 | + 'controller' => 'PostController')); |
|
55 | + } |
|
56 | 56 | |
57 | 57 | } |
58 | 58 |
@@ -2,11 +2,10 @@ discard block |
||
2 | 2 | |
3 | 3 | Loader::load('router', 'Router'); |
4 | 4 | |
5 | -class LifestreamRouter extends Router |
|
6 | -{ |
|
5 | +class LifestreamRouter extends Router |
|
6 | +{ |
|
7 | 7 | |
8 | - protected function get_redirect_array() |
|
9 | - { |
|
8 | + protected function get_redirect_array() { |
|
10 | 9 | return array( |
11 | 10 | (object) array( |
12 | 11 | 'pattern' => '@/index.(html|htm|php)$@', |
@@ -31,8 +30,7 @@ discard block |
||
31 | 30 | 'replace' => '/')); |
32 | 31 | } |
33 | 32 | |
34 | - protected function get_direct_array() |
|
35 | - { |
|
33 | + protected function get_direct_array() { |
|
36 | 34 | return array( |
37 | 35 | (object) array( |
38 | 36 | 'match' => '/', |
@@ -5,22 +5,22 @@ |
||
5 | 5 | class AJAXRouter extends Router |
6 | 6 | { |
7 | 7 | |
8 | - protected function get_redirect_array() |
|
9 | - { |
|
10 | - return array( |
|
11 | - (object) array( |
|
12 | - 'pattern' => '@^/$@', |
|
13 | - 'replace' => 'https://home.jacobemerick.com/')); |
|
14 | - } |
|
8 | + protected function get_redirect_array() |
|
9 | + { |
|
10 | + return array( |
|
11 | + (object) array( |
|
12 | + 'pattern' => '@^/$@', |
|
13 | + 'replace' => 'https://home.jacobemerick.com/')); |
|
14 | + } |
|
15 | 15 | |
16 | - protected function get_direct_array() |
|
17 | - { |
|
18 | - return array( |
|
19 | - (object) array( |
|
20 | - 'match' => '/get/portfolioImage.json', |
|
21 | - 'controller' => 'GetPortfolioImageController'), |
|
16 | + protected function get_direct_array() |
|
17 | + { |
|
18 | + return array( |
|
19 | + (object) array( |
|
20 | + 'match' => '/get/portfolioImage.json', |
|
21 | + 'controller' => 'GetPortfolioImageController'), |
|
22 | 22 | ); |
23 | - } |
|
23 | + } |
|
24 | 24 | |
25 | 25 | } |
26 | 26 |
@@ -2,19 +2,17 @@ |
||
2 | 2 | |
3 | 3 | Loader::load('router', 'Router'); |
4 | 4 | |
5 | -class AJAXRouter extends Router |
|
6 | -{ |
|
5 | +class AJAXRouter extends Router |
|
6 | +{ |
|
7 | 7 | |
8 | - protected function get_redirect_array() |
|
9 | - { |
|
8 | + protected function get_redirect_array() { |
|
10 | 9 | return array( |
11 | 10 | (object) array( |
12 | 11 | 'pattern' => '@^/$@', |
13 | 12 | 'replace' => 'https://home.jacobemerick.com/')); |
14 | 13 | } |
15 | 14 | |
16 | - protected function get_direct_array() |
|
17 | - { |
|
15 | + protected function get_direct_array() { |
|
18 | 16 | return array( |
19 | 17 | (object) array( |
20 | 18 | 'match' => '/get/portfolioImage.json', |