[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.php,1.1,1.2

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

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

Modified Files:
	serendipity_event_livesearch.php 
Log Message:
get javascript via hook to bypasse mod_rewrite issues.
correctly get request-variables with mod_rewrite and missing [QSA] command
for jannis, only used as fallback


Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_livesearch.php	13 Jul 2004 16:25:26 -0000	1.1
+++ serendipity_event_livesearch.php	14 Jul 2004 10:23:04 -0000	1.2
@@ -95,11 +95,24 @@
                     lsbase = "' . $serendipity['baseURL'] . 'plugin/ls";
                     waittext = "' . PLUGIN_EVENT_LIVESEARCH_WAIT . '";
                     </script>';
-                    echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_livesearch/serendipity_event_livesearch.js"></script>';
+                    echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugin/ls-js"></script>';
                     break;
 
                 case 'external_plugin':
-                    $parts     = explode('_', preg_replace('@^([^\?]+).*$@', '\1', $eventData));
+                    $uri_parts = explode('?', str_replace('&amp;', '&', $eventData));
+
+                    // Try to get request parameters from eventData name
+                    if (!empty($uri_parts[1])) {
+                        $reqs = explode('&', $uri_parts[1]);
+                        foreach($reqs AS $id => $req) {
+                            $val = explode('=', $req);
+                            if (empty($_REQUEST[$val[0]])) {
+                                $_REQUEST[$val[0]] = $val[1];
+                            }
+                        }
+                    }
+
+                    $parts     = explode('_', $uri_parts[0]);
                     if (!empty($parts[1])) {
                         $param     = (int) $parts[1];
                     } else {
@@ -107,6 +120,11 @@
                     }
 
                     switch($parts[0]) {
+                        case 'ls-js':
+                            header('Content-Type: text/javascript');
+                            echo file_get_contents(S9Y_INCLUDE_PATH . 'plugins/serendipity_event_livesearch/serendipity_event_livesearch.js');
+                            break;
+
                         case 'ls':
                             $res = serendipity_searchEntries($_REQUEST['s']);