admin base controller. unify rendering of html

diff --git a/ipf/admin/app.php b/ipf/admin/app.php
index 8d14c98fcf5a89c22feca6847444bc287f9f6583..2b2e9c5bc6bed1fce90e8ed2e4edbc4bc01d91d7 100644 (file)
--- a/ipf/admin/app.php
+++ b/ipf/admin/app.php
@@ -76,14 +76,6 @@ class IPF_Admin_App extends IPF_Application
         );
     }
 
-    public static function RenderToResponse($tplfile, $params=array(), $request=null)
-    {
-        $context = IPF_Project_Template::context($params, $request);
-        $tmpl = new IPF_Template_File($tplfile, IPF_Project_Template::getDefaultTemplateEnvironment());
-        $html = $tmpl->render($context);
-        return new IPF_HTTP_Response($html);
-    }
-
     private static $appComponents = array();
 
     public static function applicationComponents($app)

diff --git a/ipf/admin/controllers/base.php b/ipf/admin/controllers/base.php
new file mode 100644 (file)
index 0000000..46328f4
--- /dev/null
+++ b/ipf/admin/controllers/base.php
@@ -0,0 +1,13 @@
+<?php
+
+abstract class IPF_Admin_Base_Controller extends IPF_Controller
+{
+    protected function render($template, $params)
+    {
+        $context = IPF_Project_Template::context($params, $this->request);
+        $tmpl = new IPF_Template_File($template, IPF_Project_Template::getDefaultTemplateEnvironment());
+        $html = $tmpl->render($context);
+        return new IPF_HTTP_Response($html);
+    }
+}
+

diff --git a/ipf/admin/controllers/components.php b/ipf/admin/controllers/components.php
index 34a0299a0b8ac6fc88055dc503cb78e9e02227d5..8bb39dea7ebcc0bcee0f4e5196c4f1a606be8255 100644 (file)
--- a/ipf/admin/controllers/components.php
+++ b/ipf/admin/controllers/components.php
@@ -1,6 +1,6 @@
 <?php
 
-class IPF_Admin_Controller extends IPF_Controller
+class IPF_Admin_Controller extends IPF_Admin_Base_Controller
 {
     function index()
     {
@@ -17,35 +17,35 @@ class IPF_Admin_Controller extends IPF_Controller
             'page_title' => __('Site Administration'),
             'admin_log' => $admin_log,
         );
-        return IPF_Admin_App::RenderToResponse('admin/index.html', $context, $this->request);
+        return $this->render('admin/index.html', $context);
     }
 
     function listItems()
     {
         $component = $this->getComponent(array('view'));
         $context = $component->listItems();
-        return IPF_Admin_App::RenderToResponse($component->listTemplate(), $context, $this->request);
+        return $this->render($component->listTemplate(), $context);
     }
 
     function addItem()
     {
         $component = $this->getComponent(array('view', 'add'));
         $context = $component->addItem();
-        return IPF_Admin_App::RenderToResponse($component->addTemplate(), $context, $this->request);
+        return $this->render($component->addTemplate(), $context);
     }
 
     function editItem()
     {
         $component = $this->getComponent(array('view', 'change'));
         $context = $component->editItem($this->params[3]);
-        return IPF_Admin_App::RenderToResponse($component->editTemplate(), $context, $this->request);
+        return $this->render($component->editTemplate(), $context);
     }
 
     function deleteItem()
     {
         $component = $this->getComponent(array('view', 'delete'));
         $context = $component->deleteItem($this->params[3]);
-        return IPF_Admin_App::RenderToResponse($component->deleteTemplate(), $context, $this->request);
+        return $this->render($component->deleteTemplate(), $context);
     }
 
     function reorder()

diff --git a/ipf/admin/controllers/file_browser.php b/ipf/admin/controllers/file_browser.php
index fa665b24531e003e240ef7fc8c0a44392349953d..0855e9dc454c3f661f95c6ffd76cf2c6ade51a40 100644 (file)
--- a/ipf/admin/controllers/file_browser.php
+++ b/ipf/admin/controllers/file_browser.php
@@ -1,6 +1,6 @@
 <?php
 
-class IPF_Admin_FileBrowser_Controller extends IPF_Controller
+class IPF_Admin_FileBrowser_Controller extends IPF_Admin_Base_Controller
 {
     static function cmp($a, $b)
     {
@@ -119,7 +119,7 @@ class IPF_Admin_FileBrowser_Controller extends IPF_Controller
             'curr_dir' => $this->relative,
             'parent_dir' => $parent_dir,
         );
-        return IPF_Admin_App::RenderToResponse('admin/filebrowser.html', $context, $request);
+        return $this->render('admin/filebrowser.html', $context);
     }
 
     protected function backToIndex()

diff --git a/ipf/admin/controllers/user.php b/ipf/admin/controllers/user.php
index 58983c458c1070320f2195519614a64e90b87ecf..6c3b3c58127f6b8beff138305fc234846f90af16 100644 (file)
--- a/ipf/admin/controllers/user.php
+++ b/ipf/admin/controllers/user.php
@@ -1,6 +1,6 @@
 <?php
 
-class IPF_Admin_User_Controller extends IPF_Controller
+class IPF_Admin_User_Controller extends IPF_Admin_Base_Controller
 {
     function login()
     {
@@ -22,7 +22,7 @@ class IPF_Admin_User_Controller extends IPF_Controller
             'page_title' => IPF::get('admin_title'),
             'form' => $form,
         );
-        return IPF_Admin_App::RenderToResponse('admin/login.html', $context, $this->request);
+        return $this->render('admin/login.html', $context);
     }
 
     function logout()
@@ -31,7 +31,7 @@ class IPF_Admin_User_Controller extends IPF_Controller
         $context = array(
             'page_title' => IPF::get('admin_title'),
         );
-        return IPF_Admin_App::RenderToResponse('admin/logout.html', $context, $this->request);
+        return $this->render('admin/logout.html', $context);
     }
 
     function impersonate()