Changeset 4744 in subversion

Timestamp:

May 9, 2011 7:47:33 AM (2 years ago)

Author:

alec

Message:

• Extend parse() method so it can be used to parse templates without printing to stdout

File:

• trunk/roundcubemail/program/include/rcube_template.php (modified) (10 diffs)

trunk/roundcubemail/program/include/rcube_template.php

@@ -110 +110 @@
     }
 
-
     /**
      * Set page title variable
@@ -118 +117 @@
         $this->pagetitle = $title;
     }
-
 
     /**
@@ -139 +137 @@
         return $title;
     }
-
 
     /**
@@ -223 +220 @@
     }
 
-
     /**
      * Add a localized label to the client environment
@@ -237 +233 @@
         }
     }
-
 
     /**
@@ -256 +251 @@
         }
     }
-
 
     /**
@@ -277 +271 @@
     }
 
-
     /**
      * Redirect to a certain url
@@ -290 +283 @@
         exit;
     }
-
 
     /**
@@ -360 +352 @@
 
     /**
-     * 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'];
@@ -427 +418 @@
         $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']);
-        $this->write(trim($output));
+
+        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;
+        }
+
         if ($exit) {
             exit;
         }
     }
-
 
     /**