php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include plugin_internal.inc.php,1.6,1.7

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

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

Modified Files:
	plugin_internal.inc.php 
Log Message:
- Take advantage of foreach optimize in PHP 4.3.10, remove the key when not needed


Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plugin_internal.inc.php	24 Nov 2004 18:41:29 -0000	1.6
+++ plugin_internal.inc.php	24 Nov 2004 18:44:32 -0000	1.7
@@ -934,7 +934,7 @@
                 $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
                 $authors     = array('all' => ALL_AUTHORS);
                 if (is_array($row_authors)) {
-                    foreach($row_authors AS $rownr => $row) {
+                    foreach($row_authors as $row) {
                         $authors[$row['authorid']] = $row['username'];
                     }
                 }

[php-blog-cvs] serendipity/include plugin_internal.inc.php,1.5,1.6

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

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

Modified Files:
	plugin_internal.inc.php 
Log Message:
- is_array() is run on the wrong variable, $authors => $row_authors


Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plugin_internal.inc.php	20 Nov 2004 12:21:40 -0000	1.5
+++ plugin_internal.inc.php	24 Nov 2004 18:41:29 -0000	1.6
@@ -751,9 +751,8 @@
             $base = $serendipity['serendipityHTTPPath'];
         }
 
-        $link = $base . ($serendipity['rewrite'] == 'none' ? 'serendipity_entries.php?/' : '') . PATH_ENTRIES;
         $text = (($_SESSION['serendipityAuthedUser'] === true) ? SUPERUSER_OPEN_ADMIN : SUPERUSER_OPEN_LOGIN);
-        echo '<a href="' . $link . '" title="'. $text .'">'. $text .'</a>';
+        echo '<a href="' . serendipity_rewriteURL('admin/') . '" title="'. $text .'">'. $text .'</a>';
     }
 
     function introspect_config_item($name, &$propbag)
@@ -934,7 +933,7 @@
             case 'authorid':
                 $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
                 $authors     = array('all' => ALL_AUTHORS);
-                if (is_array($authors)) {
+                if (is_array($row_authors)) {
                     foreach($row_authors AS $rownr => $row) {
                         $authors[$row['authorid']] = $row['username'];
                     }

[php-blog-cvs] serendipity/templates/default sidebar.tpl,1.3,1.4

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

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

Modified Files:
	sidebar.tpl 
Log Message:
- Remove doublicate call to serendipity[side]SideBar:

    <td id="serendipityRightSideBar" valign="top"><div id="serendipityRightSideBar">


Index: sidebar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/sidebar.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sidebar.tpl	23 Nov 2004 12:47:14 -0000	1.3
+++ sidebar.tpl	24 Nov 2004 18:20:55 -0000	1.4
@@ -1,8 +1,6 @@
-<div id="serendipity{$pluginside}SideBar">
 {foreach from=$plugindata item=item}
     <div class="serendipitySideBarItem">
         <h3 class="serendipitySideBarTitle {$item.class}">{$item.title}</h3>
         <div class="serendipitySideBarContent">{$item.content}</div>
     </div>
 {/foreach}
-</div>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.31,1.32

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
turn of debugging default


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_event_spamblock.php	24 Nov 2004 15:52:03 -0000	1.31
+++ serendipity_event_spamblock.php	24 Nov 2004 15:54:17 -0000	1.32
@@ -285,7 +285,7 @@
 
             switch($event) {
                 case 'fetchcomments':
-                    if (is_array($eventData) && !$_SESSION['serendipityAuthedUser'] && serendipity_db_bool($this->get_config('hide_email', true))) {
+                    if (is_array($eventData) && !$_SESSION['serendipityAuthedUser'] && serendipity_db_bool($this->get_config('hide_email', false))) {
                         // Will force emails to be not displayed in comments and RSS feed for comments. Will not apply to logged in admins (so not in the backend as well)
                         @reset($eventData);
                         while(list($idx, $comment) = each($eventData)) {

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.30,1.31

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
unbreak gravatar plugins. instead the functions that display comments handle
a 'no_email' setting.
also don't hide things for logged in users.


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_event_spamblock.php	24 Nov 2004 15:30:00 -0000	1.30
+++ serendipity_event_spamblock.php	24 Nov 2004 15:52:03 -0000	1.31
@@ -285,10 +285,11 @@
 
             switch($event) {
                 case 'fetchcomments':
-                    if (is_array($eventData) && serendipity_db_bool($this->get_config('hide_email', false))) {
+                    if (is_array($eventData) && !$_SESSION['serendipityAuthedUser'] && serendipity_db_bool($this->get_config('hide_email', true))) {
+                        // Will force emails to be not displayed in comments and RSS feed for comments. Will not apply to logged in admins (so not in the backend as well)
                         @reset($eventData);
                         while(list($idx, $comment) = each($eventData)) {
-                            $eventData[$idx]['email'] = '';
+                            $eventData[$idx]['no_email'] = true;
                         }
                     }
                     break;

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.10,1.11

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

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

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
unbreak gravatar plugins. instead the functions that display comments handle
a 'no_email' setting.
also don't hide things for logged in users.


Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_blogpdf.php	19 Nov 2004 11:24:52 -0000	1.10
+++ serendipity_event_blogpdf.php	24 Nov 2004 15:52:03 -0000	1.11
@@ -364,11 +364,6 @@
 
             serendipity_plugin_api::hook_event('frontend_display', $comment);
 
-            /* Protect submitted mails against spam, by replacing @ with [at]*/
-            if (!empty($comment['email'])) {
-                $comment['email'] = str_replace('@', '[at]', $comment['email']);
-            }
-
             $name = empty($comment['username']) ? ANONYMOUS : $comment['username'];
             $body = $comment['comment'];
 

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.5,1.6 functions_entries.inc.php,1.5,1.6

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

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

Modified Files:
	functions_comments.inc.php functions_entries.inc.php 
Log Message:
unbreak gravatar plugins. instead the functions that display comments handle
a 'no_email' setting.
also don't hide things for logged in users.


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_comments.inc.php	24 Nov 2004 15:29:59 -0000	1.5
+++ functions_comments.inc.php	24 Nov 2004 15:52:02 -0000	1.6
@@ -177,7 +177,9 @@
 
             serendipity_plugin_api::hook_event('frontend_display', $comment);
 
-            if (!empty($comment['email'])) {
+            if (isset($comment['no_email']) && $comment['no_email']) {
+                $comment['email'] = false;
+            } elseif (!empty($comment['email'])) {
                 $comment['email'] = str_replace('@', '[at]', $comment['email']);
             }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_entries.inc.php	24 Nov 2004 10:17:14 -0000	1.5
+++ functions_entries.inc.php	24 Nov 2004 15:52:02 -0000	1.6
@@ -680,7 +680,9 @@
             $entry['body'] = xhtml_cleanup($entry['body']);
 
             // extract author information
-            if (empty($entry['email'])) {
+            if (isset($entry['no_email']) && $entry['no_email']) {
+                $entry['email'] = '';
+            } elseif (empty($entry['email'])) {
                 $query = "select email FROM {$serendipity['dbPrefix']}authors WHERE username = '". serendipity_db_escape_string($entry['username']) ."'";
                 $results = serendipity_db_query($query);
                 $entry['email'] = $results[0]['email'];

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.29,1.30

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
spamblock plugin can be configured to hide email adresses when displaying
comments



Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_event_spamblock.php	23 Nov 2004 10:02:59 -0000	1.29
+++ serendipity_event_spamblock.php	24 Nov 2004 15:30:00 -0000	1.30
@@ -53,7 +53,9 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION', 'Moderation nach X Tagen');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT', 'Zu viele Links');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE', 'Zu viele Links');
-
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL', 'E-Mail-Adressen bei Kommentatoren verstecken');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC', 'Zeigt in den Kommentaren keine E-Mail Adressen der jeweiligen Kommentatoren an');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_NOTICE', 'Die angegebene E-Mail Adressse wird nicht dargestellt, sondern nur für evtl. Benachrichtigungen verwendet');
         break;
 
     default:
@@ -110,6 +112,9 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION', 'Auto-moderation after X days');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT', 'Too many hyperlinks');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE', 'Too many hyperlinks');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL', 'Hide E-Mail addresses for commenting users');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC', 'Will show no E-Mail addresses in comments of commenting users');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_NOTICE', 'E-Mail addresses will not be displayed and only used for E-Mail notifications');
 
         break;
 }
@@ -128,13 +133,14 @@
         $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('version',       '1.15');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
-            'frontend_comment'     => true
+            'frontend_comment'     => true,
+            'fetchcomments'        => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', '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', 'hide_email'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -142,6 +148,13 @@
         global $serendipity;
 
         switch($name) {
+            case 'hide_email':
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC);
+                $propbag->add('default', false);
+                break;
+
             case 'bodyclone':
                 $propbag->add('type', 'boolean');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_BODYCLONE);
@@ -271,6 +284,15 @@
             }
 
             switch($event) {
+                case 'fetchcomments':
+                    if (is_array($eventData) && serendipity_db_bool($this->get_config('hide_email', false))) {
+                        @reset($eventData);
+                        while(list($idx, $comment) = each($eventData)) {
+                            $eventData[$idx]['email'] = '';
+                        }
+                    }
+                    break;
+
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
                         $serendipity['csuccess'] = 'true';
@@ -403,6 +425,10 @@
                     break;
 
                 case 'frontend_comment':
+                    if (serendipity_db_bool($this->get_config('hide_email', false))) {
+                        echo '<div class="serendipity_commentDirection">' . PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_NOTICE . '</div>';
+                    }
+
                     if ($show_captcha) {
                         echo '<div class="serendipity_commentDirection">';
                         if (!isset($serendipity['POST']['preview']) || strtolower($serendipity['POST']['captcha'] != strtolower($_SESSION['spamblock']['captcha']))) {
@@ -432,6 +458,7 @@
                         }
                         echo '</div>';
                     }
+
                     return true;
                     break;
 

[php-blog-cvs] serendipity/docs NEWS,1.6,1.7

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

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

Modified Files:
	NEWS 
Log Message:
spamblock plugin can be configured to hide email adresses when displaying
comments



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NEWS	23 Nov 2004 19:50:16 -0000	1.6
+++ NEWS	24 Nov 2004 15:30:00 -0000	1.7
@@ -3,7 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * FIX: CSS classes in the comment manager was always set to uneven 
+    * Spamblock plugin can be configured to hide E-Mail adresses when
+      displaying comments. (garvinhicking)
+
+    * FIX: CSS classes in the comment manager was always set to uneven
       (tomsommer)
 
     * When a document does not exist and Serendipity has no idea how

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.4,1.5

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
spamblock plugin can be configured to hide email adresses when displaying
comments



Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions_comments.inc.php	24 Nov 2004 10:19:05 -0000	1.4
+++ functions_comments.inc.php	24 Nov 2004 15:29:59 -0000	1.5
@@ -118,6 +118,7 @@
         return array();
     }
 
+    serendipity_plugin_api::hook_event('fetchcomments', $comments);
     return $comments;
 }
 

[php-blog-cvs] serendipity/templates/default entries.tpl,1.2,1.3

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

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

Modified Files:
	entries.tpl 
Log Message:
make sticky entries show the full date


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entries.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ entries.tpl	24 Nov 2004 10:37:53 -0000	1.3
@@ -40,7 +40,12 @@
                 {if $entry.categories and count($entry.categories) > 0}
                    {$CONST.IN} {foreach from=$entry.categories item="category"}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}">{$category.category_name|@escape}</a> {/foreach}
                 {/if}
-                {$CONST.AT} <a href="{$entry.link}">{$entry.timestamp|@formatTime:'%H:%M'}</a>
+
+                {if $dategroup.is_sticky}
+                    {$CONST.ON}
+                {else}
+                    {$CONST.AT}
+                {/if} <a href="{$entry.link}">{if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'}</a>
 
                 {if $entry.has_comments}
                     {if $use_popups}

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.3,1.4

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
forget about passing it by reference, there are places (like on comment
moderation) where we pass straight arrays and that throws errors.


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_comments.inc.php	23 Nov 2004 16:38:58 -0000	1.3
+++ functions_comments.inc.php	24 Nov 2004 10:19:05 -0000	1.4
@@ -142,7 +142,7 @@
     return $retval;
 }
 
-function serendipity_printComments(&$comments, $parentid = 0, $depth = 0, $trace = null) {
+function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace = null) {
     global $serendipity;
     static $_smartyComments;
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.24,1.25

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
karma plugin (and others) should show up when previewing a saved entry as well


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_event_karma.php	23 Nov 2004 12:36:19 -0000	1.24
+++ serendipity_event_karma.php	24 Nov 2004 10:17:16 -0000	1.25
@@ -541,9 +541,8 @@
                                 . ($karma_active ? '<div>' . sprintf(PLUGIN_KARMA_CLOSED, $karmatime) . '</div>'
                                 . PLUGIN_KARMA_CURRENT : '') . ($track_clicks ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
-                            if ($addData['extended']) {
+                            if ($addData['extended'] || $addData['preview']) {
                                 $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
-
                                 if ($track_clicks && !$addData['preview']) {
                                     $sql = serendipity_db_query('UPDATE ' . $serendipity['dbPrefix'] . 'karma SET visits = visits + 1 WHERE entryid = ' . $entryid, true);
                                     if (serendipity_db_affected_rows() < 1) {

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.4,1.5

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
karma plugin (and others) should show up when previewing a saved entry as well


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions_entries.inc.php	22 Nov 2004 13:46:38 -0000	1.4
+++ functions_entries.inc.php	24 Nov 2004 10:17:14 -0000	1.5
@@ -579,7 +579,7 @@
                 $entry['has_extended']      = true;
             }
 
-            if (isset($entry['exflag']) && $entry['exflag'] && $extended) {
+            if (isset($entry['exflag']) && $entry['exflag'] && ($extended || $preview)) {
                 $entry['is_extended']       = true;
             }
 

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.3,1.4

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

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

Modified Files:
	comments.inc.php 
Log Message:
A little too soon :)


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- comments.inc.php	23 Nov 2004 19:50:17 -0000	1.3
+++ comments.inc.php	23 Nov 2004 19:54:02 -0000	1.4
@@ -139,13 +139,13 @@
 }
 
 if ( $page != 1 && $page <= $pages ) {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
+    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
 } else {
     $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" disabled="disabled" />';
 }
 
 if ( $page != $pages ) {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
+    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
 } else {
     $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" disabled="disabled" />';
 }

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.2,1.3

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

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

Modified Files:
	comments.inc.php 
Log Message:
- CSS classes in the comment manager was always set to uneven


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- comments.inc.php	19 Nov 2004 11:05:32 -0000	1.2
+++ comments.inc.php	23 Nov 2004 19:50:17 -0000	1.3
@@ -139,13 +139,13 @@
 }
 
 if ( $page != 1 && $page <= $pages ) {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
+    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
 } else {
     $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" disabled="disabled" />';
 }
 
 if ( $page != $pages ) {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
+    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
 } else {
     $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" disabled="disabled" />';
 }
@@ -274,7 +274,7 @@
         $summary .= ' ...';
     }
 
-    $class = 'serendipity_admin_list_item_' . (($i++ % 2 == 0 ) ? 'even' : 'uneven');
+    $class = 'serendipity_admin_list_item_' . (($i % 2 == 0 ) ? 'even' : 'uneven');
 ?>
 <tr>
     <td><a name="c<?php echo $rs['id'] ?>"></a>
@@ -330,4 +330,4 @@
 </tr>
 </table>
 </form>
-<?php } ?>
\ No newline at end of file
+<?php } ?>

[php-blog-cvs] serendipity/docs NEWS,1.5,1.6

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

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

Modified Files:
	NEWS 
Log Message:
- CSS classes in the comment manager was always set to uneven


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NEWS	21 Nov 2004 03:20:01 -0000	1.5
+++ NEWS	23 Nov 2004 19:50:16 -0000	1.6
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * FIX: CSS classes in the comment manager was always set to uneven 
+      (tomsommer)
+
     * When a document does not exist and Serendipity has no idea how
       to create it, a 404 (not found) is sent instead of a 200 (OK)
       (tadpole9)

[php-blog-cvs] serendipity comment.php,1.53,1.54

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

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

Modified Files:
	comment.php 
Log Message:
fix comment.php popup to not loop through an array of all comments.


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- comment.php	22 Nov 2004 14:34:43 -0000	1.53
+++ comment.php	23 Nov 2004 16:38:58 -0000	1.54
@@ -1,7 +1,6 @@
 <?php # $Id$
 # Copyright (c) 2003-2004, Jannis Hermanns
 # All rights reserved.  See LICENSE file for licensing details
-
 session_start();
 include_once('serendipity_config.inc.php');
 header('Content-Type: text/html; charset=' . LANG_CHARSET);
@@ -79,10 +78,17 @@
     }
 } else {
     $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
+
     $serendipity['head_subtitle'] = COMMENTS;
     $serendipity['smarty_file'] = 'commentpopup.tpl';
     serendipity_smarty_init();
 
+    if ($id == 0) {
+        return false;
+    } else {
+        $serendipity['smarty']->assign('entry_id', $id);
+    }
+
     if (isset($_GET['success']) && $_GET['success'] == 'true') {
         $serendipity['smarty']->assign(
             array(
@@ -115,10 +121,8 @@
                 )
             );
 
-            serendipity_printComments(serendipity_fetchComments($id));
-
             if ($comment_allowed) {
-                serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']), $ca);
+                serendipity_displayCommentForm($id, '?', NULL, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']), $ca);
             }
         }
     } else {

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.2,1.3

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
fix comment.php popup to not loop through an array of all comments.


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions_comments.inc.php	19 Nov 2004 11:05:29 -0000	1.2
+++ functions_comments.inc.php	23 Nov 2004 16:38:58 -0000	1.3
@@ -112,7 +112,6 @@
               ORDER BY
                     co.id " . ($order != '' ? $order : '') . "
                     $limit";
-
     $comments = serendipity_db_query($query);
 
     if (!is_array($comments)) {
@@ -143,7 +142,7 @@
     return $retval;
 }
 
-function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace = null) {
+function serendipity_printComments(&$comments, $parentid = 0, $depth = 0, $trace = null) {
     global $serendipity;
     static $_smartyComments;
 
@@ -161,7 +160,6 @@
         $_smartyComments = array();
     }
 
-
     $i = 0;
     foreach ($comments as $comment) {
         if ($parentid === VIEWMODE_LINEAR || !isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
@@ -190,13 +188,13 @@
 
             $_smartyComments[] = $comment;
             if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) {
-                serendipity_printComments($comments, $comment['id'], ($depth+1), ($trace . $i .'.'));
+                serendipity_printComments($comments, $comment['id'], ($depth+1), ($trace . $i . '.'));
             }
         }
     }
 
     /* We are inside a recusive child, and we need to break out */
-    if ( $depth !== 0 ) {
+    if ($depth !== 0) {
         return true;
     }
 

[php-blog-cvs] serendipity/templates/default sidebar.tpl,1.2,1.3

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

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

Modified Files:
	sidebar.tpl 
Log Message:
restore missing id selector for plugins, destroyed at least my customized
theme when it was missing


Index: sidebar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/sidebar.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sidebar.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ sidebar.tpl	23 Nov 2004 12:47:14 -0000	1.3
@@ -1,6 +1,8 @@
+<div id="serendipity{$pluginside}SideBar">
 {foreach from=$plugindata item=item}
     <div class="serendipitySideBarItem">
         <h3 class="serendipitySideBarTitle {$item.class}">{$item.title}</h3>
         <div class="serendipitySideBarContent">{$item.content}</div>
     </div>
 {/foreach}
+</div>
\ No newline at end of file

[php-blog-cvs] serendipity/include plugin_api.inc.php,1.4,1.5

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

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

Modified Files:
	plugin_api.inc.php 
Log Message:
restore missing id selector for plugins, destroyed at least my customized
theme when it was missing


Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugin_api.inc.php	20 Nov 2004 12:21:40 -0000	1.4
+++ plugin_api.inc.php	23 Nov 2004 12:47:02 -0000	1.5
@@ -370,7 +370,13 @@
             }
         }
 
-        $serendipity['smarty']->assign('plugindata', $pluginData);
+        $serendipity['smarty']->assign(
+            array(
+                'plugindata' => $pluginData,
+                'pluginside' => ucfirst($side)
+            )
+        );
+
 
         return serendipity_smarty_fetch('sidebar_'. $side, 'sidebar.tpl', true);
     }

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.14,1.15

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
fix titlebars


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_plugin_shoutbox.php	19 Nov 2004 11:25:03 -0000	1.14
+++ serendipity_plugin_shoutbox.php	23 Nov 2004 12:36:20 -0000	1.15
@@ -94,7 +94,7 @@
     {
         global $serendipity;
 
-        $title       =& $this->title;
+        $title       = $this->title;
         $max_entries = $this->get_config('max_entries');
         $max_chars   = $this->get_config('max_chars');
         $wordwrap    = $this->get_config('wordwrap');

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.26,1.27

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
fix titlebars


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_plugin_comments.php	19 Nov 2004 11:25:01 -0000	1.26
+++ serendipity_plugin_comments.php	23 Nov 2004 12:36:20 -0000	1.27
@@ -87,7 +87,7 @@
     function generate_content(&$title)
     {
         global $serendipity;
-        $title       =& $this->title;
+        $title       = $this->title;
         $max_entries = $this->get_config('max_entries');
         $max_chars   = $this->get_config('max_chars');
         $wordwrap    = $this->get_config('wordwrap');

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.23,1.24

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
fix titlebars


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_event_karma.php	20 Nov 2004 15:18:13 -0000	1.23
+++ serendipity_event_karma.php	23 Nov 2004 12:36:19 -0000	1.24
@@ -227,7 +227,7 @@
 
     function generate_content(&$title)
     {
-        $title       =& $this->title;
+        $title       = $this->title;
     }
 
     function event_hook($event, &$bag, &$eventData, $addData = null) {

[php-blog-cvs] serendipity/include genpage.inc.php,1.5,1.6 functions_smarty.inc.php,1.7,1.8

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

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

Modified Files:
	genpage.inc.php functions_smarty.inc.php 
Log Message:
- Move smarty.php to genpage.inc.php and call it config.inc.php


Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_smarty.inc.php	23 Nov 2004 12:05:13 -0000	1.7
+++ functions_smarty.inc.php	23 Nov 2004 12:24:32 -0000	1.8
@@ -176,11 +176,6 @@
         )
     );
 
-    // For advanced usage, we allow template authors to create a file 'smarty.php' where they can
-    // setup custom smarty variables, modifieds etc. to use in their templates.
-    // This is especially important in embedded installations.
-    @include_once $serendipity['smarty']->template_dir . '/smarty.php';
-
     return true;
 }
 

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- genpage.inc.php	20 Nov 2004 19:26:43 -0000	1.5
+++ genpage.inc.php	23 Nov 2004 12:24:32 -0000	1.6
@@ -5,6 +5,10 @@
 
 serendipity_smarty_init();
 
+// For advanced usage, we allow template authors to create a file 'config.inc.php' where they can
+// setup custom smarty variables, modifiers etc. to use in their templates.
+@include_once $serendipity['smarty']->template_dir . '/config.inc.php';
+
 $serendipity['smarty']->assign(
     array(
         'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),