php-blog-cvs

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

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

Modified Files:
	serendipity.css.php serendipity_functions.inc.php 
	serendipity_genpage.inc.php serendipity_sidebar_items.php 
Log Message:
add some new hooks, CSS code passed as event data, modified code to allow
livesearch plugin (follows)


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity.css.php	26 May 2004 12:06:59 -0000	1.26
+++ serendipity.css.php	13 Jul 2004 14:15:17 -0000	1.27
@@ -11,12 +11,12 @@
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
      global $serendipity;
-     echo str_replace('{TEMPLATE_PATH}', dirname($file) .'/',  file_get_contents($file, 1));
+     return str_replace('{TEMPLATE_PATH}', dirname($file) .'/',  file_get_contents($file, 1));
 }
 
 if (!file_exists('serendipity_config_local.inc.php')) {
     if (file_exists('templates/default/style.css')) {
-        serendipity_printStylesheet('templates/default/style.css');
+        echo serendipity_printStylesheet('templates/default/style.css');
     } else {
         readfile(S9Y_INCLUDE_PATH . 'serendipity.css');
     }
@@ -24,13 +24,14 @@
 }
 
 if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css')) {
-    serendipity_printStylesheet($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css');
+    $out = serendipity_printStylesheet($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css');
 } else {
     $css = serendipity_getCSS($_REQUEST['style']);
-    echo $css['data'];
+    $out = &$css['data'];
 }
 
-serendipity_plugin_api::hook_event('css', $_REQUEST['style']);
+echo $out;
+serendipity_plugin_api::hook_event('css', $out);
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_sidebar_items.php	10 Jul 2004 14:23:19 -0000	1.71
+++ serendipity_sidebar_items.php	13 Jul 2004 14:15:18 -0000	1.72
@@ -68,11 +68,12 @@
 
         $title = QUICKSEARCH;
 ?>
-<form action="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>" method="get">
+<form id="searchform" action="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>" method="get">
     <div>
         <input type="hidden"  name="serendipity[action]" value="search" />
-        <input type="text"   id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" onfocus="value='';" size="13" />
+        <input type="text"   id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" size="13" />
     </div>
+    <div id="LSResult" style="display: none;"><div id="LSShadow"></div></div>
 </form>
 <?php
     }

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_genpage.inc.php	22 Jun 2004 10:07:32 -0000	1.29
+++ serendipity_genpage.inc.php	13 Jul 2004 14:15:18 -0000	1.30
@@ -43,6 +43,8 @@
     include $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/layout.php';
 }
 
+serendipity_plugin_api::hook_event('frontend_pagebottom', $serendipity);
+
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
 ?>
 </body>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- serendipity_functions.inc.php	13 Jul 2004 08:49:40 -0000	1.326
+++ serendipity_functions.inc.php	13 Jul 2004 14:15:17 -0000	1.327
@@ -928,7 +928,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND e.id = ec.entryid
-                            AND MATCH (title,body,extended) AGAINST ('".addslashes($term)."')
+                            AND MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($term) . "')
                             AND isdraft = 'false'
                     GROUP BY
                             e.id