From 1f385b8a3d707149d801ef8e183ceecc4da5c9bd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 17 May 2011 06:38:42 -0400
Subject: [PATCH] - Make update_cahce() method to be publicly available
---
program/include/rcube_template.php | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index fdfa15c..8495ab8 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -38,6 +38,7 @@
private $js_commands = array();
private $object_handlers = array();
private $plugin_skin_path;
+ private $template_name;
public $browser;
public $framed = false;
@@ -80,7 +81,7 @@
$this->add_script(JS_OBJECT_NAME.'.init();', 'docready');
$this->scripts_path = 'program/js/';
- $this->include_script('jquery-1.5.min.js');
+ $this->include_script('jquery.min.js');
$this->include_script('common.js');
$this->include_script('app.js');
@@ -109,7 +110,6 @@
}
}
-
/**
* Set page title variable
*/
@@ -117,7 +117,6 @@
{
$this->pagetitle = $title;
}
-
/**
* Getter for the current page title
@@ -138,7 +137,6 @@
return $title;
}
-
/**
* Set skin
@@ -222,7 +220,6 @@
$this->js_commands[] = $cmd;
}
-
/**
* Add a localized label to the client environment
*/
@@ -236,7 +233,6 @@
$this->command('add_label', $name, rcube_label($name));
}
}
-
/**
* Invoke display_message command
@@ -255,7 +251,6 @@
$this->command('display_message', $msgtext, $type);
}
}
-
/**
* Delete all stored env variables and commands
@@ -276,7 +271,6 @@
parent::reset();
}
-
/**
* Redirect to a certain url
*
@@ -289,7 +283,6 @@
header('Location: ' . $location);
exit;
}
-
/**
* Send the request output to the client.
@@ -359,22 +352,23 @@
}
/**
- * Parse a specific skin template and deliver to stdout
- *
- * Either returns nothing, or exists hard (exit();)
+ * Parse a specific skin template and deliver to stdout (or return)
*
* @param string Template name
* @param boolean Exit script
- * @return void
+ * @param boolean Don't write to stdout, return parsed content instead
+ *
* @link http://php.net/manual/en/function.exit.php
*/
- private function parse($name = 'main', $exit = true)
+ function parse($name = 'main', $exit = true, $write = true)
{
$skin_path = $this->config['skin_path'];
$plugin = false;
$realname = $name;
$temp = explode('.', $name, 2);
+
$this->plugin_skin_path = null;
+ $this->template_name = $realname;
if (count($temp) > 1) {
$plugin = $temp[0];
@@ -426,21 +420,26 @@
// trigger generic hook where plugins can put additional content to the page
$hook = $this->app->plugins->exec_hook("render_page", array('template' => $realname, 'content' => $output));
- // add debug console
- if ($this->config['debug_level'] & 8) {
- $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;">
- <a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
- <textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
- );
+ $output = $this->parse_with_globals($hook['content']);
+
+ if ($write) {
+ // add debug console
+ if ($this->config['debug_level'] & 8) {
+ $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;">
+ <a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
+ <textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
+ );
+ }
+ $this->write(trim($output));
+ }
+ else {
+ return $output;
}
- $output = $this->parse_with_globals($hook['content']);
- $this->write(trim($output));
if ($exit) {
exit;
}
}
-
/**
* Return executable javascript code for all registered commands
@@ -604,7 +603,8 @@
'/env:([a-z0-9_]+)/i',
'/request:([a-z0-9_]+)/i',
'/cookie:([a-z0-9_]+)/i',
- '/browser:([a-z0-9_]+)/i'
+ '/browser:([a-z0-9_]+)/i',
+ '/template:name/i',
),
array(
"\$_SESSION['\\1']",
@@ -612,7 +612,8 @@
"\$this->env['\\1']",
"get_input_value('\\1', RCUBE_INPUT_GPC)",
"\$_COOKIE['\\1']",
- "\$this->browser->{'\\1'}"
+ "\$this->browser->{'\\1'}",
+ $this->template_name,
),
$expression);
}
--
Gitblit v1.9.1