php-blog-cvs — Serendipity commit list

[php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.6,1.7 serendipity_functions.inc.php,1.141,1.142 serendipity_lang_de.inc.php,1.25,1.26 serendipity_lang_en.inc.php,1.35,1.36

[Tom S. <web...@ts...>]

jhe...@us... wrote:

> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv13833
> 
> Modified Files:
> 	serendipity_admin_entries.inc.php 
> 	serendipity_functions.inc.php serendipity_lang_de.inc.php 
> 	serendipity_lang_en.inc.php 
> Log Message:
> We now support drafts! Please test.

Ehm, not my blog just say: No entries to print.

Did you test this a little before committing?

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.6,1.7 serendipity_functions.inc.php,1.141,1.142 serendipity_lang_de.inc.php,1.25,1.26 serendipity_lang_en.inc.php,1.35,1.36

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv13833

Modified Files:
	serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
Log Message:
We now support drafts! Please test.


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin_entries.inc.php	5 Aug 2003 14:07:40 -0000	1.6
+++ serendipity_admin_entries.inc.php	30 Aug 2003 09:55:09 -0000	1.7
@@ -16,14 +16,14 @@
 // A little helper we don't want in _functions.inc.php
 function serendipity_drawList($action) {
     global $serendipity;
-  
+
     // Prepare variables
     if (!is_numeric($serendipity['GET']['offset'])) {
         $serendipity['GET']['offset'] = 0;
     }
-    
-    $perPage = 30;
-    
+
+    $perPage = 12;
+
     // Fetch the entries
     $entries = serendipity_fetchEntries(
                  false,
@@ -31,7 +31,8 @@
                  serendipity_db_limit(
                    $serendipity['GET']['offset'],
                    $perPage
-                 )
+                 ),
+				 'true'
                );
     $string_action = ($action == 'delete' ? DELETE_ENTRIES : EDIT_ENTRIES);
 
@@ -39,12 +40,12 @@
 ?>
 <div class="serendipity_admin_list">
     <div class="serendipity_admin_list_title"><?php echo $string_action; ?>:</div>
-    
+
     <table width="100%" class="serendipity_admin_list">
 <?php
     if (is_array($entries)) {
         $half = (int) ((count($entries) + 1)/2);
-    
+
         // Print the browse buttons
 ?>
         <tr>
@@ -77,21 +78,23 @@
             <td class="serendipity_admin_list_item">
                 <?php echo date('d.m.y, H:i', $entries[$x]['timestamp']) . ': '; ?>
                 <br />
+                <?php if ($entries[$x]['isdraft']=='true') echo DRAFT.":"?>                
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x]['id']; ?>">
                     <?php echo htmlentities(substr(empty($entries[$x]['title']) ? $entries[$x]['body'] : $entries[$x]['title'], 0, 40)); ?>
                 </a>
             </td>
-        
+
             <td class="serendipity_admin_list_item">
 <?php
             if ($x + $half < $count) {
 ?>
                 <?php echo date('d.m.y, H:i', $entries[$x + $half]['timestamp']) . ': '; ?>
                 <br />
+                <?php if ($entries[$x+$half]['isdraft']=='true') echo DRAFT.":"?>
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>">
                     <?php echo htmlentities(substr($entries[$x + $half]['title'], 0, 40)); ?>
                 </a>
-<?php 
+<?php
             }
 ?>
             </td>
@@ -107,7 +110,7 @@
             </td>
         </tr>
 <?php
-    } 
+    }
 ?>
     </table>
 </div>
@@ -122,11 +125,12 @@
                    'timestamp'  => $serendipity['POST']['timestamp'],
                    'body'       => $serendipity['POST']['body'],
                    'extended'   => $serendipity['POST']['extended'],
-                   'categoryid' => $serendipity['POST']['categoryid']
+                   'categoryid' => $serendipity['POST']['categoryid'],
+                   'isdraft'    => $serendipity['POST']['isdraft']
                  );
 
         $res = serendipity_updertEntry($entry);
-        
+
         if (is_string($res)) {
             serendipity_printEntryForm(
               '?',

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- serendipity_functions.inc.php	19 Aug 2003 16:20:25 -0000	1.141
+++ serendipity_functions.inc.php	30 Aug 2003 09:55:09 -0000	1.142
@@ -11,7 +11,7 @@
         $_SESSION['serendipityAuthedUser'] = true;
         return true;
     }
-    
+
     if ($_SESSION['serendipityAuthedUser'] === true && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
         return true;
     } else {
@@ -32,7 +32,7 @@
                 <input type="submit"   name="submit"              value="&gt;" />
            </form>
     </div>
-<?php                                                                                                
+<?php
 }
 
 function serendipity_getTemplateFile($file) {
@@ -165,13 +165,13 @@
             <td>&nbsp;</td>
             <td class="serendipity_commentsLabel">
                 <input type="checkbox" name="serendipity[remember]" <?php echo $serendipity['COOKIE']['remember'] ; ?> /> <?php echo REMEMBER_INFO; ?>
-<?php 
+<?php
     if ($serendipity['allowSubscriptions']) {
 ?>
                 <br />
                 <input type="checkbox" name="serendipity[subscribe]" /> <?php echo SUBSCRIBE_TO_THIS_ENTRY; ?>
-<?php 
-    } 
+<?php
+    }
 ?>
             </td>
        </tr>
@@ -263,7 +263,7 @@
                            )
                   );
     }
-    
+
     // Find out about diary entries
     $querystring = "SELECT timestamp from {$serendipity['dbPrefix']}entries WHERE timestamp >= $ts and timestamp <= $endts";
     $rows = serendipity_db_query($querystring);
@@ -403,12 +403,15 @@
 * Give it a range in YYYYMMDD format to gather the desired entries
 * (For february 2002 you would pass 200202 e.g.
 **/
-function serendipity_fetchEntries($range = null, $full = true, $limit = "") {
+function serendipity_fetchEntries($range = null, $full = true, $limit = "", $fetchDrafts = 'false') {
     global $serendipity;
 
     if ($full === true)
         $body = ',body, extended';
 
+	if ($fetchDrafts == 'false')
+		$drafts = "isdraft LIKE 'false'";
+
     if ( is_numeric($range)) {
         $year = (int)substr($range, 0, 4);
         $month = (int)substr($range, 4, 2);
@@ -422,9 +425,14 @@
         }
         $endts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
 
-        $and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
+        $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
+		if ($drafts)
+			$and .= "AND $drafts";
+
     } else {
         $and = "";
+		if ($drafts)
+			$and .= "WHERE $drafts";
     }
 
     if (!empty($limit)) {
@@ -485,7 +493,7 @@
 **/
 function serendipity_fetchCategories($authorid = null) {
     global $serendipity;
-    
+
     if ($authorid === null) {
         $authorid = $serendipity['authorid'];
     }
@@ -618,13 +626,13 @@
             <br />
 
             <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
-<?php 
+<?php
             if (preg_match('@/unsubscribe/(.*)/([0-9]+)@', $_SERVER['REQUEST_URI'], $res)) {
                 echo '<div align="center" style="color: #FF0000; font-weight: bold;">'. sprintf(UNSUBSCRIBE_OK, urldecode($res[1])) .'</div><br />';
             }
 
 
-                echo serendipity_printComments(serendipity_fetchComments($entry['id'])); 
+                echo serendipity_printComments(serendipity_fetchComments($entry['id']));
 ?>
             <br />
             <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
@@ -839,13 +847,13 @@
     $name          = serendipity_db_escape_string($commentInfo['name']);
     $url           = serendipity_db_escape_string($commentInfo['url']);
     $email         = serendipity_db_escape_string($commentInfo['email']);
-    
+
     if (isset($commentInfo['subscribe'])) {
         $subscribe = 'true';
     } else {
         $subscribe = 'false';
     }
-    
+
     $t      = time();
     $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title, subscribed)";
     $query .= " VALUES ('$id', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe')";
@@ -875,26 +883,26 @@
 
 function serendipity_mailSubscribers($entry_id, $poster, $posterMail, $title, $fromEmail = 'no...@ex...') {
     global $serendipity;
-    
+
     $entryURI = serendipity_archiveURL($entry_id, $title);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
-    $sql = "SELECT author, email 
-            FROM {$serendipity['dbPrefix']}comments 
-            WHERE entry_id = $entry_id 
-              AND email <> '$posterMail' 
-              AND subscribed = 'true' 
+    $sql = "SELECT author, email
+            FROM {$serendipity['dbPrefix']}comments
+            WHERE entry_id = $entry_id
+              AND email <> '$posterMail'
+              AND subscribed = 'true'
             GROUP BY email";
     $subscribers = serendipity_db_query($sql);
-    
+
     if (!is_array($subscribers)) {
         return;
     }
-    
+
     foreach ($subscribers as $subscriber) {
         $text = sprintf(
                   SUBSCRIPTION_MAIL,
-                  
+
                   $subscriber['author'],
                   $serendipity['blogTitle'],
                   $title,
@@ -902,25 +910,25 @@
                   $entryURI,
                   $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
                 );
-              
+
         mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
     }
 }
 
 function serendipity_cancelSubscription($email, $entry_id) {
     global $serendipity;
-    $sql = "UPDATE {$serendipity['dbPrefix']}comments 
-                SET subscribed = 'false' 
-            WHERE entry_id = $entry_id 
+    $sql = "UPDATE {$serendipity['dbPrefix']}comments
+                SET subscribed = 'false'
+            WHERE entry_id = $entry_id
                 AND email = '$email'";
     serendipity_db_query($sql);
-    
+
     return serendipity_db_affected_rows();
 }
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
     global $serendipity;
-    
+
     $entryURI = serendipity_archiveURL($id, $title);
 
     if ($type == 'TRACKBACK') {
@@ -1317,7 +1325,7 @@
     if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) {
         return;
     }
-    
+
     if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@i', $res, $test)) {
         if ($loc != $test[1]) {
             return;
@@ -1335,7 +1343,7 @@
 
 function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
     $res = @file_get_contents($loc);
-    
+
     if ( strlen($res) != 0 ) {
         serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text);
         serendipity_pingback_autodiscover($loc, $res);
@@ -1462,7 +1470,7 @@
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
-    
+
     // remove full matches
     array_shift($matches);
 
@@ -1758,10 +1766,13 @@
 **/
 function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = array(), $errMsg = "") {
     global $serendipity;
-
+    
     $serendipity['EditorBrowsers'] = '(IE|Mozilla)';
     $cats = serendipity_fetchCategories();
 
+    if ($entry['isdraft'] == 'true') $draftD = " SELECTED";
+    else $draftP = " SELECTED";
+
     $n = "\n";
     $cat_list = '<select name="serendipity[categoryid]">' . $n;
     $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
@@ -1788,24 +1799,31 @@
         <form action="<?php echo $targetURL; ?>" method="post" <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px">
         <?php echo $hidden; ?>
 
-        <table class="serendipityEntryEdit">
+        <table class="serendipityEntryEdit" border="0">
             <tr>
                 <td align="left" <?php echo (!$serendipity['wysiwyg'] ? 'colspan="2"' : ''); ?>>
                     <div>
-                        <input type="text" name="serendipity[title]" value="<?php echo htmlentities($entry['title']); ?>" size="<?php echo ($serendipity['wysiwyg'] ? '30' : '80'); ?>" />
-                        <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
+                        <b><?php echo TITLE?>:</b> <input type="text" name="serendipity[title]" value="<?php echo htmlentities($entry['title']); ?>" size="<?php echo ($serendipity['wysiwyg'] ? '30' : '80'); ?>" />
                     </div>
                 </td>
 
                 <?php echo ($serendipity['wysiwyg'] ? '<td>' . CATEGORY . ' ' . $cat_list . '</td>' : ''); ?>
             </tr>
-
+            <tr>
+                    <td><b><?php echo TYPE?>:</b>
+                        <select name="serendipity[isdraft]">
+                            <option  value="false" <?php echo $draftP?>><?php echo PUBLISH?></option>
+                            <option  value="true"  <?php echo $draftD?>><?php echo DRAFT?></option>
+                        </select>
+                    </td>
+                    <td align="right"><b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
+            </tr>
+            <tr>
+                <td><b><?php echo ENTRY_BODY; ?></b></td>
+                <td align="right">
 <?php
     if (!$serendipity['wysiwyg']) {
 ?>
-            <tr>
-                <td><?php echo CATEGORY; ?> <?php echo $cat_list ; ?></td>
-                <td align="right">
                     <div>
 <?php
         // Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor
@@ -1826,13 +1844,10 @@
                         <input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
 <?php   } ?>
                     </div>
-                </td>
-            </tr>
 <?php
     }
 ?>
-            <tr>
-                <td colspan="2"><?php echo ENTRY_BODY; ?></td>
+                </td>
             </tr>
 
             <tr>
@@ -1842,20 +1857,18 @@
             </tr>
 
             <tr>
-                <td colspan="2"><?php echo EXTENDED_BODY; ?></td>
+                <td colspan="2" align="right">
+                    <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
+                </td>
             </tr>
 
             <tr>
-                <td colspan="2">
-                    <textarea name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo htmlentities($entry['extended']); ?></textarea>
-                </td>
+                <td colspan="2"><b><?php echo EXTENDED_BODY; ?></b></td>
             </tr>
 
             <tr>
-                <td colspan="2" align="right">
-                    <div>
-                        <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
-                    </div>
+                <td colspan="2">
+                    <textarea name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo htmlentities($entry['extended']); ?></textarea>
                 </td>
             </tr>
         </table>
@@ -1872,7 +1885,7 @@
 
 function serendipity_authenticate_author($username, $password) {
     global $serendipity;
-    
+
     if( $_SESSION['serendipityAuthedUser'] == true ) {
         $serendipity['serendipityUser']  = $_SESSION['serendipityUser'];
         $serendipity['serendipityEmail'] = $_SESSION['serendipityEmail'];
@@ -1894,7 +1907,7 @@
     if (is_string($row)) {
         print $row;
     }
-    
+
     if ($row) {
         $_SESSION['serendipityUser']     = $serendipity['serendipityUser']  = $username;
         $_SESSION['serendipityEmail']    = $serendipity['serendipityEmail'] = $row['email'];

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_de.inc.php	25 Aug 2003 16:43:27 -0000	1.25
+++ serendipity_lang_de.inc.php	30 Aug 2003 09:55:09 -0000	1.26
@@ -267,6 +267,9 @@
 define('SYNDICATION_PLUGIN_TTL', 'Feld "ttl" (time-to-live)');
 define('SYNDICATION_PLUGIN_TTL_DESC', 'Anzahl von Minuten, nachdem Ihr Blog von fremden Seiten nicht mehr gecached werden sollte (leer: nicht verwenden) [RSS 2.0]');
 define('CONTENT', 'Inhalt');
+define('TYPE', 'Typ');
+define('DRAFT', 'Entwurf');
+define('PUBLISH', 'Ver&ouml;ffentlichung');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_en.inc.php	25 Aug 2003 16:43:27 -0000	1.35
+++ serendipity_lang_en.inc.php	30 Aug 2003 09:55:09 -0000	1.36
@@ -267,6 +267,9 @@
 define('SYNDICATION_PLUGIN_TTL', 'Field "ttl" (time-to-live)');
 define('SYNDICATION_PLUGIN_TTL_DESC', 'Amount of minutes after which your blog should not be cached any more by foreign sites/applications (empty: hidden) [RSS 2.0]');
 define('CONTENT', 'Content');
+define('TYPE', 'Type');
+define('DRAFT', 'Draft');
+define('PUBLISH', 'Publish');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] Re: serendipity comment.php,1.21,1.22 NEWS,1.15, 1.16

[Tom S. <web...@ts...>]

Garvin Hicking wrote:

> No. I installed the most recent version downloaded yesterday, 2.64.

Strange, it says in their own TrackBack RFC that the GET method is 
deprecrated

Note: in older versions of the TrackBack specification, pings are sent 
using HTTP GET requests. This behavior is deprecrated; support for GET 
requests will be removed from the Movable Type implementation in January 
of 2003.

  ----

In future revisions of the specification--once the grace period for 
switching to GET from POST has passed--this may be simplified such that 
sending a GET request to the TrackBack Ping URL will return the list of 
pings.

http://www.movabletype.org/docs/mttrackback.html

Anyway, good thing you fixed it then :)
We might aswell support both

Should we make sure the request has a referrer? So that people won't 
abuse the querystring method? Does MT send a referrer?

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

Re: [php-blog-cvs] Re: serendipity comment.php,1.21,1.22 NEWS,1.15, 1.16

[Garvin H. <squ...@su...>]

Hi Tom!

>> tracback pings are now accepted via POST/GET methods to aid moveable type
>> trackbacks.
>
> It's only old MT blogs that use GET

No. I installed the most recent version downloaded yesterday, 2.64.

Regards,
Garvin.

-- 
Garvin Hicking   | Mediengestalter
www.supergarv.de | #ICQ 21392242

[php-blog-cvs] Re: serendipity comment.php,1.21,1.22 NEWS,1.15,1.16

[Tom S. <web...@ts...>]

gar...@us... wrote:

> tracback pings are now accepted via POST/GET methods to aid moveable type
> trackbacks.

It's only old MT blogs that use GET

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] serendipity comment.php,1.21,1.22 NEWS,1.15,1.16

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9018

Modified Files:
	comment.php NEWS 
Log Message:
tracback pings are now accepted via POST/GET methods to aid moveable type
trackbacks.


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- comment.php	16 Aug 2003 11:05:48 -0000	1.21
+++ comment.php	25 Aug 2003 13:11:06 -0000	1.22
@@ -20,26 +20,26 @@
 }
 
 
-if (!($type = @$_GET['type'])) {
+if (!($type = @$_REQUEST['type'])) {
     $type = 'normal';
 }
 
 if ($type == 'trackback') {
     $uri = $_SERVER['REQUEST_URI'];
-    if (isset($_GET['entry_id'])) {
-        $id = $_GET['entry_id'];
+    if (isset($_REQUEST['entry_id'])) {
+        $id = $_REQUEST['entry_id'];
     } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
         $id = $matches[1];
     }
 
-    if (add_trackback($id, $_POST['title'], $_POST['url'],
-                      $_POST['blog_name'], $_POST['excerpt'])) {
+    if (add_trackback($id, $_REQUEST['title'], $_REQUEST['url'],
+                      $_REQUEST['blog_name'], $_REQUEST['excerpt'])) {
         report_trackback_success();
     } else {
         report_trackback_failure();
     }
 } else if ($type == 'pingback') {
-    if(add_pingback($_POST['entry_id'], $HTTP_RAW_POST_DATA)) {
+    if(add_pingback($_REQUEST['entry_id'], $HTTP_RAW_POST_DATA)) {
         report_pingback_success();
     } else {
         report_pingback_failure();

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NEWS	17 Aug 2003 23:36:24 -0000	1.15
+++ NEWS	25 Aug 2003 13:11:06 -0000	1.16
@@ -2,6 +2,7 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Trackback pings where only accepted on a POST method. Moveable Type uses GET, so we now accept both. (garvinhicking)
     * Fixed issue where trackbackpings were only sent to links in extended entry, if one existed, discarding the standard body (garvinhicking)
     * Fixed issue where two users sharing same username & password would not be able to log in correctly, causing errors on the admin pages (tomsommer)
     * Fixed issue where installation would execute SQL instructions even if a table already existed, creating "ghost"-authors (tomsommer)

[php-blog-cvs] serendipity rss.php,1.11,1.12 serendipity_admin_plugins.inc.php,1.9,1.10 serendipity_lang_de.inc.php,1.24,1.25 serendipity_lang_en.inc.php,1.34,1.35 serendipity_sidebar_items.php,1.25,1.26 NEWS,1.16,1.17

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv20500

Modified Files:
	rss.php serendipity_admin_plugins.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_sidebar_items.php NEWS 
Log Message:
* Added radio-button ('boolean') and spacer ('separator') configuration
$type-directives for the plugins

* RSS-feeds and fields can now be customized within the plugin configuration
(fields: image, webmaster, managingEditor, ttl can be controlled)

* minor code intenting

* Language updates

Plugin modifications are backwards compatible. If you haven't configured
your Syndication plugin yet, defaults are used.



Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rss.php	19 Aug 2003 03:19:04 -0000	1.11
+++ rss.php	25 Aug 2003 16:43:27 -0000	1.12
@@ -30,29 +30,75 @@
 $title       = utf8_encode($title);
 $description = utf8_encode($description);
 
-if (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) {
+include_once('serendipity_plugin_api.php');
+$plugins = serendipity_plugin_api::enum_plugins();
+$plugin  = false;
+
+if (is_array($plugins)) {
+    // load each plugin to make some introspection
+    foreach ($plugins as $plugin_data) {
+        if (preg_match('|@serendipity_syndication_plugin|', $plugin_data['name'])) {
+            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']);
+            $bag    = new serendipity_property_bag;
+            $plugin->introspect($bag);
+            break;
+        }
+    }
+}
+
+// Check for a logo to use for an RSS feed. Can either be set by configuring the
+// syndication plugin OR by just placing a rss_banner.png file in the pixel directory.
+// If both is not set, we will display our happy own branding. :-)
+
+if ($plugin && is_object($plugin) && $plugin->get_config('bannerURL') != '') {
+    $img   = $plugin->get_config('bannerURL');
+    $w     = $plugin->get_config('bannerWidth');
+    $h     = $plugin->get_config('bannerHeight');
+    $image = <<<IMAGE
+<image>
+        <url>$img</url>
+        <title>RSS: $title - $description</title>
+        <link>{$serendipity['baseURL']}</link>
+        <width>$w</width>
+        <height>$h</height>
+    </image>
+IMAGE;
+} elseif (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) {
     $i = getimagesize($serendipity['serendipityPath'] . 'pixel/rss_banner.png');
     $image = <<<IMAGE
 <image>
-    <url>{$serendipity['baseURL']}pixel/rss_banner.png</url>
-    <title>RSS: $title - $description</title>
-    <link>{$serendipity['baseURL']}</link>
-    <width>{$i[0]}</width>
-    <height>{$i[1]}</height>
-</image>
+        <url>{$serendipity['baseURL']}pixel/rss_banner.png</url>
+        <title>RSS: $title - $description</title>
+        <link>{$serendipity['baseURL']}</link>
+        <width>{$i[0]}</width>
+        <height>{$i[1]}</height>
+    </image>
 IMAGE;
 } else {
     $image = <<<IMAGE
 <image>
-    <url>{$serendipity['baseURL']}pixel/s9y_banner_tiny.png</url>
-    <title>RSS: $title - $description</title>
-    <link>{$serendipity['baseURL']}</link>
-    <width>100</width>
-    <height>21</height>
-</image>
+        <url>{$serendipity['baseURL']}pixel/s9y_banner_tiny.png</url>
+        <title>RSS: $title - $description</title>
+        <link>{$serendipity['baseURL']}</link>
+        <width>100</width>
+        <height>21</height>
+    </image>
 IMAGE;
 }
 
+// Now, if set, stitch together any fields that have been configured in the syndication plugin.
+// First, do some sanity checks
+if ($plugin && $bag && is_object($plugin) && is_object($bag)) {
+    $additional_fields = '';
+    foreach($bag->get('configuration') AS $bag_index => $bag_value) {
+        if (preg_match('|^field_(.*)$|', $bag_value, $match)) {
+            if ($plugin->get_config($bag_value) != '') {
+                $additional_fields.= '<' . $match[1] . '>' . $plugin->get_config($bag_value) . '</' . $match[1] . '>' . "\n";
+            }
+        }
+    }
+}
+
 echo '<?xml version="1.0" encoding="utf-8" ?>';
 echo "\n";
 switch ($version) {
@@ -85,8 +131,9 @@
     <dc:language>{$serendipity['lang']}</dc:language>
     <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
     <generator>Serendipity - http://www.s9y.org/</generator>
-
+    $additional_fields
     $image
+
 HEAD;
 break;
 default:

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_plugins.inc.php	20 Aug 2003 16:08:33 -0000	1.9
+++ serendipity_admin_plugins.inc.php	25 Aug 2003 16:43:27 -0000	1.10
@@ -104,8 +104,70 @@
         $cdesc  = htmlentities($cbag->get('description'));
         $value  = $plugin->get_config($config_item);
         $hvalue = (isset($_POST['serendipity']['plugin'][$config_item]) ? htmlentities($_POST['serendipity']['plugin'][$config_item]) : htmlentities($value));
-
+        $radio  = array();
+        
         switch ($cbag->get('type')) {
+            case 'seperator':
+?>
+        <tr>
+            <td colspan="2"><hr noshade="noshade" size="1" /></td>
+        </tr>
+<?php
+                break;
+                
+            case 'boolean':
+                $radio['value'][] = 'true';
+                $radio['desc'][]  = YES;
+                
+                $radio['value'][] = 'false';
+                $radio['desc'][]  = NO;
+
+            case 'radio':
+                if (!count($radio) > 0) {
+                    $radio = $cbag->get('radio');
+                }
+
+                $per_row = $cbag->get('radio_per_row');
+                if (empty($per_row)) {
+                    $per_row = 2;
+                }
+?>
+        <tr>
+            <td style="vertical-align: top"><?php echo $cname; ?></td>
+            <td style="vertical-align: top">
+<?php
+                $counter = 0;
+                foreach($radio['value'] AS $radio_index => $radio_value) {
+                    $id = htmlspecialchars($config_item . $radio_value);
+                    $counter++;
+                    if ($counter == 1) {
+?>
+                <div>
+<?php
+                    }
+?>
+                    <input type="radio" id="serendipity_plugin_<?php echo $id; ?>" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $radio_value; ?>" <?php echo ($radio_value == $hvalue ? 'checked="checked"' : ''); ?> title="<?php echo htmlentities($radio['desc'][$radio_index]); ?>" />
+                        <label for="serendipity_plugin_<?php echo $id; ?>"><?php echo htmlentities($radio['desc'][$radio_index]); ?></label>
+<?php
+                    if ($counter == $per_row) {
+                        $counter = 0;
+?>
+                </div>
+<?php
+                    }
+                }
+                
+                if ($cdesc != '') {
+?>
+                <br /><span style="color: #bbbbbb">//&nbsp;<?php echo $cdesc; ?></span>
+<?php
+                }
+?>
+            </td>
+        </tr>
+<?php
+                break;
+                
             case 'string':
 ?>
         <tr>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_de.inc.php	17 Aug 2003 18:06:03 -0000	1.24
+++ serendipity_lang_de.inc.php	25 Aug 2003 16:43:27 -0000	1.25
@@ -129,7 +129,7 @@
 define('TOP_EXITS', 'Top Exits');
 define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs');
 define('SYNDICATION', 'Syndication');
-define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication links');
+define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links');
 define('SUPERUSER', 'Eigent&uuml;mer');
 define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Eintr&auml;gen - WICHTIG');
 define('PLUG', 'Plug');
@@ -245,13 +245,28 @@
 define('RUNNING', 'Sie benutzen serendipity v.');
 define('TOGGLE_ALL', 'Alle Optionen ein-/ausblenden');
 define('TOGGLE_OPTION', 'Option ein-/ausblenden');
-
 define('SUBSCRIBE_TO_THIS_ENTRY', 'Bei Aktualisierung dieser Kommentare benachrichtigen');
 define('UNSUBSCRIBE_OK', 'TRANSLATE_ME');
 define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Benachrichtigung zu neuem Kommentar des Eintrags "%s"');
 define('SUBSCRIPTION_MAIL', "Hallo %s,\n\nEin neues Kommentar wurde dem Eintrag hinzugefügt, den Sie auf \"%s\" namens \"%s\" finden.\nDer Name des Autoren ist: %s\n\nSie können den Eintrag hier finden: %s\n\nSie können diese Benachrichtung mit folgender URL kündigen: %s\n");
 define('SIGNATURE', "\n-- \n%s wird betrieben mit Serendipity.\nDas allerbeste blog, Sie können es auch nutzen.\nWie das geht, sehen Sie auf <http://s9y.org>.");
 define('DATABASE_ALREADY_INSTALLED', 'ÜBERSPRUNGEN: Datenbank besteht bereits');
+define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
+define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
+define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 Kommentar');
+define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feld "managingEditor"');
+define('SYNDICATION_PLUGIN_WEBMASTER',  'Feld "webMaster"');
+define('SYNDICATION_PLUGIN_BANNERURL', 'Bild für den RSS feed');
+define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Breite des Bildes');
+define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Höhe des Bildes');
+define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail Adresse des Webmasters, falls vorhanden. (leer: nicht verwenden) [RSS 2.0]');
+define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail Adresse des verantwortlichen Editors, falls vorhanden. (leer: nicht verwenden) [RSS 2.0]');
+define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL für ein Bild im GIF/JPEG/PNG Format, falls vorhanden. (leer: serendipity-Logo)');
+define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'in Pixeln, max. 144');
+define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'in Pixeln, max. 400');
+define('SYNDICATION_PLUGIN_TTL', 'Feld "ttl" (time-to-live)');
+define('SYNDICATION_PLUGIN_TTL_DESC', 'Anzahl von Minuten, nachdem Ihr Blog von fremden Seiten nicht mehr gecached werden sollte (leer: nicht verwenden) [RSS 2.0]');
+define('CONTENT', 'Inhalt');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_en.inc.php	19 Aug 2003 16:20:25 -0000	1.34
+++ serendipity_lang_en.inc.php	25 Aug 2003 16:43:27 -0000	1.35
@@ -251,6 +251,22 @@
 define('SUBSCRIPTION_MAIL', "Hello %s,\n\nA new comment was made to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
 define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
 define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database already installed');
+define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
+define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
+define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
+define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Field "managingEditor"');
+define('SYNDICATION_PLUGIN_WEBMASTER',  'Field "webMaster"');
+define('SYNDICATION_PLUGIN_BANNERURL', 'Image for the RSS feed');
+define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Image width');
+define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Image height');
+define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-Mail address of the webmaster, if available. (empty: hidden) [RSS 2.0]');
+define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-Mail address of the managing editor, if available. (empty: hidden) [RSS 2.0]');
+define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL of an image in GIF/JPEG/PNG format, if available. (empty: serendipity-logo)');
+define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'in pixels, max. 144');
+define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'in pixels, max. 400');
+define('SYNDICATION_PLUGIN_TTL', 'Field "ttl" (time-to-live)');
+define('SYNDICATION_PLUGIN_TTL_DESC', 'Amount of minutes after which your blog should not be cached any more by foreign sites/applications (empty: hidden) [RSS 2.0]');
+define('CONTENT', 'Content');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_sidebar_items.php	22 Aug 2003 01:41:09 -0000	1.25
+++ serendipity_sidebar_items.php	25 Aug 2003 16:43:27 -0000	1.26
@@ -132,23 +132,117 @@
     {
         $propbag->add('name',        SYNDICATION);
         $propbag->add('description', SHOWS_RSS_BLAHBLAH);
+        $propbag->add('configuration', array(
+                                        'show_0.91',
+                                        'show_2.0',
+                                        'show_2.0c',
+                                        'seperator',
+                                        'field_managingEditor',
+                                        'field_webMaster',
+                                        'field_ttl',
+                                        'seperator',
+                                        'bannerURL',
+                                        'bannerWidth',
+                                        'bannerHeight',
+                                       )
+        );
     }
     
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'show_0.91':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        SYNDICATION_PLUGIN_091);
+                $propbag->add('description', '');
+                break;
+
+            case 'show_2.0':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        SYNDICATION_PLUGIN_20);
+                $propbag->add('description', '');
+                break;
+
+            case 'show_2.0c':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        SYNDICATION_PLUGIN_20c);
+                $propbag->add('description', '');
+                break;
+                
+            case 'seperator':
+                $propbag->add('type',        'seperator');
+                break;
+
+            case 'field_managingEditor':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_MANAGINGEDITOR);
+                $propbag->add('description', SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC);
+                break;
+
+            case 'field_webMaster':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_WEBMASTER);
+                $propbag->add('description', SYNDICATION_PLUGIN_WEBMASTER_DESC);
+                break;
+
+            case 'field_ttl':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_TTL);
+                $propbag->add('description', SYNDICATION_PLUGIN_TTL_DESC);
+                break;
+
+            case 'bannerURL':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_BANNERURL);
+                $propbag->add('description', SYNDICATION_PLUGIN_BANNERURL_DESC);
+                break;
+
+            case 'bannerWidth':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_BANNERWIDTH);
+                $propbag->add('description', SYNDICATION_PLUGIN_BANNERWIDTH_DESC);
+                break;
+
+            case 'bannerHeight':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        SYNDICATION_PLUGIN_BANNERHEIGHT);
+                $propbag->add('description', SYNDICATION_PLUGIN_BANNERHEIGHT_DESC);
+                break;
+
+            default:
+                return false;
+        }
+        return true;
+    }
+
     function generate_content(&$title)
     {
         global $serendipity;
-    
+        
         $title = SYNDICATE_THIS_BLOG;
+
+        if ($this->get_config('show_0.91') != 'false') {
 ?>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91">RSS 0.91 feed</a>
             <br />
+<?php
+        }
+        
+        if ($this->get_config('show_2.0') != 'false') {
+?>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0">RSS 2.0 feed</a>
             <br />
+<?php
+        }
+        
+        if ($this->get_config('show_2.0c') != 'false') {
+?>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments">RSS 2.0 <?php echo COMMENTS; ?></a>
 <?php
+        }
     }
 }
 
@@ -205,13 +299,13 @@
         switch($name) {
             case 'title':
                 $propbag->add('type',        'string');
-                $propbag->add('name',        'Title');
+                $propbag->add('name',        TITLE);
                 $propbag->add('description', TITLE_FOR_NUGGET);
                 break;
     
             case 'content':
                 $propbag->add('type',        'html');
-                $propbag->add('name',        'Content');
+                $propbag->add('name',        CONTENT);
                 $propbag->add('description', THE_NUGGET);
                 break;
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- NEWS	25 Aug 2003 13:11:06 -0000	1.16
+++ NEWS	25 Aug 2003 16:43:27 -0000	1.17
@@ -2,6 +2,8 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Added radio-button and "spacer" configuration directives for the plugins (garvinhicking)
+    * RSS-feeds and fields can now be customized within the plugin configuration (garvinhicking)
     * Trackback pings where only accepted on a POST method. Moveable Type uses GET, so we now accept both. (garvinhicking)
     * Fixed issue where trackbackpings were only sent to links in extended entry, if one existed, discarding the standard body (garvinhicking)
     * Fixed issue where two users sharing same username & password would not be able to log in correctly, causing errors on the admin pages (tomsommer)

[php-blog-cvs] serendipity serendipity_config.inc.php,1.25,1.26

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9694

Modified Files:
	serendipity_config.inc.php 
Log Message:
Found the bug.
It appears using \r\n is not the right thing to do :)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_config.inc.php	23 Aug 2003 19:19:42 -0000	1.25
+++ serendipity_config.inc.php	24 Aug 2003 14:26:53 -0000	1.26
@@ -158,6 +158,7 @@
 $serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);
 
 /* Default mail headers */
-$serendipity['mailheaders'] = 'X-Powered-By: Serendipity v.'. $serendipity['version'] .' & PHP v.'. phpversion();
+$serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n"
+                            . 'X-Engine: PHP/'. phpversion();
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.24,1.25

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3957

Modified Files:
	serendipity_config.inc.php 
Log Message:
For some reason PHP 4.3.3RC3 is having some problems handling CRLF in mail headers/strings. 
I don't really understand WHY, but the previous headers caused PHP to send *two* CRLF, thereby termination the header section of the mail; Dumping the remaining headers into the mail


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_config.inc.php	19 Aug 2003 16:15:44 -0000	1.24
+++ serendipity_config.inc.php	23 Aug 2003 19:19:42 -0000	1.25
@@ -158,8 +158,6 @@
 $serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);
 
 /* Default mail headers */
-$serendipity['mailheaders'] = 'X-Powered-By: Serendipity v.'. $serendipity['version'] ."\r\n"
-                            . 'X-Engine: PHP v.'. phpversion() ."\r\n";
-
+$serendipity['mailheaders'] = 'X-Powered-By: Serendipity v.'. $serendipity['version'] .' & PHP v.'. phpversion();
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.23,1.24

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29843

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Short open tag


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_sidebar_items.php	2 Aug 2003 15:14:19 -0000	1.23
+++ serendipity_sidebar_items.php	22 Aug 2003 01:38:33 -0000	1.24
@@ -182,7 +182,7 @@
         $title = POWERED_BY . ":";
 ?>
 <div class="serendipityPlug">
-    <a title=":serendipity" href="http://www.s9y.org/"><img src="<?= $serendipity['serendipityHTTPPath']; ?>pixel/s9y_banner_tiny.png" alt=":serendipity" border="0" /></a>
+    <a title=":serendipity" href="http://www.s9y.org/"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/s9y_banner_tiny.png" alt=":serendipity" border="0" /></a>
 </div>
 <?php
     }

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.24,1.25

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv30259

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Another short open tag


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_sidebar_items.php	22 Aug 2003 01:38:33 -0000	1.24
+++ serendipity_sidebar_items.php	22 Aug 2003 01:41:09 -0000	1.25
@@ -49,7 +49,7 @@
     
         $title = QUICKSEARCH;
 ?>
-<form action="<?= $serendipity['serendipityHTTPPath']; ?>search.php" method="get">
+<form action="<?php echo $serendipity['serendipityHTTPPath']; ?>search.php" method="get">
     <div>
         <input type="hidden" name="serendipity[action]" value="search" />
         <input type="text"   name="serendipity[searchTerm]" onfocus="value='';" size="13" />

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.15,1.16

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv26968

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
Add Powered-By tag to genpage.
To easier identify Serendipity blogs, even if the admin chooses to remove the Powered By plugin


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_genpage.inc.php	18 Jul 2003 17:53:21 -0000	1.15
+++ serendipity_genpage.inc.php	19 Aug 2003 16:06:57 -0000	1.16
@@ -7,6 +7,7 @@
 <html> 
 <head>
     <title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
+    <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>">
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
     <link rel="alternate"  type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
     <script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>

[php-blog-cvs] Re: serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

[Tom S. <web...@ts...>]

Wez Furlong wrote:
> Is there any need for X-Engine?
> 
>>We now send X-Powered-By and X-Engine.

No, not really. But why not? ;)

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.31,1.32 serendipity_admin_plugins.inc.php,1.8,1.9

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv31848

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_admin_plugins.inc.php 
Log Message:
Move font-sizes to be template based, not static


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_admin_installer.inc.php	20 Aug 2003 15:59:06 -0000	1.31
+++ serendipity_admin_installer.inc.php	20 Aug 2003 16:08:32 -0000	1.32
@@ -149,7 +149,7 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<span style="font-size: 10pt"><?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     $el_count = 0;
@@ -159,14 +159,14 @@
         <table width="100%" cellspacing="2">
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
-                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<span style="font-size: 10pt"><?php echo $key; ?></span></a></th>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
             </tr>
 
             <tr>
                 <td>
                     <table width="100%" cellspacing="0" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
                         <tr>
-                            <td style="padding-left: 20px; font-size: 10pt" colspan="2">
+                            <td style="padding-left: 20px;" colspan="2">
                                 <?php echo $t['descriptions'][$key] ?>
                             </td>
                         </tr>
@@ -180,7 +180,7 @@
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top">
-                                <strong><span style="font-size: 9pt"><?php echo $value[$x]['longname']; ?></span></strong>
+                                <strong><?php echo $value[$x]['longname']; ?></strong>
                                 <br />
                                 <span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
                             </td>

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_plugins.inc.php	20 Aug 2003 16:03:44 -0000	1.8
+++ serendipity_admin_plugins.inc.php	20 Aug 2003 16:08:33 -0000	1.9
@@ -198,7 +198,7 @@
         <br />
 
         <table border="0" cellpadding="5" cellspacing="0">
-            <tr style="font-size: 10pt">
+            <tr>
                 <th>&nbsp;</th>
                 <th><?php echo TITLE; ?></th>
                 <th><?php echo PLUGIN; ?></th>
@@ -262,7 +262,7 @@
                 $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . '">' . DOWN . '</a>';
             }
 ?>
-            <tr style="font-size: 10pt">
+            <tr>
                 <td style="border-bottom: 1px solid #000000">
                     <div>
                         <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>">

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.7,1.8

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv30984

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Make the plugin table look better


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_plugins.inc.php	16 Jul 2003 12:03:22 -0000	1.7
+++ serendipity_admin_plugins.inc.php	20 Aug 2003 16:03:44 -0000	1.8
@@ -197,8 +197,8 @@
         <br />
         <br />
 
-        <table border="1" cellpadding="5">
-            <tr>
+        <table border="0" cellpadding="5" cellspacing="0">
+            <tr style="font-size: 10pt">
                 <th>&nbsp;</th>
                 <th><?php echo TITLE; ?></th>
                 <th><?php echo PLUGIN; ?></th>
@@ -262,17 +262,17 @@
                 $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . '">' . DOWN . '</a>';
             }
 ?>
-            <tr>
-                <td>
+            <tr style="font-size: 10pt">
+                <td style="border-bottom: 1px solid #000000">
                     <div>
                         <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>">
                     </div>
                 </td>
                 
-                <td><?php echo $title; ?></td>
-                <td><?php echo $name; ?></td>
-                <td><?php echo $desc; ?></td>
-                <td>
+                <td style="border-bottom: 1px solid #000000"><?php echo $title; ?></td>
+                <td style="border-bottom: 1px solid #000000"><?php echo $name; ?></td>
+                <td style="border-bottom: 1px solid #000000"><?php echo $desc; ?></td>
+                <td style="border-bottom: 1px solid #000000">
                     <div><?php echo $place . $moveup . $movedown; ?></div>
                 </td>
             </tr>

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.15,1.16 serendipity_admin_installer.inc.php,1.30,1.31

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29925

Modified Files:
	serendipity_config_local.tpl 
	serendipity_admin_installer.inc.php 
Log Message:
Allow for discriptions of each configuration category.

If someone has better descriptions, please commit.


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_config_local.tpl	15 Aug 2003 23:04:36 -0000	1.15
+++ serendipity_config_local.tpl	20 Aug 2003 15:59:06 -0000	1.16
@@ -1,6 +1,7 @@
 <?php # $Id$
 
 // Database Settings
+#  Here you can enter all your database information. Serendipity needs this to be able to function
 $serendipity['dbType']               = '{Database type|dbType|string|mysql}';                 // Database type (mysql|postgres)
 $serendipity['dbHost']               = '{Database host|dbHost|string|localhost}';             // MySQL host
 $serendipity['dbUser']               = '{Database user|dbUser|string|serendipity}';           // Username
@@ -8,7 +9,8 @@
 $serendipity['dbName']               = '{Database name|dbName|string|serendipity}';           // Name of your database
 $serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_}';      // Prefix for the table names, i.e. serendipity_
 
-// Paths (note: don't forget trailing slashes for directories!!!!)
+// Paths
+# Various paths to diffirent essential folders and files. Don't forget trailing slashes for directories!
 $serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/}';          // The full and aboslute path to your serendipity installation.
 $serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
 $serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/}';          // Path to serendipity for your browser, typically '/serendipity/'
@@ -18,6 +20,7 @@
 $serendipity['indexFile']            = '{Index file|indexFile|string|index.php}';                           // Which file to use as index
 
 // General settings
+# Customize how Serendipity behaves
 $serendipity['user']                 = '{Admin username|user|string|John Doe}';             // Username for admin login
 $serendipity['pass']                 = '{Admin password|pass|protected|john}';              // Password for admin login
 $serendipity['email']                = '{Admin email|email|string|jo...@ex...}';       // Email for admin login
@@ -29,6 +32,7 @@
 $serendipity['lang']                 = '{Language file|lang|string|en}';                                    // Language (for 'en' you need serendipity_lang_en.inc.php).
 
 // Appearance and options
+# Customize how Serendipity looks and feels
 $serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
 $serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0}';               // Do you want to use the WYSIWYG editor (CAUTION: only turn this on if you use Microsoft's Internet Explorer!!!)?
 $serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
@@ -37,9 +41,10 @@
 $serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;}';                          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
 
 // Imageconversion Settings
+# Enter general information about how serendipity should handle Images
 $serendipity['magick']               = '{Use Imagemagick|magick|bool|0}';                                   // Do you have image magick installed
 $serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert}';    // Full path & name of your image magick convert binary
 $serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb}';            // Thumbnails will be named original.Suffix.ext
-$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110}';                          // Dimensions of auto-generated thumbnails
+$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110}';                          // Static width of auto-generated thumbnails
 
 ?>

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_admin_installer.inc.php	20 Aug 2003 15:34:40 -0000	1.30
+++ serendipity_admin_installer.inc.php	20 Aug 2003 15:59:06 -0000	1.31
@@ -60,17 +60,19 @@
             case '/':
                 if ($l[1] == '/') {
                     $current = trim(substr($l, 2));
-                    $config[$current] = array();
-                }
+                    $config['categories'][$current] = array();
+               }
 
                 break;
-
+            case '#':
+                    $config['descriptions'][$current] =  trim(substr($l, 1));
+                break;
             // A configure option
             case '$':
                 // Grep out the name, type and default
                 preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
                 $c = explode('|', $match[1]);
-                $config[$current][] = array(
+                $config['categories'][$current][] = array(
                                         'longname'    => $c[0],
                                         'name'        => $c[1],
                                         'type'        => $c[2],
@@ -151,7 +153,7 @@
         </div>
 <?php
     $el_count = 0;
-    foreach ($t as $key => $value) {
+    foreach ($t['categories'] as $key => $value) {
         $el_count++;
 ?>
         <table width="100%" cellspacing="2">
@@ -163,6 +165,13 @@
             <tr>
                 <td>
                     <table width="100%" cellspacing="0" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
+                        <tr>
+                            <td style="padding-left: 20px; font-size: 10pt" colspan="2">
+                                <?php echo $t['descriptions'][$key] ?>
+                            </td>
+                        </tr>
+
+
 <?php
         for ($x=0; $x<count($value); $x++) {
             if (@is_array($from)) {
@@ -174,11 +183,11 @@
                                 <strong><span style="font-size: 9pt"><?php echo $value[$x]['longname']; ?></span></strong>
                                 <br />
                                 <span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
-                            </th>
+                            </td>
 
                             <td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="1">
                                 <?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?>
-                            </th>
+                            </td>
                         </tr>
 <?php
         }

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.29,1.30

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv25146

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Use same fontsize as the rest of the blog


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_admin_installer.inc.php	17 Aug 2003 16:12:55 -0000	1.29
+++ serendipity_admin_installer.inc.php	20 Aug 2003 15:34:40 -0000	1.30
@@ -147,7 +147,7 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<span style="font-size: 8pt"><?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<span style="font-size: 10pt"><?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     $el_count = 0;
@@ -157,7 +157,7 @@
         <table width="100%" cellspacing="2">
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
-                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<span style="font-size: 8pt"><?php echo $key; ?></span></a></th>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<span style="font-size: 10pt"><?php echo $key; ?></span></a></th>
             </tr>
 
             <tr>

[php-blog-cvs] Re: serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

[Tom S. <web...@ts...>]

christian muehlhaeuser wrote:

> especially since many (weak) spam filters use this for spamicity 
> calculation...

Howso?

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

Re: [php-blog-cvs] serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

[christian m. <ch...@ch...>]

On Tuesday 19 August 2003 19:13, Wez Furlong wrote:
> Is there any need for X-Engine?
>
> > We now send X-Powered-By and X-Engine.

especially since many (weak) spam filters use this for spamicity 
calculation...

greets,
muesli

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.138,1.139

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv27976

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Show comment timestamps in 24-hour format

Make cancelSubscription return the number of affected rows


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- serendipity_functions.inc.php	17 Aug 2003 20:51:04 -0000	1.138
+++ serendipity_functions.inc.php	19 Aug 2003 16:09:43 -0000	1.139
@@ -771,7 +771,7 @@
         }
 
         /* Show when the entry was made */
-        echo ' ' . ON . ' ' . date('M d, h:i', $comment['timestamp']);
+        echo ' ' . ON . ' ' . date('M d, H:i', $comment['timestamp']);
 
         if ( $_SESSION['serendipityAuthedUser'] === true ) {
             echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';
@@ -909,8 +909,13 @@
 
 function serendipity_cancelSubscription($email, $entry_id) {
     global $serendipity;
-    $sql = "UPDATE {$serendipity['dbPrefix']}comments SET subscribed = 'false' WHERE entry_id = $entry_id AND email = '$email'";
+    $sql = "UPDATE {$serendipity['dbPrefix']}comments 
+                SET subscribed = 'false' 
+            WHERE entry_id = $entry_id 
+                AND email = '$email'";
     serendipity_db_query($sql);
+    
+    return serendipity_db_affected_rows();
 }
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {

[php-blog-cvs] serendipity serendipity_lang_en.inc.php,1.33,1.34 serendipity_functions.inc.php,1.140,1.141

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29857

Modified Files:
	serendipity_lang_en.inc.php serendipity_functions.inc.php 
Log Message:
Wrong placement of spaces


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_en.inc.php	17 Aug 2003 18:06:03 -0000	1.33
+++ serendipity_lang_en.inc.php	19 Aug 2003 16:20:25 -0000	1.34
@@ -44,7 +44,7 @@
 define('FORWARD', 'Forward');
 define('ANONYMOUS', 'Anonymous');
 define('LINK_TO_COMMENT', 'Link to comment #');
-define('SEND_MAIL_TO', 'Send a mail to ');
+define('SEND_MAIL_TO', 'Send a mail to');
 define('NEW_TRACKBACK_TO', 'New trackback made to');
 define('NEW_COMMENT_TO', 'New comment posted to');
 define('RECENT', 'Recent...');

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- serendipity_functions.inc.php	19 Aug 2003 16:15:44 -0000	1.140
+++ serendipity_functions.inc.php	19 Aug 2003 16:20:25 -0000	1.141
@@ -760,7 +760,7 @@
 <?php
         /* Link to the user's email */
         if ( !empty($comment['email']) ) {
-            echo  '<a href="mailto:' . htmlentities($comment['email']) . '"  title="' . SEND_MAIL_TO . ' ' . htmlentities($name) . '(' . $comment['email'] . ')">' . htmlentities($name) . '</a>';
+            echo  '<a href="mailto:' . htmlentities($comment['email']) . '"  title="' . SEND_MAIL_TO . ' ' . htmlentities($name) . ' (' . $comment['email'] . ')">' . htmlentities($name) . '</a>';
         } else {
             echo htmlentities($name);
         }

Re: [php-blog-cvs] serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

[Wez F. <we...@th...>]

Is there any need for X-Engine?

> We now send X-Powered-By and X-Engine.

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv28810

Modified Files:
	serendipity_functions.inc.php serendipity_config.inc.php 
Log Message:
Allow for easier handling of default mail headers.

We now send X-Powered-By and X-Engine.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- serendipity_functions.inc.php	19 Aug 2003 16:09:43 -0000	1.139
+++ serendipity_functions.inc.php	19 Aug 2003 16:15:44 -0000	1.140
@@ -903,7 +903,7 @@
                   $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
                 );
               
-        mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n");
+        mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
     }
 }
 
@@ -947,7 +947,7 @@
               . "\n" . strip_tags($comment);
     }
 
-    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n");
+    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
 }
 
 function serendipity_fetchReferences($id)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_config.inc.php	16 Aug 2003 11:05:48 -0000	1.23
+++ serendipity_config.inc.php	19 Aug 2003 16:15:44 -0000	1.24
@@ -157,12 +157,9 @@
 /* Signature sent with all mails */
 $serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);
 
-/**
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */
+/* Default mail headers */
+$serendipity['mailheaders'] = 'X-Powered-By: Serendipity v.'. $serendipity['version'] ."\r\n"
+                            . 'X-Engine: PHP v.'. phpversion() ."\r\n";
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

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

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9716

Modified Files:
	rss.php 
Log Message:
Remove managingEditor and webMaster elements, they reveal email addresses


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rss.php	10 Aug 2003 22:23:45 -0000	1.10
+++ rss.php	19 Aug 2003 03:19:04 -0000	1.11
@@ -84,8 +84,6 @@
     <description>$description</description>
     <dc:language>{$serendipity['lang']}</dc:language>
     <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
-    <webMaster>{$serendipity['CONFIG']['email']}</webMaster>
-    <managingEditor>{$serendipity['CONFIG']['email']}</managingEditor>
     <generator>Serendipity - http://www.s9y.org/</generator>
 
     $image

[php-blog-cvs] serendipity NEWS,1.14,1.15

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9604

Modified Files:
	NEWS 
Log Message:
Fix typo :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- NEWS	17 Aug 2003 20:51:04 -0000	1.14
+++ NEWS	17 Aug 2003 23:36:24 -0000	1.15
@@ -2,7 +2,7 @@
 
 Version 0.3 ()
 ------------------------------------
-    * Fixed issue where trackbackpings where only sent to links in extended entry, discarding the standard body. Now all links of the standard body are parsed as well. (garvinhicking)
+    * Fixed issue where trackbackpings were only sent to links in extended entry, if one existed, discarding the standard body (garvinhicking)
     * Fixed issue where two users sharing same username & password would not be able to log in correctly, causing errors on the admin pages (tomsommer)
     * Fixed issue where installation would execute SQL instructions even if a table already existed, creating "ghost"-authors (tomsommer)
     * Allow unsubscription of already subscribed entries (tomsommer)