From 6ffd67045c863db9f46c4352e67cc50c77306e16 Mon Sep 17 00:00:00 2001 From: Logsol Date: Mon, 8 Jul 2013 22:00:39 +0200 Subject: [PATCH] resolved ds store conflicts, added plugins --- application/controller/IndexController.php | 2 -- application/view/Index/index.phtml | 16 +--------------- application/{ => view}/main.phtml | 0 .../Katharsis/Controller/Plugin/Autorender.php | 4 ++++ .../Katharsis/Controller/Plugin/StartSession.php | 10 ++++++++++ public/index.php | 7 +++++++ 6 files changed, 22 insertions(+), 17 deletions(-) rename application/{ => view}/main.phtml (100%) create mode 100644 library/Katharsis/Controller/Plugin/StartSession.php diff --git a/application/controller/IndexController.php b/application/controller/IndexController.php index 5b69fb8..6a8f9e4 100644 --- a/application/controller/IndexController.php +++ b/application/controller/IndexController.php @@ -27,8 +27,6 @@ class IndexController extends Katharsis_Controller_Abstract */ public function indexAction() { - $this->_view->someVariableName = 'Katharsis'; - echo $this->_view->render('welcome'); } /** diff --git a/application/view/Index/index.phtml b/application/view/Index/index.phtml index ae427e8..9998451 100644 --- a/application/view/Index/index.phtml +++ b/application/view/Index/index.phtml @@ -1,15 +1 @@ - - - Swiss Didgeridoo Artwork - Schweizer Holz Didgeridoo bester Qualität - - - - - - - - - - - - \ No newline at end of file +THIS IS SPARTA \ No newline at end of file diff --git a/application/main.phtml b/application/view/main.phtml similarity index 100% rename from application/main.phtml rename to application/view/main.phtml diff --git a/library/Katharsis/Controller/Plugin/Autorender.php b/library/Katharsis/Controller/Plugin/Autorender.php index f101b3d..c1896cd 100644 --- a/library/Katharsis/Controller/Plugin/Autorender.php +++ b/library/Katharsis/Controller/Plugin/Autorender.php @@ -15,6 +15,7 @@ class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin */ public function postController() { + $view = Katharsis_View::getInstance(); $view->controllerAction = false; @@ -28,5 +29,8 @@ class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin $view = Katharsis_View::getInstance(); echo $view->render('main'); + + var_dump($view->render('main')); + die(''); } } \ No newline at end of file diff --git a/library/Katharsis/Controller/Plugin/StartSession.php b/library/Katharsis/Controller/Plugin/StartSession.php new file mode 100644 index 0000000..fefbfc2 --- /dev/null +++ b/library/Katharsis/Controller/Plugin/StartSession.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/public/index.php b/public/index.php index ce66f02..03fc35a 100644 --- a/public/index.php +++ b/public/index.php @@ -12,8 +12,15 @@ chdir('..'); require_once('library/Katharsis/Bootstrap.php'); Katharsis_Autoload::init(); + +//Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_SetNames()); +Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_StartSession()); +Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Notice()); Katharsis_Controller_Plugin::registerPlugin(new Katharsis_Controller_Plugin_Autorender()); +Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Access()); +//Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plugin_Navigation()); + try { Katharsis_Bootstrap::run();