php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.9.2.2,1.9.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_recententries.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- serendipity_plugin_recententries.php	4 Nov 2004 12:54:48 -0000	1.9.2.2
+++ serendipity_plugin_recententries.php	12 Nov 2004 15:43:30 -0000	1.9.2.3
@@ -119,7 +119,7 @@
                                                 timestamp
                                            FROM {$serendipity['dbPrefix']}entries
                                                 $sql_join
-                                          WHERE isdraft = 'false' AND timestamp <= " . time() . "
+                                          WHERE isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true) . "
                                                 $sql_where
                                        ORDER BY timestamp DESC
                                           LIMIT $number";
@@ -135,7 +135,7 @@
 
                 echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">' . $entry['title'] . '</a><br />'
                      . '<div class="serendipitySideBarDate">'
-                     . htmlspecialchars(strftime($dateformat, $entry['timestamp']))
+                     . htmlspecialchars(serendipity_strftime($dateformat, $entry['timestamp']))
                      . '</div><br />';
             }
         }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.8,1.15.2.9 serendipity_lang_cs.inc.php,1.61.2.8,1.61.2.9 serendipity_lang_cz.inc.php,1.61.2.7,1.61.2.8 serendipity_lang_da.inc.php,1.79.2.9,1.79.2.10 serendipity_lang_de.inc.php,1.98.2.10,1.98.2.11 serendipity_lang_en.inc.php,1.79.2.9,1.79.2.10 serendipity_lang_es.inc.php,1.77.2.9,1.77.2.10 serendipity_lang_fr.inc.php,1.58.2.10,1.58.2.11 serendipity_lang_it.inc.php,1.1.2.8,1.1.2.9 serendipity_lang_nl.inc.php,1.36.2.8,1.36.2.9 serendipity_lang_no.inc.php,1.2.2.8,1.2.2.9 serendipity_lang_pt.inc.php,1.36.2.9,1.36.2.10

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php 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 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.8
retrieving revision 1.61.2.9
diff -u -d -r1.61.2.8 -r1.61.2.9
--- serendipity_lang_cs.inc.php	4 Nov 2004 11:59:25 -0000	1.61.2.8
+++ serendipity_lang_cs.inc.php	12 Nov 2004 15:43:25 -0000	1.61.2.9
@@ -588,6 +588,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- serendipity_lang_no.inc.php	4 Nov 2004 11:59:26 -0000	1.2.2.8
+++ serendipity_lang_no.inc.php	12 Nov 2004 15:43:27 -0000	1.2.2.9
@@ -583,5 +583,8 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.8
retrieving revision 1.36.2.9
diff -u -d -r1.36.2.8 -r1.36.2.9
--- serendipity_lang_nl.inc.php	4 Nov 2004 11:59:25 -0000	1.36.2.8
+++ serendipity_lang_nl.inc.php	12 Nov 2004 15:43:27 -0000	1.36.2.9
@@ -593,6 +593,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79.2.9
retrieving revision 1.79.2.10
diff -u -d -r1.79.2.9 -r1.79.2.10
--- serendipity_lang_en.inc.php	4 Nov 2004 11:59:25 -0000	1.79.2.9
+++ serendipity_lang_en.inc.php	12 Nov 2004 15:43:26 -0000	1.79.2.10
@@ -585,6 +585,9 @@
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');
 @define('QUICKSAVE', 'Quicksave');
+@define('INSTALL_OFFSET', 'Server time Offset');
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone');
+@define('STICKY_POSTINGS', 'Sticky Postings');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -d -r1.15.2.8 -r1.15.2.9
--- serendipity_lang_bg.inc.php	4 Nov 2004 11:59:25 -0000	1.15.2.8
+++ serendipity_lang_bg.inc.php	12 Nov 2004 15:43:25 -0000	1.15.2.9
@@ -570,6 +570,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.36.2.9
retrieving revision 1.36.2.10
diff -u -d -r1.36.2.9 -r1.36.2.10
--- serendipity_lang_pt.inc.php	4 Nov 2004 11:59:26 -0000	1.36.2.9
+++ serendipity_lang_pt.inc.php	12 Nov 2004 15:43:27 -0000	1.36.2.10
@@ -589,6 +589,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- serendipity_lang_it.inc.php	4 Nov 2004 11:59:25 -0000	1.1.2.8
+++ serendipity_lang_it.inc.php	12 Nov 2004 15:43:26 -0000	1.1.2.9
@@ -585,6 +585,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79.2.9
retrieving revision 1.79.2.10
diff -u -d -r1.79.2.9 -r1.79.2.10
--- serendipity_lang_da.inc.php	4 Nov 2004 11:59:25 -0000	1.79.2.9
+++ serendipity_lang_da.inc.php	12 Nov 2004 15:43:25 -0000	1.79.2.10
@@ -583,6 +583,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.10
retrieving revision 1.58.2.11
diff -u -d -r1.58.2.10 -r1.58.2.11
--- serendipity_lang_fr.inc.php	4 Nov 2004 11:59:25 -0000	1.58.2.10
+++ serendipity_lang_fr.inc.php	12 Nov 2004 15:43:26 -0000	1.58.2.11
@@ -591,6 +591,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.61.2.7
retrieving revision 1.61.2.8
diff -u -d -r1.61.2.7 -r1.61.2.8
--- serendipity_lang_cz.inc.php	4 Nov 2004 11:59:25 -0000	1.61.2.7
+++ serendipity_lang_cz.inc.php	12 Nov 2004 15:43:25 -0000	1.61.2.8
@@ -586,6 +586,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -d -r1.77.2.9 -r1.77.2.10
--- serendipity_lang_es.inc.php	4 Nov 2004 11:59:25 -0000	1.77.2.9
+++ serendipity_lang_es.inc.php	12 Nov 2004 15:43:26 -0000	1.77.2.10
@@ -594,6 +594,9 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('QUICKSAVE', 'Quicksave'); // Translate
+@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
+@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.10
retrieving revision 1.98.2.11
diff -u -d -r1.98.2.10 -r1.98.2.11
--- serendipity_lang_de.inc.php	4 Nov 2004 11:59:25 -0000	1.98.2.10
+++ serendipity_lang_de.inc.php	12 Nov 2004 15:43:26 -0000	1.98.2.11
@@ -585,6 +585,9 @@
 @define('ALREADY_INSTALLED', 'Bereits installiert');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen');
 @define('QUICKSAVE', 'Zwischenspeichern');
+@define('INSTALL_OFFSET', 'Server Zeitunterschied');
+@define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone');
+@define('STICKY_POSTINGS', 'Dauerhafte Einträge');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_plugin_history serendipity_plugin_history.php,1.11.2.2,1.11.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_history.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_plugin_history.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- serendipity_plugin_history.php	29 Oct 2004 11:02:41 -0000	1.11.2.2
+++ serendipity_plugin_history.php	12 Nov 2004 15:43:30 -0000	1.11.2.3
@@ -174,11 +174,11 @@
         $full        = ($this->get_config('full', 'false') != 'true') ? false : true;
 
         if (!$min_age || !is_numeric($min_age) || $min_age < 1 || $specialage == 'year') {
-            $min_age = 365 + date('L');
+            $min_age = 365 + date('L', serendipity_serverOffsetHour());
         }
 
         if (!$max_age || !is_numeric($max_age) || $max_age < 1 || $specialage == 'year') {
-            $max_age = 365 + date('L');
+            $max_age = 365 + date('L', serendipity_serverOffsetHour());
         }
 
         if (!$max_entries || !is_numeric($max_entries) || $max_entries < 1) {
@@ -192,27 +192,34 @@
             $dateformat = '%a, %d.%m.%Y %H:%M';
         }
 
-        $maxts = mktime(23, 59, 59,  date('m'), date('d'), date('Y'));
-        $mints = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
+        $nowts = serendipity_serverOffsetHour();
+        $maxts = mktime(23, 59, 59, date('m', $nowts), date('d', $nowts), date('Y', $nowts));
+        $mints = mktime(0, 0, 0, date('m', $nowts), date('d', $nowts), date('Y', $nowts));
         $e     = serendipity_fetchEntries(array(($mints-$min_age*86400),
                                             ($maxts-$max_age*86400)), $full, 15);
-        echo (empty($intro)) ? '' : "$intro<br />";
 
-        if (!is_array($e)) return false;
+        echo (empty($intro) ? '' : "$intro<br />");
+
+        if (!is_array($e)) {
+            return false;
+        }
+
         $e_c = @count($e);
-        if ($e_c==0) return false;
-        for($x=0; $x < $e_c; $x++) {
-            $url = serendipity_archiveURL($e[$x]['id'],
-                                          $e[$x]['title'],
-                                          'serendipityHTTPPath'
-            );
-            $date = ($displaydate=='0') ? '' : strftime($dateformat,$e[$x]['timestamp']);
-            $t = ($maxlength==0 || strlen($e[$x]['title'])<=$maxlength) ?
-                    $e[$x]['title'] :
-                    (trim(substr($e[$x]['title'], 0, $maxlength-3)).' [...]');
-            echo $date . "<a href='$url' title='".str_replace("'", '`', $e[$x][title])."'>".$t."</a> " .
-                 strip_tags($e[$x]['body']) . '<br />';
+        if ($e_c == 0) {
+            return false;
         }
+
+        for ($x = 0; $x < $e_c; $x++) {
+            $url  = serendipity_archiveURL($e[$x]['id'], $e[$x]['title'], 'serendipityHTTPPath');
+            $date = ($displaydate == '0' ? '' : serendipity_strftime($dateformat, $e[$x]['timestamp']));
+            $t    = ($maxlength   == 0 || strlen($e[$x]['title']) <= $maxlength)
+                  ? $e[$x]['title']
+                  : trim(substr($e[$x]['title'], 0, $maxlength - 3)) . ' [...]';
+
+            echo $date . '"<a href="' . $url . '" title="' . htmlspecialchars($e[$x]['title']) . '">' . $t . '</a> '
+                       . strip_tags($e[$x]['body']) . '<br />';
+        }
+
         echo $outro;
     }
 }

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.24.2.1,1.24.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_comments.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- serendipity_plugin_comments.php	29 Oct 2004 11:02:39 -0000	1.24.2.1
+++ serendipity_plugin_comments.php	12 Nov 2004 15:43:29 -0000	1.24.2.2
@@ -152,7 +152,7 @@
                   ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject'], 'baseURL') .'#c' . $row['comment_id'] . '" title="' . htmlspecialchars($row['subject']) . '">'
                       . htmlspecialchars($row['subject'])
                       . '</a><br />' . "\n"
-                      . htmlspecialchars(strftime($dateformat, $row['stamp'])) . '<br />' . "\n"
+                      . htmlspecialchars(serendipity_strftime($dateformat, $row['stamp'])) . '<br />' . "\n"
                       . strip_tags($entry['comment'], '<br><img>')
                       . '<br /><br /><br />' . "\n\n"
                 );

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.7.2.3,1.7.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_blogpdf.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- serendipity_event_blogpdf.php	29 Oct 2004 11:02:33 -0000	1.7.2.3
+++ serendipity_event_blogpdf.php	12 Nov 2004 15:43:28 -0000	1.7.2.4
@@ -174,8 +174,8 @@
                 case 'frontend_display':
                     if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) {
                         $article_show = true;
-                        $year         = date('Y', $eventData['timestamp']);
-                        $month        = date('m', $eventData['timestamp']);
+                        $year         = date('Y', serendipity_serverOffsetHour($eventData['timestamp']));
+                        $month        = date('m', serendipity_serverOffsetHour($eventData['timestamp']));
                     } else {
                         break;
                     }
@@ -199,11 +199,11 @@
                     }
 
                     if (empty($year)) {
-                        $year = date('Y');
+                        $year = date('Y', serendipity_serverOffsetHour());
                     }
 
                     if (empty($month)) {
-                        $month = date('m');
+                        $month = date('m', serendipity_serverOffsetHour());
                     }
 
                     $links[] = '<a href="' . $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/monthpdf_' . $year . $month . '">' . PLUGIN_EVENT_BLOGPDF_VIEW_MONTH . '</a>';
@@ -330,7 +330,7 @@
             $posted_by .= implode(', ', $cats);
         }
 
-        $posted_by .= ' ' . AT . ' ' . date('H:i', $entry['timestamp']);
+        $posted_by .= ' ' . AT . ' ' . date('H:i', serendipity_serverOffsetHour($entry['timestamp']));
 
         $this->pdf->SetFont('Arial', 'B', 11);
         $this->pdf->Write(4, $this->prep_out($entry['title']) . "\n");
@@ -377,7 +377,7 @@
               $this->prep_out(
                 $body . "\n" .
                 '    ' . $name .
-                ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']))
+                ' ' . ON . ' ' . ucfirst(serendipity_strftime('%b %e %Y, %H:%M', $comment['timestamp']))
               ) . "\n"
             );
             $this->pdf->Ln();

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.25,1.4.2.26

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.25
retrieving revision 1.4.2.26
diff -u -d -r1.4.2.25 -r1.4.2.26
--- serendipity_event_spamblock.php	11 Nov 2004 14:10:34 -0000	1.4.2.25
+++ serendipity_event_spamblock.php	12 Nov 2004 15:43:28 -0000	1.4.2.26
@@ -554,7 +554,7 @@
 
         fwrite($fp, sprintf(
             '[%s] - [%s: %s] - [#%s, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
-            date('Y-m-d H:i:s'),
+            date('Y-m-d H:i:s', serendipity_serverOffsetHour()),
             $switch,
             $reason,
             $id,

[php-blog-cvs] serendipity/include functions.inc.php,1.1.2.2,1.1.2.3 functions_comments.inc.php,1.1.2.1,1.1.2.2 functions_entries.inc.php,1.1.2.5,1.1.2.6 functions_smarty.inc.php,1.1.2.3,1.1.2.4 plugin_internal.inc.php,1.1.2.2,1.1.2.3

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

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

Modified Files:
      Tag: branch-smarty
	functions.inc.php functions_comments.inc.php 
	functions_entries.inc.php functions_smarty.inc.php 
	plugin_internal.inc.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/plugin_internal.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- plugin_internal.inc.php	8 Nov 2004 09:25:31 -0000	1.1.2.2
+++ plugin_internal.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.3
@@ -39,40 +39,46 @@
 
         $title = CALENDAR;
 
-         if (!isset($serendipity['GET']['calendarZoom'])) {
+        // Usage of serendipity_serverOffsetHour is as follow:
+        // * Whenever a date to display needs to be set, apply the timezone offset
+        // * Whenever we USE the date anywhere in the database, subtract the timezone offset
+        // * Whenever we DISPLAY the date, we do not apply additional timezone addition to it.
+
+        if (!isset($serendipity['GET']['calendarZoom'])) {
             if (!isset($serendipity['range'])) {
-                $serendipity['GET']['calendarZoom'] = time();
-             } else {
-                $serendipity['GET']['calendarZoom'] = $serendipity['range'][0];
-             }
-         }
+                $serendipity['GET']['calendarZoom'] = serendipity_serverOffsetHour(time());
+            } else {
+                $serendipity['GET']['calendarZoom'] = serendipity_serverOffsetHour($serendipity['range'][0]);
+            }
+        }
 
 
-        $month = date('m', $serendipity['GET']['calendarZoom']);
-        $year  = date('Y', $serendipity['GET']['calendarZoom']);
+        $month = date('m', serendipity_serverOffsetHour($serendipity['GET']['calendarZoom'], true));
+        $year  = date('Y', serendipity_serverOffsetHour($serendipity['GET']['calendarZoom'], true));
 
         $bow = (int)$this->get_config('beginningOfWeek', 1);
         // Check for faulty input, is so - run the default
-        if ($bow>6) {
+        if ($bow > 6) {
             $bow = 1;
         }
 
         // Catch faulty month
         $month = (int)$month;
-        if ($month<1) {
+        if ($month < 1) {
             $month = 1;
         }
 
         // How many days does the month have?
         $ts              = strtotime($year . '-' . sprintf('%02d', $month) . '-01');
+        $now             = serendipity_serverOffsetHour(time(), true);
         $nrOfDays        = date('t', $ts);
         $firstDayWeekDay = date('w', $ts);
 
         // Calculate the first day of the week, based on the beginning of the week ($bow)
-        if ( $bow > $firstDayWeekDay ) {
-            $firstDayWeekDay = $firstDayWeekDay+7-$bow;
+        if ($bow > $firstDayWeekDay) {
+            $firstDayWeekDay = $firstDayWeekDay + 7 - $bow;
         } elseif ( $bow < $firstDayWeekDay ) {
-            $firstDayWeekDay = $firstDayWeekDay-$bow;
+            $firstDayWeekDay = $firstDayWeekDay - $bow;
         } else {
             $firstDayWeekDay = 0;
         }
@@ -86,7 +92,7 @@
             $previousYear  = $year-1;
         }
 
-        if ($month <12) {
+        if ($month < 12) {
             $nextMonth = $month+1;
             $nextYear  = $year;
         } else {
@@ -102,8 +108,8 @@
             // If no entry is available yet, allow scrolling a year back and forth
             $minmax = array(
                         '0' => array(
-                                 'min' => mktime(0, 0, 0, 1, 1, date('Y')-1),
-                                 'max' => mktime(0, 0, 0, 1, 1, date('Y')+1)
+                                 'min' => mktime(0, 0, 0, 1, 1, date('Y', $now) - 1),
+                                 'max' => mktime(0, 0, 0, 1, 1, date('Y', $now) + 1)
                                )
                             );
         }
@@ -121,9 +127,9 @@
                                   FROM {$serendipity['dbPrefix']}entries e,
                                        {$serendipity['dbPrefix']}category c,
                                        {$serendipity['dbPrefix']}entrycat ec
-                                 WHERE e.timestamp  >= $ts
-                                   AND e.timestamp  <= $endts
-                                   AND e.timestamp  <= " . time() . "
+                                 WHERE e.timestamp  >= " . serendipity_serverOffsetHour($ts, true) . "
+                                   AND e.timestamp  <= " . serendipity_serverOffsetHour($endts, true) . "
+                                   AND e.timestamp  <= $now
                                    AND e.isdraft     = 'false'
                                    AND e.id          = ec.entryid
                                    AND c.categoryid  = ec.categoryid
@@ -132,15 +138,20 @@
         }
 
         if (!isset($querystring)) {
-            $querystring = "SELECT timestamp
+            $querystring = "SELECT id, timestamp
                               FROM {$serendipity['dbPrefix']}entries e
-                             WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.timestamp <= " . time() . " AND e.isdraft = 'false'";
+                             WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
+                               AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
+                               AND e.timestamp <= $now
+                               AND e.isdraft = 'false'";
         }
 
         $rows = serendipity_db_query($querystring);
+
         $activeDays = array();
         if (is_array($rows)) {
             foreach ($rows as $row) {
+                $row['timestamp'] = serendipity_serverOffsetHour($row['timestamp']);
                 $activeDays[date('j', $row['timestamp'])] = $row['timestamp'];
             }
         }
@@ -148,9 +159,9 @@
         // Print the calendar
         $currDay     = 1;
         $nrOfRows    = ceil(($nrOfDays+$firstDayWeekDay)/7);
-        $today_day   = date('j');
-        $today_month = date('m');
-        $today_year  = date('Y');
+        $today_day   = date('j', $now);
+        $today_month = date('m', $now);
+        $today_year  = date('Y', $now);
         for ($x = 0; $x < 6; $x++) {
             // Break out if we are out of days
             if ($currDay > $nrOfDays) {
@@ -197,11 +208,10 @@
 
         $dow = array();
         for ($i = 1; $i <= 7; $i++) {
-            $dow[] = array('date' => mktime(0,0,0,3,$bow+$i-1,2004));
+            $dow[] = array('date' => mktime(0, 0, 0, 3, $bow + $i - 1, $year));
         }
         $serendipity['smarty']->assign('plugin_calendar_dow', $dow);
 
-
         $serendipity['smarty']->assign('plugin_calendar_head', array('month_date'   => $ts,
                                                                      'uri_previous' => serendipity_archiveDateUrl(sprintf('%04d/%02d', $previousYear, $previousMonth). $add_query),
                                                                      'uri_month'    => serendipity_archiveDateUrl(sprintf('%04d/%02d', $year, $month)),
@@ -297,7 +307,7 @@
                     break;
                 case 'days' :
                     $linkStamp = date('Y/m/d', $ts);
-                    $ts_title = serendipity_formatTime("%B %e. %Y", $ts);
+                    $ts_title = serendipity_formatTime("%B %e. %Y", $ts, false);
                     $ts = mktime(0, 0, 0, date('m', $ts), date('d', $ts)-1, date('Y', $ts)); // Must be last in 'case' statement
                     break;
             }
@@ -681,7 +691,7 @@
                 switch($match[1]) {
                     case 'pubDate':
                         if ($bag_content != 'false') {
-                            $bag_content = gmdate('D, d M Y H:i:s \G\M\T', $entries[0]['last_modified']);
+                            $bag_content = gmdate('D, d M Y H:i:s \G\M\T', serendipity_serverOffsetHour($entries[0]['last_modified']));
                         } else {
                             $bag_content = '';
                         }

Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_smarty.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- functions_smarty.inc.php	11 Nov 2004 12:45:21 -0000	1.1.2.3
+++ functions_smarty.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.4
@@ -58,11 +58,11 @@
 }
 
 
-function serendipity_smarty_formatTime($timestamp, $format) {
+function serendipity_smarty_formatTime($timestamp, $format, $useOffset = true) {
     if (defined($format)) {
-        return serendipity_formatTime(constant($format), $timestamp);
+        return serendipity_formatTime(constant($format), $timestamp, $useOffset);
     } else {
-        return serendipity_formatTime($format, $timestamp);
+        return serendipity_formatTime($format, $timestamp, $useOffset);
     }
 }
 
@@ -104,7 +104,7 @@
     return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
 }
 
-function serendipity_smarty_assignDefaults() {
+function serendipity_smarty_assignDefaults($smartyvars = null) {
     global $serendipity;
     $serendipity['smarty']->assign(
         array(
@@ -131,6 +131,10 @@
         )
     );
 
+    if (is_array($smartyvars)) {
+        $serendipity['smarty']->assign($smartyvars);
+    }
+
     return true;
 }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- functions_entries.inc.php	11 Nov 2004 13:42:58 -0000	1.1.2.5
+++ functions_entries.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.6
@@ -98,16 +98,16 @@
     }
 
     /* Attempt to grab range from $serendipity, if $range is not an array or null */
-    if ( !is_array($range) && !is_null($range) && isset($serendipity['range']) ) {
+    if (!is_array($range) && !is_null($range) && isset($serendipity['range'])) {
         $range = $serendipity['range'];
     }
 
     if (is_numeric($range)) {
-        $year = (int)substr($range, 0, 4);
+        $year  = (int)substr($range, 0, 4);
         $month = (int)substr($range, 4, 2);
-        $day = (int)substr($range, 6, 2);
+        $day   = (int)substr($range, 6, 2);
 
-        $startts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
+        $startts = serendipity_serverOffsetHour(mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year), true);
 
         if ($day == 0) {
             $month++;
@@ -115,15 +115,12 @@
             $day++;
         }
 
-        $endts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
+        $endts = serendipity_serverOffsetHour(mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year), true);
 
         $cond['and'] = " WHERE timestamp >= $startts AND timestamp <= $endts";
-        if ($drafts) {
-            $cond['and'] .= " AND $drafts";
-        }
     } elseif (is_array($range) && count($range)==2) {
-        $startts = (int)$range[0];
-        $endts   = (int)$range[1];
+        $startts = serendipity_serverOffsetHour((int)$range[0], true);
+        $endts   = serendipity_serverOffsetHour((int)$range[1], true);
         $cond['and'] = " WHERE timestamp >= $startts AND timestamp <= $endts";
     } else {
         if ($modified_since) {
@@ -136,13 +133,13 @@
                 $cond['orderby'] = 'last_modified DESC';
             }
         }
+    }
 
-        if (!empty($drafts)) {
-            if (!empty($cond['and'])) {
-                $cond['and'] .= " AND $drafts";
-            } else {
-                $cond['and'] = "WHERE $drafts";
-            }
+    if (!empty($drafts)) {
+        if (!empty($cond['and'])) {
+            $cond['and'] .= " AND $drafts";
+        } else {
+            $cond['and'] = "WHERE $drafts";
         }
     }
 
@@ -177,9 +174,9 @@
 
     if (!isset($serendipity['GET']['adminModule'])) {
         if (!empty($cond['and'])) {
-            $cond['and'] .= " AND e.timestamp <= '" . time() . "'";
+            $cond['and'] .= " AND e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
         } else {
-            $cond['and'] = "WHERE e.timestamp <= '" . time() . "'";
+            $cond['and'] = "WHERE e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
         }
     }
 
@@ -237,6 +234,7 @@
                     $group
                     ORDER BY {$cond['orderby']}
                     $limit";
+
     $ret = serendipity_db_query($query);
 
     if (is_string($ret)) {
@@ -293,9 +291,10 @@
     global $serendipity;
 
     $cond = array();
-    $cond['and'] = '';
+    $cond['and'] = " "; // intentional dummy string to attach dummy AND parts to the WHERE clauses
+
     if ($fetchDrafts == 'false') {
-        $cond['and'] = " AND e.isdraft = 'false' AND e.timestamp <= " . time();
+        $cond['and'] = " AND e.isdraft = 'false' AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true);
     }
 
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
@@ -319,8 +318,11 @@
                      LIMIT  1";
 
     $ret = serendipity_db_query($querystring, true);
-    $ret['categories'] = serendipity_fetchEntryCategories($ret['id']);
-    $ret['properties'] = serendipity_fetchEntryProperties($ret['id']);
+    if (is_array($ret)) {
+        $ret['categories'] = serendipity_fetchEntryCategories($ret['id']);
+        $ret['properties'] = serendipity_fetchEntryProperties($ret['id']);
+    }
+
     return $ret;
 }
 
@@ -415,7 +417,7 @@
     }
 
     $cond = array();
-    $cond['and'] = " AND isdraft = 'false' AND timestamp <= " . time();
+    $cond['and'] = " AND isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true);
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
     $querystring = "SELECT $distinct
                             e.id,
@@ -539,7 +541,7 @@
             $entries[$x]['is_sticky'] = true;
             $key = 'sticky';
         } else {
-            $key = date('Ymd', $entries[$x]['timestamp']);
+            $key = date('Ymd', serendipity_serverOffsetHour($entries[$x]['timestamp']));
         }
 
         if (!empty($entries[$x]['properties']['ep_cache_body'])) {
@@ -568,9 +570,7 @@
             $entry['commURL']   = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
             $entry['link_allow_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&amp;serendipity[entry]=' . $entry['id'];
             $entry['link_deny_comments']  = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&amp;serendipity[entry]=' . $entry['id'];
-
-
-            $entry['allow_comments'] = serendipity_db_bool($entry['allow_comments']);
+            $entry['allow_comments']      = serendipity_db_bool($entry['allow_comments']);
 
             if (strlen($entry['extended'])) {
                 $entry['has_extended']      = true;
@@ -697,9 +697,9 @@
         <email><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])); ?></email>
     </author>
 
-    <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
-    <created><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
-    <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified>
+    <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entry['timestamp'])); ?></issued>
+    <created><?php echo gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entry['timestamp'])); ?></created>
+    <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entry['last_modified'])); ?></modified>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
 
 <?php
@@ -753,7 +753,7 @@
                     echo serendipity_utf8_encode(htmlspecialchars($entry['body'].$ext));
 ?>
     </content:encoded>
-    <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
+    <pubDate><?php echo date('r', serendipity_serverOffsetHour($entry['timestamp'])); ?></pubDate>
     <guid><?php echo $guid; ?></guid>
     <?php
       $eventData = array_merge(array('display_dat' => ''), $entry);
@@ -796,7 +796,7 @@
     <dc:publisher><?php echo serendipity_utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
     <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
     <dc:subject><?php echo serendipity_utf8_encode(htmlspecialchars(implode(', ', $categories))); ?></dc:subject>
-    <dc:date><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></dc:date>
+    <dc:date><?php echo date('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entry['timestamp'])); ?></dc:date>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
 <?php
                     if ($comments === false) {
@@ -832,8 +832,8 @@
     }
 
     if (isset($timestamp)) {
-        $dated = date('Ymd', $timestamp);
-        $datem = date('Ym',  $timestamp);
+        $dated = date('Ymd', serendipity_serverOffsetHour($timestamp));
+        $datem = date('Ym',  serendipity_serverOffsetHour($timestamp));
 
         @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$dated}.html");
         @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$datem}.html");
@@ -1137,7 +1137,7 @@
         $hidden .= '        <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n;
     }
     $hidden .= '        <input type="hidden" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n;
-    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? $entry['timestamp'] : '') . '" />' . $n;
+    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : '') . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
     $hidden .= '        <input type="hidden" name="serendipity[quicksave]" value="false" />';
 
@@ -1175,8 +1175,8 @@
                     <b><?php echo DATE; ?>:</b>
                 </td>
                 <td>
-                    <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
-                    <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
+                    <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo serendipity_serverOffsetHour(isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
+                    <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, serendipity_serverOffsetHour(isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
                 </td>
                 <td align="right">
 <?php
@@ -1525,38 +1525,38 @@
     global $serendipity;
 
     $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
-    $lastYear   = date('Y', $f[0][0]);
-    $lastMonth  = date('m', $f[0][0]);
-    $thisYear   = date('Y');
-    $thisMonth  = date('m');
+    $lastYear   = date('Y', serendipity_serverOffsetHour($f[0][0]));
+    $lastMonth  = date('m', serendipity_serverOffsetHour($f[0][0]));
+    $thisYear   = date('Y', serendipity_serverOffsetHour());
+    $thisMonth  = date('m', serendipity_serverOffsetHour());
     $max        = 0;
 
     $output = array();
-    for ( $y = $thisYear; $y >= $lastYear; $y--) {
+    for ($y = $thisYear; $y >= $lastYear; $y--) {
         $output[$y]['year'] = $y;
-        for( $m=12; $m>=1; $m-- ) {
+        for ($m = 12; $m >= 1; $m--) {
 
             /* If the month we are checking are in the future, we drop it */
-            if ( $m > $thisMonth && $y == $thisYear ) {
+            if ($m > $thisMonth && $y == $thisYear) {
                 continue;
             }
 
             /* If the month is lower than the lowest month containing entries, we're done */
-            if ( $m < $lastMonth && $y <= $lastYear ) {
+            if ($m < $lastMonth && $y <= $lastYear) {
                 break;
             }
 
-            $s = mktime(0, 0, 0, $m, 1, $y);
-            $e = mktime(23, 59, 59, $m, date('t', $s), $y);
+            $s = serendipity_serverOffsetHour(mktime(0, 0, 0, $m, 1, $y), true);
+            $e = serendipity_serverOffsetHour(mktime(23, 59, 59, $m, date('t', $s), $y), true);
             $entries = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries
                                                        WHERE isdraft = 'false'
                                                            AND timestamp >= $s
                                                            AND timestamp <= $e
-                                                           AND timestamp <= " . time());
+                                                           AND timestamp <= " . serendipity_serverOffsetHour(time(), true));
             $entry_count = $entries[0][0];
 
             /* A silly hack to get the maximum amount of entries per month */
-            if ( $entry_count > $max ) {
+            if ($entry_count > $max) {
                 $max = $entry_count;
             }
 

Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_comments.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- functions_comments.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ functions_comments.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.2
@@ -134,7 +134,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }
@@ -315,7 +315,7 @@
         $email         = serendipity_db_escape_string($commentInfo['email']);
         $parentid      = (isset($commentInfo['parent_id']) && is_numeric($commentInfo['parent_id'])) ? $commentInfo['parent_id'] : 0;
         $status        = isset($commentInfo['status']) ? $commentInfo['status'] : (serendipity_db_bool($ca['moderate_comments']) ? 'pending' : 'approved');
-        $t      = isset($commentInfo['time']) ? $commentInfo['time'] : time();
+        $t             = isset($commentInfo['time']) ? $commentInfo['time'] : time();
 
         if (isset($commentInfo['subscribe'])) {
             $subscribe = 'true';

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- functions.inc.php	11 Nov 2004 11:15:55 -0000	1.1.2.2
+++ functions.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.3
@@ -22,7 +22,31 @@
     return $s;
 }
 
-function serendipity_formatTime($format, $time) {
+function serendipity_serverOffsetHour($timestamp = null, $negative = false) {
+    global $serendipity;
+
+    if ($timestamp == null) {
+        $timestamp = time();
+    }
+
+    if (empty($serendipity['serverOffsetHours']) || !is_numeric($serendipity['serverOffsetHours']) || $serendipity['serverOffsetHours'] == 0) {
+        return $timestamp;
+    } else {
+        return $timestamp + (($negative ? -$serendipity['serverOffsetHours'] : $serendipity['serverOffsetHours']) * 60 * 60);
+    }
+}
+
+function serendipity_strftime($format, $timestamp = null, $useOffset = true) {
+    if ($timestamp == null) {
+        $timestamp = serendipity_serverOffsetHour();
+    } elseif ($useOffset) {
+        $timestamp = serendipity_serverOffsetHour($timestamp);
+    }
+
+    return strftime($format, $timestamp);
+}
+
+function serendipity_formatTime($format, $time, $useOffset = true) {
     static $cache;
     if (!isset($cache)) {
         $cache = array();
@@ -34,7 +58,7 @@
             $cache[$format] = str_replace('%e', '%d', $cache[$format]);
         }
     }
-    return ucfirst(strftime($cache[$format], (int)$time));
+    return ucfirst(serendipity_strftime($cache[$format], (int)$time, $useOffset));
 }
 
 

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.1.2.1,1.1.2.2 entries.inc.php,1.1.2.1,1.1.2.2 plugins.inc.php,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: branch-smarty
	comments.inc.php entries.inc.php plugins.inc.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/Attic/entries.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- entries.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ entries.inc.php	12 Nov 2004 15:43:24 -0000	1.1.2.2
@@ -282,6 +282,10 @@
             }
         }
 
+        if (!empty($entry['timestamp'])) {
+            $entry['timestamp'] = serendipity_serverOffsetHour($entry['timestamp'], true); // Save server timezone in database always, so substract the offset we added for display; otherwise it would be added time and again
+        }
+
         if ($serendipity['POST']['quicksave'] == 'true') {
             // When quicksaving a new entry, set it to 'draft'
             if (!is_numeric($entry['id'])) {
@@ -334,12 +338,13 @@
             }
 
             if (isset($entry['id'])) {
-                $serendiipty['GET']['id'] = $entry['id'];
+                $serendipity['GET']['id'] = $entry['id'];
             } else {
                 $serendipity['GET']['id'] = 1;
             }
             $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
-            serendipity_smarty_assignDefaults();
+            $smartyvars = array('is_preview' => true);
+            serendipity_smarty_assignDefaults($smartyvars);
 
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';
@@ -384,6 +389,7 @@
 
     case 'edit':
         $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
+
     default:
         serendipity_printEntryForm(
             '?',

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/Attic/plugins.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- plugins.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ plugins.inc.php	12 Nov 2004 15:43:24 -0000	1.1.2.2
@@ -253,7 +253,7 @@
         }
 
         $plugin->cleanup();
-        $statusMsg = sprintf(SETTINGS_SAVED_AT, strftime('%T'));
+        $statusMsg = sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%T'));
     }
 ?>
 <form method="post" name="serendipityPluginConfigure">

Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/Attic/comments.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- comments.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ comments.inc.php	12 Nov 2004 15:43:24 -0000	1.1.2.2
@@ -278,7 +278,7 @@
 ?>
 <tr>
     <td><a name="c<?php echo $rs['id'] ?>"></a>
-        <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
+        <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(serendipity_strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
     </td>
 </tr>
 <tr>

[php-blog-cvs] serendipity/include/tpl config_local.tpl,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: branch-smarty
	config_local.tpl 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/Attic/config_local.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- config_local.tpl	6 Nov 2004 11:22:50 -0000	1.1.2.1
+++ config_local.tpl	12 Nov 2004 15:43:24 -0000	1.1.2.2
@@ -40,6 +40,7 @@
 $serendipity['top_as_links']         = '{INSTALL_SHOW_EXTERNAL_LINKS|top_as_links|bool||1|255}'; // INSTALL_SHOW_EXTERNAL_LINKS_DESC
 $serendipity['blockReferer']         = '{INSTALL_BLOCKREF|blockReferer|string|;|255}';      // INSTALL_BLOCKREF_DESC
 $serendipity['rewrite']              = '{INSTALL_REWRITE|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // INSTALL_REWRITE_DESC
+$serendipity['serverOffsetHours']    = '{INSTALL_OFFSET|serverOffsetHours|string|0|255}';   // INSTALL_OFFSET_DESC
 
 // INSTALL_CAT_IMAGECONV
 # INSTALL_CAT_IMAGECONV_DESC

[php-blog-cvs] serendipity index.php,1.49.2.11,1.49.2.12 rss.php,1.28.2.6,1.28.2.7

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

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

Modified Files:
      Tag: branch-smarty
	index.php rss.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -d -r1.28.2.6 -r1.28.2.7
--- rss.php	8 Nov 2004 09:25:18 -0000	1.28.2.6
+++ rss.php	12 Nov 2004 15:43:22 -0000	1.28.2.7
@@ -38,14 +38,14 @@
     // See if the client has provided the required headers.
     // Always convert the provided header into GMT timezone to allow comparing to the server-side last-modified header
     $modified_since = !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])
-                    ? gmdate('D, d M Y H:i:s \G\M\T', strtotime(stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE'])))
+                    ? gmdate('D, d M Y H:i:s \G\M\T', serendipity_serverOffsetHour(strtotime(stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE'])), true))
                     : false;
     $none_match     = !empty($_SERVER['HTTP_IF_NONE_MATCH'])
                     ? str_replace('"', '', stripslashes($_SERVER['HTTP_IF_NONE_MATCH']))
                     : false;
 
     if (is_array($latest_entry) && isset($latest_entry[0]['last_modified'])) {
-        $last_modified = gmdate('D, d M Y H:i:s \G\M\T', $latest_entry[0]['last_modified']);
+        $last_modified = gmdate('D, d M Y H:i:s \G\M\T', serendipity_serverOffsetHour($latest_entry[0]['last_modified'], true));
         $etag          = '"' . $last_modified . '"';
 
         header('Last-Modified: ' . $last_modified);
@@ -180,7 +180,7 @@
 break;
 
 case 'atom0.3':
-    $modified = gmdate('Y-m-d\TH:i:s\Z', $entries[0]['last_modified']);
+    $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
     print <<<HEAD
 <feed version="0.3"
    xmlns="http://purl.org/atom/ns#"
@@ -207,7 +207,7 @@
 break;
 
 case 'opml1.0':
-    $modified = gmdate('Y-m-d\TH:i:s\Z', $entries[0]['last_modified']);
+    $modified = gmdate('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entries[0]['last_modified']));
     print <<<HEAD
 <opml version="{$version}">
 <head>

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.11
retrieving revision 1.49.2.12
diff -u -d -r1.49.2.11 -r1.49.2.12
--- index.php	6 Nov 2004 21:33:04 -0000	1.49.2.11
+++ index.php	12 Nov 2004 15:43:21 -0000	1.49.2.12
@@ -2,15 +2,13 @@
 
 #apd_set_pprof_trace();
 
-function microtime_float()
-{
-   list($usec, $sec) = explode(" ", microtime());
-   return ((float)$usec + (float)$sec);
+function microtime_float() {
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec + (float)$sec);
 }
 
 $time_start = microtime_float();
 
-
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header('HTTP/1.0 200\r\n');
@@ -28,15 +26,15 @@
 $uri = $_SERVER['REQUEST_URI'];
 
 if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) {
-    if ( serendipity_cancelSubscription(urldecode($res[1]), $res[2]) ) {
+    if (serendipity_cancelSubscription(urldecode($res[1]), $res[2])) {
         define('DATA_UNSUBSCRIBED', urldecode($res[1]));
     }
 
-    $uri = '/'.PATH_UNSUBSCRIBE.'/'. $res[2] .'_untitled.html';
+    $uri = '/' . PATH_UNSUBSCRIBE . '/' . $res[2] . '_untitled.html';
 }
 
 if (preg_match(PAT_DELETE, $uri, $res) && $serendipity['serendipityAuthedUser'] === true) {
-    if ( $res[1] == 'comment' && serendipity_deleteComment($res[2], $res[3], 'comments') ) {
+    if ($res[1] == 'comment' && serendipity_deleteComment($res[2], $res[3], 'comments')) {
         define('DATA_COMMENT_DELETED', $res[2]);
     } elseif ( $res[1] == 'trackback' && serendipity_deleteComment($res[2], $res[3], 'trackbacks') ) {
         define('DATA_TRACKBACK_DELETED', $res[2]);
@@ -44,29 +42,26 @@
 }
 
 if (preg_match(PAT_APPROVE, $uri, $res) && $serendipity['serendipityAuthedUser'] === true) {
-    if ( $res[1] == 'comment' && serendipity_approveComment($res[2], $res[3]) ) {
+    if ($res[1] == 'comment' && serendipity_approveComment($res[2], $res[3])) {
         define('DATA_COMMENT_APPROVED', $res[2]);
-    } elseif ( $res[1] == 'trackback' && serendipity_approveComment($res[2], $res[3]) ) {
+    } elseif ($res[1] == 'trackback' && serendipity_approveComment($res[2], $res[3])) {
         define('DATA_TRACKBACK_APPROVED', $res[2]);
     }
 }
 
 
 if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range']) && is_numeric($serendipity['GET']['range'])) {
-
     preg_match_all('@/([a-z0-9]+)@i', $matches[1], $args);
 
     /* Attempt to locate hidden variables within the URI */
     foreach ($args[1] as $k => $v){
-        if ( $v{0} == 'C' ) { /* category */
+        if ($v{0} == 'C') { /* category */
             $serendipity['GET']['category'] = substr($v, 1);
             unset($args[1][$k]);
-
-        } elseif ( $v{0} == 'W' ) { /* Week */
+        } elseif ($v{0} == 'W') { /* Week */
             $week = substr($v, 1);
             unset($args[1][$k]);
-
-        } elseif ( $v == 'summary' ) { /* Summary */
+        } elseif ($v == 'summary') { /* Summary */
             $serendipity['short_archives'] = true;
             unset($args[1][$k]);
         }
@@ -78,25 +73,24 @@
     $_GET['serendipity']['action']     = 'read';
     $_GET['serendipity']['hidefooter'] = true;
 
-    if ( $week ) {
-        $tm = strtotime('+ '. ($week-2) .' WEEKS monday', mktime(0,0,0,1,1,$year));
+    if ($week) {
+        $tm = strtotime('+ '. ($week-2) .' WEEKS monday', mktime(0, 0, 0, 1, 1, $year));
         $ts = mktime(0, 0, 0, date('m', $tm), date('j', $tm), $year);
         $te = mktime(23, 59, 59, date('m', $tm), date('j', $tm)+7, $year);
-        $date = serendipity_formatTime(WEEK .' '. $week .', %Y', $ts);
+        $date = serendipity_formatTime(WEEK .' '. $week .', %Y', $ts, false);
     } else {
-        if ( $day ) {
+        if ($day) {
             $ts = mktime(0, 0, 0, $month, $day, $year);
             $te = mktime(23, 59, 59, $month, $day, $year);
-            $date = serendipity_formatTime(DATE_FORMAT_ENTRY, $ts);
+            $date = serendipity_formatTime(DATE_FORMAT_ENTRY, $ts, false);
         } else {
             $ts = mktime(0, 0, 0, $month, 1, $year);
             $te = mktime(23, 59, 59, $month, date('t', $ts), $year);
-            $date = serendipity_formatTime('%B %Y', $ts);
+            $date = serendipity_formatTime('%B %Y', $ts, $false);
         }
     }
 
     $serendipity['range'] = array($ts, $te);
-
     $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
 
     ob_start();
@@ -215,7 +209,7 @@
 
         if (isset($serendipity['GET']['calendarZoom'])) {
             $serendipity['GET']['action'] = 'read';
-            $serendipity['GET']['range'] = $serendipity['GET']['calendarZoom'];
+            $serendipity['GET']['range']  = $serendipity['GET']['calendarZoom'];
         }
         include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
     }

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.7.2.1,1.7.2.2

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

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

Modified Files:
      Tag: branch-smarty
	layout.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- layout.php	6 Nov 2004 11:22:50 -0000	1.7.2.1
+++ layout.php	12 Nov 2004 15:43:34 -0000	1.7.2.2
@@ -34,7 +34,7 @@
     <div id="<?php echo (empty($right) ? 'content_left' : (empty($left) ? 'content_right' : 'content')); ?>">
 <?php
 if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
-    $serendipity['GET']['range'] = date('Ymd');
+    $serendipity['GET']['range'] = date('Ymd', serendipity_serverOffsetHour());
 }
 
 // The main area
@@ -42,7 +42,7 @@
     // User wants to read the diary
     case 'read':
         if (isset($serendipity['GET']['id'])) {
-            serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
+            serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), true);
         } else {
             serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
         }

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.19,1.1.2.20 plugin_calendar.tpl,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl plugin_calendar.tpl 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -d -r1.1.2.19 -r1.1.2.20
--- entries.tpl	11 Nov 2004 12:45:20 -0000	1.1.2.19
+++ entries.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.20
@@ -4,7 +4,7 @@
     {foreach from=$entries item="dategroup"}
     <div class="serendipity_Entry_Date">
         {if $dategroup.is_sticky}
-        <h3 class="serendipity_date">STICKY POSTINGS</h3>
+        <h3 class="serendipity_date">{$CONST.STICKY_POSTINGS}</h3>
         {else}
         <h3 class="serendipity_date">{$dategroup.date|@formatTime:DATE_FORMAT_ENTRY}</h3>
         {/if}
@@ -58,7 +58,7 @@
                     {/if}
                 {/if}
 
-                {if $entry.is_entry_owner}
+                {if $entry.is_entry_owner and not $is_preview}
                         | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a>
                 {/if}
 
@@ -98,7 +98,7 @@
             <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br />
         {/if}
 
-        {if $is_single_entry and not $use_popups}
+        {if $is_single_entry and not $use_popups and not $is_preview}
             <div class="serendipity_comments">
                 <br />
                 <a id="trackbacks"></a>
@@ -111,7 +111,7 @@
             </div>
         {/if}
 
-        {if $is_single_entry}
+        {if $is_single_entry and not $is_preview}
             <div class="serendipity_comments">
                 <br />
                 <a id="comments"></a>

Index: plugin_calendar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/plugin_calendar.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- plugin_calendar.tpl	25 Sep 2004 23:29:20 -0000	1.1.2.1
+++ plugin_calendar.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.2
@@ -1,24 +1,28 @@
-<table width="100%" cellspacing="0" cellpadding="0" class="serendipity_calendar">
+<table style="width: 100%" cellspacing="0" cellpadding="0" class="serendipity_calendar">
     <tr>
-        <td class="serendipity_calendarHeader" align="left">
+        <td class="serendipity_calendarHeader">
 {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}
-            <a title="Back" href="{$plugin_calendar_head.uri_previous}"><img alt="{$const.BACK}" src="{serendipity_getFile file="img/back.png"}" border="0"></a>
+            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{serendipity_getFile file="img/back.png"}" style="border: 0px" /></a>
 {/if}
         </td>
-        <td colspan="5" class="serendipity_calendarHeader" align="center" valign="bottom">
-            <b><nobr><a href="{$plugin_calendar_head.uri_month}">{$plugin_calendar_head.month_date|formatTime:"%B '%y"}</a></nobr></b>
+
+        <td colspan="5" class="serendipity_calendarHeader" style="text-align: center; vertical-align: bottom">
+            <b><a style="white-space: nowrap" href="{$plugin_calendar_head.uri_month}">{$plugin_calendar_head.month_date|formatTime:"%B '%y":false}</a></b>
         </td>
-        <td class="serendipity_calendarHeader" align="right">
+
+        <td class="serendipity_calendarHeader" style="text-align: right">
 {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}
-            <a title="Forward" href="{$plugin_calendar_head.uri_next}"><img alt="{$const.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" border="0"></a>
+            <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" style="border: 0px" /></a>
 {/if}
         </td>
     </tr>
+
     <tr>
     {foreach from=$plugin_calendar_dow item="dow"}
-        <td scope="col" abbr="{$dow.date|@formatTime:"%A"}" title="{$dow.date|@formatTime:"%A"}" class="serendipity_weekDayName" align="center">{$dow.date|@formatTime:"%a"|@truncate:2:""}</td>
+        <td scope="col" abbr="{$dow.date|@formatTime:"%A":false}" title="{$dow.date|@formatTime:"%A":false}" class="serendipity_weekDayName" align="center">{$dow.date|@formatTime:"%a":false|@truncate:2:""}</td>
     {/foreach}
     </tr>
+
     {foreach from=$plugin_calendar_weeks item="week"}
         <tr class="serendipity_calendar">
         {foreach from=$week.days item="day"}

[php-blog-cvs] serendipity/docs NEWS,1.1.2.7,1.1.2.8

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- NEWS	12 Nov 2004 12:58:37 -0000	1.1.2.7
+++ NEWS	12 Nov 2004 15:43:22 -0000	1.1.2.8
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Support for adding timezone offsets in configuration
+      (garvinhicking)
+
     * Serendipity cannow be used with "JustBlogIt" extension. Just use
       this URL:
       http://yourblog/serendipity_entries.php?serendipity[adminModule]=entries&serendipity[adminAction]=new&serendipity[title]=%TITLE%&serendipity[body]=%TEXT%&serendipity[url]=%URL%

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.13,1.13.2.1

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

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

Modified Files:
      Tag: branch-smarty
	layout.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- layout.php	25 Aug 2004 08:58:19 -0000	1.13
+++ layout.php	12 Nov 2004 15:43:35 -0000	1.13.2.1
@@ -56,7 +56,7 @@
             <?=$OPENSHADOW?>
             <?php
                 if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
-                    $serendipity["GET"]["range"] = date("Ymd");
+                    $serendipity["GET"]["range"] = date("Ymd", serendipity_serverOffsetHour());
                 }
 
                 // The main area

[php-blog-cvs] serendipity/docs NEWS_OLD,NONE,1.1.2.1 NEWS,1.1.2.6,1.1.2.7

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Added Files:
      Tag: branch-smarty
	NEWS_OLD 
Log Message:
split up news file to easier handle it


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- NEWS	11 Nov 2004 13:42:58 -0000	1.1.2.6
+++ NEWS	12 Nov 2004 12:58:37 -0000	1.1.2.7
@@ -4,9 +4,9 @@
 ------------------------------------------------------------------------
 
     * Serendipity cannow be used with "JustBlogIt" extension. Just use
-      this URL: 
+      this URL:
       http://yourblog/serendipity_entries.php?serendipity[adminModule]=entries&serendipity[adminAction]=new&serendipity[title]=%TITLE%&serendipity[body]=%TEXT%&serendipity[url]=%URL%
-      (garvinhicking)      
+      (garvinhicking)
 
     * Plugin serendipity_event_spamblock: Added SURBL
       (http://www.surbl.org/) Support. Will now reject any comment that
@@ -904,522 +904,4 @@
 
     * Renamed "sebastian's weblog" theme to "blue" (sebastianbergmann)
 
-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)
-
-    * 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)
-
-    * RSS 1.0 feed supported (garvinhicking)
-
-    * Redirection after a comment has been added to prevent users
-      refreshing a page and double-submitting. (garvinhicking)
-
-    * Fixed RSS feed to only show comments when they are associated with
-      an entry_id (garvinhicking)
-
-    * Fixed page counter to count pages depending on the entries per
-      page, and not hardcoded 15 entries (garvinhicking)
-
-    * Atom 0.3 feed supported (with xml-stylesheet display)
-      (garvinhicking)
-
-    * Fixed format of mail to not send invalid mails (garvinhicking)
-
-    * Added Yahoo! blog ping (garvinhicking)
-
-    * Format trackbacks with link to the originating blog in comments
-      plugin (garvinhicking)
-
-    * The items of the comment-RSS feeds now have their GUID per
-      comment, not per entry. This allows feedreaders to properly
-      display updated to that feed. (garvinhicking)
-
-    * Do not output our own trackbacks inside the comments plugin. Use
-      anchors on the title-link to each comment. (garvinhicking)
-
-    * Moved languages to its own folder and added available languages as
-      a dropdown in the installer (tomsommer)
-
-    * Added spanish translation (Luis Cervantes)
-
-    * Added input box to admin entry panel where you can provide an
-      entry id to be directly edited. (garvinhicking)
-
-    * Edit an entry directly from your frontend (link beside trackbacks)
-      (garvinhicking)
-
-    * Made pinging blogs configurable/changeable per-entry. Added
-      "blogg.de" to RPC-ping list (garvinhicking)
-
-    * Fixed referrer and exit tracking on PostgreSQL (jtate)
-
-    * Added support for pinging weblogs.com, blo.gs, blogrolling.com and
-      technorati.com to announce new entries. (jimwinstead &
-      sebastianbergmann)
-
-    * Added mod_rewrite rules to .htaccess templates (garvinhicking)
-
-    * Changed installer to allow selection of desired rewrite rule, if
-      any. (tomsommer)
-
-    * Used patch from Craig O'Shannessy (modified and expanded to all
-      occurences) to allow usage of s9y without mod_rewrite/
-      ErrorDocument Handlers. (garvinhicking)
-
-    * Created a clickable label for the autologin, german translation
-      (garvinhicking)
-
-    * Allow Autologin, saving login information in a cookie (tomsommer
-      & jtate)
-
-    * HTML-Nugget can now be configured to preserve textformatting.
-      Default is 'apply textformatting' to stay backwards-compatible.
-      (garvinhicking)
-
-Version 0.4 (December 12th, 2003)
-------------------------------------------------------------------------
-
-    * Fixed bug #841972 - Remove reference to leer.png (tomsommer)
-
-    * RSS2.0-feed now contains wfw:comments link for per-entry comments.
-      Is interpreted by SharpReader i.e. (garvinhicking)
-
-    * XHTML1 compatibility fixes, missing <tr> from the calendar fixed.
-      Thanks to casper/jedijab79 from the forums (garvinhicking)
-
-    * Reworked Syndication plugin to allow future embedding of new RSS-
-      fields depending with individual content.
-
-      First example is the pubDate-field for the 'channel'-context, as
-      suggested by Justin Alcorn (garvinhicking)
-
-    * Added ability to close (and re-open) comments for certain entries
-      [needs DB update!] (garvinhicking)
-
-    * Fixes for comments-plugin (for 0 comments, dateformat) (tomsommer)
-
-    * Fixes for mt-XMLRPC API (gschlossnagle)
-
-    * Fixed embed-check for more strict type comparison (garvinhicking)
-
-    * Relative links inside the RSS-feed will get converted to absolute
-      ones (garvinhicking)
-
-    * Fixed trackbacks sending HTML tags and registering unslashed text
-      in excerpt (tomsommer)
-
-    * Fix bug #816499 - Serendipity should search for `convert` binary
-      in /usr/bin (tomsommer)
-
-    * Corrected path to entries printed in the comment plugin
-      (tomsommer)
-
-Version 0.3 (October 7th, 2003)
-------------------------------------------------------------------------
-
-    * Fixed evaluation of the 'embed' variable and added a small 'HowTo'
-      to the INSTALL file (garvinhicking)
-
-    * Fixed problem with escaping single quotes during installation
-      (tomsommer)
-
-    * Fixed problem with dual-trailing slashes in paths during
-      installation (tomsommer)
-
-    * Configuration/installation will now save the current s9y version
-      to the config file... Thereby allowing upgrades at a later point
-      (tomsommer)
-
-    * Include <slash:comments> in RSS-Feed. Shows amount of comments
-      available
-
-    * Differentiate subscription mails between regular comment and
-      trackback and adjust the mail's content corresponding to this
-      (garvinhicking)
-
-    * Added verbose output for DB creation on installation, PostgreSQL
-      DB-setup fixes (jtate)
-
-    * Made XHTML-compatibility fix to radio buttons of the installer
-      (garvinhicking)
-
-    * Allow for browseing of categories (on multiple pages) and have
-      per-category RSS-feed (garvinhicking & sbergmann)
-
-    * Fixed display of category in full article (garvinhicking)
-
-    * Expand all config categories in installer when s9y is first
-      installed (garvinhicking)
-
-    * Added select-dropdown configuration directive for the plugins
-      (garvinhicking)
-
-    * Prepended language defines with a '@' to suppress error messages
-      for fallback-language (garvinhicking)
-
-    * Fixed search results not displaying all content (garvinhicking)
-
-    * Fixed some undefined indexes/constants (garvinhicking)
-
-    * Support manual editing of the publish date on articles, can be
-      disallowed via $serendipity['allowDateManipulation'] (
-      garvinhicking)
-
-    * Added SQL upgrade files from 0.2 to 0.3 (troutgirl)
-
-    * Fixed a number of bugs with language detection and display during
-      installation (tomsommer)
-
-    * Fixed bug for fetching entries on a certain date. Now s9y dies
-      with an error message if MySQL errors occur (garvinhicking)
-
-    * Display link to trackbacks on single-article view (garvinhicking)
-
-    * Enable preview to include extended body (garvinhicking)
-
-    * Display author in previewed entry (tomsommer)
-
-    * Resize images based on original image proportions, not by fixed
-      width & height (tomsommer)
-
-    * Added option to preview entries (jhermanns)
-
-    * Added ability to save drafts of entries (jhermanns)
-
-    * Fixed some links not being formatted for exit-tracking, if the
-      link appeared more than once in an entry (tomsommer)
-
-    * Added radio-button and "spacer" configuration directives for the
-      plugins (garvinhicking)
-
-    * RSS-feeds and fields can now be customized within the plugin
-      configuration (garvinhicking
-
-    * Send X-Powered-By and X-Engine mail-headers with each mail
-      Serendipity sends, for easier debugging (tomsommer)
-
-    * Added Powered-By META tag to identify Serendipity Blogs even if
-      the admin has disabled the power-by plugin (tomsommer)
-
-    * Allow for descriptions of each configuration-category (tomsommer)
-
-    * Timestamps in comments are now shown in 24-hour format (tomsommer)
-
-    * Send X-Powered-By and X-Engine mail-headers with each mail
-      Serendipity sends, for easier debugging (tomsommer)
-
-    * Trackback pings where only accepted on a POST method. Moveable
-      Type uses GET, so we now accept both. (garvinhicking)
-
-    * Fixed issue where trackbackpings were only sent to links in
-      extended entry, if one existed, discarding the standard body
-      (garvinhicking)
-
-    * Fixed issue where two users sharing same username & password would
-      not be able to log in correctly, causing errors on the admin pages
-      (tomsommer)
-
-    * Fixed issue where installation would execute SQL instructions even
-      if a table already existed, creating "ghost"-authors (tomsommer)
-
-    * Allow unsubscription of already subscribed entries (tomsommer)
-
-    * Allow subscription of blog-visitors to receive comments for an
-      entry (tomsommer)
-
-    * Restrict calendar to only browse between the dates you have
-      comments available for (garvinhicking)
-
-    * Added external plugin to display the latest comments on a sidebar
-      (experimental, garvinhicking)
-
-    * Add Link to extended entry in RSS-feed, if existing
-      (garvinhicking)
-
-    * Unified and optimized admin login functionality (tomsommer)
-
-    * Fixed trackback functionality (tomsommer)
-
-    * Send User-Agent "Serendipity/v" when trackbacking (tomsommer)
-
-    * New default theme (tomsommer)
-
-    * New config section ('Appearance') and new option to block certain
-      hosts from being put into the referer table (garvinhicking)
-
-    * Installer/configuration categories can now be folded in DHTML-
-      compatible browsers (garvinhicking, tomsommer)
-
-    * Conserve linebreaks in RSS comments. (garvinhicking)
-
-    * Allow deleting categories (moving articles to another category)
-      (garvinhicking)
-
-    * Autodetect language on installation (garvinhicking)
-
-    * RSS feeds properly utf8encoded, added <webMaster>,
-      <managingEditor>,<comments>,<category> and <generator> tag
-      (garvinhicking)
-
-    * RSS feed now contains <image> link to pixel/rss_banner.png (if
-      existing), otherwise use pixel/s9y_banner_tiny.png (garvinhicking)
-
-    * External Plugin for hotword/acronym replacements, as well as any
-      other content-rewriting plugin (garvinhicking)
-
-    * Show updated values after submit, remove config entries when a
-      plugin is removed (garvinhicking)
-
-    * Added an RSS-feed for comments to entries only (garvinhicking)
-
-    * Fixed archives to not properly show entries from the first/last
-      day of a month (garvinhicking)
-
-    * Fixed the database by separating primary key from {AUTOINCREMENT}
-      (jtate)
-
-    * Rewrote installer (tomsommer)
-
-    * Added support for postgres (jtate)
-
-    * Fixed replacement of {TEMPLATE_PATH} to be relative (tomsommer)
-
-    * Major codestyle, HTML and XHTML cleanup (garvinhicking)
-
-    * Removed lots of static non-translated text (garvinhicking)
-
-    * Remove config entries when a plugin is removed (garvinhicking)
-
-    * After plugin update, show the new values for the plugin instead
-      the old ones (garvinhicking)
-
-    * After submitting a comment, redirect back to the actual previous
-      page (tomsommer)
-
-    * Fixed inclusion of templates vs. database-CSS (tomsommer)
-
-    * Fixed CSS not being showed during installation (tomsommer)
-
-    * Cleaned up the comment-form (tomsommer)
-
-    * Fixes a bug that the last day of a month was not taken into
-      account of the archives (garvinhicking)
-
-    * Allow embeding of serendipity in your custom homepage (wrapFile
-      directive - see http://blog.supergarv.de/ for example)
-      (garvinhicking)
-
-    * Added a new file serendipity_define.js.php which can be pre-
-      included to a Java-script to set some variables (garvinhicking)
-
-    * alt tag with '' instead of "" (garvinhicking)
-
-    * Added CVS ID tags to file-headers (garvinhicking)
-
-    * Added 'Force XHTML11' config option [not used yet] (garvinhicking)
-
-    * Made direct links to each comment, actually point to the right URI
-      (tomsommer)
-
-    * Inserted htmlentities() for comments output. Was vulnerable to
-      cross-site scripting attacks (garvinhicking)
-
-    * Fixed the "categories listing" so that if there were no
-      categories, it didn't display garbage (jtate)
-
-    * XML header should be utf-8, not ISO-8859-1.  This should fix the
-      encoding problems (sterling)
-
-    * Use ISO-8859-1 Charset to display pages (tomsommer)
-
-    * serendipity_date is now an H3, serendipity_title is now an H4
-      (troutgirl)
-
-    * Import stylesheets using @import (troutgirl)
-
-    * Made "H" in 'Posted by X in Y at H' a link, like in movabletype
-      (tomsommer)
-
-    * The line trailing each entry is now adapted to the "common format"
-      'Posted by xx in xx at xx | comments (n) | trackbacks (n)'
-      (jhermanns)
-
-    * Fixed minor problem with case in generated filenames (jhermanns)
-
-    * Removed all short tags '<?=' (jtate)
-
-    * Shortened the search field a little (jhermanns)
-
-    * Updated INSTALL instructions (troutgirl)
-
-    * Solved linebreak problem in "posted by..." via CSS (mueslix)
-
-    * Changed CSS class of "View Extended Entry" and "Posted by..." to
-      serendipity_entryFooter (mueslix)
-
-    * Default template is now set in the DB during installation
-      (jhermanns)
-
-    * Moved includes out of the templates (jhermanns)
-
-    * Fixed some problems with CSS not loading a first try (tomsommer)
-
-    * Saved lots of SQL queries when fetching config variables from the
-      database (tomsommer)
-
-    * Added new template system (tomsommer)
-
-    * Enhanced the insertion of emoticons (jhermanns)
-
-    * Removed static text and made some RSS regexps case-insensitive
-      (jhermanns)
-
-    * Added link to entry in emails, sent when comments or trackbacks
-      are made (tomsommer)
-
-    * Escape potential HTML characters in <title> in RSS feeds (Joyce P
-      & gschlossnagle)
-
-    * HTML is no longer allowed in comments, all HTML is formatted to
-      plain-text (tomsommer)
-
-    * Added direct link, to an entry, in the trackback dialog
-      (tomsommer)
-
-    * Top Referrers and Exits are now click-able (tomsommer)
-
-    * Admin area now uses the same styles as the rest of the blog
-      (tomsommer)
-
-    * New layout in the installer/configuration section (tomsommer)
-
-    * Fixed bug not showing the 6th row in the calendar, if the first
-      day of the month was a Sunday (tomsommer)
-
-    * Both emails and URLs, submitted with comments, are now shown.
-      E-mails are spam-secured, and URLs are checked for validity
-      (tomsommer)
-
-    * Avoid removing static files if pregenerate is not set (Joyce P &
-      tomsommer)
-
-    * Beautified the archives (jhermanns)
-
-    * RSS 2.0 is now default type of feed (sterling)
-
-    * Submitted mails in comments are now click-able (tomsommer)
-
-    * Added support for using *.gif in Image Manager, even if PHP is
-      compiled with read-only gif (tomsommer)
-
-    * Fixing bug #720632 (exit-links in html_nuggets plugin aren't
-      counted) (tomsommer)
-
-    * We now send different notification emails if the comment is a
-      trackback. (tomsommer)
-
-    * Stripped mail from HTML tags (tomsommer)
-
-    * When viewing a single entry, page <title> becomes entry's title.
-      (jhermanns)
-
-    * Links to entries are now called /archives/id_title_of_entry.html
-      (used to be /archives/e_id.html) (jhermanns)
-
-    * Time-ranges are now accessed like this: /archives/200203.html
-      (used to be /archives/d_200203.html) (jhermanns)
-
-    * Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)
-
-    * Added validation to trackback-detection (tomsommer)
-
-    * You can now delete comments and trackbacks if you are logged in
-      (tomsommer)
-
-    * New logo in "Powered By" plugin (jhermanns & tomsommer)
-
-    * Sorting Comments & trackbacks by ID (tomsommer)
-
-    * We now remember comment details in cookies if requested, and
-      delete them if wanted (tomsommer)
-
-    * Added link back to main page (tomsommer)
-
-    * Added support for deletion in blogger and metaweblog APIs
-      (gschlossnagle)
-
-    * Added lots of error-handling to image manager (tomsommer)
-
-    * We now show trackbacks in a separate window, and count them
-      separately (jhermanns)
-
-    * Superuser-login initially sends you to authoring suit now
-      (jhermanns)
-
-    * Beautified mails (tomsommer)
-
-    * In Admin-module 'Edit entries' is now called 'Authoring Suite'
-      (tomsommer)
-
-    * Improved imagick thumbnail generation (jhermanns)
-
-    * You can now delete images in image manager (tomsommer)
-
-    * Fixed lots of missing translations (jhermanns)
-
-    * Added notice if search-string is smaller than 4 chars (tomsommer)
-
-    * Link to the archives is now /archive (jhermanns)
-
-    * Disallow empty comments (tomsommer)
-
-    * Fixed broken auto-trackback discovery (gschlossnagle)
-
-    * Fixed problem with echoing of .htaccess and paths, if installation
-      fails (tomsommer)
-
-    * Added CSS to installation-screen (tomsommer)
-
-    * Fixed bug when displaying individual days by clicking on the
-      calendar (tomsommer)
-
-    * Fixed bug #719016 - (entry-title does not escape correctly)
-      (tomsommer)
-
-    * Allow the showing of *complete* archived months (tomsommer)
-
-    * Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)
-
-    * Prevent the Admin interface to be logged as referrer when using
-      the 'Back to Blog' link (bergmann)
-
-    * Added full language support - English, German (jhermanns)
-
-    * Keep track of which blog entry was linked from or referred to
-      (bergmann)
-
-    * Regenerate the .htaccess file, if installation fails (sterling &
-      muesli)
-
-Version 0.2 (April 4th, 2003)
-------------------------------------------------------------------------
+(Older NEWS see file NEWS_OLD)
\ No newline at end of file

--- NEW FILE: NEWS_OLD ---
# $Id: NEWS_OLD,v 1.1.2.1 2004/11/12 12:58:37 garvinhicking Exp $

(The latest changes are documented in the NEWS-file)

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)

    * 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)

    * RSS 1.0 feed supported (garvinhicking)

    * Redirection after a comment has been added to prevent users
      refreshing a page and double-submitting. (garvinhicking)

    * Fixed RSS feed to only show comments when they are associated with
      an entry_id (garvinhicking)

    * Fixed page counter to count pages depending on the entries per
      page, and not hardcoded 15 entries (garvinhicking)

    * Atom 0.3 feed supported (with xml-stylesheet display)
      (garvinhicking)

    * Fixed format of mail to not send invalid mails (garvinhicking)

    * Added Yahoo! blog ping (garvinhicking)

    * Format trackbacks with link to the originating blog in comments
      plugin (garvinhicking)

    * The items of the comment-RSS feeds now have their GUID per
      comment, not per entry. This allows feedreaders to properly
      display updated to that feed. (garvinhicking)

    * Do not output our own trackbacks inside the comments plugin. Use
      anchors on the title-link to each comment. (garvinhicking)

    * Moved languages to its own folder and added available languages as
      a dropdown in the installer (tomsommer)

    * Added spanish translation (Luis Cervantes)

    * Added input box to admin entry panel where you can provide an
      entry id to be directly edited. (garvinhicking)

    * Edit an entry directly from your frontend (link beside trackbacks)
      (garvinhicking)

    * Made pinging blogs configurable/changeable per-entry. Added
      "blogg.de" to RPC-ping list (garvinhicking)

    * Fixed referrer and exit tracking on PostgreSQL (jtate)

    * Added support for pinging weblogs.com, blo.gs, blogrolling.com and
      technorati.com to announce new entries. (jimwinstead &
      sebastianbergmann)

    * Added mod_rewrite rules to .htaccess templates (garvinhicking)

    * Changed installer to allow selection of desired rewrite rule, if
      any. (tomsommer)

    * Used patch from Craig O'Shannessy (modified and expanded to all
      occurences) to allow usage of s9y without mod_rewrite/
      ErrorDocument Handlers. (garvinhicking)

    * Created a clickable label for the autologin, german translation
      (garvinhicking)

    * Allow Autologin, saving login information in a cookie (tomsommer
      & jtate)

    * HTML-Nugget can now be configured to preserve textformatting.
      Default is 'apply textformatting' to stay backwards-compatible.
      (garvinhicking)

Version 0.4 (December 12th, 2003)
------------------------------------------------------------------------

    * Fixed bug #841972 - Remove reference to leer.png (tomsommer)

    * RSS2.0-feed now contains wfw:comments link for per-entry comments.
      Is interpreted by SharpReader i.e. (garvinhicking)

    * XHTML1 compatibility fixes, missing <tr> from the calendar fixed.
      Thanks to casper/jedijab79 from the forums (garvinhicking)

    * Reworked Syndication plugin to allow future embedding of new RSS-
      fields depending with individual content.

      First example is the pubDate-field for the 'channel'-context, as
      suggested by Justin Alcorn (garvinhicking)

    * Added ability to close (and re-open) comments for certain entries
      [needs DB update!] (garvinhicking)

    * Fixes for comments-plugin (for 0 comments, dateformat) (tomsommer)

    * Fixes for mt-XMLRPC API (gschlossnagle)

    * Fixed embed-check for more strict type comparison (garvinhicking)

    * Relative links inside the RSS-feed will get converted to absolute
      ones (garvinhicking)

    * Fixed trackbacks sending HTML tags and registering unslashed text
      in excerpt (tomsommer)

    * Fix bug #816499 - Serendipity should search for `convert` binary
      in /usr/bin (tomsommer)

    * Corrected path to entries printed in the comment plugin
      (tomsommer)

Version 0.3 (October 7th, 2003)
------------------------------------------------------------------------

    * Fixed evaluation of the 'embed' variable and added a small 'HowTo'
      to the INSTALL file (garvinhicking)

    * Fixed problem with escaping single quotes during installation
      (tomsommer)

    * Fixed problem with dual-trailing slashes in paths during
      installation (tomsommer)

    * Configuration/installation will now save the current s9y version
      to the config file... Thereby allowing upgrades at a later point
      (tomsommer)

    * Include <slash:comments> in RSS-Feed. Shows amount of comments
      available

    * Differentiate subscription mails between regular comment and
      trackback and adjust the mail's content corresponding to this
      (garvinhicking)

    * Added verbose output for DB creation on installation, PostgreSQL
      DB-setup fixes (jtate)

    * Made XHTML-compatibility fix to radio buttons of the installer
      (garvinhicking)

    * Allow for browseing of categories (on multiple pages) and have
      per-category RSS-feed (garvinhicking & sbergmann)

    * Fixed display of category in full article (garvinhicking)

    * Expand all config categories in installer when s9y is first
      installed (garvinhicking)

    * Added select-dropdown configuration directive for the plugins
      (garvinhicking)

    * Prepended language defines with a '@' to suppress error messages
      for fallback-language (garvinhicking)

    * Fixed search results not displaying all content (garvinhicking)

    * Fixed some undefined indexes/constants (garvinhicking)

    * Support manual editing of the publish date on articles, can be
      disallowed via $serendipity['allowDateManipulation'] (
      garvinhicking)

    * Added SQL upgrade files from 0.2 to 0.3 (troutgirl)

    * Fixed a number of bugs with language detection and display during
      installation (tomsommer)

    * Fixed bug for fetching entries on a certain date. Now s9y dies
      with an error message if MySQL errors occur (garvinhicking)

    * Display link to trackbacks on single-article view (garvinhicking)

    * Enable preview to include extended body (garvinhicking)

    * Display author in previewed entry (tomsommer)

    * Resize images based on original image proportions, not by fixed
      width & height (tomsommer)

    * Added option to preview entries (jhermanns)

    * Added ability to save drafts of entries (jhermanns)

    * Fixed some links not being formatted for exit-tracking, if the
      link appeared more than once in an entry (tomsommer)

    * Added radio-button and "spacer" configuration directives for the
      plugins (garvinhicking)

    * RSS-feeds and fields can now be customized within the plugin
      configuration (garvinhicking

    * Send X-Powered-By and X-Engine mail-headers with each mail
      Serendipity sends, for easier debugging (tomsommer)

    * Added Powered-By META tag to identify Serendipity Blogs even if
      the admin has disabled the power-by plugin (tomsommer)

    * Allow for descriptions of each configuration-category (tomsommer)

    * Timestamps in comments are now shown in 24-hour format (tomsommer)

    * Send X-Powered-By and X-Engine mail-headers with each mail
      Serendipity sends, for easier debugging (tomsommer)

    * Trackback pings where only accepted on a POST method. Moveable
      Type uses GET, so we now accept both. (garvinhicking)

    * Fixed issue where trackbackpings were only sent to links in
      extended entry, if one existed, discarding the standard body
      (garvinhicking)

    * Fixed issue where two users sharing same username & password would
      not be able to log in correctly, causing errors on the admin pages
      (tomsommer)

    * Fixed issue where installation would execute SQL instructions even
      if a table already existed, creating "ghost"-authors (tomsommer)

    * Allow unsubscription of already subscribed entries (tomsommer)

    * Allow subscription of blog-visitors to receive comments for an
      entry (tomsommer)

    * Restrict calendar to only browse between the dates you have
      comments available for (garvinhicking)

    * Added external plugin to display the latest comments on a sidebar
      (experimental, garvinhicking)

    * Add Link to extended entry in RSS-feed, if existing
      (garvinhicking)

    * Unified and optimized admin login functionality (tomsommer)

    * Fixed trackback functionality (tomsommer)

    * Send User-Agent "Serendipity/v" when trackbacking (tomsommer)

    * New default theme (tomsommer)

    * New config section ('Appearance') and new option to block certain
      hosts from being put into the referer table (garvinhicking)

    * Installer/configuration categories can now be folded in DHTML-
      compatible browsers (garvinhicking, tomsommer)

    * Conserve linebreaks in RSS comments. (garvinhicking)

    * Allow deleting categories (moving articles to another category)
      (garvinhicking)

    * Autodetect language on installation (garvinhicking)

    * RSS feeds properly utf8encoded, added <webMaster>,
      <managingEditor>,<comments>,<category> and <generator> tag
      (garvinhicking)

    * RSS feed now contains <image> link to pixel/rss_banner.png (if
      existing), otherwise use pixel/s9y_banner_tiny.png (garvinhicking)

    * External Plugin for hotword/acronym replacements, as well as any
      other content-rewriting plugin (garvinhicking)

    * Show updated values after submit, remove config entries when a
      plugin is removed (garvinhicking)

    * Added an RSS-feed for comments to entries only (garvinhicking)

    * Fixed archives to not properly show entries from the first/last
      day of a month (garvinhicking)

    * Fixed the database by separating primary key from {AUTOINCREMENT}
      (jtate)

    * Rewrote installer (tomsommer)

    * Added support for postgres (jtate)

    * Fixed replacement of {TEMPLATE_PATH} to be relative (tomsommer)

    * Major codestyle, HTML and XHTML cleanup (garvinhicking)

    * Removed lots of static non-translated text (garvinhicking)

    * Remove config entries when a plugin is removed (garvinhicking)

    * After plugin update, show the new values for the plugin instead
      the old ones (garvinhicking)

    * After submitting a comment, redirect back to the actual previous
      page (tomsommer)

    * Fixed inclusion of templates vs. database-CSS (tomsommer)

    * Fixed CSS not being showed during installation (tomsommer)

    * Cleaned up the comment-form (tomsommer)

    * Fixes a bug that the last day of a month was not taken into
      account of the archives (garvinhicking)

    * Allow embeding of serendipity in your custom homepage (wrapFile
      directive - see http://blog.supergarv.de/ for example)
      (garvinhicking)

    * Added a new file serendipity_define.js.php which can be pre-
      included to a Java-script to set some variables (garvinhicking)

    * alt tag with '' instead of "" (garvinhicking)

    * Added CVS ID tags to file-headers (garvinhicking)

    * Added 'Force XHTML11' config option [not used yet] (garvinhicking)

    * Made direct links to each comment, actually point to the right URI
      (tomsommer)

    * Inserted htmlentities() for comments output. Was vulnerable to
      cross-site scripting attacks (garvinhicking)

    * Fixed the "categories listing" so that if there were no
      categories, it didn't display garbage (jtate)

    * XML header should be utf-8, not ISO-8859-1.  This should fix the
      encoding problems (sterling)

    * Use ISO-8859-1 Charset to display pages (tomsommer)

    * serendipity_date is now an H3, serendipity_title is now an H4
      (troutgirl)

    * Import stylesheets using @import (troutgirl)

    * Made "H" in 'Posted by X in Y at H' a link, like in movabletype
      (tomsommer)

    * The line trailing each entry is now adapted to the "common format"
      'Posted by xx in xx at xx | comments (n) | trackbacks (n)'
      (jhermanns)

    * Fixed minor problem with case in generated filenames (jhermanns)

    * Removed all short tags '<?=' (jtate)

    * Shortened the search field a little (jhermanns)

    * Updated INSTALL instructions (troutgirl)

    * Solved linebreak problem in "posted by..." via CSS (mueslix)

    * Changed CSS class of "View Extended Entry" and "Posted by..." to
      serendipity_entryFooter (mueslix)

    * Default template is now set in the DB during installation
      (jhermanns)

    * Moved includes out of the templates (jhermanns)

    * Fixed some problems with CSS not loading a first try (tomsommer)

    * Saved lots of SQL queries when fetching config variables from the
      database (tomsommer)

    * Added new template system (tomsommer)

    * Enhanced the insertion of emoticons (jhermanns)

    * Removed static text and made some RSS regexps case-insensitive
      (jhermanns)

    * Added link to entry in emails, sent when comments or trackbacks
      are made (tomsommer)

    * Escape potential HTML characters in <title> in RSS feeds (Joyce P
      & gschlossnagle)

    * HTML is no longer allowed in comments, all HTML is formatted to
      plain-text (tomsommer)

    * Added direct link, to an entry, in the trackback dialog
      (tomsommer)

    * Top Referrers and Exits are now click-able (tomsommer)

    * Admin area now uses the same styles as the rest of the blog
      (tomsommer)

    * New layout in the installer/configuration section (tomsommer)

    * Fixed bug not showing the 6th row in the calendar, if the first
      day of the month was a Sunday (tomsommer)

    * Both emails and URLs, submitted with comments, are now shown.
      E-mails are spam-secured, and URLs are checked for validity
      (tomsommer)

    * Avoid removing static files if pregenerate is not set (Joyce P &
      tomsommer)

    * Beautified the archives (jhermanns)

    * RSS 2.0 is now default type of feed (sterling)

    * Submitted mails in comments are now click-able (tomsommer)

    * Added support for using *.gif in Image Manager, even if PHP is
      compiled with read-only gif (tomsommer)

    * Fixing bug #720632 (exit-links in html_nuggets plugin aren't
      counted) (tomsommer)

    * We now send different notification emails if the comment is a
      trackback. (tomsommer)

    * Stripped mail from HTML tags (tomsommer)

    * When viewing a single entry, page <title> becomes entry's title.
      (jhermanns)

    * Links to entries are now called /archives/id_title_of_entry.html
      (used to be /archives/e_id.html) (jhermanns)

    * Time-ranges are now accessed like this: /archives/200203.html
      (used to be /archives/d_200203.html) (jhermanns)

    * Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)

    * Added validation to trackback-detection (tomsommer)

    * You can now delete comments and trackbacks if you are logged in
      (tomsommer)

    * New logo in "Powered By" plugin (jhermanns & tomsommer)

    * Sorting Comments & trackbacks by ID (tomsommer)

    * We now remember comment details in cookies if requested, and
      delete them if wanted (tomsommer)

    * Added link back to main page (tomsommer)

    * Added support for deletion in blogger and metaweblog APIs
      (gschlossnagle)

    * Added lots of error-handling to image manager (tomsommer)

    * We now show trackbacks in a separate window, and count them
      separately (jhermanns)

    * Superuser-login initially sends you to authoring suit now
      (jhermanns)

    * Beautified mails (tomsommer)

    * In Admin-module 'Edit entries' is now called 'Authoring Suite'
      (tomsommer)

    * Improved imagick thumbnail generation (jhermanns)

    * You can now delete images in image manager (tomsommer)

    * Fixed lots of missing translations (jhermanns)

    * Added notice if search-string is smaller than 4 chars (tomsommer)

    * Link to the archives is now /archive (jhermanns)

    * Disallow empty comments (tomsommer)

    * Fixed broken auto-trackback discovery (gschlossnagle)

    * Fixed problem with echoing of .htaccess and paths, if installation
      fails (tomsommer)

    * Added CSS to installation-screen (tomsommer)

    * Fixed bug when displaying individual days by clicking on the
      calendar (tomsommer)

    * Fixed bug #719016 - (entry-title does not escape correctly)
      (tomsommer)

    * Allow the showing of *complete* archived months (tomsommer)

    * Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)

    * Prevent the Admin interface to be logged as referrer when using
      the 'Back to Blog' link (bergmann)

    * Added full language support - English, German (jhermanns)

    * Keep track of which blog entry was linked from or referred to
      (bergmann)

    * Regenerate the .htaccess file, if installation fails (sterling &
      muesli)

Version 0.2 (April 4th, 2003)
------------------------------------------------------------------------

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.24,1.4.2.25

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
* revert lost changes
* We use spaces, not tabs. :)


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.24
retrieving revision 1.4.2.25
diff -u -d -r1.4.2.24 -r1.4.2.25
--- serendipity_event_spamblock.php	11 Nov 2004 13:31:39 -0000	1.4.2.24
+++ serendipity_event_spamblock.php	11 Nov 2004 14:10:34 -0000	1.4.2.25
@@ -124,6 +124,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_SPAMBLOCK_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking, Sebastian Nohn');
+        $propbag->add('version',       '1.1');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
@@ -278,8 +281,8 @@
                             return false;
                         }
 
-                        // Check for identical comments.
-                        if ( $this->get_config('bodyclone', true) === true ) {
+                        // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.
+                        if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {
@@ -326,21 +329,21 @@
 
                         // Check for IP listed in SURBL
                         if (serendipity_db_bool($this->get_config('surbl_enabled', false))) {
-			    require_once 'bundled-libs/Services/SURBL.php';
-  			    $surbl = new Services_SURBL();
-			    if ($surbl->isSpam($addData['url'])) {
-			        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
-			        $eventData = array('allow_comments' => false);
-			        $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
-			        return false;
-			    }
-			    // BEGIN Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
-			    $urls = '(http|file|ftp)';
-			    $ltrs = '\w';
-			    $gunk = '/#~:.?+=&%@!\-';
-			    $punc = '.:?\-';
-			    $any = "$ltrs$gunk$punc";
-			    preg_match_all("{
+                            require_once 'bundled-libs/Services/SURBL.php';
+                            $surbl = new Services_SURBL();
+                            if ($surbl->isSpam($addData['url'])) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
+                                $eventData = array('allow_comments' => false);
+                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
+                                return false;
+                            }
+                            // BEGIN Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
+                            $urls = '(http|file|ftp)';
+                            $ltrs = '\w';
+                            $gunk = '/#~:.?+=&%@!\-';
+                            $punc = '.:?\-';
+                            $any = "$ltrs$gunk$punc";
+                            preg_match_all("{
                                               \b
                                               $urls   :
                                               [$any] +?
@@ -353,16 +356,16 @@
                                                 $
                                               )
                                           }x", $addData['comment'], $matches);
-			    // END Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
-			    foreach ($matches[0] as $surbl_check_url) {
-			      if ($surbl->isSpam($surbl_check_url)) {
-			        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
-			        $eventData = array('allow_comments' => false);
-			        $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
-			        return false;
-			      }
-			    } 
-			}
+                            // END Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
+                            foreach ($matches[0] as $surbl_check_url) {
+                                if ($surbl->isSpam($surbl_check_url)) {
+                                    $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
+                                    $eventData = array('allow_comments' => false);
+                                    $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
+                                    return false;
+                                }
+                            }
+                        }
 
                         // Captcha checking
                         if ($show_captcha && $addData['type'] == 'NORMAL') {

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.1.2.4,1.1.2.5

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

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

Modified Files:
      Tag: branch-smarty
	functions_entries.inc.php 
Log Message:
make s9y work with JustBlogIT extension. You need to be logged 
into your blog via cookie first, of course.
Please check for possible security exploits, I can't see anything bad.



Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- functions_entries.inc.php	11 Nov 2004 12:45:21 -0000	1.1.2.4
+++ functions_entries.inc.php	11 Nov 2004 13:42:58 -0000	1.1.2.5
@@ -1120,6 +1120,18 @@
     }
     $cat_list .= '</select>' . $n;
 
+    if (!empty($serendipity['GET']['title'])) {
+        $entry['title'] = utf8_decode(urldecode($serendipity['GET']['title']));
+    }
+
+    if (!empty($serendipity['GET']['body'])) {
+        $entry['body'] = utf8_decode(urldecode($serendipity['GET']['body']));
+    }
+
+    if (!empty($serendipity['GET']['url'])) {
+        $entry['body'] .= "\n" . '<br /><a href="' . htmlspecialchars(utf8_decode(urldecode($serendipity['GET']['url']))) . '">' . $entry['title'] . '</a>';
+    }
+
     $hidden = '';
     foreach($hiddens as $key => $value) {
         $hidden .= '        <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n;

[php-blog-cvs] serendipity/docs NEWS,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
make s9y work with JustBlogIT extension. You need to be logged 
into your blog via cookie first, of course.
Please check for possible security exploits, I can't see anything bad.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- NEWS	11 Nov 2004 13:31:38 -0000	1.1.2.5
+++ NEWS	11 Nov 2004 13:42:58 -0000	1.1.2.6
@@ -3,6 +3,11 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Serendipity cannow be used with "JustBlogIt" extension. Just use
+      this URL: 
+      http://yourblog/serendipity_entries.php?serendipity[adminModule]=entries&serendipity[adminAction]=new&serendipity[title]=%TITLE%&serendipity[body]=%TEXT%&serendipity[url]=%URL%
+      (garvinhicking)      
+
     * Plugin serendipity_event_spamblock: Added SURBL
       (http://www.surbl.org/) Support. Will now reject any comment that
       contains a blacklisted URL, if enabled. (nohn)

[php-blog-cvs] serendipity/docs NEWS,1.1.2.4,1.1.2.5

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

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

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
Added SURBL support to serendipity_event_spamblock

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- NEWS	9 Nov 2004 19:11:30 -0000	1.1.2.4
+++ NEWS	11 Nov 2004 13:31:38 -0000	1.1.2.5
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Plugin serendipity_event_spamblock: Added SURBL
+      (http://www.surbl.org/) Support. Will now reject any comment that
+      contains a blacklisted URL, if enabled. (nohn)
+
     * Do not allow to view extended article when item is set to "publish"
       but timestamp is in the future (garvinhicking)
 

[php-blog-cvs] serendipity/bundled-libs/Services SURBL.php,NONE,1.1.2.1

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5805/bundled-libs/Services

Added Files:
      Tag: branch-smarty
	SURBL.php 
Log Message:
Added SURBL support to serendipity_event_spamblock

--- NEW FILE: SURBL.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
// +----------------------------------------------------------------------+
// | PEAR::Services_SURBL                                                 |
// +----------------------------------------------------------------------+
// | Copyright (c) 2004 Sebastian Nohn <seb...@no...>               |
// +----------------------------------------------------------------------+
// | This source file is subject to version 3.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at the following url:           |
// | http://www.php.net/license/3_0.txt.                                  |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Sebastian Nohn <seb...@no...>                         |
// +----------------------------------------------------------------------+
//
// $Id: SURBL.php,v 1.1.2.1 2004/11/11 13:31:43 nohn Exp $

/**
 * PEAR::Services_SURBL
 *
 * This class acts as interface to the SURBL - Spam URI Realtime Blocklists.
 *
 * Services_SURBL looks up an supplied URI if it's listed in a
 * Spam URI Realtime Blocklists.
 *
 * @author  Sebastian Nohn <seb...@no...>
 * @package Services_SURBL
 * @license http://www.php.net/license/3_0.txt
 * @version 0.3
 */
require_once "Net/CheckIP.php";
require_once "Cache.php";

class Services_SURBL {

    /**     
     * @var    string
     * @access protected
     */
    var $blacklist = "multi.surbl.org";

    /**
     * @var    string
     * @access protected
     */
    var $doubleCcTldFile = "http://spamcheck.freeapp.net/two-level-tlds";

    /**
     * @var    array
     * @access private
     */
    var $twoLevelCcTld = array();

    /**
     * Check if the last two parts of the FQDN are whitelisted
     *
     * @param  $fqdn
     * @access protected
     */
    function isDoubleCcTld($fqdn) {
        // 30 Day should be way enough
        $options = array('lifeTime' => 2);
        $id = md5($this->doubleCcTldFile);

        $cache = new Cache("file", $options);
        if ($data = $cache->get($id)) {
            // Cache hit
        } else {
            // Cache miss
            $fp = fopen ($this->doubleCcTldFile, "r");
            while (!feof($fp)) {
                $buffer = fgets($fp, 4096);
                $data[] = trim($buffer);
            } // while
            $data = array_flip($data);
            fclose ($fp);
            $cache->save($id, $data);
        } // if 
        if (array_key_exists($fqdn, $data)) {
            return true;
        } else {
            return false;
        } // if
    } // function

    /**
     * Get Hostname to ask for
     *
     * Performs the following steps:
     *
     * (1) Extract the hostname from the given URI
     * (2) Check if the "hostname" is an ip
     * (3a) IS_IP Reverse the IP (1.2.3.4 -> 4.3.2.1)
     * (3b) IS_FQDN Check if is in "CC-2-level-TLD"
     * (3b1) IS_IN_2LEVEL: we want the last three names
     * (3b2) IS_NOT_2LEVEL: we want the last two names
     * (4) return the FQDN to query
     *
     * @param  string $uri
     * @access protected
     */
    function getNameForCheck($uri) {
        $host       = "";
        // (1) Extract the hostname from the given URI
        $parsed_uri = parse_url($uri);
        $host       = $parsed_uri["host"];
        // (2) Check if the "hostname" is an ip
        if (Net_CheckIP::check_ip($host)) {
            // (3a) IS_IP Reverse the IP (1.2.3.4 -> 4.3.2.1)
            $host = implode(".", array_reverse(explode(".", $host)));
        } else {
            $host_elements = explode(".", $host);
            while (count($host_elements) > 3) {
                array_shift($host_elements);
            } // while
            $host_3_elements = implode(".", $host_elements);

            $host_elements = explode(".", $host);
            while (count($host_elements) > 2) {
                array_shift($host_elements);
            } // while
            $host_2_elements = implode(".", $host_elements);

            // (3b) IS_FQDN Check if is in "CC-2-level-TLD"
            if ($this->isDoubleCcTld($host_2_elements)) {
                // (3b1) IS_IN_2LEVEL: we want the last three names
                $host = $host_3_elements;
            } else {
                // (3b2) IS_NOT_2LEVEL: we want the last two names
                $host = $host_2_elements;
            } // if
        } // if
        // (4) return the FQDN to query
        $host      .= ".".$this->blacklist;
        return $host;
    } // function

    /**
     * Set the blacklist to a desired blacklist.
     * 
     * Default is multi.surbl.org.
     *
     * It is suggested to use one of these:
     *
     * sc.surbl.org - SpamCop message-body URI domains
     * ws.surbl.org - sa-blacklist domains as a SURBL
     * ob.surbl.org - OutBlaze spamvertised sites
     * ab.surbl.org - AbuseButler spamvertised sites
     * multi.surbl.org - Combined SURBL list
     * 
     * @param  string $blacklist
     * @access public
     */
    function setBlacklist($blacklist = "multi.surbl.org") {
        $this->blacklist = $blacklist;
    }

    /**
     * Get the blacklist.
     *
     * @access public
     */
    function getBlacklist() {
        return $this->blacklist;
    }

    /**
     * Checks if the supplied URL is listen in an SURBL
     *
     * @param  string $host
     * @access public
     */
    function isSpam($host) {
        $result = gethostbyname($this->getNameForCheck($host));
        if ($result != $this->getNameForCheck($host)) {
            return true;
        } else {
            return false;
        }
    } // function

} // class
?>

[php-blog-cvs] serendipity/bundled-libs/Net CheckIP.php,NONE,1.1.2.1

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5805/bundled-libs/Net

Added Files:
      Tag: branch-smarty
	CheckIP.php 
Log Message:
Added SURBL support to serendipity_event_spamblock

--- NEW FILE: CheckIP.php ---
<?php
//
// +----------------------------------------------------------------------+
// | PHP Version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2002 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available at through the world-wide-web at                           |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Martin Jansen <mj...@ph...>                                  |
// |          Guido Haeger <gh-...@ec...>                            |
// +----------------------------------------------------------------------+
//
// $Id: CheckIP.php,v 1.1.2.1 2004/11/11 13:31:42 nohn Exp $

/**
* Class to validate the syntax of IPv4 adresses
*
* Usage:
*   <?php
*   require_once "Net/CheckIP.php";
*     
*   if (Net_CheckIP::check_ip("your_ip_goes_here")) {
*       // Syntax of the IP is ok
*   }
*   ?>
*
* @author  Martin Jansen <mj...@ph...>
* @author  Guido Haeger <gh-...@ec...>
* @package Net_CheckIP
* @version 1.1
* @access  public
*/
class Net_CheckIP
{

    /**
    * Validate the syntax of the given IP adress
    *
    * This function splits the IP address in 4 pieces
    * (separated by ".") and checks for each piece
    * if it's an integer value between 0 and 255.
    * If all 4 parameters pass this test, the function
    * returns true.
    *
    * @param  string $ip IP adress
    * @return bool       true if syntax is valid, otherwise false
    */
    function check_ip($ip)
    {
        $oct = explode('.', $ip);
        if (count($oct) != 4) {
            return false;
        }

        for ($i = 0; $i < 4; $i++) {
            if (!is_numeric($oct[$i])) {
                return false;
            }

            if ($oct[$i] < 0 || $oct[$i] > 255) {
                return false;
            }
        }

        return true;
    }
}
?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.23,1.4.2.24

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
Added SURBL support to serendipity_event_spamblock

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.23
retrieving revision 1.4.2.24
diff -u -d -r1.4.2.23 -r1.4.2.24
--- serendipity_event_spamblock.php	29 Oct 2004 12:43:29 -0000	1.4.2.23
+++ serendipity_event_spamblock.php	11 Nov 2004 13:31:39 -0000	1.4.2.24
@@ -7,6 +7,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spamschutz: Ungültiger Kommentar');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spamschutz: Ein weiterer Kommentar kann nicht so schnell übermittelt werden.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spamschutz: Ihre IP ist als Open Relay geführt, daher wird Ihr Kommentar abgewiesen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL', 'Spamschutz: Ihre Nachricht enthält eine URL, die als SPAM geführt wird, daher wird Ihr Kommentar abgewiesen.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'Dieses Blog ist im "Notfall Kommentar"-Modus. Bitte kommen Sie später wieder.');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Keine doppelten Kommentare erlauben');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Verbietet Benutzern ein Kommentar zu übermitteln, was gleichlautend bereits besteht.');
@@ -16,6 +17,8 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Schränkt die Anzahl an Kommentare pro IP ein, indem nur alle X Minuten ein Kommentar erlaubt wird. Hilfreich um Spamfluten derselben IP abzuwehren.');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Kommentare abweisen, die von geblacklisteten IPs stammen');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Wird diese Option aktiviert, werden Kommentare abgewiesen die von IPs stammen, die in einer RBL/Blacklist geführt werden. Die Aktivierung hiervon kann Dial-Up oder Proxy-User betreffen!');
+        @define('PLUGIN_EVENT_SPAMBLOCK_SURBL', 'Kommentare abweisen, die als SPAM gelistete URLs enthalten');
+        @define('PLUGIN_EVENT_SPAMBLOCK_SURBL_DESC', 'Wird diese Option aktiviert, werden Kommentare abgewiesen die als SPAM geblacklistet sind.');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST', 'Welche RBLs sollen verwendet werden');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST_DESC', 'Eine Liste von zu verwendenden RBLs. Listen mit dynamischen Hosts sollten vermieden werden.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Captchas aktivieren');
@@ -55,10 +58,12 @@
 
     default:
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector');
-        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of effective methods to prevent comment spam');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spam Prevention: Invalid message.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spam Prevention: You cannot post a comment so soon after submitting another one.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spam Prevention: The IP of the computer you are posting from, is listed as an open relay.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL', 'Spam Prevention: Your comment contains an URL listed in SURBL.');
+
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'This blog is in "Emergency Comment Blockage Mode", please come back another time');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow duplicate comments');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment');
@@ -68,6 +73,8 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Reject comments from RBL-listed hosts');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Enabling this setting will reject comments made from hosts which are listed in RBLs. Pay attention that this may affect proxy-users or dial-up users.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_SURBL', 'Reject comments that containt SURBL-listed hosts');
+        @define('PLUGIN_EVENT_SPAMBLOCK_SURBL_DESC', 'Reject comments that containt SURBL-listed hosts');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST', 'Which RBLs should be contacted');
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST_DESC', 'Blocks comments based on provided RBL lists. Avoid lists with dynamic hosts.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Enable Captchas');
@@ -98,6 +105,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_BODYCLONE', 'Duplicate comment');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_IPFLOOD', 'IP-block');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_RBL', 'RBL-block');
+        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL', 'SURBL-block');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS', 'Invalid captcha');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION', 'Auto-moderation after X days');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT', 'Too many hyperlinks');
@@ -116,15 +124,12 @@
 
         $propbag->add('name',          PLUGIN_EVENT_SPAMBLOCK_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
-        $propbag->add('stackable',     false);
-        $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
             'frontend_comment'     => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'logfile'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'logfile'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -167,6 +172,13 @@
                 $propbag->add('default', 0);
                 break;
 
+            case 'surbl_enabled':
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_SURBL);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_SURBL_DESC);
+                $propbag->add('default', false);
+                break;
+
             case 'rbl_enabled':
                 $propbag->add('type', 'boolean');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_RBL);
@@ -266,8 +278,8 @@
                             return false;
                         }
 
-                        // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.
-                        if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
+                        // Check for identical comments.
+                        if ( $this->get_config('bodyclone', true) === true ) {
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {
@@ -312,6 +324,46 @@
                             }
                         }
 
+                        // Check for IP listed in SURBL
+                        if (serendipity_db_bool($this->get_config('surbl_enabled', false))) {
+			    require_once 'bundled-libs/Services/SURBL.php';
+  			    $surbl = new Services_SURBL();
+			    if ($surbl->isSpam($addData['url'])) {
+			        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
+			        $eventData = array('allow_comments' => false);
+			        $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
+			        return false;
+			    }
+			    // BEGIN Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
+			    $urls = '(http|file|ftp)';
+			    $ltrs = '\w';
+			    $gunk = '/#~:.?+=&%@!\-';
+			    $punc = '.:?\-';
+			    $any = "$ltrs$gunk$punc";
+			    preg_match_all("{
+                                              \b
+                                              $urls   :
+                                              [$any] +?
+
+
+                                              (?=
+                                                [$punc] *
+                                                [^$any]
+                                              |
+                                                $
+                                              )
+                                          }x", $addData['comment'], $matches);
+			    // END Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
+			    foreach ($matches[0] as $surbl_check_url) {
+			      if ($surbl->isSpam($surbl_check_url)) {
+			        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
+			        $eventData = array('allow_comments' => false);
+			        $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
+			        return false;
+			      }
+			    } 
+			}
+
                         // Captcha checking
                         if ($show_captcha && $addData['type'] == 'NORMAL') {
                             if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
@@ -373,8 +425,8 @@
                                 }
                                 echo '</div>';
                             }
-                            echo '<br /><label for="captcha">';
-                            echo PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '</label><br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
+                            echo '<br />';
+                            echo '<label for="captcha">'. PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3 . '</label><br /><input type="text" size="5" name="serendipity[captcha]" value="" id="captcha" />';
                         } elseif (isset($serendipity['POST']['captcha'])) {
                             echo '<input type="hidden" name="serendipity[captcha]" value="' . htmlspecialchars($serendipity['POST']['captcha']) . '" />';
                         }

[php-blog-cvs] serendipity/bundled-libs/Net - New directory

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4837/Net

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/Net added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/bundled-libs/Services - New directory

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4837/Services

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/Services added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.18,1.1.2.19

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
* Added entries_header hook for smarty showing headers
* Finetuned smarty plugin hook function
* Fixed entryproperties embeddage of search/fetchEntry

.CVS: ----------------------------------------------------------------------


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- entries.tpl	6 Nov 2004 11:22:50 -0000	1.1.2.18
+++ entries.tpl	11 Nov 2004 12:45:20 -0000	1.1.2.19
@@ -1,4 +1,6 @@
 <!-- ENTRIES START -->
+    {serendipity_hookPlugin hook="entries_header" addData="$entry_id"}
+
     {foreach from=$entries item="dategroup"}
     <div class="serendipity_Entry_Date">
         {if $dategroup.is_sticky}