php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs NEWS,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5405/docs

Modified Files:
	NEWS 
Log Message:
allow user-defined variables in serendipity_config_local.inc.php


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NEWS	19 Nov 2004 11:24:35 -0000	1.3
+++ NEWS	20 Nov 2004 14:09:09 -0000	1.4
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * serendipity_config_local.inc.php can now contain user-defined
+      variables, which are not overwritten when changing Configuration.
+      (garvinhicking)
+
     * Improved overall performance of Plugin API, code improvements,
       query optimizing. Added with the entryproperties caching plugin,
       this boosts performance by about 15-30%. You are also adwised

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5405/include

Modified Files:
	functions_installer.inc.php 
Log Message:
allow user-defined variables in serendipity_config_local.inc.php


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_installer.inc.php	20 Nov 2004 12:21:40 -0000	1.3
+++ functions_installer.inc.php	20 Nov 2004 14:09:10 -0000	1.4
@@ -5,7 +5,9 @@
     if (is_null($path)) {
         $path = $serendipity['serendipityPath'];
     }
-    $configfp = fopen($path . $file, 'w');
+
+    $oldconfig = @file_get_contents($path . $file);
+    $configfp  = fopen($path . $file, 'w');
 
     if (!is_resource($configfp)) {
         $errs[] = sprintf(FILE_WRITE_ERROR, $file);
@@ -20,10 +22,21 @@
         $dbName = $_POST['sqlitedbName'];
     }
 
-    fwrite($configfp, "<?php\n");
+    $file_start    = "<?php\n"
+                   . "\t/*\n"
+                   . "\t  Serendipity configuration file\n";
+    $file_mark     = "\n\t// End of Serendipity configuration file"
+                   . "\n\t// You can place your own special variables after here:\n";
+    $file_end      = "\n?>\n";
+    $file_personal = '';
+
+    preg_match('@' . preg_quote($file_start) . '.*' . preg_quote($file_mark) . '(.+)' . preg_quote($file_end) . '@imsU', $oldconfig, $match);
+    if (!empty($match[1])) {
+        $file_personal = $match[1];
+    }
+
+    fwrite($configfp, $file_start);
 
-    fwrite($configfp, "\t/*\n");
-    fwrite($configfp, "\t  Serendipity configuration file\n");
     fwrite($configfp, "\t  Written on ". date('r') ."\n");
     fwrite($configfp, "\t*/\n\n");
 
@@ -41,7 +54,7 @@
         }
     }
 
-    fwrite($configfp, "?>\n");
+    fwrite($configfp, $file_mark .  $file_personal . $file_end);
 
     fclose($configfp);
 
@@ -144,7 +157,7 @@
 }
 
 function serendipity_parseTemplate($n, $raw = false, $prepend_var = null, $get_defaults = true) {
-	global $serendipity;
+    global $serendipity;
 
     if (is_array($prepend_var)) {
         $config = $configRaw = &$prepend_var;
@@ -159,13 +172,13 @@
     $maxt = count($t);
 
     for ($x=0; $x<$maxt; $x++) {
-    	$l = $t[$x];
+        $l = $t[$x];
         $l = trim($l);
 
         if ($l != '') {
-        	switch ($l[0]) {
+            switch ($l[0]) {
 
-            	// New Configure section
+                // New Configure section
                 case '/':
                     if ($l[1] == '/') {
                         $current = @constant(trim(substr($l, 2)));
@@ -179,7 +192,7 @@
 
                 // A configure option
                 case '$':
-                	// Grep out the name, type and default
+                    // Grep out the name, type and default
                     preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
 
                     // Make vars containing the elements in the | list

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16974/include/admin

Modified Files:
	installer.inc.php 
Log Message:
* Somehow my commit to plugin API from yesterday didn't make it, so
  the optimizations where missing. Now they're in. (That's why I couldn't
  reproduce the smarty calendar issue on my installation...)

* Empty nuggets can have empty title again

* Somehow the way of parsing/printing the config template changed and
  Rewrite Autodetection got lost. Now moved that autodecetion to
  query_default function where it makes much more sense (and works again)

* Fixed bad tabs instead of spaces, fixed indentation.



Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- installer.inc.php	19 Nov 2004 11:05:32 -0000	1.2
+++ installer.inc.php	20 Nov 2004 12:21:40 -0000	1.3
@@ -33,7 +33,7 @@
             if (is_array($res)) {
                 echo DIAGNOSTIC_ERROR . '<br /><br />';
                 echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />';
-                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true, true);
+                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true);
                 die();
             }
 
@@ -133,8 +133,8 @@
             $t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, $t);
         }
 
-        serendipity_printConfigTemplate($t, $from, false, true, IS_installed);
+        serendipity_printConfigTemplate($t, $from, false, true);
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.2,1.3 plugin_api.inc.php,1.3,1.4 plugin_internal.inc.php,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16974/include

Modified Files:
	functions_installer.inc.php plugin_api.inc.php 
	plugin_internal.inc.php 
Log Message:
* Somehow my commit to plugin API from yesterday didn't make it, so
  the optimizations where missing. Now they're in. (That's why I couldn't
  reproduce the smarty calendar issue on my installation...)

* Empty nuggets can have empty title again

* Somehow the way of parsing/printing the config template changed and
  Rewrite Autodetection got lost. Now moved that autodecetion to
  query_default function where it makes much more sense (and works again)

* Fixed bad tabs instead of spaces, fixed indentation.



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugin_internal.inc.php	20 Nov 2004 01:38:06 -0000	1.4
+++ plugin_internal.inc.php	20 Nov 2004 12:21:40 -0000	1.5
@@ -205,6 +205,7 @@
                                                   'classes' => implode(' ', array_keys($cellProps)));
             } // end for
         } // end for
+
         $serendipity['smarty']->assign('plugin_calendar_weeks', $smartyRows);
 
 

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions_installer.inc.php	19 Nov 2004 11:05:31 -0000	1.2
+++ functions_installer.inc.php	20 Nov 2004 12:21:40 -0000	1.3
@@ -53,20 +53,20 @@
     global $serendipity;
 
     /* I won't tell you the password, it's MD5 anyway, you can't do anything with it */
-    if ( $type == 'protected' && IS_installed === true ) {
+    if ($type == 'protected' && IS_installed === true) {
         return '';
     }
 
     switch ($optname) {
 
         case 'dbType' :
-            if ( extension_loaded('mysqli') ) {
+            if (extension_loaded('mysqli')) {
                 $type = 'mysqli';
             }
-            if ( extension_loaded('postgres') ) {
+            if (extension_loaded('postgres')) {
                 $type = 'postgres';
             }
-            if ( extension_loaded('mysql') ) {
+            if (extension_loaded('mysql')) {
                 $type = 'mysql';
             }
             return $type;
@@ -114,6 +114,9 @@
             }
             return $default;
 
+        case 'rewrite':
+            return serendipity_check_rewrite($default);
+
         default:
             if ($usertemplate) {
                 return serendipity_get_user_var($optname, $serendipity['authorid'], $default);
@@ -184,27 +187,27 @@
 
                     // Only show directives which are destined for this user. On installation, show everyting.
                     if (IS_installed === false || $serendipity['serendipityUserlevel'] >= $permission) {
-                    	$cdef 		 = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : '');
-						$distDefault = serendipity_replaceEmbeddedConfigvars($distdefault);
+                        $cdef        = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : '');
+                        $distDefault = serendipity_replaceEmbeddedConfigvars($distdefault);
 
-						/* Expand 'list' type, to a normal assocaitive array */
-						if ( $type == 'list' && preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $distDefault, $res)) {
-							$distDefault = array();
-							foreach ( $res[1] as $k => $v ) {
-								$distDefault[$res[1][$k]] = $res[2][$k];
-							}
-						}
-						$config['categories'][$current][] = $configRaw[] = array(
-												'longname'    => @constant($constant),
-												'name'        => $name,
-												'type'        => $type,
-												'default'     => $cdef,
-												'distdefault' => $distDefault,
-												'desc'        => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))),
-												'valid_for'   => $permission,
-												'flags'       => explode(',', $flags)
-												);
-					}
+                        /* Expand 'list' type, to a normal assocaitive array */
+                        if ($type == 'list' && preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $distDefault, $res)) {
+                            $distDefault = array();
+                            foreach ( $res[1] as $k => $v ) {
+                                $distDefault[$res[1][$k]] = $res[2][$k];
+                            }
+                        }
+                        $config['categories'][$current][] = $configRaw[] = array(
+                                                'longname'    => @constant($constant),
+                                                'name'        => $name,
+                                                'type'        => $type,
+                                                'default'     => $cdef,
+                                                'distdefault' => $distDefault,
+                                                'desc'        => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))),
+                                                'valid_for'   => $permission,
+                                                'flags'       => explode(',', $flags)
+                                                );
+                    }
                     break;
             }
         }
@@ -226,11 +229,7 @@
 }
 
 function serendipity_guessInput($type, $name, $value='', $default='') {
-	global $serendipity;
-
-    if ($name == 'rewrite' && $default == $value && isset($serendipity['rewrite_default']) && $serendipity['rewrite_default'] != '') {
-        $value = $serendipity['rewrite_default'];
-    }
+    global $serendipity;
 
     switch ($type) {
         case 'bool' :
@@ -255,16 +254,16 @@
             }
             echo '</select>';
             break;
-		case 'file' :
-			echo '<input type="file" size="30" name="' . $name . '" />';
-			break;
+        case 'file' :
+            echo '<input type="file" size="30" name="' . $name . '" />';
+            break;
         default :
             echo '<input type="text" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
             break;
     }
 }
 
-function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true, $_abort = true) {
+function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true) {
     global $serendipity;
 
     if (!isset($serendipity['XHTML11'])) {
@@ -275,57 +274,6 @@
         $folding = false;
     }
 
-    // If not yet installed, do some magic:
-    $abort = false;
-    if (IS_installed !== true && $_abort !== true) {
-        $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
-        $serendipity_core = serendipity_httpCoreDir();
-        $old_htaccess     = @file_get_contents($serendipity_core . '.htaccess');
-        $fp               = @fopen($serendipity_core . '.htaccess', 'w');
-        $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
-
-        if (!$fp) {
-            printf(HTACCESS_ERROR,
-              '<b>chmod go+rwx ' . getcwd() . '/</b>'
-            );
-            $abort = true;
-        } else {
-            fwrite($fp, 'ErrorDocument 404 ' . $serendipity_root . 'index.php');
-            fclose($fp);
-
-            // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
-            $sock = @fsockopen($serendipity_host, $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
-            $response = '';
-
-            if ($sock) {
-                fputs($sock, "GET {$_SERVER['PHP_SELF']}nonexistant HTTP/1.0\r\n");
-                fputs($sock, "Host: $serendipity_host\r\n");
-                fputs($sock, "User-Agent: Serendipity/{$serendipity['version']}\r\n");
-                fputs($sock, "Connection: close\r\n\r\n");
-
-                while (!feof($sock) && strlen($response) < 4096) {
-                    $response .= fgets($sock, 400);
-                }
-                fclose($sock);
-            }
-
-            if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
-                $serendipity['rewrite_default'] = 'errordocs';
-            } else {
-                $serendipity['rewrite_default'] = 'none';
-            }
-
-            if (!empty($old_htaccess)) {
-                $fp = @fopen($serendipity_core . '.htaccess', 'w');
-                fwrite($fp, $old_htaccess);
-                fclose($fp);
-            } else {
-                @unlink($serendipity_core . '.htaccess');
-            }
-        }
-    }
-
-    if ($abort === false) {
 ?>
 <script type="text/javascript" language="JavaScript">
 function showConfig(id) {
@@ -361,7 +309,7 @@
 </script>
 
 <?php
-        if (!$minimum) {
+    if (!$minimum) {
 ?>
 <form action="?" method="POST">
     <div>
@@ -369,19 +317,19 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
 <?php   }
-        if ( sizeof($t['categories']) > 1 ) { ?>
+    if (sizeof($t['categories']) > 1) { ?>
         <div align="right">
             <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
-        }
-        $el_count = 0;
-        foreach ($t['categories'] as $key => $value) {
-            $el_count++;
+    }
+    $el_count = 0;
+    foreach ($t['categories'] as $key => $value) {
+        $el_count++;
 ?>
         <table width="100%" cellspacing="2">
 <?php
-        if ( sizeof($t['categories']) > 1 ) {
+        if (sizeof($t['categories']) > 1) {
 ?>
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
@@ -398,23 +346,23 @@
                         </tr>
 
 <?php
-            for ($x=0; $x<count($value); $x++) {
+        for ($x=0; $x<count($value); $x++) {
 
-                /* Check for installOnly flag */
-                if ( in_array('installOnly', $value[$x]['flags']) && IS_installed === true ) {
-                    continue;
-                }
+            /* Check for installOnly flag */
+            if ( in_array('installOnly', $value[$x]['flags']) && IS_installed === true ) {
+                continue;
+            }
 
 
-                /* If we have a valuelist, then use the value from there */
-                if (@is_array($from)) {
-                    $value[$x]['value'] = $from[$value[$x]['name']];
-                }
+            /* If we have a valuelist, then use the value from there */
+            if (@is_array($from)) {
+                $value[$x]['value'] = $from[$value[$x]['name']];
+            }
 
-                /* If the value is never assigned in the valuelist, then use our default value */
-                if (!isset($from[$value[$x]['name']])) {
-                    $value[$x]['value'] = $value[$x]['default'];
-                }
+            /* If the value is never assigned in the valuelist, then use our default value */
+            if (!isset($from[$value[$x]['name']])) {
+                $value[$x]['value'] = $value[$x]['default'];
+            }
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">
@@ -427,22 +375,21 @@
                             </td>
                         </tr>
 <?php
-            }
+        }
 ?>
                     </table><br /><br />
                 </td>
             </tr>
         </table>
 <?php
-        }
+    }
 
-        if (!$minimum) {
+    if (!$minimum) {
 ?>
         <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" />
     </div>
 </form>
 <?php
-        }
     }
 }
 
@@ -836,4 +783,59 @@
     return preg_replace('@/include$@', '', dirname($file)) . '/';
 }
 
+function serendipity_check_rewrite($default) {
+    global $serendipity;
+
+    if (IS_installed == true) {
+        return $default;
+    }
+
+    $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
+    $serendipity_core = serendipity_httpCoreDir();
+    $old_htaccess     = @file_get_contents($serendipity_core . '.htaccess');
+    $fp               = @fopen($serendipity_core . '.htaccess', 'w');
+    $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
+
+    if (!$fp) {
+        printf(HTACCESS_ERROR,
+          '<b>chmod go+rwx ' . getcwd() . '/</b>'
+        );
+        return $default;
+    } else {
+        fwrite($fp, 'ErrorDocument 404 ' . $serendipity_root . 'index.php');
+        fclose($fp);
+
+        // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
+        $sock = @fsockopen($serendipity_host, $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
+        $response = '';
+
+        if ($sock) {
+            fputs($sock, "GET {$_SERVER['PHP_SELF']}nonexistant HTTP/1.0\r\n");
+            fputs($sock, "Host: $serendipity_host\r\n");
+            fputs($sock, "User-Agent: Serendipity/{$serendipity['version']}\r\n");
+            fputs($sock, "Connection: close\r\n\r\n");
+
+            while (!feof($sock) && strlen($response) < 4096) {
+                $response .= fgets($sock, 400);
+            }
+            fclose($sock);
+        }
+
+        if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
+            $default = 'errordocs';
+        } else {
+            $default = 'none';
+        }
+
+        if (!empty($old_htaccess)) {
+            $fp = @fopen($serendipity_core . '.htaccess', 'w');
+            fwrite($fp, $old_htaccess);
+            fclose($fp);
+        } else {
+            @unlink($serendipity_core . '.htaccess');
+        }
+
+        return $default;
+    }
+}
 ?>

Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plugin_api.inc.php	20 Nov 2004 01:38:06 -0000	1.3
+++ plugin_api.inc.php	20 Nov 2004 12:21:40 -0000	1.4
@@ -26,7 +26,6 @@
  */
 
 class serendipity_plugin_api {
-
     function register_default_plugins()
     {
         /* Register default sidebar plugins, order matters */
@@ -78,10 +77,11 @@
 
         /* Check for multiple dependencies */
         $plugin =& serendipity_plugin_api::load_plugin($key, $authorid);
-        $plugin->install();
         $bag    = new serendipity_property_bag;
         $plugin->introspect($bag);
+        serendipity_plugin_api::get_event_plugins(false, true); // Refresh static list of plugins to allow execution of added plugin
         $plugin->register_dependencies(false, $authorid);
+        $plugin->install();
 
         return $key;
     }
@@ -292,7 +292,7 @@
                 }
             }
 
-            $class_name = $name;
+            $class_name =& $name;
         }
 
         $p =& new $class_name($instance_id);
@@ -343,6 +343,7 @@
     function generate_plugins($side)
     {
         global $serendipity;
+
         $plugins = serendipity_plugin_api::enum_plugins($side);
 
         if (!is_array($plugins)) {
@@ -362,14 +363,15 @@
             ob_end_clean();
 
             if ($show_plugin !== FALSE) {
-                $pluginData[] = array('side' => $side,
-                                      'class' => get_class($plugin),
-                                      'title' => $title,
+                $pluginData[] = array('side'    => $side,
+                                      'class'   => $class,
+                                      'title'   => $title,
                                       'content' => $content);
             }
         }
 
         $serendipity['smarty']->assign('plugindata', $pluginData);
+
         return serendipity_smarty_fetch('sidebar_'. $side, 'sidebar.tpl', true);
     }
 
@@ -377,7 +379,21 @@
     {
         global $serendipity;
 
-        $title = $plugin->get_config('title');
+        // Generate plugin output. Make sure that by probing the plugin, no events are actually called. After that,
+        // restore setting of 'no_events'.
+
+        if (!is_null($plugin->title)) {
+            // Preferred way of fetching a plugins title
+            $title = &$plugin->title;
+        } else {
+            $ne = (isset($serendipity['no_events']) && $serendipity['no_events'] ? TRUE : FALSE);
+            $serendipity['no_events'] = TRUE;
+            ob_start();
+            $plugin->generate_content($title);
+            ob_end_clean();
+            $serendipity['no_events'] = $ne;
+        }
+
         if (strlen(trim($title)) == 0) {
             if (!empty($default_title)) {
                 $title = $default_title;
@@ -395,10 +411,16 @@
         return (strstr($name, '_event_'));
     }
 
-    function &get_event_plugins($getInstance = false) {
+    function &get_event_plugins($getInstance = false, $refresh = false) {
         static $event_plugins;
 
-        if (isset($event_plugins) && is_array($event_plugins)) {
+        if (!$refresh && isset($event_plugins) && is_array($event_plugins)) {
+            if ($getInstance) {
+                if (isset($event_plugins[$getInstance]['p'])) {
+                    return $event_plugins[$getInstance]['p'];
+                }
+                return false;
+            }
             return $event_plugins;
         }
 
@@ -409,7 +431,7 @@
         }
 
         $event_plugins = array();
-        foreach ($plugins as $plugin_data) {
+        foreach($plugins AS $plugin_data) {
             if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'])) {
                 /* query for its name, description and configuration data */
                 $event_plugins[$plugin_data['name']]['b'] = new serendipity_property_bag;
@@ -441,10 +463,17 @@
         $plugins = &serendipity_plugin_api::get_event_plugins();
 
         if (is_array($plugins)) {
-            foreach($plugins AS $plugin => $plugin_data) {
+            // foreach() operates on copies of values, but we want to operate on references, so we use while()
+            @reset($plugins);
+            while(list($plugin, $plugin_data) = each($plugins)) {
                 $bag = &$plugin_data['b'];
-                if ( array_key_exists($event_name, $bag->get('event_hooks')) ) {
-                    $plugin_data['p']->event_hook($event_name, $plugin_data['b'], $eventData, $addData);
+                if (array_key_exists($event_name, $bag->get('event_hooks'))) {
+                    // Check for cachable events.
+                    if (isset($eventData['is_cached']) && $eventData['is_cached'] && array_key_exists($event_name, (array)$bag->get('cachable_events'))) {
+                        continue;
+                    }
+
+                    $plugin_data['p']->event_hook($event_name, $bag, $eventData, $addData);
                 }
             }
         }
@@ -469,42 +498,25 @@
     }
 }
 
-/* holds a bunch of properties; you can have multiple
-* properties with the same name */
+/* holds a bunch of properties; since serendipity 0.8 only one value per key is allowed [was never really useful] */
 class serendipity_property_bag {
     var $properties = array();
     var $name       = null;
 
     function add($name, $value)
     {
-        $this->properties[] = array(
-                                'name'  => $name,
-                                'value' => $value
-        );
+        $this->properties[$name] = $value;
     }
 
-    function get($name)
+    function &get($name)
     {
-        $v = array();
-        foreach ($this->properties as $data) {
-            if ($data['name'] == $name) {
-                $v[] = $data['value'];
-            }
-        }
-
-        if (count($v) == 1) {
-            return $v[0];
-        }
-
-        return implode(', ', $v);
+        return $this->properties[$name];
     }
 
     function is_set($name)
     {
-        foreach ($this->properties as $data) {
-            if ($data['name'] == $name) {
-                return true;
-            }
+        if (isset($this->properties[$name])) {
+            return true;
         }
 
         return false;
@@ -517,6 +529,7 @@
     var $wrap_class    = 'serendipitySideBarItem';
     var $title_class   = 'serendipitySideBarTitle';
     var $content_class = 'serendipitySideBarContent';
+    var $title         = null;
 
     /* Be sure to call this method from your derived classes constructors,
      * otherwise your config data will not be stored or retrieved correctly

[php-blog-cvs] serendipity/include plugin_api.inc.php,1.2,1.3 plugin_internal.inc.php,1.3,1.4

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3272

Modified Files:
	plugin_api.inc.php plugin_internal.inc.php 
Log Message:
- Unbreak plugin administration: PHP died when attempting to load a plugin that used smarty
  This also provides a valuable optimization, as we do not call generate_content twice for each plugin (stupid)

- Unbreak HTML nugget to allow empty titles


Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plugin_internal.inc.php	19 Nov 2004 11:24:51 -0000	1.3
+++ plugin_internal.inc.php	20 Nov 2004 01:38:06 -0000	1.4
@@ -894,7 +894,7 @@
     {
         global $serendipity;
 
-        $title = $this->get_config('title', $this->title);
+        $title = $this->get_config('title');
         $show_where = $this->get_config('show_where', 'both');
 
         if ($show_where == 'extended' && (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id']))) {
@@ -985,4 +985,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plugin_api.inc.php	19 Nov 2004 11:05:31 -0000	1.2
+++ plugin_api.inc.php	20 Nov 2004 01:38:06 -0000	1.3
@@ -377,16 +377,7 @@
     {
         global $serendipity;
 
-        // Generate plugin output. Make sure that by probing the plugin, no events are actually called. After that,
-        // restore setting of 'no_events'.
-
-        $ne = (isset($serendipity['no_events']) && $serendipity['no_events'] ? TRUE : FALSE);
-        $serendipity['no_events'] = TRUE;
-        ob_start();
-        $plugin->generate_content($title);
-        ob_end_clean();
-        $serendipity['no_events'] = $ne;
-
+        $title = $plugin->get_config('title');
         if (strlen(trim($title)) == 0) {
             if (!empty($default_title)) {
                 $title = $default_title;

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.2,1.3 functions_smarty.inc.php,1.2,1.3 genpage.inc.php,1.2,1.3 plugin_internal.inc.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/include

Modified Files:
	functions_entries.inc.php functions_smarty.inc.php 
	genpage.inc.php plugin_internal.inc.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plugin_internal.inc.php	19 Nov 2004 11:05:31 -0000	1.2
+++ plugin_internal.inc.php	19 Nov 2004 11:24:51 -0000	1.3
@@ -1,6 +1,8 @@
 <?php # $Id$
 
 class serendipity_calendar_plugin extends serendipity_plugin {
+    var $title = CALENDAR;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',        CALENDAR);
@@ -37,7 +39,7 @@
     {
         global $serendipity;
 
-        $title = CALENDAR;
+        $title = $this->title;
 
         // Usage of serendipity_serverOffsetHour is as follow:
         // * Whenever a date to display needs to be set, apply the timezone offset
@@ -223,6 +225,8 @@
 } // end class
 
 class serendipity_quicksearch_plugin extends serendipity_plugin {
+    var $title = QUICKSEARCH;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          QUICKSEARCH);
@@ -236,7 +240,7 @@
     {
         global $serendipity;
 
-        $title = QUICKSEARCH;
+        $title = $this->title;
 ?>
 <form id="searchform" action="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>" method="get">
     <div>
@@ -251,6 +255,8 @@
 }
 
 class serendipity_archives_plugin extends serendipity_plugin {
+    var $title = ARCHIVES;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          ARCHIVES);
@@ -288,7 +294,7 @@
     {
         global $serendipity;
 
-        $title = ARCHIVES;
+        $title = $this->title;
 
         $ts = mktime(0, 0, 0);
 
@@ -323,6 +329,8 @@
 }
 
 class serendipity_topreferrers_plugin extends serendipity_plugin {
+    var $title = TOP_REFERRER;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          TOP_REFERRER);
@@ -360,7 +368,7 @@
     {
         global $serendipity;
 
-        $title = TOP_REFERRER;
+        $title = $this->title;
 
         // get local configuration (default, true, false)
         $use_links = $this->get_config('use_links', 'default');
@@ -379,6 +387,8 @@
 }
 
 class serendipity_topexits_plugin extends serendipity_plugin {
+    var $title = TOP_EXITS;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          TOP_EXITS);
@@ -416,7 +426,7 @@
     {
         global $serendipity;
 
-        $title = TOP_EXITS;
+        $title = $this->title;
 
         // get local configuration (default, true, false)
         $use_links = $this->get_config('use_links', 'default');
@@ -435,6 +445,8 @@
 }
 
 class serendipity_syndication_plugin extends serendipity_plugin {
+    var $title = SYNDICATE_THIS_BLOG;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          SYNDICATION);
@@ -578,7 +590,7 @@
     {
         global $serendipity;
 
-        $title = SYNDICATE_THIS_BLOG;
+        $title = $this->title;
 
         if (serendipity_db_bool($this->get_config('show_0.91', true))) {
 ?>
@@ -715,6 +727,8 @@
 }
 
 class serendipity_superuser_plugin extends serendipity_plugin {
+    var $title = SUPERUSER;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          SUPERUSER);
@@ -729,7 +743,7 @@
     {
         global $serendipity;
 
-        $title = SUPERUSER;
+        $title = $this->title;
         if ($this->get_config('https', 'false') == 'true') {
             $base = str_replace('http://', 'https://', $serendipity['baseURL']);
         } else {
@@ -759,6 +773,8 @@
 }
 
 class serendipity_plug_plugin extends serendipity_plugin {
+    var $title = POWERED_BY;
+
     function introspect(&$propbag)
     {
         $propbag->add('name',          POWERED_BY);
@@ -797,7 +813,7 @@
     {
         global $serendipity;
 
-        $title = POWERED_BY;
+        $title = $this->title;
 ?>
 <div class="serendipityPlug">
 <?php if ( $this->get_config('image', 'true') == 'true' ) { ?>
@@ -814,8 +830,11 @@
 }
 
 class serendipity_html_nugget_plugin extends serendipity_plugin {
+    var $title = HTML_NUGGET;
+
     function introspect(&$propbag)
     {
+        $this->title = $this->get_config('title', $this->title);
         $propbag->add('name',          HTML_NUGGET);
         $propbag->add('description',   HOLDS_A_BLAHBLAH);
         $propbag->add('stackable',     true);
@@ -875,7 +894,7 @@
     {
         global $serendipity;
 
-        $title = $this->get_config('title', $title);
+        $title = $this->get_config('title', $this->title);
         $show_where = $this->get_config('show_where', 'both');
 
         if ($show_where == 'extended' && (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id']))) {
@@ -895,6 +914,8 @@
 }
 
 class serendipity_categories_plugin extends serendipity_plugin {
+    var $title = CATEGORIES;
+
     function introspect(&$propbag) {
         global $serendipity;
 
@@ -904,26 +925,24 @@
         $propbag->add('author',        'Serendipity Team');
         $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('authorid', 'image'));
-
-        $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
-        $authors     = array('all' => ALL_AUTHORS);
-        if (is_array($authors)) {
-            foreach($row_authors AS $rownr => $row) {
-                $authors[$row['authorid']] = $row['username'];
-            }
-        }
-
-        $this->author_select_values = $authors;
     }
 
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
             case 'authorid':
+                $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
+                $authors     = array('all' => ALL_AUTHORS);
+                if (is_array($authors)) {
+                    foreach($row_authors AS $rownr => $row) {
+                        $authors[$row['authorid']] = $row['username'];
+                    }
+                }
+
                 $propbag->add('type',         'select');
                 $propbag->add('name',         CATEGORIES_TO_FETCH);
                 $propbag->add('description',  CATEGORIES_TO_FETCH_DESC);
-                $propbag->add('select_values', $this->author_select_values);
+                $propbag->add('select_values', $authors);
                 $propbag->add('default',     'all');
                 break;
 
@@ -945,7 +964,7 @@
 
         $which_category = $this->get_config('authorid');
         $categories = serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category);
-        $title      = CATEGORIES;
+        $title = $this->title;
         $html       = '';
         $image = $this->get_config('image', serendipity_getTemplateFile('img/xml.gif'));
         $image = (($image == "'none'" || $image == 'none') ? '' : $image);

Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions_smarty.inc.php	19 Nov 2004 11:05:31 -0000	1.2
+++ functions_smarty.inc.php	19 Nov 2004 11:24:51 -0000	1.3
@@ -106,10 +106,55 @@
 
 function serendipity_smarty_assignDefaults($smartyvars = null) {
     global $serendipity;
+
+    if (!isset($serendipity['smarty'])) {
+        @define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/');
+        require_once SMARTY_DIR . 'Smarty.class.php';
+        $serendipity['smarty'] = new Smarty;
+        if (!$serendipity['production']) {
+            $serendipity['smarty']->force_compile   = true;
+            $serendipity['smarty']->debugging       = true;
+        }
+        $serendipity['smarty']->template_dir  = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'];
+        $serendipity['smarty']->compile_dir   = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;
+        $serendipity['smarty']->config_dir    = &$serendipity['smarty']->template_dir;
+        $serendipity['smarty']->secure_dir    = array($serendipity['serendipityPath'] . $serendipity['templatePath']);
+        $serendipity['smarty']->security_settings['MODIFIER_FUNCS'] = array('sprintf', 'sizeof', 'count');
+        $serendipity['smarty']->security      = true;
+        $serendipity['smarty']->use_sub_dirs  = false;
+        $serendipity['smarty']->compile_check = true;
+        $serendipity['smarty']->compile_id    = &$serendipity['template'];
+
+        $serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename');
+        $serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target');
+        $serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix');
+        $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime');
+        $serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar');
+        $serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin');
+        $serendipity['smarty']->register_function('serendipity_getFile', 'serendipity_smarty_getFile');
+        $serendipity['smarty']->register_function('serendipity_printComments', 'serendipity_smarty_printComments');
+        $serendipity['smarty']->register_function('serendipity_printTrackbacks', 'serendipity_smarty_printTrackbacks');
+    }
+
+    if (!isset($serendipity['smarty_raw_mode'])) {
+        if (file_exists($serendipity['smarty']->template_dir . '/layout.php')) {
+            $serendipity['smarty_raw_mode'] = true;
+        } else {
+            $serendipity['smarty_raw_mode'] = false;
+        }
+    }
+
+    if (!isset($serendipity['smarty_file'])) {
+        $serendipity['smarty_file'] = 'index.tpl';
+    }
+
     $serendipity['smarty']->assign(
         array(
             'head_charset'              => LANG_CHARSET,
             'head_version'              => $serendipity['version'],
+            'head_title'                => $serendipity['head_title'],
+            'head_subTitle'             => $serendipity['head_subtitle'],
+
             'CONST'                     => get_defined_constants(),
 
             'is_xhtml'                  => $serendipity['XHTML11'],

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions_entries.inc.php	19 Nov 2004 11:05:30 -0000	1.2
+++ functions_entries.inc.php	19 Nov 2004 11:24:35 -0000	1.3
@@ -632,7 +632,7 @@
 
     if (!isset($serendipity['GET']['id']) &&
             (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) &&
-            (count($entries) <= $serendipity['fetchLimit'])) {
+            ($num_entries <= $serendipity['fetchLimit'])) {
         serendipity_printEntryFooter();
     } else {
         serendipity_printEntryFooter(true);

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- genpage.inc.php	19 Nov 2004 11:05:31 -0000	1.2
+++ genpage.inc.php	19 Nov 2004 11:24:51 -0000	1.3
@@ -3,15 +3,8 @@
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
-$serendipity['smarty_file'] = 'index.tpl';
-
-if (file_exists($serendipity['smarty']->template_dir . '/layout.php')) {
-    $serendipity['smarty_raw_mode'] = true;
-} else {
-    $serendipity['smarty_raw_mode'] = false;
-}
-
 serendipity_smarty_assignDefaults();
+
 $serendipity['smarty']->assign(
     array(
         'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.26,1.27

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_spamblock

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_event_spamblock.php	19 Nov 2004 11:05:42 -0000	1.26
+++ serendipity_event_spamblock.php	19 Nov 2004 11:24:57 -0000	1.27
@@ -122,6 +122,8 @@
     {
         global $serendipity;
 
+        $this->title = PLUGIN_EVENT_SPAMBLOCK_TITLE;
+
         $propbag->add('name',          PLUGIN_EVENT_SPAMBLOCK_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
         $propbag->add('stackable',     false);
@@ -240,7 +242,7 @@
 
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_SPAMBLOCK_TITLE;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData, $addData = null) {

[php-blog-cvs] serendipity/plugins/serendipity_event_s9ymarkup serendipity_event_s9ymarkup.php,1.6,1.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_s9ymarkup

Modified Files:
	serendipity_event_s9ymarkup.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_s9ymarkup.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_s9ymarkup.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_s9ymarkup.php	19 Nov 2004 11:05:41 -0000	1.6
+++ serendipity_event_s9ymarkup.php	19 Nov 2004 11:24:56 -0000	1.7
@@ -17,6 +17,7 @@
 
 class serendipity_event_s9ymarkup extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_S9YMARKUP_NAME;
 
     function introspect(&$propbag)
     {
@@ -27,6 +28,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $this->markup_elements = array(
@@ -55,9 +57,17 @@
         $propbag->add('configuration', $conf_array);
     }
 
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_S9YMARKUP_NAME;
+        $title = $this->title;
     }
 
 
@@ -81,10 +91,6 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
-                            continue;
-                        }
-
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
                             $eventData[$element] = $this->_s9y_markup($eventData[$element]);

[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.php,1.8,1.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_livesearch

Modified Files:
	serendipity_event_livesearch.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_livesearch.php	19 Nov 2004 11:05:40 -0000	1.8
+++ serendipity_event_livesearch.php	19 Nov 2004 11:24:55 -0000	1.9
@@ -19,6 +19,8 @@
 
 class serendipity_event_livesearch extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_LIVESEARCH_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -37,7 +39,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_LIVESEARCH_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData, $addData = null) {

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.6,1.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_mailer

Modified Files:
	serendipity_event_mailer.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_mailer.php	19 Nov 2004 11:05:40 -0000	1.6
+++ serendipity_event_mailer.php	19 Nov 2004 11:24:56 -0000	1.7
@@ -28,6 +28,8 @@
 
 class serendipity_event_mailer extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_MAILER_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -76,7 +78,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_MAILER_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_nl2br serendipity_event_nl2br.php,1.5,1.6

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_nl2br

Modified Files:
	serendipity_event_nl2br.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_nl2br.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_nl2br.php	19 Nov 2004 11:05:41 -0000	1.5
+++ serendipity_event_nl2br.php	19 Nov 2004 11:24:56 -0000	1.6
@@ -15,6 +15,8 @@
 
 class serendipity_event_nl2br extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_NL2BR_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -24,6 +26,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true));
 
         $this->markup_elements = array(
@@ -52,11 +55,18 @@
         $propbag->add('configuration', $conf_array);
     }
 
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
 
-    function generate_content(&$title) {
-        $title = PLUGIN_EVENT_NL2BR_NAME;
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
     }
 
+    function generate_content(&$title) {
+        $title = $this->title;
+    }
 
     function introspect_config_item($name, &$propbag)
     {
@@ -77,10 +87,6 @@
               case 'frontend_display':
 
                 foreach ($this->markup_elements as $temp) {
-                    if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
-                        continue;
-                    }
-
                     if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                         $element = $temp['element'];
                         $eventData[$element] = nl2br($eventData[$element]);

[php-blog-cvs] serendipity/plugins/serendipity_event_searchhighlight serendipity_event_searchhighlight.php,1.5,1.6

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_searchhighlight

Modified Files:
	serendipity_event_searchhighlight.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_searchhighlight.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_searchhighlight.php	19 Nov 2004 11:05:42 -0000	1.5
+++ serendipity_event_searchhighlight.php	19 Nov 2004 11:24:57 -0000	1.6
@@ -18,6 +18,8 @@
 
 class serendipity_event_searchhighlight extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -57,7 +59,7 @@
 
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME;
+        $title = $this->title;
     }
 
 

[php-blog-cvs] serendipity/plugins/serendipity_event_templatechooser serendipity_event_templatechooser.php,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_templatechooser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_templatechooser

Modified Files:
	serendipity_event_templatechooser.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_templatechooser.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_templatechooser/serendipity_event_templatechooser.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_templatechooser.php	19 Nov 2004 11:05:43 -0000	1.4
+++ serendipity_event_templatechooser.php	19 Nov 2004 11:24:58 -0000	1.5
@@ -15,6 +15,8 @@
 
 class serendipity_event_templatechooser extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_TEMPLATECHOOSER_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -33,7 +35,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_TEMPLATECHOOSER_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_textile serendipity_event_textile.php,1.8,1.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_textile

Modified Files:
	serendipity_event_textile.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_textile.php	19 Nov 2004 11:05:44 -0000	1.8
+++ serendipity_event_textile.php	19 Nov 2004 11:24:59 -0000	1.9
@@ -19,6 +19,7 @@
 
 class serendipity_event_textile extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_TEXTILE_NAME;
 
     function introspect(&$propbag)
     {
@@ -29,6 +30,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $propbag->add('preserve_tags',
@@ -67,9 +69,17 @@
 
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_TEXTILE_NAME;
+        $title = $this->title;
+    }
+
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
     }
 
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
 
     function introspect_config_item($name, &$propbag)
     {
@@ -93,10 +103,6 @@
                 $preserve_tags = &$bag->get('preserve_tags');
 
                 foreach ($this->markup_elements as $temp) {
-                    if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
-                        continue;
-                    }
-
                     if (serendipity_db_bool($this->get_config($temp['name'], true))) {
                         $element = $temp['element'];
 

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_statistics

Modified Files:
	serendipity_event_statistics.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_event_statistics.php	19 Nov 2004 11:05:43 -0000	1.14
+++ serendipity_event_statistics.php	19 Nov 2004 11:24:58 -0000	1.15
@@ -113,6 +113,8 @@
 
 class serendipity_event_statistics extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_STATISTICS_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -145,7 +147,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_STATISTICS_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.21,1.22

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_karma

Modified Files:
	serendipity_event_karma.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_event_karma.php	19 Nov 2004 11:05:40 -0000	1.21
+++ serendipity_event_karma.php	19 Nov 2004 11:24:55 -0000	1.22
@@ -99,6 +99,7 @@
     var $karmaId      = '';
     var $karmaTimeOut = '';
     var $karmaVoting  = '';
+    var $title        = PLUGIN_KARMA_NAME;
 
     function introspect(&$propbag)
     {
@@ -226,7 +227,7 @@
 
     function generate_content(&$title)
     {
-        $title       = PLUGIN_KARMA_NAME;
+        $title       =& $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData, $addData = null) {

[php-blog-cvs] serendipity/plugins/serendipity_event_htmlvalidator serendipity_event_htmlvalidator.php,1.6,1.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_htmlvalidator

Modified Files:
	serendipity_event_htmlvalidator.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_htmlvalidator.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_htmlvalidator.php	19 Nov 2004 11:05:39 -0000	1.6
+++ serendipity_event_htmlvalidator.php	19 Nov 2004 11:24:54 -0000	1.7
@@ -28,6 +28,8 @@
 
 class serendipity_event_htmlvalidator extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_HTMLVALIDATOR_NAME;
+
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -128,7 +130,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_HTMLVALIDATOR_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_entryproperties serendipity_event_entryproperties.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_entryproperties

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_entryproperties.php	19 Nov 2004 11:05:39 -0000	1.2
+++ serendipity_event_entryproperties.php	19 Nov 2004 11:24:54 -0000	1.3
@@ -3,14 +3,14 @@
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Erweiterte Eigenschaften von Artikeln');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(nicht-öffentliche Artikel, dauerhafte Artikel)');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(Cache, nicht-öffentliche Artikel, dauerhafte Artikel)');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Dauerhafte Artikel');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Artikel können gelesen werden von');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'mir selbst');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-Autoren');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'allen');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Artikel cachen?');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'Falls diese Option aktiviert ist, wird eine Cache-Version des Artikels gespeichert. Dieses Caching wird zwar die Performance erhöhen, aber Flexibilität anderer Plugins einschränken.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'Falls diese Option aktiviert ist, wird eine Cache-Version des Artikels gespeichert. Dieses Caching wird zwar die Performance erhöhen, aber Flexibilität anderer Plugins eventuell einschränken.');
         @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Cachen aller Artikel');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Suche nach zu cachenden Artikeln...');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Bearbeite Artikel %d bis %d');
@@ -25,14 +25,14 @@
     case 'es':
     default:
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Extended properties for entries');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(non-public articles, sticky posts)');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(cache, non-public articles, sticky posts)');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Mark this entry as a Sticky Post');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Entries can be read by');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'Myself');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-authors');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'Everyone');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Allow to cache entries?');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'If enabled, a cached version will be generated on every saving. Caching will increase performance, but decrease flexibility for other plugins.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'If enabled, a cached version will be generated on every saving. Caching will increase performance, but maybe decrease flexibility for other plugins.');
         @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Build cached entries');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Fetching next batch of entries...');
         @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Fetching entries %d to %d');
@@ -46,7 +46,8 @@
 
 class serendipity_event_entryproperties extends serendipity_event
 {
-var $services;
+    var $services;
+    var $title = PLUGIN_EVENT_ENTRYPROPERTIES_TITLE;
 
     function introspect(&$propbag)
     {
@@ -65,7 +66,9 @@
             'backend_display'                                   => true,
             'frontend_entryproperties'                          => true,
             'backend_sidebar_entries_event_display_buildcache'  => true,
-            'backend_sidebar_entries'                           => true
+            'backend_sidebar_entries'                           => true,
+            'backend_cache_entries'                             => true,
+            'backend_cache_purge'                               => true
         ));
 
         $propbag->add('configuration', array('cache'));
@@ -86,7 +89,24 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_ENTRYPROPERTIES_TITLE;
+        $title = $this->title;
+    }
+
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+    }
+
+    function updateCache(&$entry) {
+        global $serendipity;
+
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$entry['id'] . " AND property LIKE 'ep_cache_%'");
+        serendipity_plugin_api::hook_event('frontend_display', $entry);
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_body', '" . serendipity_db_escape_string($entry['body']) . "')");
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_extended', '" . serendipity_db_escape_string($entry['extended']) . "')");
     }
 
     function event_hook($event, &$bag, &$eventData, $addData = null) {
@@ -136,9 +156,11 @@
                     break;
 
                 case 'backend_sidebar_entries':
+                    if ($is_cache) {
 ?>
                         &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a><br />
 <?php
+                    }
                     return true;
                     break;
 
@@ -165,10 +187,7 @@
 
                         foreach($entries AS $idx => $entry) {
                             printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING . '<br />', $entry['id'], htmlspecialchars($entry['title']));
-                            serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$entry['id'] . " AND property LIKE 'ep_cache_%'");
-                            serendipity_plugin_api::hook_event('frontend_display', $entry);
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_body', '" . serendipity_db_escape_string($entry['body']) . "')");
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_extended', '" . serendipity_db_escape_string($entry['extended']) . "')");
+                            $this->updateCache($entry);
                             echo PLUGIN_EVENT_ENTRYPROPERTIES_CACHED . '<br /><br />';
                         }
 
@@ -191,6 +210,36 @@
                     return true;
                     break;
 
+                case 'backend_cache_entries':
+                    if (!$is_cache) {
+                        return true;
+                    }
+
+                    $entries = serendipity_fetchEntries(
+                        null,
+                        true,
+                        $serendipity['fetchLimit'],
+                        false,
+                        false,
+                        'timestamp DESC',
+                        '',
+                        true
+                    );
+
+                    foreach($entries AS $idx => $entry) {
+                        $this->updateCache($entry);
+                    }
+                    return true;
+                    break;
+
+                case 'backend_cache_purge':
+                    if (!$is_cache) {
+                        return true;
+                    }
+
+                    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE property LIKE 'ep_cache_%'");
+                    break;
+
                 case 'backend_publish':
                 case 'backend_save':
                     if (!isset($serendipity['POST']['properties']) || !is_array($serendipity['POST']['properties']) || !isset($eventData['id'])) {
@@ -222,7 +271,11 @@
                     break;
 
                 case 'frontend_entryproperties':
-                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ")";
+                    $and = '';
+                    if (!$is_cache) {
+                        $and = " AND property NOT LIKE 'ep_cache_%' ";
+                    }
+                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ") $and";
 
                     $properties = serendipity_db_query($q);
                     if (!is_array($properties)) {

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite serendipity_event_contentrewrite.php,1.10,1.11

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_contentrewrite

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_contentrewrite.php	19 Nov 2004 11:05:38 -0000	1.10
+++ serendipity_event_contentrewrite.php	19 Nov 2004 11:24:53 -0000	1.11
@@ -48,7 +48,8 @@
 
 class serendipity_event_contentrewrite extends serendipity_event
 {
-var $rewrite_from, $rewrite_to;
+    var $title = PLUGIN_EVENT_CONTENTREWRITE_NAME;
+    var $rewrite_from, $rewrite_to;
 
     function cleanup() {
         // Cleanup. Remove all empty configs on SAVECONF-Submit.
@@ -61,11 +62,13 @@
     {
         global $serendipity;
 
+        $this->title = $this->get_config('title', $this->title);
         $propbag->add('name',          PLUGIN_EVENT_CONTENTREWRITE_NAME);
         $propbag->add('description',   PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Garvin Hicking');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',    array(
             'frontend_display' => true
         ));
@@ -145,6 +148,15 @@
         $this->counter = $counter;
     }
 
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
     function introspect_config_item($name, &$propbag)
     {
         foreach($this->markup_elements as $element) {
@@ -163,7 +175,6 @@
             $switch[2] = 'empty';
         }
 
-
         switch($switch[1]) {
             case 'title':
 
@@ -216,7 +227,7 @@
 
     function generate_content(&$title)
     {
-        $title = $this->get_config('title');
+        $title = $this->get_config('title', $this->title);
 ?>
 <table>
 <?php
@@ -242,10 +253,6 @@
         if (isset($hooks[$event])) {
             switch($event) {
                 case 'frontend_display':
-                    if (isset($eventData['is_cached']) && $eventData['is_cached']) {
-                        continue;
-                    }
-
                     $char   = &$this->get_config('rewrite_char');
                     $string = &$this->get_config('rewrite_string');
                     foreach($this->rewrite_from AS $nr => $v_from) {

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.13,1.14

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_creativecommons

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_event_creativecommons.php	19 Nov 2004 11:05:38 -0000	1.13
+++ serendipity_event_creativecommons.php	19 Nov 2004 11:24:53 -0000	1.14
@@ -36,8 +36,11 @@
 }
 
 class serendipity_event_creativecommons extends serendipity_event {
+    var $title = PLUGIN_CREATIVECOMMONS_NAME;
+
     function introspect(&$propbag)
     {
+
         $propbag->add('name',          PLUGIN_CREATIVECOMMONS_NAME);
         $propbag->add('description',   PLUGIN_CREATIVECOMMONS_DESC);
         $propbag->add('stackable',     false);
@@ -105,7 +108,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_CREATIVECOMMONS_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.9,1.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_blogpdf

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_blogpdf.php	19 Nov 2004 11:05:37 -0000	1.9
+++ serendipity_event_blogpdf.php	19 Nov 2004 11:24:52 -0000	1.10
@@ -140,6 +140,7 @@
 
 class serendipity_event_blogpdf extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_BLOGPDF_NAME;
     var $pdf;
 
     function introspect(&$propbag)
@@ -159,7 +160,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_BLOGPDF_NAME;
+        $title = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.12,1.13

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_emoticate

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_event_emoticate.php	19 Nov 2004 11:05:38 -0000	1.12
+++ serendipity_event_emoticate.php	19 Nov 2004 11:24:53 -0000	1.13
@@ -17,6 +17,7 @@
 
 class serendipity_event_emoticate extends serendipity_event
 {
+    var $title = PLUGIN_EVENT_EMOTICATE_NAME;
 
     function introspect(&$propbag)
     {
@@ -27,6 +28,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $this->markup_elements = array(
@@ -55,6 +57,15 @@
 
     }
 
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
     function getEmoticons() {
         global $serendipity;
 
@@ -106,7 +117,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_EMOTICATE_NAME;
+        $title = $this->title;
     }
 
     function example() {
@@ -142,10 +153,6 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
-                            continue;
-                        }
-
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                             $element = &$eventData[$temp['element']];
 

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.9,1.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/plugins/serendipity_event_bbcode

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_bbcode.php	19 Nov 2004 11:05:37 -0000	1.9
+++ serendipity_event_bbcode.php	19 Nov 2004 11:24:51 -0000	1.10
@@ -17,7 +17,7 @@
 
 class serendipity_event_bbcode extends serendipity_event
 {
-
+    var $title = PLUGIN_EVENT_BBCODE_NAME;
     function introspect(&$propbag)
     {
         global $serendipity;
@@ -27,6 +27,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Jez Hancock, Garvin Hicking');
         $propbag->add('version',       '1.0');
+        $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true, 'css' => true));
 
         $this->markup_elements = array(
@@ -153,7 +154,7 @@
     }
 
     function generate_content(&$title) {
-        $title = PLUGIN_EVENT_BBCODE_NAME;
+        $title = $this->title;
     }
 
 
@@ -175,6 +176,15 @@
         return true;
     }
 
+    function install() {
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
+    function uninstall() {
+        serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
+        serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
+    }
+
     function bbcode($input) {
         /* Regular expressions taken from http://smarty.incutio.com/?page=BBCodePlugin Wiki (Andre Rabold) */
         $input = preg_replace(array_keys($this->bbcodes), array_values($this->bbcodes), $input);
@@ -195,10 +205,6 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
-                            continue;
-                        }
-
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
                             $eventData[$element] = $this->bbcode($eventData[$element]);

[php-blog-cvs] serendipity/docs NEWS,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422/docs

Modified Files:
	NEWS 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	19 Nov 2004 11:05:29 -0000	1.2
+++ NEWS	19 Nov 2004 11:24:35 -0000	1.3
@@ -3,6 +3,19 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Improved overall performance of Plugin API, code improvements,
+      query optimizing. Added with the entryproperties caching plugin,
+      this boosts performance by about 15-30%. You are also adwised
+      to use opcode-caches, if available [APC, Zend Cache, Turck, ...]
+      (garvinhicking)
+
+    * Entries can be cached by the 'entryproperties' plugins. This
+      caching interacts with other plugins: When cacheable plugins are
+      added, the cache is updated, as well as when an entry is modified.
+      When the plugin is first installed, it creates the cache for the
+      latest 15 entries; you can create a cache of all entries using
+      the admin interface. (garvinhicking)
+
     * New CSS classes for distinction of authors within entries/comments:
       .serendipity_entry_(author|comment)_USERNAME, applied to each
       entry container, where USERNAME is replaced with the name of the

[php-blog-cvs] serendipity index.php,1.54,1.55 serendipity.css.php,1.32,1.33 serendipity_config.inc.php,1.101,1.102

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29422

Modified Files:
	index.php serendipity.css.php serendipity_config.inc.php 
Log Message:
* Move Smarty object instancing to a function call, so that is not
  created when not needed (like for CSS)
* make head_title / head_subtitle globally available, so that plugins
  can also use it
* Code optimizations: Queries, referenced variables, plugin API
* Improved entryproperties cache
* Improved Plugin API calls to fetch titles of entries
* Improved Plugin aPI calls to set the authorid of a plugin
* Improved some plugins to not create costy introspect() calls, and move
  them to the introspect_config_item() part
* Fixed trackexits plugin to not abuse the query() function too often




Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity.css.php	25 Aug 2004 16:25:24 -0000	1.32
+++ serendipity.css.php	19 Nov 2004 11:24:34 -0000	1.33
@@ -26,6 +26,5 @@
 serendipity_plugin_api::hook_event('css', $out);
 
 echo $out;
-
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- serendipity_config.inc.php	19 Nov 2004 11:04:59 -0000	1.101
+++ serendipity_config.inc.php	19 Nov 2004 11:24:34 -0000	1.102
@@ -229,33 +229,5 @@
 
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
 
-define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/');
-require_once SMARTY_DIR . 'Smarty.class.php';
-$serendipity['smarty'] = new Smarty;
-if (!$serendipity['production']) {
-    $serendipity['smarty']->force_compile   = true;
-    $serendipity['smarty']->debugging       = true;
-}
-$serendipity['smarty']->template_dir  = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'];
-$serendipity['smarty']->compile_dir   = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;
-$serendipity['smarty']->config_dir    = &$serendipity['smarty']->template_dir;
-$serendipity['smarty']->secure_dir    = array($serendipity['serendipityPath'] . $serendipity['templatePath']);
-$serendipity['smarty']->security_settings['MODIFIER_FUNCS'] = array('sprintf', 'sizeof', 'count');
-$serendipity['smarty']->security      = true;
-$serendipity['smarty']->use_sub_dirs  = false;
-$serendipity['smarty']->compile_check = true;
-$serendipity['smarty']->compile_id    = &$serendipity['template'];
-
-$serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename');
-$serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target');
-$serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix');
-$serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime');
-$serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar');
-$serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin');
-$serendipity['smarty']->register_function('serendipity_getFile', 'serendipity_smarty_getFile');
-$serendipity['smarty']->register_function('serendipity_printComments', 'serendipity_smarty_printComments');
-$serendipity['smarty']->register_function('serendipity_printTrackbacks', 'serendipity_smarty_printTrackbacks');
-
-
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- index.php	19 Nov 2004 11:04:58 -0000	1.54
+++ index.php	19 Nov 2004 11:24:34 -0000	1.55
@@ -1,7 +1,6 @@
 <?php # $Id$
 
 $global_debug = true;
-
 if ($global_debug) {
     #apd_set_pprof_trace();
 
@@ -143,9 +142,8 @@
     $_GET['serendipity']['id']     = $id;
 
     $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
-    $title = $title[0];
-
-    $serendipity['smarty']->assign(array('head_title' => $title, 'head_subtitle' => $serendipity['blogTitle']));
+    $serendipity['head_title']    = $title[0];
+    $serendipity['head_subtitle'] = $serendipity['blogTitle'];
 
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
@@ -235,7 +233,8 @@
 
 if ($global_debug) {
     /* TODO: Remove (hide) this debug */
-    echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: 10pt; font-weight: bold; padding: 10px">Page generated in '. round(microtime_float()-$time_start,6) .' seconds, '. sizeof(get_included_files()) .' files included</div>';
+    echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: 10pt; font-weight: bold; padding: 10px">Page delivered in '. round(microtime_float()-$time_start,6) .' seconds, '. sizeof(get_included_files()) .' files included</div>';
+    echo '</div>';
 }
 
 /* vim: set sts=4 ts=4 expandtab : */