php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_config.inc.php,1.46.2.1,1.46.2.1.2.1

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

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

Modified Files:
      Tag: branch-0-5-pl1
	serendipity_config.inc.php 
Log Message:
version increase


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.1.2.1
diff -u -d -r1.46.2.1 -r1.46.2.1.2.1
--- serendipity_config.inc.php	31 Jan 2004 17:05:58 -0000	1.46.2.1
+++ serendipity_config.inc.php	14 Feb 2004 17:07:35 -0000	1.46.2.1.2.1
@@ -11,7 +11,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']    = '0.5';
+$serendipity['version']    = '0.5-pl1';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = 'none';
 

[php-blog-cvs] serendipity NEWS,1.54.2.5.2.1,1.54.2.5.2.2

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

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

Modified Files:
      Tag: branch-0-5-pl1
	NEWS 
Log Message:
Release


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.54.2.5.2.1
retrieving revision 1.54.2.5.2.2
diff -u -d -r1.54.2.5.2.1 -r1.54.2.5.2.2
--- NEWS	13 Feb 2004 16:59:35 -0000	1.54.2.5.2.1
+++ NEWS	14 Feb 2004 17:06:42 -0000	1.54.2.5.2.2
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 0.5-pl1 ()
+Version 0.5-pl1 (February, 14th 2004)
 ------------------------------------
     * Fixed XHTML-invalid anchor name (garvinhicking)
     * Fixed installation problems [file_get_contents, htacces copy&paste] for PHP < 4.3.0 (garvinhicking)

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.10,1.11

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
Translation.

Tom, it would be good to include the string to be translated in the new file, not just "[translate]". This would make it easier for translators to see, what they actually have to translate. Thanks :-)


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_de.inc.php	13 Feb 2004 18:34:14 -0000	1.10
+++ serendipity_lang_de.inc.php	13 Feb 2004 21:11:32 -0000	1.11
@@ -15,7 +15,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
 @define('HAVE_TO_BE_LOGGED_ON', 'Sie müssen angemeldet sein, um diese Seite zu sehen:');
-@define('WRONG_USERNAME_OR_PASSWORD', '[TRANSLATE!!]');
+@define('WRONG_USERNAME_OR_PASSWORD', 'Das Passwort oder der Username war falsch. Bitte wiederholen Sie die Eingabe.');
 @define('APPEARANCE', 'Aussehen');
 @define('MANAGE_STYLES', 'Styles verwalten');
 @define('CONFIGURE_PLUGINS', 'Plugins verwalten');

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.8,1.9

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

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
Added note when using wrong username or password to gain access to admin/author suite

Need translations


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_en.inc.php	13 Feb 2004 18:25:34 -0000	1.8
+++ serendipity_lang_en.inc.php	13 Feb 2004 18:53:15 -0000	1.9
@@ -15,6 +15,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
 @define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged on to view this page:');
+@define('WRONG_USERNAME_OR_PASSWORD', 'You appear to have entered a wrong username or password');
 @define('APPEARANCE', 'Appearance');
 @define('MANAGE_STYLES', 'Manage styles');
 @define('CONFIGURE_PLUGINS', 'Configure Plugins');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.205,1.206 NEWS,1.66,1.67

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Log Message:
Added note when using wrong username or password to gain access to admin/author suite

Need translations


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- serendipity_functions.inc.php	13 Feb 2004 18:25:33 -0000	1.205
+++ serendipity_functions.inc.php	13 Feb 2004 18:34:13 -0000	1.206
@@ -62,6 +62,13 @@
 ?>
     <td class="serendipity_admin">
     <div class="serendipity_auth_required">
+<?php
+    if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) {
+?>
+        <div align="center" style="color: #FF0000; font-weight: bold;"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
+<?php
+    }
+?>
             <form action="?" method="post">
                 <input type="hidden"   name="serendipity[action]" value="admin" />
                 <table cellspacing="3" cellpadding="0" border="0" align="center">

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- NEWS	13 Feb 2004 16:50:39 -0000	1.66
+++ NEWS	13 Feb 2004 18:34:13 -0000	1.67
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Added notice when using a wrong username or password to gain access to admin/author suites (tomsommer)
+    * Added date & time translation using strftime() and setlocale() (tomsommer)
     * HTML Validator event plugin. Can be used to validate your entry upon preview (garvinhicking)
     * Create example events: mailer, weblogping, contentrewrite, eventwrapper (garvinhicking)
     * Created event plugin API to hook on certain serendipity actions (garvinhicking)

[php-blog-cvs] serendipity/lang serendipity_lang_es.inc.php,1.8,1.9 serendipity_lang_de.inc.php,1.9,1.10

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

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

Modified Files:
	serendipity_lang_es.inc.php serendipity_lang_de.inc.php 
Log Message:
Added note when using wrong username or password to gain access to admin/author suite

Need translations


Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_es.inc.php	13 Feb 2004 18:25:34 -0000	1.8
+++ serendipity_lang_es.inc.php	13 Feb 2004 18:34:14 -0000	1.9
@@ -18,6 +18,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
 @define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta pagina:');
+@define('WRONG_USERNAME_OR_PASSWORD', '[TRANSLATE!!]');
 @define('APPEARANCE', 'Apariencia');
 @define('MANAGE_STYLES', 'Control de estilos');
 @define('CONFIGURE_PLUGINS', 'Configurar Plugins');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_lang_de.inc.php	13 Feb 2004 18:25:34 -0000	1.9
+++ serendipity_lang_de.inc.php	13 Feb 2004 18:34:14 -0000	1.10
@@ -15,6 +15,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
 @define('HAVE_TO_BE_LOGGED_ON', 'Sie müssen angemeldet sein, um diese Seite zu sehen:');
+@define('WRONG_USERNAME_OR_PASSWORD', '[TRANSLATE!!]');
 @define('APPEARANCE', 'Aussehen');
 @define('MANAGE_STYLES', 'Styles verwalten');
 @define('CONFIGURE_PLUGINS', 'Plugins verwalten');

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.7,1.8 serendipity_lang_de.inc.php,1.8,1.9 serendipity_lang_es.inc.php,1.7,1.8

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

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

Modified Files:
	serendipity_lang_en.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
Begin support fot setlocale() and strftime(), removes no-longer needed month translations.

TODO: Find out which locales should be used for lang_en, lang_de, lang_es (Anyone?)


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_en.inc.php	9 Feb 2004 15:15:56 -0000	1.7
+++ serendipity_lang_en.inc.php	13 Feb 2004 18:25:34 -0000	1.8
@@ -10,15 +10,8 @@
 ##########################################################################
 
 // English language file
-if (!isset($serendipity['months'])) {
-    $serendipity['months']  = array('J...@ha...', 'January', 'February', 'March',
-                        'April', 'May', 'June', 'July', 'August', 'September',
-                        'October', 'November', 'December');
-}
-
-if (!isset($serendipity['weekDayAbb'])) {
-    $serendipity['weekDayAbb'] = array('M', 'Tu', 'W', 'Th', 'F', 'Sa', 'Su');
-}
+@define('LANG_LOCALE', 'en_EN');
+@define('DATE_FORMAT_1', '%A, %B %e. %Y');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
 @define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged on to view this page:');
@@ -123,7 +116,6 @@
 @define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
 @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I\'ll automatically calculate the new size so the proportions  one value and press the TAB key, I\'ll automatically calculate the new size so the proportions don\'t get messed up:');
-@define('DATE_FORMAT_1', 'l, F jS Y');
 @define('CALENDAR', 'Calendar');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
 @define('QUICKSEARCH', 'Quicksearch');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_de.inc.php	9 Feb 2004 15:15:56 -0000	1.8
+++ serendipity_lang_de.inc.php	13 Feb 2004 18:25:34 -0000	1.9
@@ -10,16 +10,8 @@
 ##########################################################################
 
 // German language file
-if (!isset($serendipity['months'])) {
-    $serendipity['months']  = array('J...@ha...', 'Januar', 'Februar', 'M&auml;rz',
-                        'April', 'Mai', 'Juni', 'Juli', 'August', 'September',
-                        'Oktober', 'November', 'Dezember');
-}
-
-if (!isset($serendipity['weekDayAbb'])) {
-    $serendipity['weekDayAbb'] = array('Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So');
-}
-
+@define('DATE_LOCALE', 'german');
+@define('DATE_FORMAT_1', '%A, %B %e. %Y');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfl&auml;che');
 @define('HAVE_TO_BE_LOGGED_ON', 'Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_es.inc.php	9 Feb 2004 15:15:56 -0000	1.7
+++ serendipity_lang_es.inc.php	13 Feb 2004 18:25:34 -0000	1.8
@@ -13,15 +13,8 @@
 ##########################################################################
 
 // Spanish language file
-if (!isset($serendipity['months'])) {
-    $serendipity['months']  = array('J...@ha...', 'Enero', 'Febrero', 'Marzo',
-                        'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre',
-                        'Octubre', 'Noviembre', 'Diciembre');
-}
-
-if (!isset($serendipity['weekDayAbb'])) {
-    $serendipity['weekDayAbb'] = array('L', 'M', 'X', 'J', 'V', 'S', 'D');
-}
+@define('DATE_LOCALE', 'spanish');
+@define('DATE_FORMAT_1', '%A, %B %e. %Y');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
 @define('HAVE_TO_BE_LOGGED_ON', 'Debes identificarte para ver esta pagina:');

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.40,1.41 serendipity_functions.inc.php,1.204,1.205

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

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

Modified Files:
	serendipity_sidebar_items.php serendipity_functions.inc.php 
Log Message:
Begin support fot setlocale() and strftime(), removes no-longer needed month translations.

TODO: Find out which locales should be used for lang_en, lang_de, lang_es (Anyone?)


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_sidebar_items.php	9 Feb 2004 15:21:41 -0000	1.40
+++ serendipity_sidebar_items.php	13 Feb 2004 18:25:33 -0000	1.41
@@ -79,7 +79,7 @@
 
             $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ym', $ts) . '.html';
 
-            $ts_title = $serendipity['months'][date('n', $ts)] . ' ' . date('Y', $ts);
+            $ts_title = ucfirst(strftime("%B %Y", $ts));
 
             echo '<a href="' . $link . '" title="' . $ts_title . '">' . $ts_title . '</a><br />' . "\n";
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- serendipity_functions.inc.php	13 Feb 2004 16:50:39 -0000	1.204
+++ serendipity_functions.inc.php	13 Feb 2004 18:25:33 -0000	1.205
@@ -339,7 +339,7 @@
             $activeDays[date('j', $row['timestamp'])] = $row['timestamp'];
         }
     }
-
+    $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month)));
     // Prepare the table
     $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $year . sprintf('%02d', $month) . '.html?' . $base_query;
 ?>
@@ -357,7 +357,7 @@
         </td>
 
         <td colspan="5" align="center" valign="bottom" class="serendipity_calendarHeader">
-            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo $serendipity["months"][$month] . ' \'' . substr($year, 2); ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
+            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo $monthName . ' \'' . substr($year, 2); ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
         </td>
 
         <td align="right" class="serendipity_calendarHeader">
@@ -374,9 +374,10 @@
 
     <tr>
 <?php
-foreach($serendipity['weekDayAbb'] AS $weekKey => $weekVal) {
+for ( $i = 1; $i <= 7; $i++ ) {
+    $date = mktime(0,0,0,3,$i,2004);
 ?>
-        <td class="serendipity_weekDayName" align="center"><?php echo $weekVal; ?></td>
+        <td class="serendipity_weekDayName" align="center"><?php echo substr(strftime("%a", $date),0,2); ?></td>
 <?php
 }
 ?>
@@ -729,7 +730,7 @@
 
     $lastDate = '';
     for ($x = 0, $num_entries = count($entries); $x < $num_entries; $x++) {
-        $d = date(DATE_FORMAT_1, $entries[$x]['timestamp']);
+        $d = ucfirst(strftime(DATE_FORMAT_1, $entries[$x]['timestamp']));
         $bydate[$d][] = $entries[$x];
     }
 
@@ -991,7 +992,7 @@
         }
 
         /* Show when the entry was made */
-        echo ' ' . ON . ' ' . date('M d, H:i', $comment['timestamp']);
+        echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
 
         if ($_SESSION['serendipityAuthedUser'] === true) {
             echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';

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

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

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

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
Updated german translation


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_contentrewrite.php	10 Feb 2004 13:36:54 -0000	1.2
+++ serendipity_event_contentrewrite.php	13 Feb 2004 17:19:05 -0000	1.3
@@ -17,9 +17,9 @@
         @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDESCRIPTION', 'Beschreibung #%s');
         @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDDESCRIPTION', 'Die Beschreibung des Eintrages ({ziel})');
         @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRING', 'Umformungsmaske');
-        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC', 'Ein beliebiger Text der zur Ersetzung verwendet werden soll. Fügen Sie {quelle} und {ziel} The string used to rewrite. Place {from} and {to} anywhere you like to get a rewrite.' . "\n" . 'Example: <acronym title="{to}">{from}</acronym>');
-        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR', 'Rewrite char');
-        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'If there is any char you append to force rewriting, enter it here. If you want to only replace \'serendipity*\' with what you entered for that word but want the \'*\' removed, enter that char here. NOTE: You can\'t use a different rewrite_char for a plugin having the same rewrite_string!');
+        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC', 'Ein beliebiger Text der zur Ersetzung verwendet werden soll. Fügen Sie {quelle} und {ziel} irgendwo in diesem Text ein.' . "\n" . 'Beispiel: <acronym title="{quelle}">{ziel}</acronym>');
+        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR', 'Rewrite Zeichen');
+        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'Falls es ein besonderes Zeichen geben soll, was die Wort-Ersetzung ausführt, geben Sie es hier an. Falls z.B. nur \'serendipity*\' damit ersetzt werden soll, was Sie als Akronym für \'serendipity\' definiert haben, und das \'*\' soll entfernt werden, dann geben Sie dieses Zeichen an.');
         break;
         
     case 'en':
@@ -42,7 +42,7 @@
         @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRING', 'Rewrite string');
         @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC', 'The string used to rewrite. Place {from} and {to} anywhere you like to get a rewrite.' . "\n" . 'Example: <acronym title="{to}">{from}</acronym>');
         @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR', 'Rewrite char');
-        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'If there is any char you append to force rewriting, enter it here. If you want to only replace \'serendipity*\' with what you entered for that word but want the \'*\' removed, enter that char here. NOTE: You can\'t use a different rewrite_char for a plugin having the same rewrite_string!');
+        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'If there is any char you append to force rewriting, enter it here. If you want to only replace \'serendipity*\' with what you entered for that word but want the \'*\' removed, enter that char here.');
         break;
 }
 
@@ -185,7 +185,7 @@
 ?>
 <table>
 <?php
-	if (is_array($this->rewrite_from)) {
+    if (is_array($this->rewrite_from)) {
             foreach($this->rewrite_from AS $key => $val) {
 ?>
     <tr>
@@ -209,10 +209,8 @@
                 case 'frontend_display':
                     $char   = &$this->get_config('rewrite_char');
                     $string = &$this->get_config('rewrite_string');
-
                     foreach($this->rewrite_from AS $nr => $v_from) {
                         $v_to   = $this->rewrite_to[$nr];
-                        
                         if ($v_from != '' && $v_to != '') {
                             // Use the supplied rewrite string and replace the {from} and {to} values with the ones we got from the plugin
                             $new =

[php-blog-cvs] serendipity NEWS,1.54.2.5,1.54.2.5.2.1 serendipity.css.php,1.21,1.21.10.1 serendipity_admin.php,1.26,1.26.4.1 serendipity_admin_entries.inc.php,1.15,1.15.4.1 serendipity_admin_installer.inc.php,1.50.2.1,1.50.2.1.2.1 serendipity_functions.inc.php,1.193.2.2,1.193.2.2.2.1

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

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

Modified Files:
      Tag: branch-0-5-pl1
	NEWS serendipity.css.php serendipity_admin.php 
	serendipity_admin_entries.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_functions.inc.php 
Log Message:
branch-0-5-pl1: Backported bugfixes


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.54.2.5
retrieving revision 1.54.2.5.2.1
diff -u -d -r1.54.2.5 -r1.54.2.5.2.1
--- NEWS	6 Feb 2004 14:13:05 -0000	1.54.2.5
+++ NEWS	13 Feb 2004 16:59:35 -0000	1.54.2.5.2.1
@@ -1,5 +1,14 @@
 # $Id$
 
+Version 0.5-pl1 ()
+------------------------------------
+    * Fixed XHTML-invalid anchor name (garvinhicking)
+    * Fixed installation problems [file_get_contents, htacces copy&paste] for PHP < 4.3.0 (garvinhicking)
+    * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
+    * Fixed output of an empty external stylesheet on admin panel (garvinhicking)
+    * Do not output comment-type ("NORMAL") on entry view (garvinhicking)
+    * Fixed RSS 0.91 feed (was not printing any entries) (garvinhicking)
+
 Version 0.5 (February, 6th 2004)
 ------------------------------------
     * Fixed bug not showing comment or entry admin-tools on apparently static pages (garvinhicking, tomsommer)

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.21
retrieving revision 1.21.10.1
diff -u -d -r1.21 -r1.21.10.1
--- serendipity.css.php	10 Aug 2003 18:10:00 -0000	1.21
+++ serendipity.css.php	13 Feb 2004 16:59:35 -0000	1.21.10.1
@@ -1,5 +1,6 @@
 <?php # $Id$
 
+include_once('compat.php');
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
      global $serendipity;

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.26
retrieving revision 1.26.4.1
diff -u -d -r1.26 -r1.26.4.1
--- serendipity_admin.php	7 Jan 2004 17:53:44 -0000	1.26
+++ serendipity_admin.php	13 Feb 2004 16:59:35 -0000	1.26.4.1
@@ -17,7 +17,7 @@
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
         <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" />
 <?php
-if (isset($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
+if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
 ?>
         <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" />
 <?php

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -d -r1.15 -r1.15.4.1
--- serendipity_admin_entries.inc.php	21 Jan 2004 15:09:32 -0000	1.15
+++ serendipity_admin_entries.inc.php	13 Feb 2004 16:59:35 -0000	1.15.4.1
@@ -229,7 +229,7 @@
         break;
 
     case 'edit':
-        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
     default:
         serendipity_printEntryForm(
             '?',

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.1.2.1
diff -u -d -r1.50.2.1 -r1.50.2.1.2.1
--- serendipity_admin_installer.inc.php	3 Feb 2004 10:34:10 -0000	1.50.2.1
+++ serendipity_admin_installer.inc.php	13 Feb 2004 16:59:35 -0000	1.50.2.1.2.1
@@ -441,7 +441,7 @@
 
     if (!$fp) {
         $errs[] = sprintf(FILE_WRITE_ERROR, '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', $content);
+        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', htmlspecialchars($content));
         return $errs;
     } else {
         // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.193.2.2
retrieving revision 1.193.2.2.2.1
diff -u -d -r1.193.2.2 -r1.193.2.2.2.1
--- serendipity_functions.inc.php	4 Feb 2004 04:47:09 -0000	1.193.2.2
+++ serendipity_functions.inc.php	13 Feb 2004 16:59:35 -0000	1.193.2.2.2.1
@@ -553,12 +553,14 @@
 /**
 * Fetches a specific entry
 **/
-function serendipity_fetchEntry($key, $val, $full = true) {
+function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false') {
     global $serendipity;
 
-    if ($full === true) {
-        $body = ', body, extended';
+    $drafts = '';
+    if ($fetchDrafts == 'false') {
+        $drafts = "AND isdraft = 'false'";
     }
+
     $querystring = "SELECT
                             *,
                             c.category_name,
@@ -573,6 +575,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND $key LIKE $val
+                            $drafts
                     LIMIT 1";
 
     return serendipity_db_query($querystring, true);
@@ -628,6 +631,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND MATCH (title,body,extended) AGAINST ('".addslashes($term)."')
+                            AND isdraft = 'false'
                     ORDER BY
                             timestamp DESC";
 
@@ -739,7 +743,7 @@
 
                 $html_extended = '';
                 if ($extended && strlen($entry['extended'])) {
-                    $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="#extended"></a>';
+                    $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
                     $html_extended .= nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
                 }
 
@@ -962,7 +966,7 @@
             <?php echo nl2br(serendipity_markup_text(serendipity_emoticate($body))); ?><br />
 
             <div class="serendipity_comment_source">
-                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> - <?php echo $type . ' '; ?>
+                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> 
 <?php
         /* Link to the user's email */
         if ( !empty($comment['email']) ) {
@@ -1275,7 +1279,7 @@
     </content>
 </entry>
 <?php
-            } elseif ($version == '0.92' || $version == '2.0') {
+            } elseif ($version == '0.91' || $version == '2.0') {
                 /*********** BEGIN RSS 0.91/2.0 FEED *************/
 ?>
 <item>

[php-blog-cvs] serendipity NEWS,1.65,1.66 serendipity_admin.php,1.26,1.27 serendipity_functions.inc.php,1.203,1.204

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

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

Modified Files:
	NEWS serendipity_admin.php serendipity_functions.inc.php 
Log Message:
Prepare bugfix 0.5-pl1 release


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- NEWS	10 Feb 2004 15:48:45 -0000	1.65
+++ NEWS	13 Feb 2004 16:50:39 -0000	1.66
@@ -7,9 +7,17 @@
     * Created event plugin API to hook on certain serendipity actions (garvinhicking)
     * Redesigned image manager (tomsommer)
     * Added image syncronization with database (tomsommer)
-    * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
     * Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
 
+Version 0.5-pl1 ()
+------------------------------------
+    * Fixed XHTML-invalid anchor name (garvinhicking)
+    * Fixed installation problems [file_get_contents, htacces copy&paste] for PHP < 4.3.0 (garvinhicking)
+    * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
+    * Fixed output of an empty external stylesheet on admin panel (garvinhicking)
+    * Do not output comment-type ("NORMAL") on entry view (garvinhicking)
+    * Fixed RSS 0.91 feed (was not printing any entries) (garvinhicking)
+
 Version 0.5 (February 6th, 2004)
 ------------------------------------
     * Fixed bug not showing comment or entry admin-tools on apparently static pages (garvinhicking, tomsommer)

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_admin.php	7 Jan 2004 17:53:44 -0000	1.26
+++ serendipity_admin.php	13 Feb 2004 16:50:39 -0000	1.27
@@ -17,7 +17,7 @@
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
         <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" />
 <?php
-if (isset($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
+if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
 ?>
         <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" />
 <?php

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- serendipity_functions.inc.php	11 Feb 2004 12:23:12 -0000	1.203
+++ serendipity_functions.inc.php	13 Feb 2004 16:50:39 -0000	1.204
@@ -1294,7 +1294,7 @@
     </content>
 </entry>
 <?php
-            } elseif ($version == '0.92' || $version == '2.0') {
+            } elseif ($version == '0.91' || $version == '2.0') {
                 /*********** BEGIN RSS 0.91/2.0 FEED *************/
 ?>
 <item>

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.52,1.53

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Make pastable .htaccess code really pastable :)


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_admin_installer.inc.php	2 Feb 2004 10:56:21 -0000	1.52
+++ serendipity_admin_installer.inc.php	11 Feb 2004 12:37:20 -0000	1.53
@@ -441,7 +441,7 @@
 
     if (!$fp) {
         $errs[] = sprintf(FILE_WRITE_ERROR, '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', $content);
+        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', htmlspecialchars($content));
         return $errs;
     } else {
         // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.

[php-blog-cvs] serendipity serendipity.css.php,1.21,1.22 serendipity_functions.inc.php,1.202,1.203

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

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

Modified Files:
	serendipity.css.php serendipity_functions.inc.php 
Log Message:
Minor bugfix:
* use compat.php in serendipity.css.php for installation on machines with PHP < 4.3.x [file_get_contents]
* Removed invalid '#' from <a (name|id)='#anchorname'>.


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity.css.php	10 Aug 2003 18:10:00 -0000	1.21
+++ serendipity.css.php	11 Feb 2004 12:23:12 -0000	1.22
@@ -1,5 +1,6 @@
 <?php # $Id$
 
+include_once('compat.php');
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
      global $serendipity;

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- serendipity_functions.inc.php	10 Feb 2004 15:48:45 -0000	1.202
+++ serendipity_functions.inc.php	11 Feb 2004 12:23:12 -0000	1.203
@@ -746,7 +746,7 @@
 
                 $html_extended = '';
                 if ($extended && strlen($entry['extended'])) {
-                    $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="#extended"></a>';
+                    $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
                     $html_extended .= nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
                 }
 

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

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

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

Modified Files:
	serendipity_event_htmlvalidator.php 
Log Message:
Well, some more configuration options would be nice. :-)


Index: serendipity_event_htmlvalidator.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_htmlvalidator.php	10 Feb 2004 15:49:24 -0000	1.1
+++ serendipity_event_htmlvalidator.php	10 Feb 2004 16:04:27 -0000	1.2
@@ -8,6 +8,8 @@
         @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC', 'Der übliche Zeichensatz Ihrer Einträge');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'Dokumenttyp');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC', 'Der übliche Dokumenttyp Ihrer Einträge');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_VALIDATE', 'Bei jeder Vorschau aktiviert');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE', 'HTML-Validator bei der Vorschau ausführen');
         break;
     
     case 'en':
@@ -19,6 +21,8 @@
         @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC', 'The usual charset of your articles');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'Doctype');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC', 'The usual document type of your articles');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_VALIDATE', 'Validate on each preview');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE', 'Show HTML-Validator on preview');
         break;
 }
 
@@ -31,16 +35,23 @@
         $propbag->add('name',          PLUGIN_EVENT_HTMLVALIDATOR_NAME);
         $propbag->add('description',   PLUGIN_EVENT_HTMLVALIDATOR_DESC);
         $propbag->add('event_hooks',    array(
-            'backend_preview' => true
+            'backend_preview' => true,
+            'backend_display' => true,
         ));
         
-        $propbag->add('configuration', array('charset', 'doctype'));
+        $propbag->add('configuration', array('charset', 'doctype', 'default_validate'));
         
     }
 
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
+            case 'default_validate':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_VALIDATE);
+                $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_VALIDATE);
+                break;
+
             case 'charset':
                 $propbag->add('type',        'select');
                 $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_CHARSET);
@@ -120,8 +131,25 @@
         $hooks = &$bag->get('event_hooks');
 
         if (isset($hooks[$event])) {
-            switch($event) {
-                case 'backend_preview':
+            switch($event) {
+                case 'backend_display':
+?>
+                    <fieldset style="margin: 5px">
+                        <legend><?php echo PLUGIN_EVENT_HTMLVALIDATOR_NAME; ?></legend>
+<?php
+                        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['default_validate']) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config('default_validate') == 'true') ? 'checked="checked"' : '');
+?>
+                            <input style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[default_validate]" id="serendipity[default_validate]" value="true" <?php echo $selected; ?> />
+                                <label style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[default_validate]">&nbsp;<?php echo PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE; ?>&nbsp;&nbsp;</label>
+                    </fieldset>
+<?php
+                    break;
+                
+                case 'backend_preview':
+                    if (!$serendipity['POST']['default_validate']) {
+                        return true;
+                    }
+                    
                     $url = 'validator.w3.org';
                     $path = '/check';
                     $fp = fsockopen($url, 80, $errno, $errstr, 30);

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

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

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

Modified Files:
	serendipity_event_mailer.php 
Log Message:
Fixed language string


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_mailer.php	9 Feb 2004 15:12:54 -0000	1.1
+++ serendipity_event_mailer.php	10 Feb 2004 15:50:29 -0000	1.2
@@ -49,7 +49,7 @@
     }
 
     function generate_content(&$title) {
-        $title = 'Entry mailer';
+        $title = PLUGIN_EVENT_MAILER_NAME;
     }
 
     function event_hook($event, &$bag, &$eventData) {

[php-blog-cvs] serendipity/plugins/serendipity_event_htmlvalidator serendipity_event_htmlvalidator.php,NONE,1.1

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

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

Added Files:
	serendipity_event_htmlvalidator.php 
Log Message:
New event plugin: HTML Validator.

If used, it can validate your entries upon preview of your created entry.



--- NEW FILE: serendipity_event_htmlvalidator.php ---
<?php # $Id: serendipity_event_htmlvalidator.php,v 1.1 2004/02/10 15:49:24 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_HTMLVALIDATOR_NAME', 'HTML Validator');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DESC', 'Überprüft, ob ein Artikel XML-konform ist');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSET', 'Zeichensatz');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC', 'Der übliche Zeichensatz Ihrer Einträge');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'Dokumenttyp');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC', 'Der übliche Dokumenttyp Ihrer Einträge');
        break;
    
    case 'en':
    case 'es':
    default:
        @define('PLUGIN_EVENT_HTMLVALIDATOR_NAME', 'HTML Validator');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DESC', 'Validates entries on their XML-conformity');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSET', 'Charset');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC', 'The usual charset of your articles');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'Doctype');
        @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC', 'The usual document type of your articles');
        break;
}

class serendipity_event_htmlvalidator extends serendipity_event
{
    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_HTMLVALIDATOR_NAME);
        $propbag->add('description',   PLUGIN_EVENT_HTMLVALIDATOR_DESC);
        $propbag->add('event_hooks',    array(
            'backend_preview' => true
        ));
        
        $propbag->add('configuration', array('charset', 'doctype'));
        
    }

    function introspect_config_item($name, &$propbag)
    {
        switch($name) {
            case 'charset':
                $propbag->add('type',        'select');
                $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_CHARSET);
                $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC);
                $propbag->add('select_values', array(
                    '(detect automatically)' => '(detect automatically)',
                    'utf-8 (Unicode, worldwide)' => 'utf-8 (Unicode, worldwide)',
                    'utf-16 (Unicode, worldwide)' => 'utf-16 (Unicode, worldwide)',
                    'iso-8859-1 (Western Europe)' => 'iso-8859-1 (Western Europe)',
                    'iso-8859-2 (Central Europe)' => 'iso-8859-2 (Central Europe)',
                    'iso-8859-3 (Southern Europe)' => 'iso-8859-3 (Southern Europe)',
                    'iso-8859-4 (Baltic Rim)' => 'iso-8859-4 (Baltic Rim)',
                    'iso-8859-5 (Cyrillic)' => 'iso-8859-5 (Cyrillic)',
                    'iso-8859-6-i (Arabic)' => 'iso-8859-6-i (Arabic)',
                    'iso-8859-7 (Greek)' => 'iso-8859-7 (Greek)',
                    'iso-8859-8-i (Hebrew)' => 'so-8859-8-i (Hebrew)',
                    'iso-8859-9 (Turkish)' => 'iso-8859-9 (Turkish)',
                    'iso-8859-10 (Latin 6)' => 'iso-8859-10 (Latin 6)',
                    'iso-8859-13 (Latin 7)' => 'iso-8859-13 (Latin 7)',
                    'iso-8859-14 (Celtic)' => 'iso-8859-14 (Celtic)',
                    'iso-8859-15 (Latin 9)' => 'iso-8859-15 (Latin 9)',
                    'us-ascii (basic English)' => 'us-ascii (basic English)',
                    'euc-jp (Japanese, Unix)' => 'euc-jp (Japanese, Unix)',
                    'shift_jis (Japanese, Win/Mac)' => 'shift_jis (Japanese, Win/Mac)',
                    'iso-2022-jp (Japanese, email)' => 'iso-2022-jp (Japanese, email)',
                    'euc-kr (Korean)' => 'euc-kr (Korean)',
                    'gb2312 (Chinese, simplified)' => 'gb2312 (Chinese, simplified)',
                    'gb18030 (Chinese, simplified)' => 'gb18030 (Chinese, simplified)',
                    'big5 (Chinese, traditional)' => 'big5 (Chinese, traditional)',
                    'tis-620 (Thai)' => 'tis-620 (Thai)',
                    'koi8-r (Russian)' => 'koi8-r (Russian)',
                    'koi8-u (Ukrainian)' => 'koi8-u (Ukrainian)',
                    'macintosh (MacRoman)' => 'macintosh (MacRoman)',
                    'windows-1250 (Central Europe)' => 'windows-1250 (Central Europe)',
                    'windows-1251 (Cyrillic)' => 'windows-1251 (Cyrillic)',
                    'windows-1252 (Western Europe)' => 'windows-1252 (Western Europe)',
                    'windows-1253 (Greek)' => 'windows-1253 (Greek)',
                    'windows-1254 (Turkish)' => 'windows-1254 (Turkish)',
                    'windows-1255 (Hebrew)' => 'windows-1255 (Hebrew)',
                    'windows-1256 (Arabic)' => 'windows-1256 (Arabic)',
                    'windows-1257 (Baltic Rim)' => 'windows-1257 (Baltic Rim)'
                ));
                break;

            case 'doctype':
                $propbag->add('type',        'select');
                $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE);
                $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC);
                $propbag->add('select_values', array(
                    'Inline'                 => '(detect automatically)',
                    'XHTML 1.1'              => 'XHTML 1.1',
                    'XHTML Basic 1.0'        => 'XHTML Basic 1.0',
                    'XHTML 1.0 Strict'       => 'XHTML 1.0 Strict',
                    'XHTML 1.0 Transitional' => 'XHTML 1.0 Transitional',
                    'XHTML 1.0 Frameset'     => 'XHTML 1.0 Frameset',
                    'HTML 4.01 Strict'       => 'HTML 4.01 Strict',
                    'HTML 4.01 Transitional' => 'HTML 4.01 Transitional',
                    'HTML 4.01 Frameset'     => 'HTML 4.01 Frameset',
                    'HTML 3.2'               => 'HTML 3.2',
                    'HTML 2.0'               => 'HTML 2.0'
                ));
                break;

            default:
                    return false;
        }
        return true;
    }

    function generate_content(&$title) {
        $title = PLUGIN_EVENT_HTMLVALIDATOR_NAME;
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
        
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'backend_preview':
                    $url = 'validator.w3.org';
                    $path = '/check';
                    $fp = fsockopen($url, 80, $errno, $errstr, 30);

                    $doctype = $this->get_config('doctype');
                    $charset = $this->get_config('charset');

                    if (empty($doctype)) {
                        $doctype = 'XHTML 1.1';
                    }
                    
                    if (empty($charset)) {
                        $charset = 'iso-8859-1 (Western Europe)';
                    }
                    
                    $data = '<html><head><title>s9y</title></head><body><div>'
                          . $eventData
                          . '</div></body></html>';
                    $request_data .= '-----------------------------24464570528145
Content-Disposition: form-data; name="uploaded_file"; filename="s9y.htm"
Content-Type: text/html

' . $data . '
-----------------------------24464570528145
Content-Disposition: form-data; name="charset"

' . $charset . '
-----------------------------24464570528145
Content-Disposition: form-data; name="doctype"

' . $doctype . '
-----------------------------24464570528145
Content-Disposition: form-data; name="verbose"

1
-----------------------------24464570528145--';

                    $request_length = strlen($request_data);
                    $REQUEST = array();
                    $REQUEST[] = 'POST ' . $path . ' HTTP/1.0';
                    $REQUEST[] = 'Host: ' . $url;
                    $REQUEST[] = 'User-Agent: serendipity/' . $serendipity['version'];
                    $REQUEST[] = 'Referer: http://validator.w3.org/';
                    $REQUEST[] = 'Content-Type: multipart/form-data; boundary=---------------------------24464570528145';
                    $REQUEST[] = 'Content-Length: ' . $request_length;
                    $REQUEST[] = 'Connection: close' . "\n";
                    $REQUEST[] = $request_data;

                    $REQUEST_STRING = implode("\n", $REQUEST);
                    fputs($fp, $REQUEST_STRING);

                    $line = fgets($fp, 1024);
                    if (preg_match('@^HTTP/1\.. (2|3)0(2|0)@', $line)) {
                        $out = '';
                        $inheader = 1;
                        while(!feof($fp) && strlen($out) < 200000) {
                            $line = fgets($fp,1024);
                            if ($inheader && ($line == "\n" || $line == "\r\n")) {
                                $inheader = 0;
                            } elseif (!$inheader) {
                                $out .= $line;
                            }
                        }
                    }
                    fclose($fp);
                    
                    preg_match('@<table class="header">.+</table>.+</div>.+(<h2 .+)</body>@ms', $out, $html);

                    // Cut the waste
                    $html[1] = preg_replace(
                                 array(
                                   '@<address>.+</address>@ms',
                                   '@<dl class="tip">.+</dl>@ms',
                                   '@<div id="source".+>.+</div>@msU'
                                 ),
                                 
                                 array(
                                   '',
                                   '',
                                   ''
                                 ),
                                
                                 $html[1]
                    );
                    
                    echo '<div style="border: 1px solid red; margin: 10px; padding: 5px; "><div>' . $html[1] . '</div>';
                    return true;
                    break;
                
                default:
                    return false;
                    break;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity NEWS,1.64,1.65 serendipity_admin_entries.inc.php,1.16,1.17 serendipity_functions.inc.php,1.201,1.202

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

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

Modified Files:
	NEWS serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php 
Log Message:
New event plugin: HTML Validator.

If used, it can validate your entries upon preview of your created entry.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- NEWS	10 Feb 2004 13:36:40 -0000	1.64
+++ NEWS	10 Feb 2004 15:48:45 -0000	1.65
@@ -2,6 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * HTML Validator event plugin. Can be used to validate your entry upon preview (garvinhicking)
     * Create example events: mailer, weblogping, contentrewrite, eventwrapper (garvinhicking)
     * Created event plugin API to hook on certain serendipity actions (garvinhicking)
     * Redesigned image manager (tomsommer)

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin_entries.inc.php	8 Feb 2004 12:06:05 -0000	1.16
+++ serendipity_admin_entries.inc.php	10 Feb 2004 15:48:45 -0000	1.17
@@ -185,9 +185,9 @@
 
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';
-            serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0));
+            serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
             echo '</div>';
-
+            
             serendipity_printEntryForm(
                 '?',
                 array(

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- serendipity_functions.inc.php	9 Feb 2004 15:20:52 -0000	1.201
+++ serendipity_functions.inc.php	10 Feb 2004 15:48:45 -0000	1.202
@@ -717,7 +717,7 @@
 /**
 * Prints the entries you fetched with serendipity_fetchEntries/searchEntries in HTML.
 **/
-function serendipity_printEntries($entries, $extended = 0) {
+function serendipity_printEntries($entries, $extended = 0, $preview = false) {
     global $serendipity;
 
     /* pre-walk the array to collect them keyed by date */
@@ -832,6 +832,9 @@
 ?>
         </div>
 <?php
+                if ($preview) {
+                    serendipity_plugin_api::hook_event('backend_preview', $article);
+                }
             } // end for-loop (entries)
 ?>
     </div>

[php-blog-cvs] serendipity serendipity_plugin_api.php,1.10,1.11

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

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

Modified Files:
	serendipity_plugin_api.php 
Log Message:
Prevent double listing of plugin/events


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_plugin_api.php	10 Feb 2004 13:36:54 -0000	1.10
+++ serendipity_plugin_api.php	10 Feb 2004 15:46:19 -0000	1.11
@@ -110,9 +110,9 @@
                 $p = get_parent_class($p);
             }
 
-            if ($p == 'serendipity_plugin' && !$event_only ) {
+            if ($p == 'serendipity_plugin' && $class_name != 'serendipity_event' && !$event_only ) {
                 $classes[] = '@' . $class_name;
-            } elseif ($p == 'serendipity_event' && $event_only) {
+            } elseif ($p == 'serendipity_event' && $class_name != 'serendipity_event' && $event_only) {
                 $classes[] = '@' . $class_name;
             }
         }
@@ -133,6 +133,12 @@
                 continue;
             }
             
+            $existing = array_search('@' . $f, $classes);
+            if ($existing !== null && $existing !== false) {
+                // If an external plugin/event already exists as internal, remove the internal reference because its redundant
+                unset($classes[$existing]);
+            }
+            
             if (file_exists($ppath . '/' . $f . '/' . $f . '.php')) {
                 $classes[] = $f;
             }

[php-blog-cvs] serendipity/plugins/serendipity_event_htmlvalidator - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator added to the repository

[php-blog-cvs] serendipity NEWS,1.63,1.64 serendipity_admin_plugins.inc.php,1.15,1.16 serendipity_plugin_api.php,1.9,1.10 db_update-0.5-0.5.1.sql,1.2,1.3

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

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

Modified Files:
	NEWS serendipity_admin_plugins.inc.php 
	serendipity_plugin_api.php db_update-0.5-0.5.1.sql 
Log Message:
Clarifications, small bugfix to content_rewrite event


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- NEWS	8 Feb 2004 17:56:27 -0000	1.63
+++ NEWS	10 Feb 2004 13:36:40 -0000	1.64
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Create example events: mailer, weblogping, contentrewrite, eventwrapper (garvinhicking)
+    * Created event plugin API to hook on certain serendipity actions (garvinhicking)
     * Redesigned image manager (tomsommer)
     * Added image syncronization with database (tomsommer)
     * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_plugins.inc.php	9 Feb 2004 15:20:31 -0000	1.15
+++ serendipity_admin_plugins.inc.php	10 Feb 2004 13:36:54 -0000	1.16
@@ -185,6 +185,7 @@
 
         /* Swap the one were moving with the one that's in the spot we're moving to */
         $tmp = $plugins[$idx_to_move]['sort_order'];
+
         $plugins[$idx_to_move]['sort_order'] = (int)$plugins[$idx_to_move + ($_GET['submit'] == 'move down' ? 1 : -1)]['sort_order'];
         $plugins[$idx_to_move + ($_GET['submit'] == 'move down' ? 1 : -1)]['sort_order'] = (int)$tmp;
 

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_plugin_api.php	9 Feb 2004 15:21:19 -0000	1.9
+++ serendipity_plugin_api.php	10 Feb 2004 13:36:54 -0000	1.10
@@ -149,7 +149,7 @@
 
         if ($filter !== '*') {
             if ($negate) {
-                $sql .= "WHERE NOT placement='$filter' ";
+                $sql .= "WHERE placement != '$filter' ";
             } else {
                 $sql .= "WHERE placement='$filter' ";
             }

Index: db_update-0.5-0.5.1.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db_update-0.5-0.5.1.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update-0.5-0.5.1.sql	9 Feb 2004 15:20:03 -0000	1.2
+++ db_update-0.5-0.5.1.sql	10 Feb 2004 13:36:54 -0000	1.3
@@ -11,10 +11,23 @@
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
+/*
+ If you were using the content_rewrite plugin, you need to execute:
+ 
 UPDATE serendipity_plugins
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
- WHERE name LIKE '%serendipity_plugin_content_rewrite%';
+ WHERE name LIKE '%serendipity_plugin_content_rewrite%';
 
 UPDATE serendipity_config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
- WHERE name LIKE '%serendipity_plugin_content_rewrite%';
+ WHERE name LIKE '%serendipity_plugin_content_rewrite%';
+ 
+UPDATE serendipity_plugins
+   SET placement = 'event'
+ WHERE name LIKE '%serendipity_event_contentrewrite%';
+ 
+ After that, you have to add the serendipity_plugin_eventwrapper to your
+ plugins and configure this plugin. Set the serendipity_event_contentrewrite 
+ plugin for wrapping there to see the output generatet by contentrewrite
+ anywhere you like on the sidebars.
+*/
\ No newline at end of file

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

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

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

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
Clarifications, small bugfix to content_rewrite event


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_contentrewrite.php	9 Feb 2004 15:12:54 -0000	1.1
+++ serendipity_event_contentrewrite.php	10 Feb 2004 13:36:54 -0000	1.2
@@ -185,13 +185,15 @@
 ?>
 <table>
 <?php
-        foreach($this->rewrite_from AS $key => $val) {
+	if (is_array($this->rewrite_from)) {
+            foreach($this->rewrite_from AS $key => $val) {
 ?>
     <tr>
         <th style="font-size: 8pt; font-color: white;"><?= htmlentities($val); ?></th>
         <td><?= htmlentities($this->rewrite_to[$key]); ?></td>
     </tr>
 <?php
+            }
         }
 ?>
 </table>

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.6,1.7 serendipity_lang_es.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_es.inc.php 
Log Message:
Tom, PLEASE don't forget to add new language strings to other files as well.



Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_de.inc.php	3 Feb 2004 19:13:20 -0000	1.6
+++ serendipity_lang_de.inc.php	9 Feb 2004 14:15:01 -0000	1.7
@@ -321,6 +321,8 @@
 @define('SENDING_PING', 'Sende XML-RPC ping zu %s');
 @define('EDIT_ENTRY', 'Eintrag bearbeiten');
 @define('HTACCESS_ERROR', 'Um die Webserverkonfiguration zu testen benötigt serendipity die Möglichkeit, die Datei ".htaccess" zu erstellen. Das aufgrund von rechteproblemen nicht möglich. Bitte passen sie die Rechte wie folgt an: <br />&nbsp;&nbsp;%s<br />und laden Sie diese Seite neu.');
-
+@define('SYNCING', 'Synchronsizere Datenbank mit Bilder-Ordner');
+@define('SYNC_DONE', 'Fertig (%s Bilder synchronisiert).');
+ 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_es.inc.php	3 Feb 2004 16:24:01 -0000	1.5
+++ serendipity_lang_es.inc.php	9 Feb 2004 14:15:01 -0000	1.6
@@ -300,6 +300,8 @@
 @define('NEXT_PAGE', 'Pagina siguiente');
 @define('ALL_CATEGORIES', 'Todas las categorías');
 @define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
-
+@define('SYNCING', 'Syncronizing the database with the image folder');
+@define('SYNC_DONE', 'Done (Syncronized %s images).');
+ 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping added to the repository

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.14,1.15

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Introducing event plugins (see mailing list)


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_admin_plugins.inc.php	13 Oct 2003 12:02:10 -0000	1.14
+++ serendipity_admin_plugins.inc.php	9 Feb 2004 15:20:31 -0000	1.15
@@ -8,6 +8,144 @@
 include_once 'serendipity_plugin_api.php';
 include_once 'serendipity_sidebar_items.php';
 
+function show_plugins($event_only = false)
+{
+    global $serendipity;
+
+    /* list of classes for creating instances (standard plugins) */
+    $classes = serendipity_plugin_api::enum_plugin_classes($event_only);
+?>
+<form action="?serendipity[adminModule]=plugins" method="post">
+<?php
+    $event_only_uri = '';
+    if ($event_only) {
+        $event_only_uri = '&amp;serendipity[event_plugin]=true';
+?>
+    <input type="hidden" name="serendipity[event_plugin]" value="true" />
+<?php
+    }
+?>
+    <div>
+        <select name="serendipity[plugin_to_add]">
+            <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
+<?php
+    foreach ($classes as $class_name) {
+        $plugin =& serendipity_plugin_api::load_plugin($class_name);
+
+        /* query for its name, description and configuration data */
+        $bag = new serendipity_property_bag;
+        $plugin->introspect($bag);
+
+        $name = $bag->get('name');
+        $desc = $bag->get('description');
+?>
+            <option value="<?php echo $class_name; ?>"><?php echo $name . ' - ' . $desc; ?></option>
+<?php
+    }
+?>
+        </select>
+        <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
+        <br />
+        <br />
+
+        <table border="0" cellpadding="5" cellspacing="0">
+            <tr>
+                <th>&nbsp;</th>
+                <th><?php echo TITLE; ?></th>
+                <th><?php echo DESCRIPTION; ?></th>
+<?php
+    if (!$event_only) {
+?>
+                <th><?php echo PLACEMENT; ?></th>
+<?php
+    }
+?>
+            </tr>
+<?php
+
+    $sort_order = 0;
+
+    /* Block display the plugins per placement location. */
+    if ($event_only) {
+        $plugin_placements = array('event');
+    } else {
+        $plugin_placements = array('left', 'right', 'hide');
+    }
+
+    foreach ($plugin_placements as $plugin_placement) {
+        $plugins = serendipity_plugin_api::enum_plugins($plugin_placement);
+
+        if (!is_array($plugins)) {
+            continue;
+        }
+
+        $sort_idx = 0;
+        foreach ($plugins as $plugin_data) {
+            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']);
+            $key    = urlencode($plugin_data['name']);
+
+            /* query for its name, description and configuration data */
+            $bag = new serendipity_property_bag;
+            $plugin->introspect($bag);
+
+            $name  = htmlentities($bag->get('name'));
+            $desc  = htmlentities($bag->get('description'));
+            if ($event_only) {
+                $place = '<input type="hidden" name="serendipity[placement][' . $plugin_data['name'] . ']" value="event" />';
+            } else {
+                $place = placement_box('serendipity[placement][' . $plugin_data['name'] . ']', $plugin_data['placement']);
+            }
+
+            $title = serendipity_plugin_api::get_plugin_title($plugin, '&nbsp;');
+
+            if ($bag->is_set('configuration')) {
+                $url   = '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $key;
+                $desc  = '<a href="' . $url . '">' . $desc  . '</a>';
+                $name  = '<a href="' . $url . '">' . $name  . '</a>';
+                $title = '<a href="' . $url . '">' . $title . '</a>';
+            }
+
+            /* Only display UP/DOWN links if there's somewhere for the plugin to go */
+            if ($sort_idx == 0) {
+                $moveup   = '';
+            } else {
+                $moveup   = '<a href="?serendipity[adminModule]=plugins&amp;submit=move+up&amp;serendipity[plugin_to_move]=' . $key . $event_only_uri . '">' . UP . '</a>';
+            }
+
+            if ($sort_idx == (count($plugins)-1)) {
+                $movedown = '';
+            } else {
+                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . $event_only_uri . '">' . DOWN . '</a>';
+            }
+?>
+            <tr>
+                <td style="border-bottom: 1px solid #000000">
+                    <div>
+                        <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>">
+                    </div>
+                </td>
+
+                <td style="border-bottom: 1px solid #000000"><?php echo $title; ?></td>
+                <td style="border-bottom: 1px solid #000000"><?php echo $desc; ?></td>
+                <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
+                    <div><?php echo $place . $moveup . $movedown; ?></div>
+                </td>
+            </tr>
+<?php
+            $sort_idx++;
+        }
+    }
+?>
+        </table>
+        <br />
+
+        <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>"  value="<?php echo DELETE; ?>" />
+        <input type="submit" name="SAVE"   title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>"   />
+    </div>
+</form>
+<?php
+}
+
 function placement_box($name, $val)
 {
     static $opts = array(
@@ -24,7 +162,11 @@
 }
 
 if (isset($_GET['serendipity']['plugin_to_move']) && isset($_GET['submit'])) {
-    $plugins = serendipity_plugin_api::enum_plugins();
+    if (isset($_GET['serendipity']['event_plugin'])) {
+        $plugins = serendipity_plugin_api::enum_plugins('event', false);
+    } else {
+        $plugins = serendipity_plugin_api::enum_plugins('event', true);
+    }
 
     /* Renumber the sort order to be certain that one actually exists
         Also look for the one we're going to move */
@@ -79,6 +221,8 @@
                 $plugin->set_config($config_item, $_POST['serendipity']['plugin'][$config_item]);
             }
         }
+
+        $plugin->cleanup();
     }
 ?>
 <form method="post" name="serendipityPluginConfigure">
@@ -117,7 +261,7 @@
                 break;
 
             case 'select':
-                $select = $plugin->select_values;
+                $select = $cbag->get('select_values');
 ?>
         <tr>
             <td style="vertical-align: top"><?php echo $cname; ?></td>
@@ -255,7 +399,11 @@
     }
 
     if (isset($_POST['NEW']) && $_POST['serendipity']['plugin_to_add'] != '0') {
-        $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add']);
+        if (isset($_POST['serendipity']['event_plugin'])) {
+            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'event');
+        } else {
+            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add']);
+        }
         /* TODO: redirect to configuration for that instance */
     }
 
@@ -265,123 +413,11 @@
         }
     }
 
-    /* list of classes for creating instances */
-    $classes = serendipity_plugin_api::enum_plugin_classes();
-?>
-<form action="?serendipity[adminModule]=plugins" method="post">
-    <div>
-        <select name="serendipity[plugin_to_add]">
-            <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
-<?php
-    foreach ($classes as $class_name) {
-        $plugin =& serendipity_plugin_api::load_plugin($class_name);
-
-            /* query for its name, description and configuration data */
-            $bag = new serendipity_property_bag;
-            $plugin->introspect($bag);
-
-            $name = $bag->get('name');
-            $desc = $bag->get('description');
-?>
-            <option value="<?php echo $class_name; ?>"><?php echo $name . ' - ' . $desc; ?></option>
-<?php
-    }
-?>
-        </select>
-        <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
-        <br />
-        <br />
-
-        <table border="0" cellpadding="5" cellspacing="0">
-            <tr>
-                <th>&nbsp;</th>
-                <th><?php echo TITLE; ?></th>
-                <th><?php echo DESCRIPTION; ?></th>
-                <th><?php echo PLACEMENT; ?></th>
-            </tr>
-<?php
-
-    $sort_order = 0;
-
-    /* Block display the plugins per placement location. */
-    $plugin_placements = array('left', 'right', 'hide');
-
-    foreach ($plugin_placements as $plugin_placement) {
-        $plugins = serendipity_plugin_api::enum_plugins($plugin_placement);
-
-        if (!is_array($plugins)) {
-            continue;
-        }
-
-        $sort_idx = 0;
-        foreach ($plugins as $plugin_data) {
-            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']);
-            $key    = urlencode($plugin_data['name']);
-
-            /* query for its name, description and configuration data */
-            $bag = new serendipity_property_bag;
-            $plugin->introspect($bag);
-
-            $name  = htmlentities($bag->get('name'));
-            $desc  = htmlentities($bag->get('description'));
-            $place = placement_box('serendipity[placement][' . $plugin_data['name'] . ']', $plugin_data['placement']);
-
-            $title = '';
-
-            ob_start();
-            $plugin->generate_content($title);
-            ob_end_clean();
-
-            if (strlen(trim($title)) == 0) {
-                $title = '&nbsp;';
-            }
-
-            if ($bag->is_set('configuration')) {
-                $url   = '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $key;
-                $desc  = '<a href="' . $url . '">' . $desc  . '</a>';
-                $name  = '<a href="' . $url . '">' . $name  . '</a>';
-                $title = '<a href="' . $url . '">' . $title . '</a>';
-            }
-
-            /* Only display UP/DOWN links if there's somewhere for the plugin to go */
-            if ($sort_idx == 0) {
-                $moveup   = '';
-            } else {
-                $moveup   = '<a href="?serendipity[adminModule]=plugins&amp;submit=move+up&amp;serendipity[plugin_to_move]=' . $key . '">' . UP . '</a>';
-            }
-
-            if ($sort_idx == (count($plugins)-1)) {
-                $movedown = '';
-            } else {
-                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . '">' . DOWN . '</a>';
-            }
-?>
-            <tr>
-                <td style="border-bottom: 1px solid #000000">
-                    <div>
-                        <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>">
-                    </div>
-                </td>
-
-                <td style="border-bottom: 1px solid #000000"><?php echo $title; ?></td>
-                <td style="border-bottom: 1px solid #000000"><?php echo $desc; ?></td>
-                <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
-                    <div><?php echo $place . $moveup . $movedown; ?></div>
-                </td>
-            </tr>
-<?php
-            $sort_idx++;
-        }
-    }
-?>
-        </table>
-        <br />
+    echo '<h2>' . SIDEBAR_PLUGINS . '</h2>';
+    show_plugins(false);
 
-        <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>"  value="<?php echo DELETE; ?>" />
-        <input type="submit" name="SAVE"   title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>"   />
-    </div>
-</form>
-<?php
+    echo '<h2>' . EVENT_PLUGINS . '</h2>';
+    show_plugins(true);
 }
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_eventwrapper serendipity_plugin_eventwrapper.php,NONE,1.1

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

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

Added Files:
	serendipity_plugin_eventwrapper.php 
Log Message:
New event-wrapper plugin. Whenever an event plugin generates data, it can't be displayed in the sidebar. Thus this wrapper-plugin can wrap generated data inside an event to display in a sidebar. See the content-rewrite plugin for example usage. This way, the needed data can stay within the event plugin container.


--- NEW FILE: serendipity_plugin_eventwrapper.php ---
<?php # $Id: serendipity_plugin_eventwrapper.php,v 1.1 2004/02/09 15:14:21 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_WRAPPER_NAME', 'Event-Ausgabe Wrapper');
        @define('PLUGIN_EVENT_WRAPPER_DESC', 'Zeigt die Ausgabedaten eines Event-Plugins an');
        @define('PLUGIN_EVENT_WRAPPER_PLUGIN', 'Quell Event-Plugin');
        @define('PLUGIN_EVENT_WRAPPER_PLUGINDESC', 'Wählen Sie das Event-Plugin aus, für das die Ausgabe dargestellt werden soll');
        @define('PLUGIN_EVENT_WRAPPER_TITLEDESC', 'Geben Sie den Titel für die Sidebar an. Die Eingabe eines leeren Titels zeigt den des Event-Plugins an.');
        break;
        
    case 'en':
    case 'es':
    default:
        @define('PLUGIN_EVENT_WRAPPER_NAME', 'Event-Output wrapper');
        @define('PLUGIN_EVENT_WRAPPER_DESC', 'Displays gathered data by a certain event plugin');
        @define('PLUGIN_EVENT_WRAPPER_PLUGIN', 'Source event plugin');
        @define('PLUGIN_EVENT_WRAPPER_PLUGINDESC', 'Select the event plugin for which the output should be displayed');
        @define('PLUGIN_EVENT_WRAPPER_TITLEDESC', 'Enter the title for this sidebar item (leave empty for inheritance by event plugin)');

        break;
}

class serendipity_plugin_eventwrapper extends serendipity_plugin
{
var $rewrite_from, $rewrite_to;

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_WRAPPER_NAME);
        $propbag->add('description',   PLUGIN_EVENT_WRAPPER_DESC);
        
        $propbag->add('configuration', array('event_plugin', 'title'));

    }

    function introspect_config_item($name, &$propbag)
    {
        global $serendipity;
        
        switch($name) {
            case 'event_plugin':
                $plugins = serendipity_plugin_api::get_event_plugins();
                $select = array();

                if (is_array($plugins)) {
                    foreach($plugins AS $plugname => $plugarray) {
                        $select[$plugname] = $plugarray['t'];
                    }
                }
                
                $propbag->add('type',        'select');
                $propbag->add('name',        PLUGIN_EVENT_WRAPPER_PLUGIN);
                $propbag->add('description', PLUGIN_EVENT_WRAPPER_PLUGINDESC);
                $propbag->add('select_values', $select);
                break;

            case 'title':
                $propbag->add('type',        'string');
                $propbag->add('name',        TITLE);
                $propbag->add('description', PLUGIN_EVENT_WRAPPER_TITLEDESC);
                break;

            default:
                    return false;
        }
        return true;
    }

    function generate_content(&$title)
    {
        $bag = new serendipity_property_bag;
        $this->introspect($bag);
        $wrap = &serendipity_plugin_api::get_event_plugins($this->get_config('event_plugin'));
        $faketitle = '';
        if (is_object($wrap)) {
            $wrap->generate_content($faketitle);
        }
        
        if ($this->get_config('title') != '') {
            $title = $this->get_config('title');
        } else {
            $title = $faketitle;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>