Add smaty modifier that can pass referenced variables to a smarty plugin api. Hurts to see that, but seems to be the only way

include/compat.inc.php

@@ -133,7 +133,7 @@ if (extension_loaded('filter') && function_exists('filter_id') && function_exist
     foreach ($_COOKIE as $key => $value) {
         $_COOKIE[$key] = filter_input(INPUT_COOKIE, $key, FILTER_UNSAFE_RAW);
     }
-    
+
     // NOT YET IMPLEMENTED IN PHP:
     /*
     foreach ($_SESSION as $key => $value) {

include/functions_smarty.inc.php

@@ -496,6 +496,42 @@ function serendipity_smarty_hookPlugin($params, &$smarty) {
     serendipity_plugin_api::hook_event($params['hook'], $params['data'], $params['addData']);
 }
 
+/**
+ * Smarty Modifier: Be able to execute the hook of an event plugin and return its output, uses a REFERENCED variable.
+ *
+ * Listens to specific serendipity global variables:
+ *  $serendipity['skip_smarty_hooks'] - If TRUE, no plugins will be executed at all
+ *  $serendipity['skip_smarty_hook']  - Can be set to an array of plugin hooks to NOT execute
+ *
+ * @access public
+ * @param   mixed       EventData (referenced)
+ * @param   string      Event hook name
+ * @param   mixed       Additional data
+ * @return null
+ */
+function serendipity_smarty_refhookPlugin(&$eventData, $hook, $addData = null) {
+    global $serendipity;
+
+    if (!isset($hook)) {
+        $smarty->trigger_error(__FUNCTION__ .": missing 'hook' parameter");
+        return;
+    }
+
+    // Smarty hooks can be bypassed via an internal variable (temporarily)
+    if (isset($serendipity['skip_smarty_hooks']) && $serendipity['skip_smarty_hooks']) {
+        return;
+    }
+
+    // A specific hook can also be bypassed by creating an associative array like this:
+    // $serendipity['skip_smarty_hook'] = array('entries_header');
+    // That would only skip the entries_header event hook, but allow all others.
+    // Of course it cannot be used in conjunction with the all-blocking skip_smarty_hooks.
+    if (isset($serendipity['skip_smarty_hook']) && is_array($serendipity['skip_smarty_hook']) && isset($serendipity['skip_smarty_hook'][$params['hook']])) {
+        return;
+    }
+
+    serendipity_plugin_api::hook_event($hook, $eventData, $addData);
+}
 
 /**
  * Smarty Function: Prints a list of sidebar plugins
@@ -704,7 +740,7 @@ function serendipity_smarty_init($vars = array()) {
             if (!class_exists('Smarty')) {
                 include SMARTY_DIR . 'Smarty.class.php';
             }
-            
+
             if (!class_exists('Smarty')) {
                 return false;
             }
@@ -745,6 +781,7 @@ function serendipity_smarty_init($vars = array()) {
             $serendipity['smarty']->register_modifier('serendipity_utf8_encode', 'serendipity_utf8_encode');
             $serendipity['smarty']->register_modifier('ifRemember', 'serendipity_ifRemember');
             $serendipity['smarty']->register_modifier('checkPermission', 'serendipity_checkPermission');
+            $serendipity['smarty']->register_modifier('serendipity_refhookPlugin', 'serendipity_smarty_refhookPlugin');
 
             $serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar');
             $serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin');

plugins/serendipity_event_spamblock/serendipity_event_spamblock.php

@@ -39,7 +39,7 @@ var $filter_defaults;
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
-        $propbag->add('version',       '1.67');
+        $propbag->add('version',       '1.68');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
@@ -682,6 +682,11 @@ var $filter_defaults;
             // Check if the entry is older than the allowed amount of time. Enforce kaptchas if that is true
             // of if kaptchas are activated for every entry
             $show_captcha = ($captchas && isset($eventData['timestamp']) && ($captchas_ttl < 1 || ($eventData['timestamp'] < (time() - ($captchas_ttl*60*60*24)))) ? true : false);
+            
+            // Plugins can override with custom captchas
+            if (isset($serendipity['plugins']['disable_internal_captcha'])) {
+                $show_captcha = false;
+            }
 
             $forcemoderation = $this->get_config('forcemoderation', 60);
             $forcemoderation_treat = $this->get_config('forcemoderation_treat', 'moderate');

templates/default/admin/entries.tpl

@@ -35,7 +35,7 @@
     {*** ENTRY TITLE, DRAFT END ***}
 
     <tr>
-   
+
     {*** ENTRY DATE,CATEGORY START ***}
     {if $entry_vars.allowDateManipulation}
         <td>
@@ -50,7 +50,7 @@
     {else}
         <td align="right" colspan="3">
     {/if}
-            <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="{$CONST.TOGGLE_OPTION}"><img src="{serendipity_getFile file='img/plus.png'}" id="option_categoryselector" style="border: 20px" alt="" border="0" /></a> <b>{$CONST.CATEGORY}:</b> 
+            <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="{$CONST.TOGGLE_OPTION}"><img src="{serendipity_getFile file='img/plus.png'}" id="option_categoryselector" style="border: 20px" alt="" border="0" /></a> <b>{$CONST.CATEGORY}:</b>
             <select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multiple">
                 <option value="0">[{$CONST.NO_CATEGORY}]</option>
                 {foreach from=$entry_vars.category_options item="entry_cat"}
@@ -66,7 +66,7 @@
             var selector_toggle  = new Array();
             var selector_store   = new Array();
             var selector_restore = new Array();
-        
+
             function checkSave() {
                 {serendipity_hookPlugin hook='backend_entry_checkSave' hookAll='true'}
                 return true;
@@ -197,9 +197,9 @@
             <br />
             <fieldset>
                 <legend><b>{$CONST.ADVANCED_OPTIONS}</b></legend>
-    {*** EXTERNAL PLUGINS OUTPUT START ***}                
+    {*** EXTERNAL PLUGINS OUTPUT START ***}
-                {serendipity_hookPlugin hook="backend_display" data=$entry_vars.entry hookAll="true"}
+                {$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}
-    {*** EXTERNAL PLUGINS OUTPUT END ***}                
+    {*** EXTERNAL PLUGINS OUTPUT END ***}
             </fieldset>
         </td>
     </tr>
@@ -218,7 +218,7 @@
     {foreach from=$entry_vars.wysiwyg_blocks item="wysiwyg_block_item" key="wysiwyg_block_jsname"}
         {$wysiwyg_block_item|emit_htmlarea_code:$wysiwyg_block_jsname}
     {/foreach}
-    {serendipity_hookPlugin hook="backend_wysiwyg_finish" data=$entry_vars.wysiwyg_blocks hookAll="true"}
+    {serendipity_refhookPlugin hook="backend_wysiwyg_finish" data=$entry_vars.wysiwyg_blocks}
 {/if}
 {*** SPAWN WYSIWYG EDITORS END ***}
 

templates/default/admin/index.tpl

@@ -77,7 +77,7 @@
 {if NOT $admin_vars.is_logged_in}
 {*** LOGIN-AREA START ***}
 
-    {serendipity_hookPlugin hook="backend_header" data=$admin_vars.out hookAll="true"}
+    {$admin_vars.out|@serendipity_refhookPlugin:'backend_login_page'}
                 <td colspan="2" class="serendipityAdminContent">
                     <div align="center">{$CONST.WELCOME_TO_ADMIN}<br />
                     {$CONST.PLEASE_ENTER_CREDENTIALS}
@@ -88,7 +88,7 @@
                     {if $admin_vars.post_action != '' AND NOT $admin_vars.is_logged_in}
                     <div class="serendipityAdminMsgError">{$CONST.WRONG_USERNAME_OR_PASSWORD}</div>
                     {/if}
-                    
+
                     <form action="serendipity_admin.php" method="post">
                         <input type="hidden" name="serendipity[action]" value="admin" />
                         <table cellspacing="10" cellpadding="0" border="0" align="center">