Changeset a366a32 in github

Timestamp:

Jul 13, 2009 2:52:15 PM (4 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

d5515f6

Parents:

c6514e0

Message:

Prevent from endless loops in render_page hook

Location:

program/include

Files:

• rcube_plugin_api.php (modified) (4 diffs)
• rcube_template.php (modified) (1 diff)

program/include/rcube_plugin_api.php

@@ -40 +40 @@
   private $template_contents = array();
   
-  private  $required_plugins = array('filesystem_attachments');
+  private $required_plugins = array('filesystem_attachments');
+  private $active_hook = false;
 
   /**
@@ -180 +181 @@
   {
     $args += array('abort' => false);
+    $this->active_hook = $hook;
     
     foreach ((array)$this->handlers[$hook] as $callback) {
@@ -190 +192 @@
     }
     
+    $this->active_hook = false;
     return $args;
   }
@@ -258 +261 @@
   }
   
+  
+  /**
+   * Check if a plugin hook is currently processing.
+   * Mainly used to prevent loops and recursion.
+   *
+   * @param string Hook to check (optional)
+   * @return boolean True if any/the given hook is currently processed, otherwise false
+   */
+  public function is_processing($hook = null)
+  {
+    return $this->active_hook && (!$hook || $this->active_hook == $hook);
+  }
+  
   /**
    * Include a plugin script file in the current HTML page

program/include/rcube_template.php

@@ -288 +288 @@
     {
         if ($templ != 'iframe') {
+            // prevent from endless loops
+            if ($this->app->plugins->is_processing('render_page')) {
+                raise_error(array('code' => 505, 'type' => 'php', 'message' => 'Recursion alert: ignoring output->send()'), true, false);
+                return;
+            }
             $this->parse($templ, false);
         }