Add Horde_Template binder

diff --git a/babel/lib/base.php b/babel/lib/base.php
index 5f4071d..231f5ba 100644 (file)
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -53,7 +53,7 @@ require_once 'Horde/Form/Renderer.php';
 require_once 'Horde/Form/Action.php';
 
 /* Templates */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 
 /* Module selection */
 $app = Horde_Util::getFormData('module');

diff --git a/framework/Core/lib/Horde/Core/Binder/Template.php b/framework/Core/lib/Horde/Core/Binder/Template.php
new file mode 100644 (file)
index 0000000..825f19b
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Binder/Template.php
@@ -0,0 +1,15 @@
+<?php
+class Horde_Core_Binder_Template implements Horde_Injector_Binder
+{
+    public function create(Horde_Injector $injector)
+    {
+        return new Horde_Template(array(
+            'cacheob' => $injector->getInstance('Horde_Cache')
+        ));
+    }
+
+    public function equals(Horde_Injector_Binder $binder)
+    {
+        return false;
+    }
+}

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index e8b5da4..4d685d2 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -311,6 +311,7 @@ class Horde_Registry
         /* Set the rest of the default bindings. */
         $GLOBALS['injector']->addBinder('Horde_Db_Adapter_Base', new Horde_Core_Binder_Db('reader'));
         $GLOBALS['injector']->addBinder('Horde_Log_Logger', new Horde_Core_Binder_Logger());
+        $GLOBALS['injector']->addBinder('Horde_Template', new Horde_Core_Binder_Template());
 
         /* Create the global permissions object. */
         // TODO: Remove(?)

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index ad0ff50..2bc7766 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -55,6 +55,7 @@ Application Framework.
        <file name="Db.php" role="php" />
        <file name="Logger.php" role="php" />
        <file name="Memcache.php" role="php" />
+       <file name="Template.php" role="php" />
       </dir> <!-- /lib/Horde/Core/Binder -->
      </dir> <!-- /lib/Horde/Core -->
      <file name="ErrorHandler.php" role="php" />
@@ -135,6 +136,7 @@ Application Framework.
    <install name="lib/Horde/Core/Binder/Db.php" as="Horde/Core/Binder/Db.php" />
    <install name="lib/Horde/Core/Binder/Logger.php" as="Horde/Core/Binder/Logger.php" />
    <install name="lib/Horde/Core/Binder/Memcache.php" as="Horde/Core/Binder/Memcache.php" />
+   <install name="lib/Horde/Core/Binder/Template.php" as="Horde/Core/Binder/Template.php" />
    <install name="lib/Horde/ErrorHandler.php" as="Horde/ErrorHandler.php" />
    <install name="lib/Horde/Exception/HookNotSet.php" as="Horde/Exception/HookNotSet.php" />
    <install name="lib/Horde/Help.php" as="Horde/Help.php" />

diff --git a/framework/Template/lib/Horde/Template.php b/framework/Template/lib/Horde/Template.php
index 85c34d1..ad2829b 100644 (file)
--- a/framework/Template/lib/Horde/Template.php
+++ b/framework/Template/lib/Horde/Template.php
@@ -100,17 +100,21 @@ class Horde_Template
     /**
      * Constructor.
      *
-     * @param string $basepath  The directory where templates are read from.
+     * @param array $params  The following configuration options:
+     * <pre>
+     * 'basepath' - (string) The directory where templates are read from.
+     * 'cacheob' - (Horde_Cache) A caching object used to cache the output.
+     * </pre>
      */
     public function __construct($basepath = null)
     {
-        if (!is_null($basepath)) {
-            $this->_basepath = $basepath;
+        if (isset($params['basepath'])) {
+            $this->_basepath = $params['basepath'];
         }
 
-        try {
-            $this->_cache = $GLOBALS['injector']->getInstance('Horde_Cache');
-        } catch (Horde_Exception $e) {}
+        if (isset($params['cacheob'])) {
+            $this->_cache = $params['cacheob'];
+        }
     }
 
     /**

diff --git a/framework/Template/package.xml b/framework/Template/package.xml
index cf836c9..56c35cf 100644 (file)
--- a/framework/Template/package.xml
+++ b/framework/Template/package.xml
@@ -69,14 +69,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <pearinstaller>
     <min>1.5.4</min>
    </pearinstaller>
-<!--
+  </required>
+  <optional>
    <package>
-    <name>Horde</name>
+    <name>Cache</name>
     <channel>pear.horde.org</channel>
    </package>
--->
-  </required>
-  <optional>
    <extension>
     <name>gettext</name>
    </extension>

diff --git a/framework/Template/test/Horde/Template/array_assoc.phpt b/framework/Template/test/Horde/Template/array_assoc.phpt
index 38b39af..797b0cc 100644 (file)
--- a/framework/Template/test/Horde/Template/array_assoc.phpt
+++ b/framework/Template/test/Horde/Template/array_assoc.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('foo', array('one' => 'one', 'two' => 2));
 echo $template->fetch('/array_assoc.html');
 

diff --git a/framework/Template/test/Horde/Template/array_if.phpt b/framework/Template/test/Horde/Template/array_if.phpt
index c05d475..23a4e6c 100644 (file)
--- a/framework/Template/test/Horde/Template/array_if.phpt
+++ b/framework/Template/test/Horde/Template/array_if.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('foo', array('one', 'two', 'three'), true);
 $template->set('bar', array(), true);
 echo $template->fetch('/array_if.html');

diff --git a/framework/Template/test/Horde/Template/array_nested.phpt b/framework/Template/test/Horde/Template/array_nested.phpt
index f393996..a22e8c3 100644 (file)
--- a/framework/Template/test/Horde/Template/array_nested.phpt
+++ b/framework/Template/test/Horde/Template/array_nested.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $categories = array('fruit', 'veggie', 'thing');
 $subcats = array('fruit' => array('apple', 'pear'),
                  'veggie' => array('tomato', 'potato', 'carrot', 'onion'),

diff --git a/framework/Template/test/Horde/Template/array_simple.phpt b/framework/Template/test/Horde/Template/array_simple.phpt
index e691bc7..5bbd970 100644 (file)
--- a/framework/Template/test/Horde/Template/array_simple.phpt
+++ b/framework/Template/test/Horde/Template/array_simple.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('string', array('one', 'two', 'three'));
 $template->set('int', array(1, 2, 3));
 echo $template->fetch('/array_simple.html');

diff --git a/framework/Template/test/Horde/Template/if.phpt b/framework/Template/test/Horde/Template/if.phpt
index 20d7ec6..56e5b54 100644 (file)
--- a/framework/Template/test/Horde/Template/if.phpt
+++ b/framework/Template/test/Horde/Template/if.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('foo', true, true);
 $template->set('bar', false, true);
 $template->set('baz', 'baz', true);

diff --git a/framework/Template/test/Horde/Template/iterator.phpt b/framework/Template/test/Horde/Template/iterator.phpt
index 9b31d89..25d6ad5 100644 (file)
--- a/framework/Template/test/Horde/Template/iterator.phpt
+++ b/framework/Template/test/Horde/Template/iterator.phpt
@@ -8,7 +8,7 @@ $i = new ArrayObject(array(1, 2, 3));
 $a = new ArrayObject(array('one' => 'one', 'two' => 2));
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('s', $s);
 $template->set('i', $i);
 $template->set('a', $a);

diff --git a/framework/Template/test/Horde/Template/scalar.phpt b/framework/Template/test/Horde/Template/scalar.phpt
index ac54504..83989f3 100644 (file)
--- a/framework/Template/test/Horde/Template/scalar.phpt
+++ b/framework/Template/test/Horde/Template/scalar.phpt
@@ -8,7 +8,7 @@ if (defined('E_DEPRECATED')) {
 }
 
 require dirname(__FILE__) . '/../../../lib/Horde/Template.php';
-$template = new Horde_Template(dirname(__FILE__));
+$template = new Horde_Template(array('basepath' => dirname(__FILE__)));
 $template->set('one', 'one');
 $template->set('two', 2);
 echo $template->fetch('/scalar.html');

diff --git a/gollem/clipboard.php b/gollem/clipboard.php
index fc0a513..f5a8599 100644 (file)
--- a/gollem/clipboard.php
+++ b/gollem/clipboard.php
@@ -33,7 +33,7 @@ foreach ($_SESSION['gollem']['clipboard'] as $key => $val) {
 }
 
 /* Set up the template object. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('cancelbutton', _("Cancel"));
 $template->set('clearbutton', _("Clear"));

diff --git a/gollem/lib/Gollem.php b/gollem/lib/Gollem.php
index 3a62c46..13f089c 100644 (file)
--- a/gollem/lib/Gollem.php
+++ b/gollem/lib/Gollem.php
@@ -729,7 +729,7 @@ class Gollem
      */
     static public function menu()
     {
-        $t = new Horde_Template();
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
 
         $t->set('forminput', Horde_Util::formInput());
         $t->set('be_select', Gollem::backendSelect(), true);

diff --git a/gollem/manager.php b/gollem/manager.php
index 0bdb548..ff47a7e 100644 (file)
--- a/gollem/manager.php
+++ b/gollem/manager.php
@@ -274,7 +274,7 @@ $sources = Gollem::displayColumns();
 $columns = isset($sources[$backkey]) ? $sources[$backkey] : $GLOBALS['gollem_be']['attributes'];
 
 /* Prepare the template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 
 $attrib = $GLOBALS['gollem_vfs']->getModifiablePermissions();

diff --git a/gollem/quota.php b/gollem/quota.php
index 7111408..96c52dc 100644 (file)
--- a/gollem/quota.php
+++ b/gollem/quota.php
@@ -24,7 +24,7 @@ if (!$isPopup) {
 }
 
 /* Set up the template object. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('hasjs', false, true);
 if ($isPopup) {

diff --git a/gollem/selectlist.php b/gollem/selectlist.php
index 8adce5c..2be59f5 100644 (file)
--- a/gollem/selectlist.php
+++ b/gollem/selectlist.php
@@ -91,7 +91,7 @@ Horde::addInlineScript(implode(';', $js_code));
 Gollem::status();
 
 /* Set up the template object. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->set('addbutton', _("Add"));
 $t->set('donebutton', _("Done"));
 $t->set('cancelbutton', _("Cancel"));

diff --git a/gollem/templates/prefs/columnselect.inc b/gollem/templates/prefs/columnselect.inc
index 80cd2a8..e0d5abe 100644 (file)
--- a/gollem/templates/prefs/columnselect.inc
+++ b/gollem/templates/prefs/columnselect.inc
@@ -26,7 +26,7 @@ if (!$prefs->isLocked('columns')) {
     Horde::addScriptFile('columnselect.js', 'gollem');
     Horde::addInlineScript($js_columns);
 
-    $t = new Horde_Template();
+    $t = $injector->createInstance('Horde_Template');
     $t->setOption('gettext', true);
 
     $be = array();

diff --git a/horde/admin/setup/config.php b/horde/admin/setup/config.php
index 8e03ea7..f344f81 100644 (file)
--- a/horde/admin/setup/config.php
+++ b/horde/admin/setup/config.php
@@ -81,7 +81,7 @@ $form = Horde_Util::bufferOutput(array($form, 'renderActive'), $renderer, $vars,
 
 
 /* Set up the template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('php', htmlspecialchars($php), true);
 /* Create the link for the diff popup only if stored in session. */
 $diff_link = '';

diff --git a/horde/admin/setup/diff.php b/horde/admin/setup/diff.php
index 6a235ee..87297fe 100644 (file)
--- a/horde/admin/setup/diff.php
+++ b/horde/admin/setup/diff.php
@@ -74,7 +74,7 @@ if (!empty($_SESSION['_config'])) {
 }
 
 /* Set up the template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('diffs', $diffs, true);
 

diff --git a/horde/admin/setup/index.php b/horde/admin/setup/index.php
index 78d5449..5caf6bb 100644 (file)
--- a/horde/admin/setup/index.php
+++ b/horde/admin/setup/index.php
@@ -235,7 +235,7 @@ if (file_exists(Horde::getTempDir() . '/horde_setup_upgrade.php')) {
 }
 
 /* Set up the template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('versions', !empty($versions), true);
 $template->set('version_action', Horde::applicationUrl('admin/setup/index.php'));

diff --git a/horde/services/logintasks.php b/horde/services/logintasks.php
index 5bbb2a4..ea2d6c9 100644 (file)
--- a/horde/services/logintasks.php
+++ b/horde/services/logintasks.php
@@ -29,7 +29,7 @@ if (!($tasks = Horde_LoginTasks::singleton($app))) {
 $tasks->runTasks(Horde_Util::getPost('logintasks_page'));
 
 /* Create the Horde_Template item. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('javascript', $browser->hasFeature('javascript'), true);
 
 /* Have the maintenance module do all necessary processing. */

diff --git a/horde/services/obrowser/index.php b/horde/services/obrowser/index.php
index b1e3958..d1325bc 100644 (file)
--- a/horde/services/obrowser/index.php
+++ b/horde/services/obrowser/index.php
@@ -95,7 +95,7 @@ foreach ($list as $path => $values) {
     $rows[] = $row;
 }
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('rows', $rows);
 $template->set('close', '<a href="#" onclick="window.close(); return false;">' . Horde::img('close.png') . '</a>');

diff --git a/hylax/compose.php b/hylax/compose.php
index 84bdebb..5d399f8 100644 (file)
--- a/hylax/compose.php
+++ b/hylax/compose.php
@@ -46,7 +46,7 @@ $form->addVariable(_("Subject"), 'subject', 'text', false, false, null, array(fa
 $form->addVariable(_("Comment"), 'comment', 'longtext', false, false, null, array(4, 80));
 
 /* Set up template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('form', '');
 $template->set('menu', Hylax::getMenu('string'));
 $template->set('notify', Horde_Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));

diff --git a/hylax/folder.php b/hylax/folder.php
index 48f24ac..18945aa 100644 (file)
--- a/hylax/folder.php
+++ b/hylax/folder.php
@@ -85,7 +85,7 @@ foreach ($base_folders as $key => $value) {
 }
 
 /* Set up template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 if ($folder == 'archive') {
     $template->set('folder_name', $path);
 } else {

diff --git a/hylax/send.php b/hylax/send.php
index 0472ecd..bb2f5af 100644 (file)
--- a/hylax/send.php
+++ b/hylax/send.php
@@ -62,7 +62,7 @@ $renderer = new Horde_Form_Renderer();
 $send_form = Horde_Util::bufferOutput(array($form, 'renderActive'), $renderer, $vars, 'send.php', 'post');
 
 /* Set up template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('form', $send_form);
 $template->set('pages', $pages);
 $template->set('menu', $menu->getMenu());

diff --git a/hylax/summary.php b/hylax/summary.php
index cb95a48..7280537 100644 (file)
--- a/hylax/summary.php
+++ b/hylax/summary.php
@@ -24,7 +24,7 @@ foreach ($outbox as $item) {
 }
 
 /* Set up actions. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('in_faxes', $hylax->gateway->numFaxesIn());
 $template->set('out_faxes', $hylax->gateway->numFaxesOut());
 $template->set('inbox', $fmt_inbox, true);

diff --git a/hylax/view.php b/hylax/view.php
index 0d15ae2..eb9ac58 100644 (file)
--- a/hylax/view.php
+++ b/hylax/view.php
@@ -38,7 +38,7 @@ $title = _("View Fax");
 $pages = Hylax::getPages($fax_id, $fax['fax_pages']);
 
 /* Set up template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('form', '');
 $template->set('pages', $pages);
 $template->set('menu', Hylax::getMenu('string'));

diff --git a/imp/acl.php b/imp/acl.php
index 26ec521..c2eaa82 100644 (file)
--- a/imp/acl.php
+++ b/imp/acl.php
@@ -130,7 +130,7 @@ $chunk = Horde_Util::nonInputVar('chunk');
 Horde_Prefs_Ui::generateHeader('imp', null, null, $chunk);
 
 /* Set up template. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('aclurl', Horde::applicationUrl('acl.php'));
 $t->set('forminput', Horde_Util::formInput());

diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php
index 3432e61..cd96af5 100644 (file)
--- a/imp/compose-dimp.php
+++ b/imp/compose-dimp.php
@@ -154,7 +154,7 @@ if ($get_sig && !empty($sig)) {
         : $msg . "\n" . $sig;
 }
 
-$t = new Horde_Template(IMP_TEMPLATES . '/imp/');
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('title', $title);
 
@@ -189,7 +189,7 @@ $scripts = array(
 );
 
 IMP_Dimp::header(_("Message Composition"), $scripts);
-echo $t->fetch('compose.html');
+echo $t->fetch(IMP_TEMPLATES . '/imp/compose.html');
 Horde::includeScriptFiles();
 Horde::outputInlineScript();
 echo $compose_result['jsappend'];

diff --git a/imp/compose.php b/imp/compose.php
index e091f2e..6baf986 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -761,7 +761,7 @@ if (!$redirect) {
 
 
 /* Set up the base template now. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('post_action', Horde::applicationUrl('compose.php')->add('uniq', uniqid(mt_rand())));
 $t->set('allow_compose', !$compose_disable);

diff --git a/imp/contacts.php b/imp/contacts.php
index f65c2fb..f391af7 100644 (file)
--- a/imp/contacts.php
+++ b/imp/contacts.php
@@ -62,7 +62,7 @@ foreach (explode('|', Horde_Util::getFormData('sa')) as $addr) {
 }
 
 /* Prepare the contacts template. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 
 $template->set('action', Horde::applicationUrl('contacts.php')->add(array('uniq' => uniqid(mt_rand()))));

diff --git a/imp/filterprefs.php b/imp/filterprefs.php
index a2137fb..25e3432 100644 (file)
--- a/imp/filterprefs.php
+++ b/imp/filterprefs.php
@@ -46,7 +46,7 @@ $chunk = Horde_Util::nonInputVar('chunk');
 $group = 'filters';
 Horde_Prefs_Ui::generateHeader('imp', null, null, $chunk);
 
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('navcell', Horde_Util::bufferOutput(array('Horde_Prefs_Ui', 'generateNavigationCell'), 'imp', 'filters'));
 $t->set('prefsurl', Horde::getServiceLink('options', 'imp'));

diff --git a/imp/folders.php b/imp/folders.php
index 7c23800..4cc17cd 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -277,7 +277,7 @@ case 'folders_empty_mailbox_confirm':
         require IMP_TEMPLATES . '/common-header.inc';
         IMP::menu();
 
-        $template = new Horde_Template();
+        $template = $injector->createInstance('Horde_Template');
         $template->setOption('gettext', true);
         $template->set('delete', ($actionID == 'delete_folder_confirm'));
         $template->set('empty', ($actionID == 'folders_empty_mailbox_confirm'));
@@ -319,7 +319,7 @@ case 'mbox_size':
             $loop[] = $data;
         }
 
-        $template = new Horde_Template();
+        $template = $injector->createInstance('Horde_Template');
         $template->setOption('gettext', true);
         $template->set('folders', $loop);
         $template->set('folders_url', $folders_url);
@@ -347,7 +347,7 @@ if ($_SESSION['imp']['file_upload'] && ($actionID == 'import_mbox')) {
     IMP::quota();
 
     /* Prepare import template. */
-    $i_template = new Horde_Template();
+    $i_template = $injector->createInstance('Horde_Template');
     $i_template->setOption('gettext', true);
     $i_template->set('folders_url', $folders_url_ob);
     $i_template->set('import_folder', $folder_list[0]);
@@ -380,7 +380,7 @@ Horde::addInlineScript(array(
 
 /* Prepare the header template. */
 $refresh_title = _("Reload View");
-$head_template = new Horde_Template();
+$head_template = $injector->createInstance('Horde_Template');
 $head_template->setOption('gettext', true);
 $head_template->set('title', $refresh_title);
 $head_template->set('folders_url', $folders_url_ob);
@@ -393,7 +393,7 @@ $head_template->set('refresh', Horde::link($folders_url_ob, $refresh_title, '',
 $head_template->set('folders_token', $folders_token);
 
 /* Prepare the actions template. */
-$a_template = new Horde_Template();
+$a_template = $injector->createInstance('Horde_Template');
 $a_template->setOption('gettext', true);
 $a_template->set('id', 0);
 $a_template->set('javascript', $browser->hasFeature('javascript'));
@@ -467,7 +467,7 @@ foreach ($raw_rows as $key => $val) {
 }
 
 /* Render the rows now. */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set('rows', $rows);
 

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index 55b032c..bfbbd8d 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -1130,9 +1130,9 @@ class IMP_Ajax_Application extends Horde_Ajax_Application_Base
         $result = new stdClass;
         $result->portal = '';
         if (!empty($blocks)) {
-            $t = new Horde_Template(IMP_TEMPLATES . '/imp/');
+            $t = $GLOBALS['injector']->createInstance('Horde_Template');
             $t->set('block', $blocks);
-            $result->portal = $t->fetch('portal.html');
+            $result->portal = $t->fetch(IMP_TEMPLATES . '/imp/portal.html');
         }
         $result->linkTags = $linkTags;
 

diff --git a/imp/lib/Crypt/Pgp.php b/imp/lib/Crypt/Pgp.php
index b3a8164..5a5a3cf 100644 (file)
--- a/imp/lib/Crypt/Pgp.php
+++ b/imp/lib/Crypt/Pgp.php
@@ -639,7 +639,7 @@ class IMP_Crypt_Pgp extends Horde_Crypt_Pgp
         require IMP_TEMPLATES . '/common-header.inc';
         IMP::status();
 
-        $t = new Horde_Template();
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
         $t->setOption('gettext', true);
         $t->set('selfurl', Horde::applicationUrl('pgp.php'));
         $t->set('broken_mp_form', $GLOBALS['browser']->hasQuirk('broken_multipart_form'));

diff --git a/imp/lib/Crypt/Smime.php b/imp/lib/Crypt/Smime.php
index b831075..52631c8 100644 (file)
--- a/imp/lib/Crypt/Smime.php
+++ b/imp/lib/Crypt/Smime.php
@@ -475,7 +475,7 @@ class IMP_Crypt_Smime extends Horde_Crypt_Smime
         require IMP_TEMPLATES . '/common-header.inc';
         IMP::status();
 
-        $t = new Horde_Template();
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
         $t->setOption('gettext', true);
         $t->set('selfurl', Horde::applicationUrl('smime.php'));
         $t->set('broken_mp_form', $GLOBALS['browser']->hasQuirk('broken_multipart_form'));

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 8edffc5..9f2a85f 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -521,7 +521,7 @@ class IMP
             return;
         }
 
-        $t = new Horde_Template();
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
         $t->set('forminput', Horde_Util::formInput());
         $t->set('use_folders', ($_SESSION['imp']['protocol'] != 'pop') && $GLOBALS['conf']['user']['allow_folders'], true);
         if ($t->get('use_folders')) {
@@ -565,7 +565,7 @@ class IMP
     {
         $quotadata = self::quotaData(true);
         if (!empty($quotadata)) {
-            $t = new Horde_Template();
+            $t = $GLOBALS['injector']->createInstance('Horde_Template');
             $t->set('class', $quotadata['class']);
             $t->set('message', $quotadata['message']);
             echo $t->fetch(IMP_TEMPLATES . '/quota/quota.html');
@@ -1157,7 +1157,7 @@ class IMP
      */
     static protected function _getNewMessagePopup($var)
     {
-        $t = new Horde_Template();
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
         $t->setOption('gettext', true);
         if (is_array($var)) {
             if (empty($var)) {

diff --git a/imp/lib/Ui/Compose.php b/imp/lib/Ui/Compose.php
index 94ed197..056113e 100644 (file)
--- a/imp/lib/Ui/Compose.php
+++ b/imp/lib/Ui/Compose.php
@@ -260,7 +260,7 @@ class IMP_Ui_Compose
         $menu->add(Horde::applicationUrl('compose.php'), _("New Message"), 'compose.png');
         $menu->add('', _("Close this window"), 'close.png', null, null, 'window.close();');
         require IMP_TEMPLATES . '/common-header.inc';
-        $success_template = new Horde_Template();
+        $success_template = $GLOBALS['injector']->createInstance('Horde_Template');
         $success_template->set('menu', $menu->render());
         echo $success_template->fetch(IMP_TEMPLATES . '/compose/success.html');
         IMP::status();

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 9aa2877..8272ba3 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -22,7 +22,7 @@ function _outputSummaries($msgs)
     } catch (Horde_Exception_HookNotSet $e) {}
 
     if (!isset($template)) {
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->setOption('gettext', true);
 
         // Some browsers have trouble with hidden overflow in table cells
@@ -405,7 +405,7 @@ IMP::status();
 IMP::quota();
 
 /* Prepare the header template. */
-$hdr_template = new Horde_Template();
+$hdr_template = $injector->createInstance('Horde_Template');
 $hdr_template->set('title', $title);
 $hdr_template->set('pagetitle', $pagetitle);
 if ($readonly) {
@@ -452,7 +452,7 @@ if (empty($pageOb['end'])) {
     if ($pageOb['anymsg'] && isset($deleted_prompt)) {
         /* Show 'Show Deleted' prompt if mailbox has no viewable message but
            has hidden, deleted messages. */
-        $del_template = new Horde_Template();
+        $del_template = $injector->createInstance('Horde_Template');
         $del_template->set('hide', Horde::widget($refresh_url->copy()->add(array('actionID' => 'hide_deleted', 'mailbox_token' => $mailbox_token)), $deleted_prompt, 'widget hideAction', '', '', $deleted_prompt));
         if (!$readonly) {
             $del_template->set('purge', Horde::widget($refresh_url->copy()->add(array('actionID' => 'expunge_mailbox', 'mailbox_token' => $mailbox_token)), _("Purge Deleted"), 'widget purgeAction', '', '', _("Pur_ge Deleted")));
@@ -460,7 +460,7 @@ if (empty($pageOb['end'])) {
         echo $del_template->fetch(IMP_TEMPLATES . '/mailbox/actions_deleted.html');
     }
 
-    $empty_template = new Horde_Template();
+    $empty_template = $injector->createInstance('Horde_Template');
     $empty_template->setOption('gettext', true);
     $empty_template->set('search_mbox', $search_mbox);
     echo $empty_template->fetch(IMP_TEMPLATES . '/mailbox/empty_mailbox.html');
@@ -473,7 +473,7 @@ if ($pageOb['msgcount']) {
     $use_trash = $prefs->getValue('use_trash');
 
     /* Prepare the navbar template. */
-    $n_template = new Horde_Template();
+    $n_template = $injector->createInstance('Horde_Template');
     $n_template->setOption('gettext', true);
     $n_template->set('id', 1);
     $n_template->set('sessiontag', Horde_Util::formInput());
@@ -508,7 +508,7 @@ if ($pageOb['msgcount']) {
     echo $n_template->fetch(IMP_TEMPLATES . '/mailbox/navbar.html');
 
     /* Prepare the actions template. */
-    $a_template = new Horde_Template();
+    $a_template = $injector->createInstance('Horde_Template');
     if (!$readonly) {
         $del_class = ($use_trash && (($imp_mbox['mailbox'] == (IMP::folderPref($prefs->getValue('trash_folder'), true))) || !is_null($vtrash)))
             ? 'permdeleteAction'
@@ -655,7 +655,7 @@ if ($pageOb['msgcount']) {
     }
 
     /* Prepare the message headers template. */
-    $mh_template = new Horde_Template();
+    $mh_template = $injector->createInstance('Horde_Template');
     $mh_template->setOption('gettext', true);
     $mh_template->set('check_all', Horde::getAccessKeyAndTitle(_("Check _All/None")));
     $mh_template->set('form_tag', true);
@@ -689,7 +689,7 @@ while (list(,$ob) = each($mbox_info['overview'])) {
             $folder_link = Horde::applicationUrl('mailbox.php')->add('mailbox', $ob['mailbox']);
             $folder_link = Horde::link($folder_link, sprintf(_("View messages in %s"), IMP::displayFolder($ob['mailbox'])), 'smallheader') . IMP::displayFolder($ob['mailbox']) . '</a>';
             if (is_null($search_template)) {
-                $search_template = new Horde_Template();
+                $search_template = $injector->createInstance('Horde_Template');
             }
             $search_template->set('lastMbox', $lastMbox);
             $search_template->set('folder_link', $folder_link);
@@ -828,7 +828,7 @@ while (list(,$ob) = each($mbox_info['overview'])) {
 _outputSummaries($msgs);
 
 /* Prepare the message footers template. */
-$mf_template = new Horde_Template();
+$mf_template = $injector->createInstance('Horde_Template');
 $mf_template->set('page', $pageOb['page']);
 echo $mf_template->fetch(IMP_TEMPLATES . '/mailbox/message_footers.html');
 

diff --git a/imp/message.php b/imp/message.php
index 7b58376..b2af2ee 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -407,7 +407,7 @@ if ($imp_search->isSearchMbox($imp_mbox['mailbox'])) {
 }
 
 /* Prepare the navbar top template. */
-$t_template = new Horde_Template();
+$t_template = $injector->createInstance('Horde_Template');
 $t_template->set('message_url', $message_url);
 $t_template->set('form_input', Horde_Util::formInput());
 $t_template->set('mailbox', htmlspecialchars($imp_mbox['mailbox']));
@@ -420,7 +420,7 @@ $t_template->set('status', $status);
 $t_template->set('message_token', $message_token);
 
 /* Prepare the navbar navigate template. */
-$n_template = new Horde_Template();
+$n_template = $injector->createInstance('Horde_Template');
 $n_template->setOption('gettext', true);
 $n_template->set('readonly', $readonly);
 $n_template->set('usepop', $use_pop);
@@ -458,7 +458,7 @@ if (Horde_Util::nonInputVar('next_url')) {
 }
 
 /* Prepare the navbar actions template. */
-$a_template = new Horde_Template();
+$a_template = $injector->createInstance('Horde_Template');
 $a_template->setOption('gettext', true);
 $a_template->set('readonly', $readonly);
 $compose_params = array('identity' => $identity, 'thismailbox' => $mailbox_name, 'uid' => $uid);
@@ -557,7 +557,7 @@ $hdrs = array();
 $i = 1;
 
 /* Prepare the main message template. */
-$m_template = new Horde_Template();
+$m_template = $injector->createInstance('Horde_Template');
 foreach ($display_headers as $head => $val) {
     $hdrs[] = array('name' => $basic_headers[$head], 'val' => $val, 'i' => (++$i % 2));
 }

diff --git a/imp/pgp.php b/imp/pgp.php
index 512221f..fb43cfb 100644 (file)
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -233,7 +233,7 @@ $chunk = Horde_Util::nonInputVar('chunk');
 Horde_Prefs_Ui::generateHeader('imp', null, 'pgp', $chunk);
 
 /* If PGP preference not active, do NOT show PGP Admin screen. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 if ($prefs->getValue('use_pgp')) {
     Horde::addScriptFile('imp.js', 'imp');

diff --git a/imp/rss.php b/imp/rss.php
index e229ce4..dcadcd6 100644 (file)
--- a/imp/rss.php
+++ b/imp/rss.php
@@ -78,7 +78,7 @@ $description = ($total_num == 0)
     ? _("No Messages")
     : sprintf(_("%u of %u messages in %s unread."), $unseen_num, $total_num, IMP::getLabel($mailbox));
 
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->set('charset', Horde_Nls::getCharset());
 $t->set('xsl', $registry->get('themesuri') . '/feed-rss.xsl');
 $t->set('pubDate', htmlspecialchars(date('r')));

diff --git a/imp/saveimage.php b/imp/saveimage.php
index c36fdbf..dc364fb 100644 (file)
--- a/imp/saveimage.php
+++ b/imp/saveimage.php
@@ -44,7 +44,7 @@ if (!$registry->hasMethod('images/selectGalleries') ||
 }
 
 /* Build the template. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('action', Horde::applicationUrl('saveimage.php'));
 $t->set('id', htmlspecialchars($id));

diff --git a/imp/search-basic.php b/imp/search-basic.php
index 5103ed9..b24875e 100644 (file)
--- a/imp/search-basic.php
+++ b/imp/search-basic.php
@@ -55,7 +55,7 @@ foreach ($imp_search->flagFields() as $key => $val) {
 }
 
 /* Prepare the search template. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 
 $t->set('action', Horde::applicationUrl('search-basic.php'));

diff --git a/imp/search.php b/imp/search.php
index daea04c..c44acb7 100644 (file)
--- a/imp/search.php
+++ b/imp/search.php
@@ -133,7 +133,7 @@ if (!empty($recent_searches)) {
 $js_load[] = 'ImpSearch.updateSelectedFolders(' . Horde_Serialize::serialize(array($search_mailbox), Horde_Serialize::JSON, $charset) . ')';
 
 /* Prepare the search template. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('action', Horde::applicationUrl('search.php'));
 $t->set('subscribe', $subscribe);

diff --git a/imp/smime.php b/imp/smime.php
index 078cfae..19163c0 100644 (file)
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -156,7 +156,7 @@ try {
 }
 
 /* If S/MIME preference not active, do NOT show S/MIME Admin screen. */
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('use_smime_help', Horde_Help::link('imp', 'smime-overview'));
 if ($openssl_check && $prefs->getValue('use_smime')) {

diff --git a/imp/stationery.php b/imp/stationery.php
index 4375536..ffc3397 100644 (file)
--- a/imp/stationery.php
+++ b/imp/stationery.php
@@ -104,7 +104,7 @@ if ($stationery['t'] == 'html') {
 $chunk = Horde_Util::nonInputVar('chunk');
 Horde_Prefs_Ui::generateHeader('imp', null, null, $chunk);
 
-$t = new Horde_Template();
+$t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 $t->set('action', Horde::selfUrl());
 $t->set('forminput', Horde_Util::formInput());

diff --git a/imp/thread.php b/imp/thread.php
index bea4b94..1a49e88 100644 (file)
--- a/imp/thread.php
+++ b/imp/thread.php
@@ -139,7 +139,7 @@ foreach ($loop_array as $mbox => $idxlist) {
 $imp_message = IMP_Message::singleton();
 $imp_message->flag(array('\\seen'), $loop_array);
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->setOption('gettext', true);
 $template->set(
     'subject',

diff --git a/ingo/filters.php b/ingo/filters.php
index aa63686..a8f5b9e 100644 (file)
--- a/ingo/filters.php
+++ b/ingo/filters.php
@@ -305,7 +305,7 @@ if (count($filter_list) == 0) {
     }
 
     /* Output the template. */
-    $template = new Horde_Template();
+    $template = $injector->createInstance('Horde_Template');
     $template->set('down_img', $down_img);
     $template->set('up_img', $up_img);
     $template->set('filter', $display, true);

diff --git a/jeta/index.php b/jeta/index.php
index 956b01c..deb7417 100644 (file)
--- a/jeta/index.php
+++ b/jeta/index.php
@@ -13,7 +13,7 @@ Horde_Registry::appInit('jeta');
 
 $applet = Jeta_Applet::factory($prefs->getValue('sshdriver'));
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('menu', Jeta::getMenu()->render());
 $template->set('notification', $notification->notify(array('listeners' => 'status')));
 $template->set('applet', $applet->generateAppletCode());

diff --git a/kronolith/feed/index.php b/kronolith/feed/index.php
index af00ffb..1cf54fb 100644 (file)
--- a/kronolith/feed/index.php
+++ b/kronolith/feed/index.php
@@ -88,7 +88,7 @@ $identity = Horde_Prefs_Identity::factory('none', $owner);
 $history = Horde_History::singleton();
 $now = new Horde_Date(time());
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('charset', Horde_Nls::getCharset());
 $template->set('updated', $now->format(DATE_ATOM));
 $template->set('kronolith_name', 'Kronolith');

diff --git a/kronolith/lib/FreeBusy/View.php b/kronolith/lib/FreeBusy/View.php
index b1a0a6f..dbd5ad6 100644 (file)
--- a/kronolith/lib/FreeBusy/View.php
+++ b/kronolith/lib/FreeBusy/View.php
@@ -85,7 +85,7 @@ class Kronolith_FreeBusy_View {
             ->remove('fbview')
             ->add('fbview', $this->view);
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('title', $this->_title());
 
         $html = $template->fetch(KRONOLITH_TEMPLATES . '/fbview/header.html') .
@@ -104,13 +104,13 @@ class Kronolith_FreeBusy_View {
             foreach ($this->_requiredMembers as $member) {
                 $member->simplify();
                 $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
-                $template = new Horde_Template();
+                $template = $GLOBALS['injector']->createInstance('Horde_Template');
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
                 $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
             }
 
-            $template = new Horde_Template();
+            $template = $GLOBALS['injector']->createInstance('Horde_Template');
             $template->set('title', _("Required Attendees"));
             $template->set('rows', $rows);
             $template->set('span', count($this->_timeBlocks));
@@ -125,13 +125,13 @@ class Kronolith_FreeBusy_View {
             foreach ($this->_optionalMembers as $member) {
                 $member->simplify();
                 $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
-                $template = new Horde_Template();
+                $template = $GLOBALS['injector']->createInstance('Horde_Template');
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
                 $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
             }
 
-            $template = new Horde_Template();
+            $template = $GLOBALS['injector']->createInstance('Horde_Template');
             $template->set('title', _("Optional Attendees"));
             $template->set('rows', $rows);
             $template->set('span', count($this->_timeBlocks));
@@ -143,12 +143,12 @@ class Kronolith_FreeBusy_View {
         // Required Resources
         //if (count($this->_requiredResourceMembers) > 0) {
         if (count($this->_requiredResourceMembers) > 0 || count($this->_optionalResourceMembers) > 0) {
-            $template = new Horde_Template();
+            $template = $GLOBALS['injector']->createInstance('Horde_Template');
             $rows = '';
             foreach ($this->_requiredResourceMembers as $member) {
                 $member->simplify();
                 $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
-                $template = new Horde_Template();
+                $template = $GLOBALS['injector']->createInstance('Horde_Template');
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
                 $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
@@ -156,12 +156,12 @@ class Kronolith_FreeBusy_View {
             foreach ($this->_optionalResourceMembers as $member) {
                 $member->simplify();
                 $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
-                $template = new Horde_Template();
+                $template = $GLOBALS['injector']->createInstance('Horde_Template');
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
                 $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
             }
-            $template = new Horde_Template();
+            $template = $GLOBALS['injector']->createInstance('Horde_Template');
             $template->set('title', _("Required Resources"));
             $template->set('rows', $rows);
             $template->set('span', count($this->_timeBlocks));
@@ -172,17 +172,17 @@ class Kronolith_FreeBusy_View {
 
 //        // Optional Resources
 //        if (count($this->_optionalResourceMembers) > 0) {
-//            $template = new Horde_Template();
+//            $template = $GLOBALS['injector']->createInstance('Horde_Template');
 //            $rows = '';
 //            foreach ($this->_optionalResourceMembers as $member) {
 //                $member->simplify();
 //                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
-//                $template = new Horde_Template();
+//                $template = $GLOBALS['injector']->createInstance('Horde_Template');
 //                $template->set('blocks', $blocks);
 //                $template->set('name', $member->getName());
 //                $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
 //            }
-//            $template = new Horde_Template();
+//            $template = $GLOBALS['injector']->createInstance('Horde_Template');
 //            $template->set('title', _("Optional Resources"));
 //            $template->set('rows', $rows);
 //            $template->set('span', count($this->_timeBlocks));
@@ -198,7 +198,7 @@ class Kronolith_FreeBusy_View {
                                     $optimal->getFreePeriods($this->_start->timestamp(), $this->_end->timestamp()),
                                     'meetingblock.html', _("All Attendees"));
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('name', _("All Attendees"));
         $template->set('blocks', $blocks);
         $rows = $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
@@ -209,7 +209,7 @@ class Kronolith_FreeBusy_View {
                                     $required->getFreePeriods($this->_start->timestamp(), $this->_end->timestamp()),
                                     'meetingblock.html', _("Required Attendees"));
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
@@ -220,7 +220,7 @@ class Kronolith_FreeBusy_View {
 //                                    $required->getFreePeriods($this->_start->timestamp(), $this->_end->timestamp()),
 //                                    'meetingblock.html', _("Required Attendees"));
 //
-//        $template = new Horde_Template();
+//        $template = $GLOBALS['injector']->createInstance('Horde_Template');
 //        $template->set('name', _("Required Attendees"));
 //        $template->set('blocks', $blocks);
 //        $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
@@ -228,7 +228,7 @@ class Kronolith_FreeBusy_View {
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('rows', $rows);
         $template->set('title', _("Overview"));
         $template->set('span', count($this->_timeBlocks));
@@ -292,7 +292,7 @@ class Kronolith_FreeBusy_View {
 
     function _getBlocks($member, $periods, $blockfile, $label)
     {
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('label', $label);
 
         reset($periods);

diff --git a/kronolith/lib/View/Day.php b/kronolith/lib/View/Day.php
index 02a2f0e..cd39923 100644 (file)
--- a/kronolith/lib/View/Day.php
+++ b/kronolith/lib/View/Day.php
@@ -273,7 +273,7 @@ class Kronolith_View_Day extends Kronolith_Day {
             $rows[] = array('row' => $row, 'slot' => $newEventUrl);
         }
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('row_height', round(20 / $this->_slotsPerHour));
         $template->set('rows', $rows);
         $template->set('show_slots', true, true);

diff --git a/kronolith/lib/View/Week.php b/kronolith/lib/View/Week.php
index 5cc41c0..b76e689 100644 (file)
--- a/kronolith/lib/View/Week.php
+++ b/kronolith/lib/View/Week.php
@@ -307,7 +307,7 @@ class Kronolith_View_Week {
             $rows[] = array('row' => $row, 'slot' => '<span class="' . $hourclass . '">' . $time . '</span>');
         }
 
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('row_height', round(20 / $this->_slotsPerHour));
         $template->set('rows', $rows);
         $template->set('show_slots', !$more_timeslots, true);

diff --git a/vilma/lib/base.php b/vilma/lib/base.php
index cf326b3..827fc4d 100644 (file)
--- a/vilma/lib/base.php
+++ b/vilma/lib/base.php
@@ -40,7 +40,7 @@ require_once VILMA_BASE . '/lib/Vilma.php';
 require_once VILMA_BASE . '/lib/Driver.php';
 
 /* Templates */
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 
 /* Notification system. */
 $notification = &Horde_Notification::singleton();

diff --git a/whups/data.php b/whups/data.php
index 32cd121..e627d09 100644 (file)
--- a/whups/data.php
+++ b/whups/data.php
@@ -55,7 +55,7 @@ Whups::sortTickets($tickets,
                    isset($_templates[$tpl]['sortby']) ? $_templates[$tpl]['sortby'] : null,
                    isset($_templates[$tpl]['sortdir']) ? $_templates[$tpl]['sortdir'] : null);
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('tickets', $tickets);
 $template->set('now', strftime('%x'));
 $template->set('values', Whups::getSearchResultColumns(null, true));

diff --git a/whups/query/rss.php b/whups/query/rss.php
index 49bd952..2b3fede 100644 (file)
--- a/whups/query/rss.php
+++ b/whups/query/rss.php
@@ -54,7 +54,7 @@ foreach (array_keys($tickets) as $i) {
     $items[$i]['pubDate'] = htmlspecialchars(date('r', $tickets[$i]['timestamp']));
 }
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('charset', Horde_Nls::getCharset());
 $template->set('xsl', $registry->get('themesuri') . '/feed-rss.xsl');
 $template->set('pubDate', htmlspecialchars(date('r')));

diff --git a/whups/queue/rss.php b/whups/queue/rss.php
index 6c61456..bbc8256 100644 (file)
--- a/whups/queue/rss.php
+++ b/whups/queue/rss.php
@@ -85,7 +85,7 @@ foreach (array_keys($tickets) as $i) {
     $items[$i]['pubDate'] = htmlspecialchars(date('r', $tickets[$i]['timestamp']));
 }
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('charset', Horde_Nls::getCharset());
 $template->set('xsl', $registry->get('themesuri') . '/feed-rss.xsl');
 $template->set('pubDate', htmlspecialchars(date('r')));

diff --git a/whups/search/rss.php b/whups/search/rss.php
index ca43272..fe949c5 100644 (file)
--- a/whups/search/rss.php
+++ b/whups/search/rss.php
@@ -46,7 +46,7 @@ foreach (array_keys($tickets) as $i) {
     $items[$i]['pubDate'] = htmlspecialchars(date('r', $tickets[$i]['timestamp']));
 }
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('charset', Horde_Nls::getCharset());
 $template->set('xsl', $registry->get('themesuri') . '/feed-rss.xsl');
 $template->set('pubDate', htmlspecialchars(date('r')));

diff --git a/whups/ticket/rss.php b/whups/ticket/rss.php
index af5afa6..e1d69f4 100644 (file)
--- a/whups/ticket/rss.php
+++ b/whups/ticket/rss.php
@@ -41,7 +41,7 @@ foreach (array_keys($history) as $i) {
     $items[$i]['url'] = $self . '#t' . $i;
 }
 
-$template = new Horde_Template();
+$template = $injector->createInstance('Horde_Template');
 $template->set('charset', Horde_Nls::getCharset());
 $template->set('xsl', $registry->get('themesuri') . '/feed-rss.xsl');
 $template->set('pubDate', htmlspecialchars(date('r')));

diff --git a/wicked/lib/Page/AddPage.php b/wicked/lib/Page/AddPage.php
index 876e682..76fcb83 100644 (file)
--- a/wicked/lib/Page/AddPage.php
+++ b/wicked/lib/Page/AddPage.php
@@ -70,8 +70,7 @@ class AddPage extends Page {
 
         $search_results = null;
         if ($this->_results) {
-            require_once 'Horde/Template.php';
-            $template = new Horde_Template();
+            $template = $GLOBALS['injector']->createInstance('Horde_Template');
             $pages = array();
             foreach ($this->_results as $page) {
                 if (!empty($page['page_history'])) {

diff --git a/wicked/lib/Page/AllPages.php b/wicked/lib/Page/AllPages.php
index 70ab829..38fdab8 100644 (file)
--- a/wicked/lib/Page/AllPages.php
+++ b/wicked/lib/Page/AllPages.php
@@ -50,8 +50,7 @@ class AllPages extends Page {
             return $summaries;
         }
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $pages = array();
         foreach ($summaries as $page) {
             $page = new StandardPage($page);

diff --git a/wicked/lib/Page/AttachedFiles.php b/wicked/lib/Page/AttachedFiles.php
index 2324582..da6098f 100644 (file)
--- a/wicked/lib/Page/AttachedFiles.php
+++ b/wicked/lib/Page/AttachedFiles.php
@@ -112,8 +112,7 @@ class AttachedFiles extends Page {
             return $attachments;
         }
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
 
         $template->setOption('gettext', true);
         $template->set('pageName', $this->pageName());

diff --git a/wicked/lib/Page/LeastPopular.php b/wicked/lib/Page/LeastPopular.php
index 99ece9a..48baca6 100644 (file)
--- a/wicked/lib/Page/LeastPopular.php
+++ b/wicked/lib/Page/LeastPopular.php
@@ -53,8 +53,7 @@ class LeastPopular extends Page {
             return $summaries;
         }
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $pages = array();
         foreach ($summaries as $page) {
             $page = new StandardPage($page);

diff --git a/wicked/lib/Page/MergeOrRename.php b/wicked/lib/Page/MergeOrRename.php
index f79f853..d1d3e71 100644 (file)
--- a/wicked/lib/Page/MergeOrRename.php
+++ b/wicked/lib/Page/MergeOrRename.php
@@ -62,8 +62,7 @@ class MergeOrRename extends Page {
     {
         global $wicked, $registry, $notification;
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->setOption('gettext', true);
 
         $referrer = $this->referrer();

diff --git a/wicked/lib/Page/MostPopular.php b/wicked/lib/Page/MostPopular.php
index 054ffec..9bda187 100644 (file)
--- a/wicked/lib/Page/MostPopular.php
+++ b/wicked/lib/Page/MostPopular.php
@@ -53,8 +53,7 @@ class MostPopular extends Page {
             return $summaries;
         }
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $pages = array();
         foreach ($summaries as $page) {
             $page = new StandardPage($page);

diff --git a/wicked/lib/Page/RecentChanges.php b/wicked/lib/Page/RecentChanges.php
index 1ef11d2..79fe8a3 100644 (file)
--- a/wicked/lib/Page/RecentChanges.php
+++ b/wicked/lib/Page/RecentChanges.php
@@ -95,8 +95,7 @@ class RecentChanges extends Page {
             return $changes;
         }
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
         $template->set('changes', $changes);
 
         return $template->fetch(WICKED_TEMPLATES . '/display/RecentChanges.html');

diff --git a/wicked/lib/Page/Search.php b/wicked/lib/Page/Search.php
index f74a221..90615e8 100644 (file)
--- a/wicked/lib/Page/Search.php
+++ b/wicked/lib/Page/Search.php
@@ -89,8 +89,7 @@ class Search extends Page {
 
         Horde::addScriptFile('tables.js', 'horde', true);
 
-        require_once 'Horde/Template.php';
-        $template = new Horde_Template();
+        $template = $GLOBALS['injector']->createInstance('Horde_Template');
 
         /* Prepare exact match section */
         $exact = array();