@@ -17,34 +17,34 @@ |
||
| 17 | 17 | class AjaxExample extends \erdiko\core\AjaxController |
| 18 | 18 | { |
| 19 | 19 | |
| 20 | - /** |
|
| 20 | + /** |
|
| 21 | 21 | * Get |
| 22 | 22 | */ |
| 23 | - public function get($var = null) |
|
| 24 | - { |
|
| 25 | - if($var != null) |
|
| 26 | - { |
|
| 27 | - // load action |
|
| 28 | - return $this->_autoaction($var); |
|
| 29 | - } |
|
| 23 | + public function get($var = null) |
|
| 24 | + { |
|
| 25 | + if($var != null) |
|
| 26 | + { |
|
| 27 | + // load action |
|
| 28 | + return $this->_autoaction($var); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - $data = array("hello", "world"); |
|
| 32 | - $view = new \erdiko\core\View('examples/helloworld', $data); |
|
| 31 | + $data = array("hello", "world"); |
|
| 32 | + $view = new \erdiko\core\View('examples/helloworld', $data); |
|
| 33 | 33 | |
| 34 | - $this->setContent($view); |
|
| 35 | - } |
|
| 34 | + $this->setContent($view); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Get Example |
|
| 39 | - */ |
|
| 40 | - public function getExample() |
|
| 41 | - { |
|
| 42 | - $content = array( |
|
| 43 | - 'hello' => 'world', |
|
| 44 | - 'ajax' => 'rocks' |
|
| 45 | - ); |
|
| 37 | + /** |
|
| 38 | + * Get Example |
|
| 39 | + */ |
|
| 40 | + public function getExample() |
|
| 41 | + { |
|
| 42 | + $content = array( |
|
| 43 | + 'hello' => 'world', |
|
| 44 | + 'ajax' => 'rocks' |
|
| 45 | + ); |
|
| 46 | 46 | |
| 47 | - $this->setContent($content); |
|
| 48 | - } |
|
| 47 | + $this->setContent($content); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | 50 | } |
@@ -24,65 +24,65 @@ |
||
| 24 | 24 | * Hooks |
| 25 | 25 | */ |
| 26 | 26 | \erdiko\core\ToroHook::add("404", function ($vars = array()) { |
| 27 | - // Toro::serve Legacy |
|
| 28 | - $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 29 | - if (empty($vars['message'])) { |
|
| 30 | - $vars['message'] = "Sorry, we cannot find that page."; |
|
| 31 | - } |
|
| 32 | - if (empty($vars['error'])) { |
|
| 33 | - $vars['error'] = $vars['message']; |
|
| 34 | - } |
|
| 35 | - if (!isset($vars['path_info'])) { |
|
| 36 | - $vars['path_info'] = ""; |
|
| 37 | - } |
|
| 27 | + // Toro::serve Legacy |
|
| 28 | + $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 29 | + if (empty($vars['message'])) { |
|
| 30 | + $vars['message'] = "Sorry, we cannot find that page."; |
|
| 31 | + } |
|
| 32 | + if (empty($vars['error'])) { |
|
| 33 | + $vars['error'] = $vars['message']; |
|
| 34 | + } |
|
| 35 | + if (!isset($vars['path_info'])) { |
|
| 36 | + $vars['path_info'] = ""; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - Erdiko::log(\Psr\Log\LogLevel::ERROR, "404 {$vars['path_info']} {$vars['error']}"); |
|
| 40 | - $vars['code'] = 404; |
|
| 39 | + Erdiko::log(\Psr\Log\LogLevel::ERROR, "404 {$vars['path_info']} {$vars['error']}"); |
|
| 40 | + $vars['code'] = 404; |
|
| 41 | 41 | |
| 42 | - $theme = new \erdiko\core\Theme( 'bootstrap' ); |
|
| 43 | - $theme->addCss( 'font-awesome', |
|
| 44 | - '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' ); |
|
| 45 | - $theme->addCss( 'font-awesome-animation', |
|
| 46 | - '/themes/bootstrap/css/font-awesome-animation.css' ); |
|
| 42 | + $theme = new \erdiko\core\Theme( 'bootstrap' ); |
|
| 43 | + $theme->addCss( 'font-awesome', |
|
| 44 | + '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' ); |
|
| 45 | + $theme->addCss( 'font-awesome-animation', |
|
| 46 | + '/themes/bootstrap/css/font-awesome-animation.css' ); |
|
| 47 | 47 | |
| 48 | - $response = new \erdiko\core\Response( $theme ); |
|
| 49 | - $response->setContent( \Erdiko::getView('error', $vars) ); |
|
| 50 | - $response->send(); |
|
| 48 | + $response = new \erdiko\core\Response( $theme ); |
|
| 49 | + $response->setContent( \Erdiko::getView('error', $vars) ); |
|
| 50 | + $response->send(); |
|
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | 53 | \erdiko\core\ToroHook::add("500", function ($vars = array()) { |
| 54 | - // Toro::serve Legacy |
|
| 55 | - $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 56 | - $vars['code'] = 500; |
|
| 57 | - $vars['message'] = "Sorry, something went wrong."; |
|
| 58 | - Erdiko::log(\Psr\Log\LogLevel::ERROR, "{$vars['code']}: {$vars['path_info']} {$vars['error']}"); |
|
| 54 | + // Toro::serve Legacy |
|
| 55 | + $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 56 | + $vars['code'] = 500; |
|
| 57 | + $vars['message'] = "Sorry, something went wrong."; |
|
| 58 | + Erdiko::log(\Psr\Log\LogLevel::ERROR, "{$vars['code']}: {$vars['path_info']} {$vars['error']}"); |
|
| 59 | 59 | |
| 60 | - $theme = new \erdiko\core\Theme( 'bootstrap' ); |
|
| 61 | - $theme->addCss( 'font-awesome', |
|
| 62 | - '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' ); |
|
| 63 | - $theme->addCss( 'font-awesome-animation', |
|
| 64 | - '/themes/bootstrap/css/font-awesome-animation.css' ); |
|
| 60 | + $theme = new \erdiko\core\Theme( 'bootstrap' ); |
|
| 61 | + $theme->addCss( 'font-awesome', |
|
| 62 | + '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' ); |
|
| 63 | + $theme->addCss( 'font-awesome-animation', |
|
| 64 | + '/themes/bootstrap/css/font-awesome-animation.css' ); |
|
| 65 | 65 | |
| 66 | - $response = new \erdiko\core\Response( $theme ); |
|
| 67 | - $response->setContent( \Erdiko::getView('error', $vars) ); |
|
| 68 | - $response->send(); |
|
| 66 | + $response = new \erdiko\core\Response( $theme ); |
|
| 67 | + $response->setContent( \Erdiko::getView('error', $vars) ); |
|
| 68 | + $response->send(); |
|
| 69 | 69 | }); |
| 70 | 70 | |
| 71 | 71 | // Error management & beautify output. |
| 72 | 72 | \erdiko\core\ToroHook::add("general_error", function ($vars = array()) { |
| 73 | - $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 74 | - if(!isset($vars['path_info'])){ |
|
| 75 | - $vars['path_info'] = $_SERVER['REQUEST_URI']; |
|
| 76 | - } |
|
| 77 | - Erdiko::log(\Psr\Log\LogLevel::ERROR, "{$vars['code']}: {$vars['path_info']} {$vars['error']}"); |
|
| 73 | + $vars['debug'] = \erdiko\core\ErrorHandler::isDebug(); |
|
| 74 | + if(!isset($vars['path_info'])){ |
|
| 75 | + $vars['path_info'] = $_SERVER['REQUEST_URI']; |
|
| 76 | + } |
|
| 77 | + Erdiko::log(\Psr\Log\LogLevel::ERROR, "{$vars['code']}: {$vars['path_info']} {$vars['error']}"); |
|
| 78 | 78 | |
| 79 | - $theme = new \erdiko\core\Theme('bootstrap'); |
|
| 80 | - $theme->addCss('font-awesome', |
|
| 81 | - '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css'); |
|
| 82 | - $theme->addCss('font-awesome-animation', |
|
| 83 | - '/themes/bootstrap/css/font-awesome-animation.css'); |
|
| 79 | + $theme = new \erdiko\core\Theme('bootstrap'); |
|
| 80 | + $theme->addCss('font-awesome', |
|
| 81 | + '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css'); |
|
| 82 | + $theme->addCss('font-awesome-animation', |
|
| 83 | + '/themes/bootstrap/css/font-awesome-animation.css'); |
|
| 84 | 84 | |
| 85 | - $response = new \erdiko\core\Response($theme); |
|
| 86 | - $response->setContent(\Erdiko::getView('error', $vars)); |
|
| 87 | - $response->send(); |
|
| 85 | + $response = new \erdiko\core\Response($theme); |
|
| 86 | + $response->setContent(\Erdiko::getView('error', $vars)); |
|
| 87 | + $response->send(); |
|
| 88 | 88 | }); |
| 89 | 89 | \ No newline at end of file |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | <title><?php echo $this->getPageTitle(); ?></title> |
| 13 | 13 | |
| 14 | 14 | <?php |
| 15 | - // Spit out CSS |
|
| 15 | + // Spit out CSS |
|
| 16 | 16 | foreach ($this->getCss() as $css) { |
| 17 | 17 | if ($css['active']) { |
| 18 | 18 | echo "<link rel='stylesheet' href='".$css['file']."' type='text/css' />\n"; |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | require_once dirname(dirname(__DIR__))."/app/bootstrap.php"; |
| 13 | 13 | |
| 14 | 14 | try { |
| 15 | - \erdiko\core\ErrorHandler::init(); // Front-end error management |
|
| 16 | - Erdiko::serve(); |
|
| 15 | + \erdiko\core\ErrorHandler::init(); // Front-end error management |
|
| 16 | + Erdiko::serve(); |
|
| 17 | 17 | |
| 18 | 18 | } catch (\Exception $e) { |
| 19 | 19 | echo $e->getMessage(); |