php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_creativecommons.php	14 Jun 2004 11:29:36 -0000	1.9
+++ serendipity_event_creativecommons.php	22 Jun 2004 13:45:43 -0000	1.10
@@ -71,6 +71,7 @@
                 $propbag->add('type',          'boolean');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_NC);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_NC_DESC);
+                $propbag->add('default',       'true');
                 break;
 
             case 'nd':
@@ -82,12 +83,15 @@
                     'desc'  => array(YES, PLUGIN_CREATIVECOMMONS_SA_DESC, NO)
                 ));
                 $propbag->add('radio_per_row', '1');
+                $propbag->add('default', 'yes');
+
                 break;
 
             case 'txt':
                 $propbag->add('type',          'boolean');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_TXT);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_TXT_DESC);
+                $propbag->add('default',       'true');
                 break;
 
             default:

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

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_bbcode.php	13 Apr 2004 10:00:37 -0000	1.4
+++ serendipity_event_bbcode.php	22 Jun 2004 13:45:43 -0000	1.5
@@ -112,6 +112,8 @@
         $propbag->add('type',        'boolean');
         $propbag->add('name',        $name);
         $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+        $propbag->add('default',     'true');
+
         return true;
     }
 

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

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

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

Modified Files:
	serendipity_plugin_templatedropdown.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_plugin_templatedropdown.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_templatedropdown/serendipity_plugin_templatedropdown.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_templatedropdown.php	3 Mar 2004 08:18:00 -0000	1.1
+++ serendipity_plugin_templatedropdown.php	22 Jun 2004 13:45:50 -0000	1.2
@@ -27,7 +27,7 @@
         // Register (multiple) dependencies. KEY is the name of the depending plugin. VALUE is a mode of either 'remove' or 'keep'.
         // If the mode 'remove' is set, removing the plugin results in a removal of the depending plugin. 'Keep' meens to
         // not touch the depending plugin.
-        $this->dependencies = array('serendipity_event_templatechooser' => 'remove'); 
+        $this->dependencies = array('serendipity_event_templatechooser' => 'remove');
     }
 
     function introspect_config_item($name, &$propbag)
@@ -37,18 +37,22 @@
                 $propbag->add('type',        'string');
                 $propbag->add('name',        TITLE);
                 $propbag->add('description', TITLE);
+                $propbag->add('default',     '');
                 break;
+
             case 'show_submit':
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        PLUGIN_TEMPLATEDROPDOWN_SUBMIT);
                 $propbag->add('description', PLUGIN_TEMPLATEDROPDOWN_SUBMIT_DESC);
+                $propbag->add('default',     'false');
                 break;
+
             default:
                     return false;
         }
         return true;
     }
-  
+
     function generate_content(&$title) {
         global $serendipity;
         $title = $this->get_config('title', $title);
@@ -64,7 +68,7 @@
         $uri['path'] = str_replace($serendipity['serendipityHTTPPath'], '', $uri['path']);
         $url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . $uri['path'] . $qst;
         $url = str_replace($serendipity['indexFile'] . '&', '', $url); // Kill possible looped repitions which could occur
-        
+
         echo '<form id="theme_chooser" action="' . $url . '" method="post">';
         echo '<select name="user_template" onchange="document.getElementById(\'theme_chooser\').submit();">';
         foreach (serendipity_fetchTemplates() as $template) {
@@ -73,7 +77,7 @@
         }
         echo '</select>';
 
-        if ($this->get_config('show_submit', $title) == 'true') {
+        if ($this->get_config('show_submit', 'false') == 'true') {
             echo '<input type="submit" name="submit" value="' . GO . '" size="4" />';
         }
         echo '</form>';

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

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_plugin_shoutbox.php	3 May 2004 11:55:09 -0000	1.9
+++ serendipity_plugin_shoutbox.php	22 Jun 2004 13:45:49 -0000	1.10
@@ -15,7 +15,7 @@
         @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Anzahl an Kommentaren');
         @define('PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)');
         break;
-    
+
     case 'en':
     case 'es':
     default:
@@ -37,10 +37,10 @@
     function introspect(&$propbag)
     {
         global $serendipity;
-        
+
         $propbag->add('name',          PLUGIN_SHOUTBOX_NAME);
         $propbag->add('description',   PLUGIN_SHOUTBOX_BLAHBLAH);
-        
+
         $propbag->add('configuration', array(
                                              'wordwrap',
                                              'max_chars',
@@ -55,24 +55,28 @@
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_SHOUTBOX_WORDWRAP);
                 $propbag->add('description', PLUGIN_SHOUTBOX_WORDWRAP_BLAHBLAH);
+                $propbag->add('default',     30);
                 break;
 
             case 'max_chars':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_SHOUTBOX_MAXCHARS);
                 $propbag->add('description', PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH);
+                $propbag->add('default',     120);
                 break;
 
             case 'max_entries':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_SHOUTBOX_MAXENTRIES);
                 $propbag->add('description', PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH);
+                $propbag->add('default',     15);
                 break;
 
             case 'dateformat':
                 $propbag->add('type', 'string');
                 $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT);
                 $propbag->add('description', sprintf(GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH, '%a, %m.%m.%Y %H:%M'));
+                $propbag->add('default',     '%a, %d.%m.%Y %H:%M');
                 break;
 
             default:
@@ -90,7 +94,7 @@
         $max_chars   = $this->get_config('max_chars');
         $wordwrap    = $this->get_config('wordwrap');
         $dateformat  = $this->get_config('dateformat');
-        
+
         //Put new shout into the database if necessary
         if ($_REQUEST['action'] == 'fillshoutbox' && $_REQUEST['serendipity']['shouttext'] != '') {
 
@@ -108,8 +112,8 @@
 
             $sql =  sprintf(
                       "INSERT INTO %sshoutbox (
-                            timestamp, 
-                            ip, 
+                            timestamp,
+                            ip,
                             body
                        ) VALUES (
                             %s,
@@ -123,7 +127,7 @@
                     serendipity_db_escape_string($_REQUEST['serendipity']['shouttext']));
             serendipity_db_query($sql);
         }
-        if ( $serendipity['GET']['action'] == 'shoutboxdelete' 
+        if ( $serendipity['GET']['action'] == 'shoutboxdelete'
           && $_SESSION['serendipityAuthedUser'] === true) {
             $sql  = sprintf("DELETE from %sshoutbox
                               WHERE id = %d
@@ -136,15 +140,15 @@
         if (!$max_entries || !is_numeric($max_entries) || $max_entries < 1) {
             $max_entries = 15;
         }
-        
+
         if (!$max_chars || !is_numeric($max_chars) || $max_chars < 1) {
             $max_chars = 120;
         }
-        
+
         if (!$wordwrap || !is_numeric($wordwrap) || $wordwrap < 1) {
             $wordwrap = 30;
         }
-        
+
         if (!$dateformat || strlen($dateformat) < 1) {
             $dateformat = '%a, %d.%m.%Y %H:%M';
         }
@@ -175,18 +179,18 @@
                 if (count($aComment) > 1) {
                     $comment .= ' [...]';
                 }
-                
+
                 $deleteLink = "";
                 if ($_SESSION['serendipityAuthedUser'] === true) {
                     $deleteLink =  ' | <a href="' . $serendipity['baseURL']
-                                  . '?serendipity[action]=shoutboxdelete&amp;serendipity[comment_id]=' 
-                                  . $row['comment_id'] . '">' . PLUGIN_SHOUTBOX_DELETE . '</a>';                
+                                  . '?serendipity[action]=shoutboxdelete&amp;serendipity[comment_id]='
+                                  . $row['comment_id'] . '">' . PLUGIN_SHOUTBOX_DELETE . '</a>';
                 }
                 $entry = array('comment' => wordwrap($comment, $wordwrap, "\n",1));
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
 
                 echo "<b>" . htmlspecialchars(strftime($dateformat, $row['stamp'])) . '</b> <br />' . "\n"
-                     . $entry['comment'] 
+                     . $entry['comment']
                      . $deleteLink
                      . '<br /><br /><br />' . "\n\n";
             }

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

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

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_plugin_recententries.php	7 Apr 2004 12:42:44 -0000	1.6
+++ serendipity_plugin_recententries.php	22 Jun 2004 13:45:49 -0000	1.7
@@ -35,12 +35,14 @@
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_RECENTENTRIES_NUMBER);
                 $propbag->add('description', PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH);
+                $propbag->add('default', 10);
                 break;
 
             case 'dateformat':
                 $propbag->add('type', 'string');
                 $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT);
                 $propbag->add('description', sprintf(GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH, '%A, %B %e %Y'));
+                $propbag->add('default', '%A, %B %e %Y');
                 break;
 
             default:

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.3,1.4

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

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

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_plugin_remoterss.php	11 Jun 2004 12:19:06 -0000	1.3
+++ serendipity_plugin_remoterss.php	22 Jun 2004 13:45:49 -0000	1.4
@@ -272,6 +272,7 @@
                 $propbag->add('type', 'boolean');
                 $propbag->add('name', DO_MARKUP);
                 $propbag->add('description', DO_MARKUP_DESCRIPTION);
+                $propbag->add('default', 'false');
                 break;
 
             case 'feedtype':
@@ -280,42 +281,49 @@
                 $propbag->add('name', PLUGIN_REMOTERSS_FEEDTYPE);
                 $propbag->add('description', PLUGIN_REMOTERSS_FEEDTYPE_BLAHBLAH);
                 $propbag->add('select_values', $select);
+                $propbag->add('default', 'rss');
                 break;
 
             case 'number':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_REMOTERSS_NUMBER);
                 $propbag->add('description', PLUGIN_REMOTERSS_NUMBER_BLAHBLAH);
+                $propbag->add('default', '0');
                 break;
 
             case 'dateformat':
                 $propbag->add('type', 'string');
                 $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT);
                 $propbag->add('description', sprintf(GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH, '%A, %B %e. %Y'));
+                $propbag->add('default', '%A, %B %e. %Y');
                 break;
 
             case 'sidebartitle':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_REMOTERSS_SIDEBARTITLE);
                 $propbag->add('description', PLUGIN_REMOTERSS_SIDEBARTITLE_BLAHBLAH);
+                $propbag->add('default', '');
                 break;
 
             case 'rssuri':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_REMOTERSS_RSSURI);
                 $propbag->add('description', PLUGIN_REMOTERSS_RSSURI_BLAHBLAH);
+                $propbag->add('default', '');
                 break;
 
             case 'target':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_REMOTERSS_RSSTARGET);
                 $propbag->add('description', PLUGIN_REMOTERSS_RSSTARGET_BLAHBLAH);
+                $propbag->add('default', '_blank');
                 break;
 
             case 'cachetime':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_REMOTERSS_CACHETIME);
                 $propbag->add('description', PLUGIN_REMOTERSS_CACHETIME_BLAHBLAH);
+                $propbag->add('default', 10800);
                 break;
 
             default:

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

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

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

Modified Files:
	serendipity_plugin_eventwrapper.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_plugin_eventwrapper.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_eventwrapper/serendipity_plugin_eventwrapper.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_plugin_eventwrapper.php	3 Apr 2004 17:36:18 -0000	1.2
+++ serendipity_plugin_eventwrapper.php	22 Jun 2004 13:45:48 -0000	1.3
@@ -8,7 +8,7 @@
         @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:
@@ -28,10 +28,10 @@
     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'));
 
     }
@@ -39,7 +39,7 @@
     function introspect_config_item($name, &$propbag)
     {
         global $serendipity;
-        
+
         switch($name) {
             case 'event_plugin':
                 $plugins = serendipity_plugin_api::get_event_plugins();
@@ -50,17 +50,19 @@
                         $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);
+                $propbag->add('default', 'false');
                 break;
 
             case 'title':
                 $propbag->add('type',        'string');
                 $propbag->add('name',        TITLE);
                 $propbag->add('description', PLUGIN_EVENT_WRAPPER_TITLEDESC);
+                $propbag->add('default', '');
                 break;
 
             default:
@@ -73,12 +75,17 @@
     {
         $bag = new serendipity_property_bag;
         $this->introspect($bag);
-        $wrap = &serendipity_plugin_api::get_event_plugins($this->get_config('event_plugin'));
+        $plug = $this->get_config('event_plugin', 'false');
+        if ($plug == 'false') {
+            return;
+        }
+
+        $wrap = &serendipity_plugin_api::get_event_plugins($plug);
         $faketitle = '';
         if (is_object($wrap)) {
             $wrap->generate_content($faketitle);
         }
-        
+
         if ($this->get_config('title') != '') {
             $title = $this->get_config('title');
         } else {

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

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

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

Added Files:
	serendipity_event_xhtmlcleanup.php 
Log Message:
XHTML sanitizer plugin


--- NEW FILE: serendipity_event_xhtmlcleanup.php ---
(This appears to be a binary file; contents omitted.)

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

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

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

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

[php-blog-cvs] serendipity/templates/newspaper style.css,1.9,1.10

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

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

Modified Files:
	style.css 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- style.css	19 May 2004 09:27:33 -0000	1.9
+++ style.css	22 Jun 2004 10:07:34 -0000	1.10
@@ -327,4 +327,10 @@
 }
 
 .serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
 }
\ No newline at end of file

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.19,1.20

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

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19932/templates/mt-trendy

Modified Files:
	style.css 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- style.css	19 May 2004 09:27:33 -0000	1.19
+++ style.css	22 Jun 2004 10:07:33 -0000	1.20
@@ -246,4 +246,10 @@
 }
 
 .serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
 }
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.156,1.157 serendipity_functions.inc.php,1.300,1.301 serendipity_genpage.inc.php,1.28,1.29

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

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

Modified Files:
	NEWS serendipity_functions.inc.php serendipity_genpage.inc.php 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- serendipity_functions.inc.php	21 Jun 2004 15:17:09 -0000	1.300
+++ serendipity_functions.inc.php	22 Jun 2004 10:07:32 -0000	1.301
@@ -82,7 +82,7 @@
 <?php
     if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) {
 ?>
-        <div align="center" style="color: #FF0000; font-weight: bold;"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
+        <div class="serendipity_center" style="color: #FF0000; font-weight: bold;"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
 <?php
     }
 ?>
@@ -223,8 +223,8 @@
     }
 ?>
 <div class="serendipityCommentForm">
-    <a name="serendipity_CommentForm"></a>
-    <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post" onsubmit="if (document.getElementById('serendipity_remember') && document.getElementById('serendipity_remember').checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
+    <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_CommentForm"></a>
+    <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post">
     <div><input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" /></div>
     <table border="0" width="100%" cellpadding="3">
         <tr>
@@ -1122,7 +1122,7 @@
                     }
                 }
                 ?>
-            <span class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></span>
+            <div class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></div>
             <?php echo $html_extended; ?>
 
             <div class='serendipity_entryFooter'>
@@ -1186,13 +1186,12 @@
 <?php
                 if (isset($serendipity['GET']['id'])) {
 ?>
-            <span class="serendipity_comments">
-            <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&amp;entry_id=<?php echo $entry['id']; ?>" />
+            <div class="serendipity_comments">
             <br />
             <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
 <?php
                     if (preg_match('@/unsubscribe/(.*)/([0-9]+)@', $_SERVER['REQUEST_URI'], $res)) {
-                        echo '<div align="center" style="color: #FF0000; font-weight: bold;">'. sprintf(UNSUBSCRIBE_OK, urldecode($res[1])) .'</div><br />';
+                        echo '<div class="serendipity_center" style="color: #FF0000; font-weight: bold;">'. sprintf(UNSUBSCRIBE_OK, urldecode($res[1])) .'</div><br />';
                     }
 
                     echo serendipity_printComments(serendipity_fetchComments($entry['id']), (isset($entry['allow_comments']) ? $entry['allow_comments'] : true));
@@ -1236,11 +1235,11 @@
                     } else {
 ?>
             <br />
-            <div style="color: #FF0000" align="center"><?php echo COMMENTS_CLOSED; ?></div>
+            <div class="serendipity_center" style="color: #FF0000"><?php echo COMMENTS_CLOSED; ?></div>
 <?php
                     }
 ?>
-            </span>
+            </div>
 <?php
                 }
 ?>
@@ -1379,7 +1378,7 @@
         $comments = serendipity_fetchComments($id);
     }
 
-    $retval = $parent ? '' : '<select id="serendipity[replyTo]" name="serendipity[replyTo]"><option value="0">[ ' . TOP_LEVEL . ' ]</option>';
+    $retval = $parent ? '' : '<select id="serendipity_replyTo" name="serendipity_replyTo"><option value="0">[ ' . TOP_LEVEL . ' ]</option>';
     $i = 0;
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
@@ -1401,7 +1400,7 @@
 <?php
     if (!count($comments) && !$parentid) {
 ?>
-            <div align="center"><?php echo NO_COMMENTS; ?></div>
+            <div class="serendipity_center"><?php echo NO_COMMENTS; ?></div>
 <?php
     }
 
@@ -1453,7 +1452,7 @@
             }
 
             /* Allow people to easily reply to this comment */
-            echo ' <a href="#serendipity_CommentForm" onclick="document.getElementById(\'serendipity[replyTo]\').value=\'' . $comment['id'] . '\';">' . REPLY . '</a>';
+            echo ' <a href="#serendipity_CommentForm" onclick="document.getElementById(\'serendipity_replyTo\').value=\'' . $comment['id'] . '\';">' . REPLY . '</a>';
 ?>
 
             </div>
@@ -1720,7 +1719,7 @@
     static $p = array(
         '/\&([\s\<])/',       // ampersand followed by whitespace or tag
         '/\&$/',              // ampersand at end of body
-        '/<(b|h)r([^\/>]*)>/i',    // unclosed br tag - attributes included
+        '/<(br|hr|img)([^\/>]*)>/i',    // unclosed br tag - attributes included
     );
 
     static $r = array(

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_genpage.inc.php	2 May 2004 20:49:59 -0000	1.28
+++ serendipity_genpage.inc.php	22 Jun 2004 10:07:32 -0000	1.29
@@ -21,13 +21,12 @@
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
     <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss2" />
     <link rel="alternate"  type="application/x.atom+xml"  title="Atom"  href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/atom.xml" />
-<?php
-        if (strtolower($serendipity['extCSS'])!='none') {
-?>
+<?php if (strtolower($serendipity['extCSS'])!='none') { ?>
     <style type="text/css">@import "<?php echo $serendipity['extCSS']; ?>";</style>
-<?php
-        }
-?>
+<?php }
+      if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) { ?>
+    <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&amp;entry_id=<?php echo $serendipity['GET']['id']; ?>" />
+<?php } ?>
 </head>
 
 <body>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- NEWS	21 Jun 2004 15:15:38 -0000	1.156
+++ NEWS	22 Jun 2004 10:07:31 -0000	1.157
@@ -3,6 +3,18 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Remaining XHTML 1.1 issues fixed:
+      - Use <div> instead of <span> for entry's contents.
+      - Removed obsolete javascript-function for comments
+      - Removed 'align' attribute from <div> tags, replaced with new
+        CSS class 'serendipity_align'
+      - Show the pingback-link element in the HEAD area. Embedded blogs
+        need to do that on their own.
+      - New plugin 'serendipity_event_xhtmlcleanup' to correct most
+        common XHTML errors (unclosed single tags, missing 'alt'
+        attribute, unescaped ampersands)
+        (garvinhicking)
+
     * SQLite support now works. (garvinhicking)
 
     * Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if

[php-blog-cvs] serendipity/templates/moz-modern style.css,1.9,1.10

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

Update of /cvsroot/php-blog/serendipity/templates/moz-modern
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19932/templates/moz-modern

Modified Files:
	style.css 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- style.css	19 May 2004 09:27:32 -0000	1.9
+++ style.css	22 Jun 2004 10:07:33 -0000	1.10
@@ -435,4 +435,10 @@
 }
 
 .serendipity_comments {
-}
\ No newline at end of file
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}

[php-blog-cvs] serendipity/templates/default style.css,1.21,1.22

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

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

Modified Files:
	style.css 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- style.css	19 May 2004 09:27:32 -0000	1.21
+++ style.css	22 Jun 2004 10:07:33 -0000	1.22
@@ -370,4 +370,10 @@
 }
 
 .serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
 }
\ No newline at end of file

[php-blog-cvs] serendipity/templates/blue style.css,1.8,1.9

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

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

Modified Files:
	style.css 
Log Message:
XHTML fixes: Now my blog validates as XHTML 1.1 Strict (at least the
overview and detailed entry pane). :-)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	19 May 2004 09:27:32 -0000	1.8
+++ style.css	22 Jun 2004 10:07:33 -0000	1.9
@@ -297,4 +297,10 @@
 }
 
 .serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
 }
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.3,1.4

[Sebastian N. <no...@us...>]

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

Modified Files:
	serendipity_event_mailer.php 
Log Message:
- Allow users to include the url to the article in the mail
- Allow users to remove html from the article before mailing it

Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_mailer.php	3 Apr 2004 17:36:17 -0000	1.3
+++ serendipity_event_mailer.php	22 Jun 2004 09:44:50 -0000	1.4
@@ -6,6 +6,10 @@
         @define('PLUGIN_EVENT_MAILER_DESC', 'Verschickt jeden neuen Artikel im Blog via E-Mail');
         @define('PLUGIN_EVENT_MAILER_RECIPIENT', 'Mail-Empfänger');
         @define('PLUGIN_EVENT_MAILER_RECIPIENTDESC', 'Die E-Mail Adresse an die die Artikel verschickt werden sollen (empfohlen: Eine Mailing-Liste)');
+        @define('PLUGIN_EVENT_MAILER_LINK', 'URL des Artikels mailen?');
+        @define('PLUGIN_EVENT_MAILER_LINKDESC', 'Verschickt die URL des Artikels.');
+        @define('PLUGIN_EVENT_MAILER_STRIPTAGS', 'HTML entfernen?');
+        @define('PLUGIN_EVENT_MAILER_STRIPTAGSDESC', 'Entfernt HTML-Anweisungen aus der Mail.');
         break;
     
     case 'en':
@@ -15,6 +19,10 @@
         @define('PLUGIN_EVENT_MAILER_DESC', 'Mails each new entry to your blog via E-Mail');
         @define('PLUGIN_EVENT_MAILER_RECIPIENT', 'Mail recipient');
         @define('PLUGIN_EVENT_MAILER_RECIPIENTDESC', 'E-Mail address you want to send the entries to (suggested: a mailing list)');
+        @define('PLUGIN_EVENT_MAILER_LINK', 'Mail link to article?');
+        @define('PLUGIN_EVENT_MAILER_LINKDESC', 'Include a link to the article in the mail.');
+        @define('PLUGIN_EVENT_MAILER_STRIPTAGS', 'Remove HTML?');
+        @define('PLUGIN_EVENT_MAILER_STRIPTAGSDESC', 'Remove HTML-Tags from the mail.');
         break;
 }
 
@@ -30,7 +38,7 @@
             'backend_publish' => true
         ));
         
-        $propbag->add('configuration', array('mailto'));
+        $propbag->add('configuration', array('mailto', 'includelink', 'striptags'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -41,6 +49,16 @@
                 $propbag->add('name',        PLUGIN_EVENT_MAILER_RECIPIENT);
                 $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
                 break;
+            case 'includelink':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_MAILER_LINK);
+                $propbag->add('description', PLUGIN_EVENT_MAILER_LINKDESC);
+                break;
+            case 'striptags':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_MAILER_STRIPTAGS);
+                $propbag->add('description', PLUGIN_EVENT_MAILER_STRIPTAGSDESC);
+                break;
             default:
                 break;
         }
@@ -67,6 +85,12 @@
                       'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                     );
                     
+                    if($this->get_config('includelink') == true)
+                       $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
+
+                    if($this->get_config('striptags') == true)
+                       $mail['body'] = strip_tags($mail['body']);
+
                     mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
                     return true;
                     break;

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.23,1.24 serendipity_lang_cz.inc.php,1.23,1.24 serendipity_lang_da.inc.php,1.40,1.41 serendipity_lang_de.inc.php,1.51,1.52 serendipity_lang_en.inc.php,1.40,1.41 serendipity_lang_es.inc.php,1.40,1.41 serendipity_lang_fr.inc.php,1.19,1.20

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Log Message:
better formatting for trackback verbose output 
flushing weblogping event


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_cs.inc.php	18 Jun 2004 15:43:59 -0000	1.23
+++ serendipity_lang_cs.inc.php	21 Jun 2004 15:17:10 -0000	1.24
@@ -513,7 +513,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 @define('SUCCESS', 'Success');
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_da.inc.php	18 Jun 2004 15:44:00 -0000	1.40
+++ serendipity_lang_da.inc.php	21 Jun 2004 15:17:10 -0000	1.41
@@ -508,7 +508,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 @define('SUCCESS', 'Success');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_fr.inc.php	18 Jun 2004 15:44:00 -0000	1.19
+++ serendipity_lang_fr.inc.php	21 Jun 2004 15:17:10 -0000	1.20
@@ -501,7 +501,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 @define('SUCCESS', 'Success');
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_cz.inc.php	18 Jun 2004 15:44:00 -0000	1.23
+++ serendipity_lang_cz.inc.php	21 Jun 2004 15:17:10 -0000	1.24
@@ -513,7 +513,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 @define('SUCCESS', 'Success');
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_en.inc.php	18 Jun 2004 15:44:00 -0000	1.40
+++ serendipity_lang_en.inc.php	21 Jun 2004 15:17:10 -0000	1.41
@@ -500,7 +500,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 @define('SUCCESS', 'Success');
 /* 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.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_es.inc.php	18 Jun 2004 15:44:00 -0000	1.40
+++ serendipity_lang_es.inc.php	21 Jun 2004 15:17:10 -0000	1.41
@@ -491,7 +491,7 @@
 @define('TRACKBACK_SENT', 'done: %s');
 @define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
 @define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking the links you entered for possible trackbacks...');
+@define('TRACKBACK_CHECKING', 'Checking your entered link %s for possible trackbacks...');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_lang_de.inc.php	18 Jun 2004 15:49:30 -0000	1.51
+++ serendipity_lang_de.inc.php	21 Jun 2004 15:17:10 -0000	1.52
@@ -498,7 +498,7 @@
 @define('TRACKBACK_SENT', 'fertig: %s');
 @define('TRACKBACK_NOT_FOUND', 'Kein Trackback: Keine gültige Trackback-URI gefunden.');
 @define('TRACKBACK_URI_MISMATCH', 'Kein Trackback: The automatisch erkannte Trackback-URI entspricht nicht der ursprünglich angegebenen URI.');
-@define('TRACKBACK_CHECKING', 'Überprüfe Links auf etwaige Trackbacks-Ping...');
+@define('TRACKBACK_CHECKING', 'Überprüfe Link %s auf Trackback-Ping...');
 @define('SUCCESS', 'Erfolgreich beendet');
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,1.7,1.8

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

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

Modified Files:
	serendipity_event_weblogping.php 
Log Message:
better formatting for trackback verbose output 
flushing weblogping event


Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_event_weblogping.php	11 Jun 2004 08:33:51 -0000	1.7
+++ serendipity_event_weblogping.php	21 Jun 2004 15:17:09 -0000	1.8
@@ -10,7 +10,7 @@
         @define('PLUGIN_EVENT_WEBLOGPING_CUSTOM', 'Selbstdefinierte Ping-Services');
         @define('PLUGIN_EVENT_WEBLOGPING_CUSTOM_BLAHBLA', 'Mehrere durch "," getrennte Ping-Services im Format: "host.domain/pfad". Falls am Anfang eines Hosts ein "*" eingefügt wird, werden an den Host die erweiterten XML-RPC Optionen gesendet; der Host muss diese Optionen unterstützen.');
         break;
-    
+
     case 'en':
     case 'es':
     default:
@@ -31,7 +31,7 @@
     function introspect(&$propbag)
     {
         global $serendipity;
-        
+
         $propbag->add('name',          PLUGIN_EVENT_WEBLOGPING_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_WEBLOGPING_DESC);
         $propbag->add('event_hooks',    array(
@@ -42,7 +42,7 @@
             'backend_publish' => true,
             'backend_draft' => true
         ));
-        
+
         $this->services = array(
             array(
               'name'     => 'blo.gs',
@@ -50,19 +50,19 @@
               'path'     => '/',
               'extended' => true
             ),
-    
+
             array(
               'name' => 'blogrolling.com',
               'host' => 'rpc.blogrolling.com',
               'path' => '/pinger/'
             ),
-    
+
             array(
               'name' => 'technorati.com',
               'host' => 'rpc.technorati.com',
               'path' => '/rpc/ping'
             ),
-    
+
             array(
               'name' => 'weblogs.com',
               'host' => 'rpc.weblogs.com',
@@ -110,9 +110,9 @@
         foreach($this->services AS $key => $service) {
             $conf_array[] = $service['name'];
         }
-        
+
         $conf_array[] = 'manual_services';
-        
+
         $propbag->add('configuration', $conf_array);
     }
 
@@ -124,7 +124,7 @@
                 $propbag->add('name',        PLUGIN_EVENT_WEBLOGPING_CUSTOM);
                 $propbag->add('description', PLUGIN_EVENT_WEBLOGPING_CUSTOM_BLAHBLA);
                 break;
-            
+
             default:
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        $name);
@@ -136,10 +136,10 @@
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_WEBLOGPING_TITLE . ' ' . PLUGIN_EVENT_WEBLOGPING_DESC;
     }
-    
+
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-        
+
         $hooks = &$bag->get('event_hooks');
         if (isset($hooks[$event])) {
             switch($event) {
@@ -152,7 +152,7 @@
                         // Detect if the current checkbox needs to be saved. We use the field chk_timestamp to see,
                         // if the form has already been submitted and individual changes shall be preserved
                         $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries_' . $service['name']]) || (!isset($serendipity['POST']['chk_timestamp']) && $this->get_config($service['name']) == 'true') ? 'checked="checked"' : '');
-                        
+
                         $onclick = '';
                         if (!empty($service['supersedes'])) {
                             $onclick    = 'onclick="';
@@ -187,11 +187,12 @@
                             }
                         }
                     }
-                    
+
                     foreach ($this->services as $index => $service) {
                         if (isset($serendipity['POST']['announce_entries_' . $service['name']])) {
                             printf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING . '...<br />', $service['host']);
-                    
+                            flush();
+
                             # XXX append $serendipity['indexFile'] to baseURL?
                             $args = array(
                               new XML_RPC_Value(
@@ -203,39 +204,39 @@
                                 'string'
                               )
                             );
-                    
+
                             if ($service['extended']) {
                                 # the checkUrl: for when the main page is not really the main page
                                 $args[] = new XML_RPC_Value(
                                   '',
                                   'string'
                                 );
-                    
+
                                 # the rssUrl
                                 $args[] = new XML_RPC_Value(
                                   $serendipity['baseURL'] . 'rss.php?version=2.0',
                                   'string'
                                 );
                             }
-                    
+
                             $message = new XML_RPC_Message(
                               $service['extended'] ? 'weblogUpdates.extendedPing' : 'weblogUpdates.ping',
                               $args
                             );
-                    
+
                             $client = new XML_RPC_Client(
                               $service['path'],
                               $service['host']
                             );
-                    
+
                             # 15 second timeout may not be long enough for weblogs.com
                             $result = $client->send($message, 15);
                         }
                     }
-                    
+
                     return true;
                     break;
-                
+
                 case 'frontend_display':
                 case 'backend_insert':
                 case 'backend_update':

[php-blog-cvs] serendipity serendipity_entries.php,1.34,1.35 serendipity_functions.inc.php,1.299,1.300

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

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

Modified Files:
	serendipity_entries.php serendipity_functions.inc.php 
Log Message:
better formatting for trackback verbose output 
flushing weblogping event


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- serendipity_functions.inc.php	21 Jun 2004 14:55:32 -0000	1.299
+++ serendipity_functions.inc.php	21 Jun 2004 15:17:09 -0000	1.300
@@ -2016,13 +2016,13 @@
 function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text)
 {
     if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) {
-        echo TRACKBACK_NOT_FOUND;
+        echo TRACKBACK_NOT_FOUND . '<br />';
         return;
     }
 
     if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@i', $res, $test)) {
         if ($loc != $test[1]) {
-            echo TRACKBACK_URI_MISMATCH;
+            echo TRACKBACK_URI_MISMATCH . '<br />';
             return;
         }
     }
@@ -2047,6 +2047,7 @@
 }
 
 function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
+    echo '<br />';
     printf(TRACKBACK_CHECKING, $loc);
     echo '<br />';
     flush();

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_entries.php	17 Jun 2004 20:13:48 -0000	1.34
+++ serendipity_entries.php	21 Jun 2004 15:17:09 -0000	1.35
@@ -49,7 +49,7 @@
 ?>
             <td id="serendipityLeftSideBar">
                 <div class="serendipitySideBarItem">
-                    <div class="serendipitySideBarTitle"><?php echo ENTRIES; ?></div>
+                    <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?>:</div>
                     <div class="serendipitySideBarContent">
                         &bull; <a href="?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php          echo NEW_ENTRY;      ?></a><br />
                         &bull; <a href="?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php   echo EDIT_ENTRIES;   ?></a><br />

[php-blog-cvs] serendipity NEWS,1.155,1.156

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

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

Modified Files:
	NEWS 
Log Message:
Dude :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- NEWS	21 Jun 2004 14:55:31 -0000	1.155
+++ NEWS	21 Jun 2004 15:15:38 -0000	1.156
@@ -3,8 +3,7 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * SQLite support now works. Only basic functionality tested (posting,
-      installation, browsing) but it looks very good! (garvinhicking)
+    * SQLite support now works. (garvinhicking)
 
     * Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if
       there are more than 4 rows (tomsommer)

[php-blog-cvs] serendipity NEWS,1.154,1.155 htaccess.errordocs.tpl,1.5,1.6 htaccess.normal.tpl,1.5,1.6 htaccess.rewrite.tpl,1.9,1.10 serendipity_config.inc.php,1.81,1.82 serendipity_config_local.tpl,1.39,1.40 serendipity_db_sqlite.inc.php,1.6,1.7 serendipity_functions.inc.php,1.298,1.299 serendipity_functions_installer.inc.php,1.14,1.15

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

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

Modified Files:
	NEWS htaccess.errordocs.tpl htaccess.normal.tpl 
	htaccess.rewrite.tpl serendipity_config.inc.php 
	serendipity_config_local.tpl serendipity_db_sqlite.inc.php 
	serendipity_functions.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
Made SQLite work.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- NEWS	19 Jun 2004 19:28:52 -0000	1.154
+++ NEWS	21 Jun 2004 14:55:31 -0000	1.155
@@ -3,7 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if 
+    * SQLite support now works. Only basic functionality tested (posting,
+      installation, browsing) but it looks very good! (garvinhicking)
+
+    * Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if
       there are more than 4 rows (tomsommer)
 
     * Use the right HTML code for trackback-link detection when using
@@ -208,7 +211,7 @@
 
     * Configuration is now language-dependant. (garvinhicking)
 
-Version 0.6-pl3 ()
+Version 0.6-pl3 (June 20th, 2004)
 ------------------------------------------------------------------------
 
     * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only).

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- serendipity_config.inc.php	20 Jun 2004 19:52:00 -0000	1.81
+++ serendipity_config.inc.php	21 Jun 2004 14:55:31 -0000	1.82
@@ -195,5 +195,6 @@
                             . 'X-Engine: PHP/'. phpversion();
 
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_config_local.tpl	16 Jun 2004 18:28:58 -0000	1.39
+++ serendipity_config_local.tpl	21 Jun 2004 14:55:32 -0000	1.40
@@ -2,7 +2,7 @@
 
 // INSTALL_CAT_DB
 # INSTALL_CAT_DB_DESC
-$serendipity['dbType']               = '{INSTALL_DBTYPE|dbType|list|mysql=>MySQL,postgres=>PostgreSQL,mysqli=>MySQLi|255}'; // INSTALL_DBTYPE_DESC
+$serendipity['dbType']               = '{INSTALL_DBTYPE|dbType|list|mysql=>MySQL,postgres=>PostgreSQL,mysqli=>MySQLi,sqlite=>SQLite|255}'; // INSTALL_DBTYPE_DESC
 $serendipity['dbHost']               = '{INSTALL_DBHOST|dbHost|string|localhost|255}';                                      // INSTALL_DBHOST_DESC
 $serendipity['dbUser']               = '{INSTALL_DBUSER|dbUser|string|serendipity|255}';                                    // INSTALL_DBUSER_DESC
 $serendipity['dbPass']               = '{INSTALL_DBPASS|dbPass|protected||255}';                                            // INSTALL_DBPASS_DESC
@@ -44,6 +44,6 @@
 # INSTALL_CAT_IMAGECONV_DESC
 $serendipity['magick']               = '{INSTALL_IMAGEMAGICK|magick|bool|0|255}';                                   // INSTALL_IMAGEMAGICK_DESC
 $serendipity['convert']              = '{INSTALL_IMAGEMAGICKPATH|convert|string|/usr/local/bin/convert|255}';       // INSTALL_IMAGEMAGICKPATH_DESC
-$serendipity['thumbSuffix']          = '{INSTALL_THUMBSUFFIX|thumbSuffix|string|serendipityThumb|255}';             // INSTALL_THUMBSUFFIX_DESC 
+$serendipity['thumbSuffix']          = '{INSTALL_THUMBSUFFIX|thumbSuffix|string|serendipityThumb|255}';             // INSTALL_THUMBSUFFIX_DESC
 $serendipity['thumbSize']            = '{INSTALL_THUMBWIDTH|thumbSize|int|110|255}';                                // INSTALL_THUMBWIDTH_DESC
 ?>

Index: htaccess.errordocs.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.errordocs.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htaccess.errordocs.tpl	3 Jun 2004 09:53:29 -0000	1.5
+++ htaccess.errordocs.tpl	21 Jun 2004 14:55:31 -0000	1.6
@@ -16,7 +16,7 @@
     deny from all
 </Files>
 
-<Files sqlite.db>
+<Files *.db>
     deny from all
 </Files>
 

Index: htaccess.normal.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.normal.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htaccess.normal.tpl	3 Jun 2004 09:53:29 -0000	1.5
+++ htaccess.normal.tpl	21 Jun 2004 14:55:31 -0000	1.6
@@ -14,7 +14,7 @@
     deny from all
 </Files>
 
-<Files sqlite.db>
+<Files *.db>
     deny from all
 </Files>
 

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- htaccess.rewrite.tpl	3 Jun 2004 09:53:29 -0000	1.9
+++ htaccess.rewrite.tpl	21 Jun 2004 14:55:31 -0000	1.10
@@ -31,7 +31,7 @@
     deny from all
 </Files>
 
-<Files sqlite.db>
+<Files *.db>
     deny from all
 </Files>
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- serendipity_functions.inc.php	21 Jun 2004 08:01:36 -0000	1.298
+++ serendipity_functions.inc.php	21 Jun 2004 14:55:32 -0000	1.299
@@ -768,6 +768,7 @@
                    WHERE ec.entryid IN (" . implode(', ', $search_ids) . ")";
 
         $search_ret = serendipity_db_query($query);
+
         if (is_array($search_ret)) {
             foreach($search_ret AS $i => $entry) {
                 $ret[$assoc_ids[$entry['entryid']]]['categories'][] = $entry;
@@ -2709,7 +2710,7 @@
     }
 
     if ($username != '') {
-        if ($is_md5 === false) {
+        if ($is_md5 === false && !empty($password)) {
             $password = md5($password);
         }
 

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_functions_installer.inc.php	16 Jun 2004 22:21:55 -0000	1.14
+++ serendipity_functions_installer.inc.php	21 Jun 2004 14:55:32 -0000	1.15
@@ -16,6 +16,10 @@
         return $errs;
     }
 
+    if (isset($_POST['sqlitedbName']) && !empty($_POST['sqlitedbName'])) {
+        $dbName = $_POST['sqlitedbName'];
+    }
+
     fwrite($configfp, "<?php\n");
 
     fwrite($configfp, "\t/*\n");
@@ -48,7 +52,7 @@
 
     switch ($optname) {
 
-        case 'dbType' : 
+        case 'dbType' :
             if ( extension_loaded('mysqli') ) {
                 $type = 'mysqli';
             }
@@ -167,10 +171,10 @@
                 case '$':
                     // Grep out the name, type and default
                     preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
-                    
+
                     // Make vars containing the elements in the | list
                     list($constant, $name, $type, $distdefault, $permission, $flags) = explode('|', $match[1]);
-                    
+
                     // 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) : '');
@@ -356,7 +360,7 @@
 ?>
         <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;">
@@ -378,7 +382,7 @@
                 /* 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 */
@@ -486,6 +490,12 @@
         $errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
     }
 
+    if ($_POST['dbType'] == 'sqlite') {
+        // We don't want that our SQLite db file can be guessed from other applications on a server
+        // and have access to our's. So we randomize the SQLite dbname.
+        $_POST['sqlitedbName'] = $_POST['dbName'] . '_' . md5(time());
+    }
+
     $serendipity['dbType'] = $_POST['dbType'];
     // Probe database
     // (do it after the dir stuff, as we need to be able to create the sqlite database)

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_db_sqlite.inc.php	25 Jul 2003 01:03:18 -0000	1.6
+++ serendipity_db_sqlite.inc.php	21 Jun 2004 14:55:32 -0000	1.7
@@ -1,129 +1,163 @@
 <?php # $Id$
 
+if (!function_exists('sqlite_open')) {
+    @dl('sqlite.so');
+    @dl('sqlite.dll');
+}
+
 function serendipity_db_connect()
 {
     global $serendipity;
-    
-    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . 'sqlite.db');
+
+    if (isset($serendipity['dbConn'])) {
+        return $serendipity['dbConn'];
+    }
+
+    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db');
+
+    return $serendipity['dbConn'];
 }
 
 function serendipity_db_escape_string($string)
 {
-    static $search  = array("\x00", '%',   '\'',   '\"');
-    static $replace = array('%00',  '%25', '\\\'', '\\\"');
-    
+    static $search  = array("\x00", '%',   "'",   '\"');
+    static $replace = array('%00',  '%25', "''", '\\\"');
+
     return str_replace($search, $replace, $string);
 }
 
 function serendipity_db_affected_rows()
 {
-    return sqlite_changes($GLOBALS['serendipity']['dbConn']);
+    global $serendipity;
+
+    return sqlite_changes($serendipity['dbConn']);
 }
 
 function serendipity_db_insert_id()
 {
-    return sqlite_last_insert_rowid($GLOBALS['serendipity']['dbConn']);
+    global $serendipity;
+
+    return sqlite_last_insert_rowid($serendipity['dbConn']);
 }
 
-function serendipity_db_sqlite_fetch_array($res)
+function serendipity_db_sqlite_fetch_array($res, $type = SQLITE_BOTH)
 {
     static $search  = array('%00',  '%25');
     static $replace = array("\x00", '%');
-    
-    $row = sqlite_fetch_array($res);
+
+    $row = sqlite_fetch_array($res, $type);
     if (!is_array($row)) {
         return $row;
     }
-    
-    /* strip any slashes */
-    $r = array();
+
+    /* strip any slashes, correct fieldname */
     foreach ($row as $i => $v) {
-        $r[$i] = str_replace($search, $replace, $v);
+        // TODO: If a query of the format 'SELECT a.id, b.text FROM table' is used,
+        //       the sqlite extension will give us key indizes 'a.id' and 'b.text'
+        //       instead of just 'id' and 'text' like in mysql/postgresql extension.
+        //       To fix that, we use a preg-regex; but that is quite performance costy.
+        //       Either we always need to use 'SELECT a.id AS id, b.text AS text' in query,
+        //       or the sqlite extension may get fixed. :-)
+        $row[preg_replace('@^.+\.(.*)@', '\1', $i)] = str_replace($search, $replace, $v);
     }
 
-    return $r;
+    return $row;
 }
 
-function serendipity_db_query($sql, $single = false, $result_type = "both")
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false)
 {
     global $serendipity;
-    
-    $res = sqlite_exec($sql, $serendipity['dbConn']);
+    static $type_map = array(
+                         'assoc' => SQLITE_ASSOC,
+                         'num'   => SQLITE_NUM,
+                         'both'  => SQLITE_BOTH
+    );
+
+    static $debug = false;
+
+    if ($debug) $fp = @fopen('sqlite.log', 'a');
+
+    $res = sqlite_query($sql, $serendipity['dbConn']);
     if (!$res) {
         if (!$serendipity['production']) {
             var_dump($res);
             var_dump($sql);
             return "problem with query";
         }
+        if ($debug) fwrite($fp, '[' . date('d.m.Y H:i') . '] [ERROR] SQLITE QUERY: ' . $sql . "\n\n");
+
         return false;
+    } elseif ($debug) {
+        fwrite($fp, '[' . date('d.m.Y H:i') . '] SQLITE QUERY: ' . $sql . "\n\n");
     }
-    
+
     if ($res === true) {
         return true;
     }
-    
-    $rows = array();
-    
-    if ($result_type == 'num') {
-        while (($row = serendipity_db_sqlite_fetch_array($res))) {
-            $rows[] = $row;
+
+    if (sqlite_num_rows($res) == 0) {
+        if ($single) {
+            return false;
         }
+        return true;
     } else {
-    
-        $field_names = serendipity_db_sqlite_fetch_array($res);
-    
-        if ($result_type == 'both') {
-            while (($row = sqlite_fetch_array($res))) {
-                foreach ($field_names as $i => $name) {
-                    $row[$name] = $row[$i];
-                }
-                $rows[] = $row;
-            }
-        } else {
+        $rows = array();
 
-            /* string keys only */
-            while (($row = serendipity_db_sqlite_fetch_array($res))) {
-                $r = array();
-                foreach ($field_names as $i => $name) {
-                    $r[$name] = $row[$i];
-                }
-                $rows[] = $r;
-            }
+        while (($row = serendipity_db_sqlite_fetch_array($res, $type_map[$result_type]))) {
+            $rows[] = $row;
         }
+
+        if ($debug) fwrite($fp, '[' . date('d.m.Y H:i') . '] SQLITE RESULT: ' . print_r($rows, true). "\n\n");
+        if ($debug) fclose($fp);
+
+        if ($single && count($rows) == 1) {
+            return $rows[0];
+        }
+
+        return $rows;
     }
-    
-    if ($single && count($rows) == 0) {
-        return false;
-    }
-    
-    if ($single && count($rows) == 1) {
-        return $rows[0];
-    }
-    
-    return $rows;
 }
 
 function serendipity_db_probe($hash, &$errs)
 {
     global $serendipity;
-    
-    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . 'sqlite.db');
+
+    $dbName = (isset($hash['sqlitedbName']) ? $hash['sqlitedbName'] : $hash['dbName']);
+
+    if (!function_exists('sqlite_open')) {
+        $errs[] = "SQLite extension not installed. Use \"pear install sqlite\" on your webserver.";
+        return false;
+    }
+
+    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $dbName . '.db');
 
     if ($serendipity['dbConn']) {
         return true;
     }
 
-    $errs[] = "Unable to open \"{$serendipity['serendipityPath']}sqlite.db\" - check permissions!";
+    $errs[] = "Unable to open \"{$serendipity['serendipityPath']}$dbName.db\" - check permissions (directory needs to be writeable for webserver)!";
     return false;
 }
 
 function serendipity_db_schema_import($query)
 {
-    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}');
-    static $replace = array('INTEGER', 'PRIMARY KEY', '', '');
+    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+    static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 
+function serendipity_db_limit($start, $offset) {
+    return $start . ', ' . $offset;
+}
+
+function serendipity_db_limit_sql($limitstring) {
+    return ' LIMIT ' . $limitstring;
+}
+
+function serendipity_db_concat($string) {
+    return 'concat(' . $string . ')';
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.297,1.298

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
strict var check - thanks to Riscky Abacus


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- serendipity_functions.inc.php	19 Jun 2004 19:28:51 -0000	1.297
+++ serendipity_functions.inc.php	21 Jun 2004 08:01:36 -0000	1.298
@@ -1127,7 +1127,7 @@
             <div class='serendipity_entryFooter'>
 <?php
                 echo ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['username']);
-                if (sizeof($entry['categories']) != 0) {
+                if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) {
                     echo ' ' . IN . ' ';
                     $cats = array();
                     foreach ($entry['categories'] as $cat) {
@@ -2603,7 +2603,7 @@
                         }
                     }
 
-                    selector_toggle['categoryselector'] = '<?php echo ((isset($serendipity['POST']['categories']) && sizeof($serendipity['POST']['categories']) > 1) ? 'on' : 'off'); ?>';
+                    selector_toggle['categoryselector'] = '<?php echo ((isset($serendipity['POST']['categories']) && is_array($serendipity['POST']['categories']) && sizeof($serendipity['POST']['categories']) > 1) ? 'on' : 'off'); ?>';
                     showItem('categoryselector');
                     </script>
                     </td>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.80,1.81

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Only assign those values if a user is logged in; could cause empty email-address in RSS feed, i.e.


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_config.inc.php	18 Jun 2004 09:04:24 -0000	1.80
+++ serendipity_config.inc.php	20 Jun 2004 19:52:00 -0000	1.81
@@ -179,8 +179,13 @@
 $old_include = @ini_get('include_path');
 @ini_set('include_path', $serendipity['serendipityPath'] . PATH_SEPARATOR . $serendipity['serendipityPath'] . 'bundled-libs/' . PATH_SEPARATOR . $old_include);
 
-$serendipity['user']  = isset($_SESSION['serendipityUser'])  ? $_SESSION['serendipityUser']  : '';
-$serendipity['email'] = isset($_SESSION['serendipityEmail']) ? $_SESSION['serendipityEmail'] : '';
+if (isset($_SESSION['serendipityUser'])) {
+    $serendipity['user']  = $_SESSION['serendipityUser'];
+}
+
+if (isset($_SESSION['serendipityEmail'])) {
+    $serendipity['email'] = $_SESSION['serendipityEmail'];
+}
 
 /* Signature sent with all mails */
 $serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);

[php-blog-cvs] serendipity NEWS,1.103.4.9,1.103.4.10

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

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

Modified Files:
      Tag: branch_0_6
	NEWS 
Log Message:
release


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.9
retrieving revision 1.103.4.10
diff -u -d -r1.103.4.9 -r1.103.4.10
--- NEWS	18 Jun 2004 16:53:58 -0000	1.103.4.9
+++ NEWS	20 Jun 2004 19:21:38 -0000	1.103.4.10
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 0.6-pl3 ()
+Version 0.6-pl3 (June 20th, 2004)
 ------------------------------------------------------------------------
 
     * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only).

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.296,1.297 NEWS,1.153,1.154

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Log Message:
Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if there are more than 4 rows


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- NEWS	18 Jun 2004 16:53:26 -0000	1.153
+++ NEWS	19 Jun 2004 19:28:52 -0000	1.154
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed Bug #963248 - Calendar cannot calculate LastRow CSS class if 
+      there are more than 4 rows (tomsommer)
+
     * Use the right HTML code for trackback-link detection when using
       markup plugins like Text_Wiki (garvinhicking)
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- serendipity_functions.inc.php	18 Jun 2004 16:53:26 -0000	1.296
+++ serendipity_functions.inc.php	19 Jun 2004 19:28:51 -0000	1.297
@@ -474,6 +474,7 @@
 <?php
     // Print the calendar
     $currDay     = 1;
+    $nrOfRows    = ceil(($nrOfDays+$firstDayWeekDay)/7);
     $today_day   = date('j');
     $today_month = date('m');
     $today_year  = date('Y');
@@ -488,13 +489,13 @@
         // Prepare row
         for ($y = 0; $y < 7; $y++) {
             // Be able to print borders nicely
-            if ($x == 4 && $y == 6) {
+            if ($x == $nrOfRows-1 && $y == 6) {
                 $cellProp = 'LastInLastRow';
             } else if ($y == 0) {
                 $cellProp = 'FirstInRow';
             } else if ($y == 6) {
                 $cellProp = 'LastInRow';
-            } else if ($x == 4) {
+            } else if ($x == $nrOfRows-1) {
                 $cellProp = 'LastRow';
             } else {
                 $cellProp = '';