php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.43,1.44 serendipity_lang_cz.inc.php,1.43,1.44 serendipity_lang_da.inc.php,1.60,1.61 serendipity_lang_de.inc.php,1.75,1.76 serendipity_lang_en.inc.php,1.61,1.62 serendipity_lang_es.inc.php,1.59,1.60 serendipity_lang_fr.inc.php,1.39,1.40 serendipity_lang_nl.inc.php,1.17,1.18 serendipity_lang_pt.inc.php,1.17,1.18

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
Rewrote top_as_links usage:

The basic config setting will set, if serendipity emits foreign links as
clickable. Default is yes. Currently only is used to decide whether to
display links of commenting users.

The exit plugin will by default show links as clickable. If the option
'top_as_links' in basic config is set, but the plugin config has not been
touched, that config setting will override the plugins config. As soon as
one configures the exit plugin to (not) show links, it will use that setting
regardless of the basic config setting.

The referrer sidebar plugin works the same as the exit plugin, but its
default is to NOT show links.

I think that's quite reasonable and a good compromise between supplying good
visitor handling/usability and not showing foreign URLs. Usually only the
referrer stats are hard to control, and with means of comment moderation you
can already enforce display of comment urls. And with latest changes to
exit.php it cannot be used for exit-spamming anymore.



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_lang_cs.inc.php	23 Jul 2004 09:24:19 -0000	1.43
+++ serendipity_lang_cs.inc.php	26 Jul 2004 13:52:03 -0000	1.44
@@ -552,6 +552,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* 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.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_lang_da.inc.php	23 Jul 2004 09:24:19 -0000	1.60
+++ serendipity_lang_da.inc.php	26 Jul 2004 13:52:03 -0000	1.61
@@ -549,6 +549,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* 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.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_lang_fr.inc.php	23 Jul 2004 09:24:19 -0000	1.39
+++ serendipity_lang_fr.inc.php	26 Jul 2004 13:52:03 -0000	1.40
@@ -541,6 +541,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* 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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_lang_cz.inc.php	23 Jul 2004 09:24:19 -0000	1.43
+++ serendipity_lang_cz.inc.php	26 Jul 2004 13:52:03 -0000	1.44
@@ -550,6 +550,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ 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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_nl.inc.php	23 Jul 2004 09:24:19 -0000	1.17
+++ serendipity_lang_nl.inc.php	26 Jul 2004 13:52:03 -0000	1.18
@@ -540,6 +540,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* 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.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_lang_en.inc.php	23 Jul 2004 09:24:19 -0000	1.61
+++ serendipity_lang_en.inc.php	26 Jul 2004 13:52:03 -0000	1.62
@@ -539,6 +539,8 @@
 @define('TRACKBACK_SPECIFIC_ON_CLICK', 'This link is not meant to be clicked. It contains the trackback URI for this entry. You can use this URI to send ping- & trackbacks from your own blog to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.');
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_lang_es.inc.php	23 Jul 2004 09:24:19 -0000	1.59
+++ serendipity_lang_es.inc.php	26 Jul 2004 13:52:03 -0000	1.60
@@ -534,6 +534,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* 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.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_lang_de.inc.php	23 Jul 2004 09:32:40 -0000	1.75
+++ serendipity_lang_de.inc.php	26 Jul 2004 13:52:03 -0000	1.76
@@ -536,6 +536,8 @@
 @define('COMMENTS_MODERATE', 'Kommentare und Trackbacks dieses Eintrags werden moderiert');
 @define('PLUGIN_SUPERUSER_HTTPS', 'https zum Login verwenden');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Erstellt eine https-URL als Login-Link zum Blog. Der Webserver muss dies unterstützen!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Externe Links klickbar?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'Falls deaktiviert, so werden keine Referrer/Exit/Kommentar-URLs als aktive Links angezeigt. Dies kann innerhalb der Plugin-Konfiguration für die Seitenleiste teilweise überbrückt werden!');
 
 /* 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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_pt.inc.php	23 Jul 2004 09:24:19 -0000	1.17
+++ serendipity_lang_pt.inc.php	26 Jul 2004 13:52:03 -0000	1.18
@@ -536,6 +536,8 @@
 @define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate
 @define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login');
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
+@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
+@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.365,1.366 serendipity_config_local.tpl,1.41,1.42 serendipity_sidebar_items.php,1.76,1.77

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_config_local.tpl 
	serendipity_sidebar_items.php 
Log Message:
Rewrote top_as_links usage:

The basic config setting will set, if serendipity emits foreign links as
clickable. Default is yes. Currently only is used to decide whether to
display links of commenting users.

The exit plugin will by default show links as clickable. If the option
'top_as_links' in basic config is set, but the plugin config has not been
touched, that config setting will override the plugins config. As soon as
one configures the exit plugin to (not) show links, it will use that setting
regardless of the basic config setting.

The referrer sidebar plugin works the same as the exit plugin, but its
default is to NOT show links.

I think that's quite reasonable and a good compromise between supplying good
visitor handling/usability and not showing foreign URLs. Usually only the
referrer stats are hard to control, and with means of comment moderation you
can already enforce display of comment urls. And with latest changes to
exit.php it cannot be used for exit-spamming anymore.



Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_sidebar_items.php	23 Jul 2004 10:29:19 -0000	1.76
+++ serendipity_sidebar_items.php	26 Jul 2004 13:52:02 -0000	1.77
@@ -117,7 +117,7 @@
     {
         $propbag->add('name',        TOP_REFERRER);
         $propbag->add('description', SHOWS_TOP_SITES);
-        $propbag->add('configuration', array('limit'));
+        $propbag->add('configuration', array('limit', 'use_links'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -130,6 +130,12 @@
                 $propbag->add('default',     10);
                 break;
 
+            case 'use_links':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        INSTALL_TOP_AS_LINKS);
+                $propbag->add('description', INSTALL_TOP_AS_LINKS_DESC);
+                $propbag->add('default',     false);
+
             default:
                 return false;
         }
@@ -141,7 +147,16 @@
         global $serendipity;
 
         $title = TOP_REFERRER;
-        echo serendipity_displayTopReferrers($this->get_config('limit', 10));
+
+        $use_links = $this->get_config('use_links', 'none');
+        if ($use_links == 'none' && !serendipity_get_config_var('top_as_links', false, true)) {
+            // If the user made no selection and he has 'top_as_links' switched off, we will not emit a link!
+            $use_links = false;
+        } elseif (serendipity_db_bool($use_links) === false) {
+            $use_links = false;
+        }
+
+        echo serendipity_displayTopReferrers($this->get_config('limit', 10), $use_links);
     }
 }
 
@@ -150,7 +165,7 @@
     {
         $propbag->add('name',        TOP_EXITS);
         $propbag->add('description', SHOWS_TOP_EXIT);
-        $propbag->add('configuration', array('limit'));
+        $propbag->add('configuration', array('limit', 'use_links'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -163,6 +178,12 @@
                 $propbag->add('default',     10);
                 break;
 
+            case 'use_links':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        INSTALL_TOP_AS_LINKS);
+                $propbag->add('description', INSTALL_TOP_AS_LINKS_DESC);
+                $propbag->add('default',     true);
+
             default:
                 return false;
         }
@@ -174,7 +195,16 @@
         global $serendipity;
 
         $title = TOP_EXITS;
-        echo serendipity_displayTopExits($this->get_config('limit', 10));
+
+        $use_links = $this->get_config('use_links', 'none');
+        if ($use_links == 'none' && !serendipity_get_config_var('top_as_links', true)) {
+            // If the user made no selection and he has 'top_as_links' switched off, we will not emit a link!
+            $use_links = false;
+        } elseif (serendipity_db_bool($use_links) === false) {
+            $use_links = false;
+        }
+
+        echo serendipity_displayTopExits($this->get_config('limit', 10), $use_links);
     }
 }
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -d -r1.365 -r1.366
--- serendipity_functions.inc.php	26 Jul 2004 12:49:07 -0000	1.365
+++ serendipity_functions.inc.php	26 Jul 2004 13:52:02 -0000	1.366
@@ -1594,7 +1594,7 @@
             }
 
             /* Link to the user's website, if the URL is valid */
-            $showlink = serendipity_get_config_var('top_as_links', false, true);
+            $showlink = serendipity_get_config_var('top_as_links', true);
             if (($showlink === true) && (!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
                 echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
             }
@@ -3222,15 +3222,15 @@
     }
 }
 
-function serendipity_displayTopReferrers($limit = 10) {
+function serendipity_displayTopReferrers($limit = 10, $use_links = true) {
     serendipity_displayTopUrlList('referrers', $limit);
 }
 
-function serendipity_displayTopExits($limit = 10) {
-    serendipity_displayTopUrlList('exits', $limit);
+function serendipity_displayTopExits($limit = 10, $use_links = true) {
+    serendipity_displayTopUrlList('exits', $limit, $use_links);
 }
 
-function serendipity_displayTopUrlList($list, $limit) {
+function serendipity_displayTopUrlList($list, $limit, $use_links = true) {
     global $serendipity;
 
     /* HACK */
@@ -3254,12 +3254,11 @@
                   LIMIT $limit";
     }
 
-    $link = serendipity_get_config_var('top_as_links', false, true);
     $rows = serendipity_db_query($query);
     echo "<span class='serendipityReferer'>";
     if (is_array($rows)) {
         foreach ($rows as $row) {
-            if ($link) {
+            if ($use_links) {
                 printf(
                     '<a href="%1$s://%2$s" title="%2$s" >%2$s</a> (%3$s)<br />',
                     $row['scheme'],

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_config_local.tpl	5 Jul 2004 06:28:14 -0000	1.41
+++ serendipity_config_local.tpl	26 Jul 2004 13:52:02 -0000	1.42
@@ -37,7 +37,7 @@
 $serendipity['XHTML11']              = '{INSTALL_XHTML11|XHTML11|bool|0|255}';              // INSTALL_XHTML11_DESC
 $serendipity['enablePopup']          = '{INSTALL_POPUP|enablePopup|bool|1|255}';            // INSTALL_POPUP_DESC
 $serendipity['embed']                = '{INSTALL_EMBED|embed|bool||255}';                   // INSTALL_EMBED_DESC
-$serendipity['top_as_links']         = '{INSTALL_TOP_AS_LINKS|top_as_links|bool||0|255}';      // INSTALL_TOP_AS_LINKS_DESC
+$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
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.364,1.365

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
reverted tom's patch from 1.361 to 1.362 - this seriously breaks themes (at
least default theme) when more than one entry is made on a single day.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- serendipity_functions.inc.php	26 Jul 2004 03:23:06 -0000	1.364
+++ serendipity_functions.inc.php	26 Jul 2004 12:49:07 -0000	1.365
@@ -1187,7 +1187,7 @@
         <h4 class="serendipity_title"><a href="<?php echo $entryLink; ?>"><?php echo htmlspecialchars($entry['title']); ?></a></h4>
 
         <div class="serendipity_entry">
-                <?php
+<?php
                 if (is_array($entry['categories'])) {
                     $icon_string = '';
                     foreach ($entry['categories'] as $cat) {
@@ -1199,9 +1199,9 @@
                         echo '<span class="serendipity_entryIcon">' . $icon_string . '</span>';
                     }
                 }
-                ?>
+?>
             <div class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></div>
-            <?php echo $html_extended; ?>
+                <?php echo $html_extended; ?>
 
             <div class='serendipity_entryFooter'>
 <?php
@@ -1267,15 +1267,11 @@
                          dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); ?>" />
                 </rdf:RDF>
                 -->
-        <?php
-
-            $eventData = array_merge(array('display_dat' => ''), $entry);
-            serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData);
-            echo $eventData['display_dat'];
-
-        ?>
-</div>
 <?php
+                $eventData = array_merge(array('display_dat' => ''), $entry);
+                serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData);
+                echo $eventData['display_dat'];
+
                 if (isset($serendipity['GET']['id'])) {
 
                     /********** MESSAGES *********/
@@ -1389,6 +1385,7 @@
                 }
             } // end for-loop (entries)
 ?>
+    </div>
 <?php
         } // end for-loop (dates)
 

[php-blog-cvs] serendipity/templates/mt3-independence style.css,1.2,1.3

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

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

Modified Files:
	style.css 
Log Message:
This looks wrong


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- style.css	26 Jul 2004 03:23:08 -0000	1.2
+++ style.css	26 Jul 2004 12:02:14 -0000	1.3
@@ -133,7 +133,7 @@
     margin-bottom: 10px;
 }
 
-.serendipity_commentpublic_html/en/templatessTitle {
+.serendipity_commentTitle {
     display: block;
     color: #333;
     font-family: 'Trebuchet MS', Verdana, sans-serif;

[php-blog-cvs] serendipity NEWS,1.187,1.188

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

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

Modified Files:
	NEWS 
Log Message:
dummy commit (check if ACLs work)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- NEWS	23 Jul 2004 18:56:37 -0000	1.187
+++ NEWS	26 Jul 2004 10:29:40 -0000	1.188
@@ -31,7 +31,7 @@
     * New CSS classes 'serendipity_msg_notice' and
       'serendipity_msg_important'. (garvinhicking)
 
-    * Added a new theme, "Idea"
+    * Added a new theme, "Idea" (tadpole9)
 
     * Changed 'View extended entry' to 'Continue reading "[title]"'
       (tomsommer)

[php-blog-cvs] serendipity/templates/mt3-independence style.css,1.1,1.2

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- style.css	26 Jul 2004 01:07:45 -0000	1.1
+++ style.css	26 Jul 2004 03:23:08 -0000	1.2
@@ -133,7 +133,7 @@
     margin-bottom: 10px;
 }
 
-.serendipity_commentsTitle {
+.serendipity_commentpublic_html/en/templatessTitle {
     display: block;
     color: #333;
     font-family: 'Trebuchet MS', Verdana, sans-serif;
@@ -193,6 +193,7 @@
     margin-right: 15px;
     margin-left: 15px;
     padding: 3px;
+    padding-bottom: 0;
     background-color: #FFFFFF;
     border-right: 1px dotted #BBB;
 }

[php-blog-cvs] serendipity/templates/mt3-chalkboard style.css,1.4,1.5

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-chalkboard/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	19 Jul 2004 08:50:58 -0000	1.4
+++ style.css	26 Jul 2004 03:23:08 -0000	1.5
@@ -211,6 +211,7 @@
     margin-left: 10px;
     color: #ffffff;
     padding: 3px;
+    padding-bottom: 0;
     font-size: small;
     border-right: 1px dotted #BBB;
 }

[php-blog-cvs] serendipity/templates/newspaper style.css,1.11,1.12

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- style.css	19 Jul 2004 08:50:58 -0000	1.11
+++ style.css	26 Jul 2004 03:23:09 -0000	1.12
@@ -149,6 +149,9 @@
     padding-top:16px;
 }
 
+.serendipity_comment {
+    padding-top: 1em;
+}
 
 .serendipity_comment_source {
 

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

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-rusty/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	19 Jul 2004 08:50:57 -0000	1.8
+++ style.css	26 Jul 2004 03:23:08 -0000	1.9
@@ -200,13 +200,16 @@
 /* Comments */
 
 .serendipity_comment {
-  border-bottom: 1px dotted #999;
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
   padding: 3px;
 }
 
+.serendipity_comment_source {
+  border-bottom: 1px dotted #999;
+}
+
 .serendipity_commentsLabel {
   font-size: small;
 }

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

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-plainjane/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- style.css	19 Jul 2004 08:50:57 -0000	1.9
+++ style.css	26 Jul 2004 03:23:08 -0000	1.10
@@ -180,13 +180,16 @@
 /* Comments */
 
 .serendipity_comment {
-  border-bottom: 1px dotted #999;
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
   padding: 3px;
 }
 
+.serendipity_comment_source {
+  border-bottom: 1px dotted #999;
+}
+
 .serendipity_commentsLabel {
   font-size: small;
 }

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

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-georgiablue/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- style.css	19 Jul 2004 08:50:57 -0000	1.9
+++ style.css	26 Jul 2004 03:23:07 -0000	1.10
@@ -173,13 +173,16 @@
 /* Comments */
 
 .serendipity_comment {
-  border-bottom: 1px dotted #999;
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
   padding: 3px;
 }
 
+.serendipity_comment_source {
+  border-bottom: 1px dotted #999;
+}
+
 .serendipity_commentsLabel {
   font-size: small;
 }

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

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-gettysburg/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	19 Jul 2004 08:50:57 -0000	1.8
+++ style.css	26 Jul 2004 03:23:07 -0000	1.9
@@ -181,13 +181,16 @@
 /* Comments */
 
 .serendipity_comment {
-  border-bottom: 1px dotted #999;
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
   padding: 3px;
 }
 
+.serendipity_comment_source {
+  border-bottom: 1px dotted #999;
+}
+
 .serendipity_commentsLabel {
   font-size: small;
 }

[php-blog-cvs] serendipity/templates/idea style.css,1.2,1.3

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/idea/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- style.css	19 Jul 2004 08:50:56 -0000	1.2
+++ style.css	26 Jul 2004 03:23:07 -0000	1.3
@@ -252,7 +252,13 @@
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
+  margin-top: 1em;
   padding: 3px;
+  padding-bottom: 0;
+}
+
+.serendipity_commentBody {
+  padding-bottom: 1em;
 }
 
 .serendipity_commentsLabel {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.363,1.364

[Evan N. <tad...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- serendipity_functions.inc.php	25 Jul 2004 09:26:03 -0000	1.363
+++ serendipity_functions.inc.php	26 Jul 2004 03:23:06 -0000	1.364
@@ -1584,7 +1584,7 @@
 ?>
     <div class="serendipity_comment">
             <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
-            <?php echo $body; ?><br />
+            <div class="serendipity_commentBody"><?php echo $body; ?></div>
 
             <div class="serendipity_comment_source">
                 <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $indent . $i; ?>">#<?php echo $indent . $i; ?></a>
@@ -1620,7 +1620,6 @@
                 }
             ?>
         </div>
-        <br />
 <?php
         }
     }

[php-blog-cvs] serendipity/templates/mt-clean style.css,1.13,1.14

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- style.css	19 Jul 2004 08:50:56 -0000	1.13
+++ style.css	26 Jul 2004 03:23:07 -0000	1.14
@@ -160,13 +160,16 @@
 /* Comments */
 
 .serendipity_comment {
-  border-bottom: 1px dotted #999;
   font-size: small;
   margin-left: 10px;
   margin-right: 10px;
   padding: 3px;
 }
 
+.serendipity_comment_source {
+  border-bottom: 1px dotted #999;
+}
+
 .serendipity_commentsLabel {
   font-size: small;
 }

[php-blog-cvs] serendipity/templates/blue style.css,1.10,1.11

[Evan N. <tad...@us...>]

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

Modified Files:
	style.css 
Log Message:
Make comments much more tolerant of threaded comments. It is a slight BC break, but the old system looks terrible with threaded comments.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- style.css	19 Jul 2004 08:50:55 -0000	1.10
+++ style.css	26 Jul 2004 03:23:07 -0000	1.11
@@ -180,6 +180,10 @@
   margin-top: 5px;
 }
 
+.serendipity_comment {
+  padding-top: 1em;
+}
+
 td.serendipityEntriesBox {
   background-color: #ffffff;
   padding: 10px;

[php-blog-cvs] serendipity/templates/mt3-independence info.txt,NONE,1.1 preview.png,NONE,1.1 style.css,NONE,1.1

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

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

Added Files:
	info.txt preview.png style.css 
Log Message:
Introducing MT3 - Independence


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

--- NEW FILE: style.css ---
h4,h3 {
    margin: 0;
}

.serendipitySideBarContent input {
    width: 175px;
}

#mainpane {
    line-height: 140%;
    text-align: left;
    padding: 0px;
    width: 700px;
    background-color: #ffffff;
    border: 1px solid #FFFFFF;
    margin: auto;
}

#content {
    width: 500px;
}

#serendipityRightSideBar {
    width: 200px;
    padding: 10px;
    background-color: #ffffff;
    vertical-align: top;
}

#serendipityLeftSideBar {
    width: 130px;
    padding: 10px;
    vertical-align: top;
    background-color: #ffffff;
}

BODY {
    margin: 0px 0px 20px 0px;
    background-color: #0F314E;
}

INPUT, TEXTAREA {
    font-size: x-small;
    font-family: verdana, arial, helvetica, sans-serif;
}

TH, TD {
    font-size: x-small;
}

P, TD, TH, DIV, SPAN {
    font-family: verdana, arial, helvetica, sans-serif;
}

#serendipity_banner {
    font-family: Georgia, 'Times New Roman', serif;
    color: #FFFFFF;
    background-color: #B22222;
    text-align: left;
    border-bottom: 1px solid #FFFFFF;
    width: 700px;
    height: 72px;
    margin: auto;
}

a.homelink1,
a.homelink1:hover,
a.homelink1:link,
a.homelink1:visited,
#serendipity_banner h1 {
    color: #ffffff;
    font-size: xx-large;
    padding-left: 10px;
    padding-top: 2px;
    margin: 0px;
    text-decoration: none;
}

a.homelink2,
a.homelink2:hover,
a.homelink2:link,
a.homelink2:visited,
#serendipity_banner h2 {
    color: #FFFFFF;
    padding-left: 10px;
    font-size: small;
    margin: 0px;
    text-decoration: none;
}

.serendipity_title {
    color: #333;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    font-size: small;
    text-align: left;
    font-weight: bold;
    margin-bottom: 0px;
}

.serendipity_title a:link,
.serendipity_title a:visited,
.serendipity_title a:hover {
    color: #333;
    text-decoration: none;
}

.serendipity_entry {
    background-color: #ffffff;
    color: #666666;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    font-size: small;
    clear:both;
}

.serendipity_entry_body_folded,
.serendipity_entry_body_unfolded,
.serendipity_entry_extended {
    /* Inner blocks of .serendipity_entry, can be used for further customization */
}

div.serendipity_Entry_Date {
    width: auto;
    padding-left: 15px;
}

.serendipity_date {
    color: #B22222;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    font-size: small;
    text-align: left;
    font-weight: bold;
    padding-top: 5px;
    margin-bottom: 10px;
}

.serendipity_commentsTitle {
    display: block;
    color: #333;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    border-bottom: 1px solid #999999;
    font-size: small;
    text-align: left;
    font-weight: bold;
    margin-bottom: 10px;
}

div.serendipity_entryFooter {
    color: #999999;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    font-size: x-small;
    border-top: 1px solid #999999;
    text-align: left;
    margin-bottom: 25px;
    line-height: normal;
    padding: 3px;
    
}

img.serendipity_entryIcon {
    float: right;
    border: 0px;
}

img.serendipity_entryIcon {
    float: right;
    border: 0px;
}

TD.serendipity_commentsLabel {
    font-size: x-small;
    font-weight: bold;
    vertical-align: top;
}

TD.serendipity_commentsValue input,
TD.serendipity_commentsValue select,
TD.serendipity_commentsValue textarea {
    width: 99%;
    border: 1px solid #333;
    padding: 2px;
}

.serendipity_commentForm {
    font-size:x-small;
    color: #ffffff;
    margin-bottom: 13px;
    margin-right: 10px;
    margin-left: 10px;
    background-color: #FFFFFF;
}
.serendipity_comment {
    font-size: x-small;
    margin-right: 15px;
    margin-left: 15px;
    padding: 3px;
    background-color: #FFFFFF;
    border-right: 1px dotted #BBB;
}

.serendipity_comment_source {
    margin-top: 5px;
    padding-left: 5px;
}

TD.serendipity_admin {
    padding: 10px;
}

a {
    text-decoration: underline;
    
    
    }

a:link {
    color: #0F314E;
    }

a:visited {
    color: #0F314E;
    }

a:active {
    color: #0F314E;
    }

a:hover {
    color: #B22222;
    }

TABLE.serendipity_calendar TD {
    text-align: center;
}
TABLE.serendipity_calendar A {
    text-decoration:underline;
}

TABLE.serendipity_calendar A:hover {
    text-decoration: none;
}

TD.serendipity_weekDayName {
    text-align: center;
    font-weight: normal;
}
TD.serendipity_calendarHeader A:link,
TD.serendipity_calendarHeader A:visited,
TD.serendipity_calendarHeader A:hover {
    color: #B22222;
    font-family: Verdana, Arial, sans-serif;
    font-size: x-small;
    text-align: left;
    font-weight: bold;
    
    text-transform: uppercase;
    padding: 3px;
    letter-spacing: .3em;
}
div.serendipityPlug {
    text-align: center;
}

div.serendipityPlug A {
    text-decoration: none;
    border: 0px;
}

.serendipitySideBarContent {
    padding: 3px;
}

/* Container for each item on the side bar */
div.serendipitySideBarItem {
    color: #666666;
    font-family: 'Trebuchet MS', Verdana, sans-serif;
    font-size: x-small;
    text-align: left;
    margin-bottom: 15px;
    line-height: normal;
    padding: 3px;
}

/* title of an individual item */
.serendipitySideBarTitle {
    color: #B22222;
    font-family: Verdana, Arial, sans-serif;
    font-size: x-small;
    border-bottom: 1px solid #B22222;
    font-weight: bold;
    text-transform: uppercase;
    letter-spacing: .2em;
    padding: 3px;
}

.serendipityImageButton {
    cursor: pointer;
}

td.serendipitySideBar {
    font-size: x-small;
    width: 200px;
    padding: 10px;
}

div.serendipity_admin_title {
    font-size: 22px;
    font-weight: bold;
    margin-bottom: 12px;
}

div.serendipity_admin_list_title {
    font-size: 12px;
    font-weight: bold;
    margin-bottom: 8px;
}

td.serendipity_admin_list_item {
    padding: 15px;
    border: dashed 1px #000000;
}

.serendipity_entry p {
    margin: 0px;
    padding-bottom: 10px;
}

/** Embedded images with the s9y image manager **/
.serendipity_imageComment_center,
.serendipity_imageComment_left,
.serendipity_imageComment_right {
    border: 1px solid black;
    background-color: #EFEFEF;
    margin: 3px;
}

.serendipity_imageComment_center {
    margin: 0px;
}

.serendipity_imageComment_left {
    float: left;
}

.serendipity_imageComment_right {
    float: right;
}

.serendipity_imageComment_img,
.serendipity_imageComment_img img {
    margin: 0px;
    padding: 0px;
    border: 0px;
}

.serendipity_imageComment_txt {
    margin: 0px;
    padding: 3px;
    clear: both;
    font-size: xx-small;
}

.serendipity_imageCommentClosing_center {
    clear: both;
    display: block;
}

.serendipity_admin_list_item_even {
    background-color: #fefefe;
}

.serendipity_admin_list_item_uneven {
    background-color: #eee;
}
.serendipity_admin_filters {
    font-size: 10px;
}

.serendipity_admin_filters input,
.serendipity_admin_filters select {
    font-size: 10px;
}

.serendipity_comments {
}

.serendipity_center {
    margin-left: auto;
    margin-right: auto;
    text-align: center;
}

.serendipity_msg_important {
    color: red;
    font-weight: bold;
    font-size: small;
}

.serendipity_msg_notice {
    color: green;
    font-weight: bold;
    font-size: small;
}

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

--- NEW FILE: info.txt ---
Name: MT3 - Independence
Author: Kaustubh Srikanth & Tom Sommer
Date: 31-06-2004

[php-blog-cvs] serendipity/templates/mt3-independence - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/mt3-independence added to the repository

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.362,1.363

[Kristian K. <is...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
This patch is incomplete, but works.

1. TRACKBACK_SPECIFIC is now no longer part of serendipity_commentsTitle,
   which is good, because TRACKBACK_SPECIFIC is long, and commentsTitle is
large. Not a good combo.

2. This is the incomplete part: top_as_links is now also used to suppress
   the (Link) display for comments. If set to false, the (Link) is no longer
show. So top_as_links should really be renamed comment_spam_nazi or
something like that, and should globally govern all settings to that user
supplied external links are no longer generated when set. 

TODO:
- Rename option (I can do that).
- The text for the setting needs to be changed (I can do that for de and en).
- Migration code needed (Don't know how to do that).
- Are there more places where comment_spam_nazi would apply?
  - Top Exits, Top Referrers
  - (Link) in comments
  - Referrer in per article link lists must not be a link



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -d -r1.362 -r1.363
--- serendipity_functions.inc.php	23 Jul 2004 18:56:37 -0000	1.362
+++ serendipity_functions.inc.php	25 Jul 2004 09:26:03 -0000	1.363
@@ -1306,8 +1306,8 @@
             <div class="serendipity_comments">
             <br />
             <a id="trackbacks"></a>
-             <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?>
-                (<a style="font-weight: normal" href="<?php echo $tbu; ?>" onClick="alert('<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>'); return false;" title="<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>"><?php echo TRACKBACK_SPECIFIC; ?></a>)</div>
+             <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?></div>
+                (<a style="font-weight: normal" href="<?php echo $tbu; ?>" onClick="alert('<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>'); return false;" title="<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>"><?php echo TRACKBACK_SPECIFIC; ?></a>)<br />
 <?php
                     serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id']));
 ?>
@@ -1597,7 +1597,8 @@
             }
 
             /* Link to the user's website, if the URL is valid */
-            if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
+            $showlink = serendipity_get_config_var('top_as_links', false, true);
+            if (($showlink === true) && (!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
                 echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
             }
 

[php-blog-cvs] serendipity comment.php,1.42,1.43

[Evan N. <tad...@us...>]

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

Modified Files:
	comment.php 
Log Message:
Fix a typo

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- comment.php	19 Jul 2004 08:50:54 -0000	1.42
+++ comment.php	23 Jul 2004 19:11:14 -0000	1.43
@@ -152,7 +152,7 @@
 <?php
                 serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']));
             } elseif  (!serendipity_db_bool($ca['allow_comments'])) { ?>
-                <div class="serendipity_center serendipity_msg_important""><?php echo COMMENTS_CLOSED; ?></div>
+                <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div>
 <?php
             }
         }

[php-blog-cvs] serendipity NEWS,1.186,1.187 serendipity_functions.inc.php,1.361,1.362

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Don't embed comments, trackbacks and comment-form in entry CSS class


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- serendipity_functions.inc.php	23 Jul 2004 18:49:55 -0000	1.361
+++ serendipity_functions.inc.php	23 Jul 2004 18:56:37 -0000	1.362
@@ -1274,6 +1274,7 @@
             echo $eventData['display_dat'];
 
         ?>
+</div>
 <?php
                 if (isset($serendipity['GET']['id'])) {
 
@@ -1388,7 +1389,6 @@
                 }
             } // end for-loop (entries)
 ?>
-    </div>
 <?php
         } // end for-loop (dates)
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- NEWS	23 Jul 2004 09:24:19 -0000	1.186
+++ NEWS	23 Jul 2004 18:56:37 -0000	1.187
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Don't embed comments, trackbacks and comment-form in entry CSS
+      class (tomsommer)
+
     * RFE #996320: Added https-option to login sidebar-plugin 
       (garvinhicking)
     

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.360,1.361

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
What the hell?


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -d -r1.360 -r1.361
--- serendipity_functions.inc.php	23 Jul 2004 09:54:41 -0000	1.360
+++ serendipity_functions.inc.php	23 Jul 2004 18:49:55 -0000	1.361
@@ -1307,7 +1307,7 @@
             <a id="trackbacks"></a>
              <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?>
                 (<a style="font-weight: normal" href="<?php echo $tbu; ?>" onClick="alert('<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>'); return false;" title="<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>"><?php echo TRACKBACK_SPECIFIC; ?></a>)</div>
-?>
+<?php
                     serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id']));
 ?>
             </div>

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

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

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

Modified Files:
	serendipity_event_livesearch.js 
Log Message:
Try to make Evan happy by removing autocomplete and putting it to JS.
Jannis, please test if this still works out for you!


Index: serendipity_event_livesearch.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_livesearch.js	20 Jul 2004 09:54:45 -0000	1.4
+++ serendipity_event_livesearch.js	23 Jul 2004 10:29:19 -0000	1.5
@@ -51,6 +51,10 @@
         isIE = true;
     }
 
+    if (document.getElementById('searchform').setAttribute) {
+        document.getElementById('searchform').setAttribute('autocomplete','off');
+        document.getElementById('serendipityQuickSearchTermField').setAttribute('autocomplete','off');
+    }
     document.getElementById('serendipityQuickSearchTermField').style.border = '1px solid green';
 }
 

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.75,1.76

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Try to make Evan happy by removing autocomplete and putting it to JS.
Jannis, please test if this still works out for you!


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_sidebar_items.php	23 Jul 2004 09:24:19 -0000	1.75
+++ serendipity_sidebar_items.php	23 Jul 2004 10:29:19 -0000	1.76
@@ -68,7 +68,7 @@
 
         $title = QUICKSEARCH;
 ?>
-<form id="searchform" autocomplete='off' action="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>" method="get">
+<form id="searchform" action="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['indexFile']; ?>" method="get">
     <div>
         <input type="hidden"  name="serendipity[action]" value="search" />
         <input type="text"   id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" size="13" />

[php-blog-cvs] serendipity serendipity_functions_installer.inc.php,1.21,1.22

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

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

Modified Files:
	serendipity_functions_installer.inc.php 
Log Message:
Fixed rewrite rule.
Tom, grepping for 'PATH_APPROVECOMMENT' would have shown you all occurences
you need to change :-)


Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_functions_installer.inc.php	17 Jul 2004 12:03:06 -0000	1.21
+++ serendipity_functions_installer.inc.php	23 Jul 2004 10:06:39 -0000	1.22
@@ -621,8 +621,8 @@
                    '{PAT_ARCHIVE}', '{PATH_ARCHIVE}',
                    '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
                    '{PAT_PLUGIN}', '{PATH_PLUGIN}',
-                   '{PAT_DELETECOMMENT}', '{PATH_DELETECOMMENT}',
-                   '{PAT_APPROVECOMMENT}', '{PATH_APPROVECOMMENT}'
+                   '{PAT_DELETE}', '{PATH_DELETE}',
+                   '{PAT_APPROVE}', '{PATH_APPROVE}'
                  ),
 
                  array(
@@ -638,8 +638,8 @@
                    trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE,
                    trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
                    trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
-                   trim(PAT_DELETECOMMENT, '@/i'), PATH_DELETECOMMENT,
-                   trim(PAT_APPROVECOMMENT, '@/i'), PATH_APPROVECOMMENT
+                   trim(PAT_DELETE, '@/i'), PATH_DELETE,
+                   trim(PAT_APPROVE, '@/i'), PATH_APPROVE
                  ),
 
                  implode('', $a)