php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.62,1.63

[<gsc...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Avoid removing static files if pregenerate is not set.

Patch by Joyce P., simplified by Tom S.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_functions.inc.php	12 Jun 2003 12:14:59 -0000	1.62
+++ serendipity_functions.inc.php	14 Jun 2003 03:14:24 -0000	1.63
@@ -712,6 +712,11 @@
 {
     global $serendipity;
 
+    // If pregenerate is not set, short circuit all this logic
+    // and remove nothing.
+    if(!$serendipity['pregenerate']) {
+        return;
+    }
     if (isset($timestamp)) {
         $dated = date("Ymd", $timestamp);
         $datem = date("Ym", $timestamp);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.61,1.62

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Bugfix in archive.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_functions.inc.php	11 Jun 2003 18:10:31 -0000	1.61
+++ serendipity_functions.inc.php	12 Jun 2003 12:14:59 -0000	1.62
@@ -1792,10 +1792,12 @@
 
 	foreach($out as $year => $months) {
 		echo "<h2>$year</h2><div class='serendipity_entry'>\n";
-		for($y=1; $y<count($months); $y++) {
+		for($y=1; $y<13; $y++) {
+                        if ($months[$y]) {
 			echo "<img src='{$serendipity['serendipityHTTPPath']}pixel/bar1.png' height='10' width='".ceil($months[$y][0]*$fac)."' hspace='0' vspace='0'>";
 			echo "<img src='{$serendipity['serendipityHTTPPath']}pixel/blank.png' height='10' width='".($barwidth-ceil($months[$y][0]*$fac))."' hspace='0' vspace='0'> ";
 			echo $months[$y][1]."<br />";
+                        }
 		}
 		echo "</div>";
 	}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.60,1.61

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Beautified the archives, check it out: http://blog.jannis.to/archive


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_functions.inc.php	5 Jun 2003 10:11:49 -0000	1.60
+++ serendipity_functions.inc.php	11 Jun 2003 18:10:31 -0000	1.61
@@ -539,7 +539,7 @@
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type='NORMAL') {
     global $serendipity;
-    
+
     if ($type == 'TRACKBACK') {
 
 /* If the comment is a trackback */
@@ -566,7 +566,7 @@
 
 ".COMMENTS.":
 ". strip_tags($comment);
-   
+
     }
 
 $signature = "
@@ -1767,8 +1767,9 @@
     $lastYear = date("Y", $f[0][0]);
     $lastMonth= date("m", $f[0]);
     $currYear = date("Y");
+	$max = 0;
     while($currYear>=$lastYear) {
-         echo "<h2>$currYear</h2><div class='serendipity_entry'>";
+         // echo "<h2>$currYear</h2><div class='serendipity_entry'>";
          for($x=1; $x<13; $x++) {
               $entries = serendipity_postAmount($currYear, $x);
               if ($entries>0) {
@@ -1780,11 +1781,24 @@
                   $b = "</font>";
               }
               if ($x<=date("m") || $currYear < date("Y"))
-                  echo str_repeat("&nbsp;", 8)."$a{$serendipity['months'][$x]} $b<br>";
+                  $out[$currYear][$x] = array($entries, "$a{$serendipity['months'][$x]} $b");
+			  if ($entries > $max) $max = $entries;
          }
-         echo "</div>";
+         // echo "</div>";
          $currYear--;
     }
+	$barwidth = 40;
+	$fac = $barwidth/$max;
+
+	foreach($out as $year => $months) {
+		echo "<h2>$year</h2><div class='serendipity_entry'>\n";
+		for($y=1; $y<count($months); $y++) {
+			echo "<img src='{$serendipity['serendipityHTTPPath']}pixel/bar1.png' height='10' width='".ceil($months[$y][0]*$fac)."' hspace='0' vspace='0'>";
+			echo "<img src='{$serendipity['serendipityHTTPPath']}pixel/blank.png' height='10' width='".($barwidth-ceil($months[$y][0]*$fac))."' hspace='0' vspace='0'> ";
+			echo $months[$y][1]."<br />";
+		}
+		echo "</div>";
+	}
 }
 
 

[php-blog-cvs] serendipity NEWS,1.2,1.3

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

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

Modified Files:
	NEWS 
Log Message:
More changes in 0.3


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	6 Jun 2003 16:36:18 -0000	1.2
+++ NEWS	6 Jun 2003 16:48:58 -0000	1.3
@@ -10,7 +10,7 @@
 	* Links to entries are now called /archives/id_title_of_entry.html (used to be /archives/e_id.html) (jhermanns)
 	* Timeranges are now accessed like this: /archives/200203.html (used to be /archives/d_200203.html) (jhermanns)
 	* Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)
-	* Added validation to trackbacks (tomsommmer)
+	* Added validation to trackback-detection (tomsommmer)
 	* You can now delete comments and trackbacks if you are logged in (tomsommer)
 	* New logo in "Powered By" plugin (jhermanns & tomsommer)
 	* Sorting Comments & tracksback by ID (tomsommer)
@@ -35,6 +35,10 @@
 	* Fixed bug #719016 - (entry-title does not escape correctly) (tomsommer)
 	* Allow the showing of *complete* archived months (tomsommer)
 	* Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)
-
+	* Prevent the admin interface to be logged as referrer when using the 'Back to Blog' link (bergmann)
+	* Added full language support - English, German (jhermanns)
+ 	* Keep track of which blog entry was linked from or referred to (bergmann)
+	* Regenerate the .htaccess file, if installation fails (sterling & muesli)
+	
 Version 0.2 (April 4, 2003)
 ------------------------------------

[php-blog-cvs] serendipity NEWS,1.1,1.2

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

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

Modified Files:
	NEWS 
Log Message:
Typos suck


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NEWS	6 Jun 2003 16:33:31 -0000	1.1
+++ NEWS	6 Jun 2003 16:36:18 -0000	1.2
@@ -4,7 +4,7 @@
 	* Submitted mails in comments are now clickable (tomsommer)
 	* Added support for using *.gif in Image Manager, even if PHP is compiled with read-only gif (tomsommer)
 	* Fixing bug #720632 (exit-links in html_nuggets plugin aren't counted) (tomsommer)
-	* We now send diffirent notification emails if the comment is a trackback. (tomsommer)
+	* We now send different notification emails if the comment is a trackback. (tomsommer)
 	* Stipped mail from HTML tags (tomsommer)
 	* When viewing a single entry, page <title> becomes entry's title. (jhermanns)
 	* Links to entries are now called /archives/id_title_of_entry.html (used to be /archives/e_id.html) (jhermanns)
@@ -18,9 +18,9 @@
 	* Added link back to main page (tomsommer)
 	* Added support for deletion in blogger and metaweblog APIs (gschlossnagle)
 	* Added lots of error-handling to image manager (tomsommer)
-	* We now show trackbacks in a seperate window, and count them seperately (jhermanns)
+	* We now show trackbacks in a seperate window, and count them separately (jhermanns)
 	* Superuser-login initially sends you to authoring suit now (jhermanns)
-	* Beutified mails (tomsommer)
+	* Beautified mails (tomsommer)
 	* In Admin-module 'Edit entries' is now called 'Authoring Suite' (tomsommer)
 	* Improved imagick thumbnail generation (jhermanns)
 	* You can now delete images in image manager (tomsommer)
@@ -29,7 +29,7 @@
 	* Link to the archives is now /archive (jhermanns)
 	* Disallow empty comments (tomsommer)
 	* Fixed broken auto-trackback discovery (gschlossnagle)
-	* Fixed problem with echo'ing of .htaccess and paths, if installation fails (tomsommer)
+	* Fixed problem with echoing of .htaccess and paths, if installation fails (tomsommer)
 	* Added CSS to installation-screen (tomsommer)
 	* Fixed bug when displaying individual days by clicking on the calendar (tomsommer)
 	* Fixed bug #719016 - (entry-title does not escape correctly) (tomsommer)

[php-blog-cvs] serendipity NEWS,NONE,1.1

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

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

Added Files:
	NEWS 
Log Message:
Initial Import of NEWS

It's here we display all relevant changes from version to version.


--- NEW FILE: NEWS ---
Version 0.3 ()
------------------------------------
	* RSS 2.0 is now default type of feed (sterling)
	* Submitted mails in comments are now clickable (tomsommer)
	* Added support for using *.gif in Image Manager, even if PHP is compiled with read-only gif (tomsommer)
	* Fixing bug #720632 (exit-links in html_nuggets plugin aren't counted) (tomsommer)
	* We now send diffirent notification emails if the comment is a trackback. (tomsommer)
	* Stipped mail from HTML tags (tomsommer)
	* When viewing a single entry, page <title> becomes entry's title. (jhermanns)
	* Links to entries are now called /archives/id_title_of_entry.html (used to be /archives/e_id.html) (jhermanns)
	* Timeranges are now accessed like this: /archives/200203.html (used to be /archives/d_200203.html) (jhermanns)
	* Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)
	* Added validation to trackbacks (tomsommmer)
	* You can now delete comments and trackbacks if you are logged in (tomsommer)
	* New logo in "Powered By" plugin (jhermanns & tomsommer)
	* Sorting Comments & tracksback by ID (tomsommer)
	* We now remember comment details in cookies if requested, and delete them if wanted (tomsommer)
	* Added link back to main page (tomsommer)
	* Added support for deletion in blogger and metaweblog APIs (gschlossnagle)
	* Added lots of error-handling to image manager (tomsommer)
	* We now show trackbacks in a seperate window, and count them seperately (jhermanns)
	* Superuser-login initially sends you to authoring suit now (jhermanns)
	* Beutified mails (tomsommer)
	* In Admin-module 'Edit entries' is now called 'Authoring Suite' (tomsommer)
	* Improved imagick thumbnail generation (jhermanns)
	* You can now delete images in image manager (tomsommer)
	* Fixed lots of missing translations (jhermanns)
	* Added notice if search-string is smaller than 4 chars (tomsommer)
	* Link to the archives is now /archive (jhermanns)
	* Disallow empty comments (tomsommer)
	* Fixed broken auto-trackback discovery (gschlossnagle)
	* Fixed problem with echo'ing of .htaccess and paths, if installation fails (tomsommer)
	* Added CSS to installation-screen (tomsommer)
	* Fixed bug when displaying individual days by clicking on the calendar (tomsommer)
	* Fixed bug #719016 - (entry-title does not escape correctly) (tomsommer)
	* Allow the showing of *complete* archived months (tomsommer)
	* Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)

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

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.15,1.16

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Serendipity URL is now http://www.s9y.org



Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_sidebar_items.php	6 Jun 2003 15:44:57 -0000	1.15
+++ serendipity_sidebar_items.php	6 Jun 2003 15:52:49 -0000	1.16
@@ -157,7 +157,7 @@
 		global $serendipity;
 
 		$title = POWERED_BY.":";
-		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['serendipityHTTPPath']}pixel/s9y_banner_tiny.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://www.s9y.org\"><img src=\"{$serendipity['serendipityHTTPPath']}pixel/s9y_banner_tiny.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
 	}
 }
 

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.14,1.15

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Correct link to RSS 0.91 feed


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_sidebar_items.php	3 Jun 2003 15:14:56 -0000	1.14
+++ serendipity_sidebar_items.php	6 Jun 2003 15:44:57 -0000	1.15
@@ -120,8 +120,8 @@
 
 		$title = SYNDICATE_THIS_BLOG;
 ?>
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'>RSS 0.91 feed</a>
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=0.91'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=0.91'>RSS 0.91 feed</a>
             <br/>
             <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
             <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.59,1.60

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
add mailto: to emails

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_functions.inc.php	4 Jun 2003 22:10:20 -0000	1.59
+++ serendipity_functions.inc.php	5 Jun 2003 10:11:49 -0000	1.60
@@ -430,7 +430,7 @@
     }
 
     foreach ($comments as $comment) {
-        $link = empty($comment['url']) ? $comment['email'] : $comment['url'];
+        $link = empty($comment['url']) ? "mailto:{$comment['email']}" : $comment['url'];
         $name = empty($comment['author']) ? 'Anonymous' : $comment['author'];
         $type = $comment['type'] == 'trackback' ? TRACKBACK_FROM : POSTED_BY;
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.58,1.59

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
1) We don't preserve transparency (need a fix..)
2) We need to make sure PHP is compiled with imagepng before we use it


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_functions.inc.php	4 Jun 2003 22:02:17 -0000	1.58
+++ serendipity_functions.inc.php	4 Jun 2003 22:10:20 -0000	1.59
@@ -1150,10 +1150,13 @@
 	if ( !function_exists($loadfn) ) {
 		return false;
 	}
-	/* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG
-	   This will at the same time preserve GIF transparency */  
+	/* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
 	if ( !function_exists($savefn) ) {
-		$savefn = "imagepng";
+		if ( function_exists("imagepng") ) {
+			$savefn = "imagepng";
+		} else {
+			return false;
+		}
 	}
 
 	$in = $loadfn($infilename);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.57,1.58

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
If imagegif() does not exist, we use imagepng() to handle *.gif images.

If imagecreatefromX() does not exist, we are bailing out


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_functions.inc.php	30 May 2003 15:05:20 -0000	1.57
+++ serendipity_functions.inc.php	4 Jun 2003 22:02:17 -0000	1.58
@@ -1145,9 +1145,15 @@
 		default:
 			return false;
 	}
-
-	if (!function_exists($loadfn) && !function_exists($savefn)) {
+	
+	/* If our loader does not exist, we are doomed */
+	if ( !function_exists($loadfn) ) {
 		return false;
+	}
+	/* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG
+	   This will at the same time preserve GIF transparency */  
+	if ( !function_exists($savefn) ) {
+		$savefn = "imagepng";
 	}
 
 	$in = $loadfn($infilename);

[php-blog-cvs] serendipity rss.php,1.2,1.3

[<ste...@us...>]

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

Modified Files:
	rss.php 
Log Message:
syndicate 2.0 as default


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rss.php	30 Mar 2003 15:38:09 -0000	1.2
+++ rss.php	4 Jun 2003 16:19:27 -0000	1.3
@@ -4,7 +4,7 @@
 include_once("serendipity_config.inc.php");
 $version = $_GET['version'];
 if (empty($version)) {
-    $version = '0.91';
+    $version = '2.0';
 }
 
 $description = $serendipity['blogDescription'];

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.13,1.14

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Fixing bug #720632 (exit-links in html_nuggets plugin aren't counted)

Let me know if it breaks anything?


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_sidebar_items.php	25 May 2003 16:36:33 -0000	1.13
+++ serendipity_sidebar_items.php	3 Jun 2003 15:14:56 -0000	1.14
@@ -195,7 +195,7 @@
 	function generate_content(&$title)
 	{
 		$title = $this->get_config('title', $title);
-		echo $this->get_config('content');
+		echo serendipity_markup_text($this->get_config('content'));
 	}
 
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.56,1.57

[<gsc...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed merge conflict


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_functions.inc.php	30 May 2003 14:24:21 -0000	1.56
+++ serendipity_functions.inc.php	30 May 2003 15:05:20 -0000	1.57
@@ -283,13 +283,7 @@
 
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
-<<<<<<< serendipity_functions.inc.php
-	
 	if (!is_array($entries) || $entries[0] == false) {
-=======
-
-	if (!is_array($entries)) {
->>>>>>> 1.43
   		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
 	}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.55,1.56

[<gsc...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
make sure array is not empty


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_functions.inc.php	26 May 2003 13:14:14 -0000	1.55
+++ serendipity_functions.inc.php	30 May 2003 14:24:21 -0000	1.56
@@ -51,6 +51,9 @@
 }
 function serendipity_forgetCommentDetails() {
 	global $serendipity;
+        if(!$serendipity['COOKIE']) {
+		return;
+	}
 	foreach ($serendipity['COOKIE'] as $n => $v) {
 		serendipity_deleteCookie($n);
 	}
@@ -280,8 +283,13 @@
 
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
+<<<<<<< serendipity_functions.inc.php
+	
+	if (!is_array($entries) || $entries[0] == false) {
+=======
 
 	if (!is_array($entries)) {
+>>>>>>> 1.43
   		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
 	}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.54,1.55 serendipity_xmlrpc.php,1.3,1.4

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_xmlrpc.php 
Log Message:
Removed some occurences of archives/e_ and archives/d_


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_functions.inc.php	26 May 2003 00:18:56 -0000	1.54
+++ serendipity_functions.inc.php	26 May 2003 13:14:14 -0000	1.55
@@ -944,7 +944,7 @@
     array_shift($matches);
 
     // Make trackback URL
-    $url = "{$serendipity['baseURL']}archives/e_{$id}.html";
+    $url = "{$serendipity['baseURL']}archives/{$id}_".serendipity_makeFilename($title).".html";
 
     // Add URL references
     $locations = $matches[0];

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_xmlrpc.php	24 May 2003 14:10:40 -0000	1.3
+++ serendipity_xmlrpc.php	26 May 2003 13:14:14 -0000	1.4
@@ -255,8 +255,8 @@
           'mt_allow_pings' => new XML_RPC_Value(1, 'boolean'),
           'mt_convert_breaks' => new XML_RPC_Value(0, 'boolean'),
           'title' => new XML_RPC_Value($entry['title'],'string'),
-          'permalink' => new XML_RPC_Value($serendipity['baseURL']."/archives/e_$postid.html", 'string'),
-          'link' => new XML_RPC_Value($serendipity['baseURL']."/archives/e_$postid.html", 'string'));
+          'permalink' => new XML_RPC_Value($serendipity['baseURL']."/archives/{$postid}_.html", 'string'),
+          'link' => new XML_RPC_Value($serendipity['baseURL']."/archives/{$postid}_.html", 'string'));
     $entry = new XML_RPC_Value($tmp, 'struct');
     return  new XML_RPC_Response($entry);
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.53,1.54 serendipity_lang_en.inc.php,1.11,1.12

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_lang_en.inc.php 
Log Message:
We now send diffirent emails if the comment is a trackback.

We also strip HTML tags in the mails

And we changed the signature a bit


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_functions.inc.php	25 May 2003 17:20:04 -0000	1.53
+++ serendipity_functions.inc.php	26 May 2003 00:18:56 -0000	1.54
@@ -516,8 +516,7 @@
               AND e.authorid = a.authorid";
     $row = serendipity_db_query($query, true);
     if($row['mail_comments']) {
-        serendipity_sendComment($row['email'], $name, $email, $url, $id,
-                          $row['title'], $comments);
+        serendipity_sendComment($row['email'], $name, $email, $url, $id, $row['title'], $comments, $type);
     }
     serendipity_purgeEntry($id, $t);
 }
@@ -536,25 +535,45 @@
     serendipity_db_query("UPDATE ".$serendipity["dbPrefix"]." SET comments=comments+1 WHERE id LIKE $id");
 }
 
-function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment) {
+function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type='NORMAL') {
     global $serendipity;
-    $text =
-sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle],$id)."
+    
+    if ($type == 'TRACKBACK') {
 
-IP Address: $_SERVER[REMOTE_ADDR]
-".NAME.": $fromName
-".EMAIL.": $fromEmail
-URL: $fromUrl
+/* If the comment is a trackback */
+	$subject =  "[$serendipity[blogTitle]] New trackback made to $title";
+	$text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title)."
 
-".COMMENTS.":
+Weblog ".NAME.": ". stripslashes($fromName) ."
+Link to remote-entry: $fromUrl
 
-$comment
+Excerpt:
+". strip_tags($comment);
+
+
+    } else {
 
+/* If the comment is a.. comment */
+	$subject = "[$serendipity[blogTitle]] New comment posted to $title";
+	$text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle],$title)."
+
+User IP Address: $_SERVER[REMOTE_ADDR]
+User ".NAME.": $fromName
+User ".EMAIL.": $fromEmail
+User URL: $fromUrl
+
+".COMMENTS.":
+". strip_tags($comment);
+   
+    }
+
+$signature = "
 --
-Powered by serendipity.
-My blog runs on PHP.  Yours can too.
-http://php-blog.sf.net/ to find out how.";
-mail($to, "[$serendipity[blogTitle]] New comment posted to $title",  $text,
+$serendipity[blogTitle] is powered by Serendipity.
+The best PHP blog around, you can use it too.
+Check out http://php-blog.sf.net/ to find out how.";
+
+mail($to, $subject,  $text.$signature,
      "From: $fromName <$fromEmail>\r\n");
 
 }

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_en.inc.php	22 May 2003 23:01:00 -0000	1.11
+++ serendipity_lang_en.inc.php	26 May 2003 00:18:56 -0000	1.12
@@ -82,7 +82,8 @@
 define("POSTED_BY", "Posted by");
 define("TRACKBACK_FROM", "Trackback from");
 define("ON", "on");
-define("A_NEW_COMMENT_BLAHBLAH", "A new comment has been posted on your blog %s, on entry #%s.");
+define("A_NEW_COMMENT_BLAHBLAH", "A new comment has been posted on your blog \"%s\", in the entry entitled \"%s\".");
+define("A_NEW_TRACKBACK_BLAHBLAH", "A new trackback has been made to your blog-entry entitled \"%s\".");
 define("NO_CATEGORY", "No Category");
 define("ENTRY_BODY", "Entry Body");
 define("EXTENDED_BODY", "Extended Body");

[php-blog-cvs] serendipity serendipity_entries.php,1.5,1.6

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

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

Modified Files:
	serendipity_entries.php 
Log Message:
Sessioning for the admin-interface wasn't SUCH a bad idea ;)


Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_entries.php	25 May 2003 19:49:21 -0000	1.5
+++ serendipity_entries.php	25 May 2003 20:07:55 -0000	1.6
@@ -1,4 +1,5 @@
 <?php
+session_start();
 if (file_exists("./serendipity_config_local.inc.php")) {
     include("serendipity_config.inc.php");
 } else {

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

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

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

Modified Files:
	index.php 
Log Message:
When viewing a single entry, page <title> becomes entry's title.


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index.php	25 May 2003 17:28:57 -0000	1.10
+++ index.php	25 May 2003 19:54:57 -0000	1.11
@@ -46,7 +46,7 @@
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
    $title = $title[0];
 
-   $serendipity['blogSubTitle'] = htmlspecialchars($title);
+   $serendipity['blogTitle'] = htmlspecialchars($title);
 
    ob_start();
    include_once("serendipity_genpage.inc.php");

[php-blog-cvs] serendipity serendipity_entries.php,1.4,1.5 serendipity_entries_overview.inc.php,1.1,1.2

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

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

Modified Files:
	serendipity_entries.php serendipity_entries_overview.inc.php 
Log Message:
Removed unnessecary session_start()s that prevent search engines from properly indexing everything...


Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_entries.php	5 Apr 2003 23:46:55 -0000	1.4
+++ serendipity_entries.php	25 May 2003 19:49:21 -0000	1.5
@@ -1,5 +1,4 @@
 <?php
-session_start();
 if (file_exists("./serendipity_config_local.inc.php")) {
     include("serendipity_config.inc.php");
 } else {

Index: serendipity_entries_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries_overview.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_entries_overview.inc.php	30 Mar 2003 15:50:05 -0000	1.1
+++ serendipity_entries_overview.inc.php	25 May 2003 19:49:21 -0000	1.2
@@ -10,6 +10,5 @@
 ##########################################################################
 
 if (IN_serendipity !== true) die ("Don't hack!");
-session_start();
 ?>
 Welcome back, <?= $_SESSION['serendipityUser'] ?>.  

[php-blog-cvs] serendipity index.php,1.9,1.10

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

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

Modified Files:
	index.php 
Log Message:
Allow archives/id_.html.


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- index.php	25 May 2003 16:36:33 -0000	1.9
+++ index.php	25 May 2003 17:28:57 -0000	1.10
@@ -33,7 +33,7 @@
         echo $data;
 }
 
-else if (preg_match('@/(\d+)_\w+\.html@i', $uri, $matches)) {
+else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
    $id = $matches[1];
 
     serendipity_track_referrer($id);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.52,1.53

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Rewrite Umlauts, too.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_functions.inc.php	25 May 2003 16:36:33 -0000	1.52
+++ serendipity_functions.inc.php	25 May 2003 17:20:04 -0000	1.53
@@ -261,7 +261,15 @@
 *  Creates a filename that consists of [a-zA-z0-9_] (with some custom adjustments (space -> _, ä -> ae and such)
 **/
 function serendipity_makeFilename($str) {
-	return preg_replace('#[^\w]#', '', str_replace(" ", "_" , $str));
+	$str = str_replace("Ä", "Ae", $str);
+	$str = str_replace("ä", "ae", $str);
+	$str = str_replace("Ö", "Oe", $str);
+	$str = str_replace("ö", "oe", $str);
+	$str = str_replace("Ü", "Ue", $str);
+	$str = str_replace("ü", "ue", $str);
+	$str = str_replace("ß", "sz", $str);
+	$str = str_replace(" ", "_" , $str);
+	return preg_replace('#[^\w]#', '', $str);
 }
 
 /**

[php-blog-cvs] serendipity index.php,1.8,1.9 search.php,1.2,1.3 serendipity_admin.php,1.8,1.9 serendipity_config.inc.php,1.10,1.11 serendipity_functions.inc.php,1.51,1.52 serendipity_sidebar_items.php,1.12,1.13

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

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

Modified Files:
	index.php search.php serendipity_admin.php 
	serendipity_config.inc.php serendipity_functions.inc.php 
	serendipity_sidebar_items.php 
Log Message:
+++ATTENTION+++
This one's a troublemaker for those who already use serendipity. The link-rewriting has been changed. An entry is now accessed like this:

/archives/id_title_of_entry.html (used to be /archives/e_id.html)

Timeranges are now accessed like this:

/archives/200203.html (used to be /archives/d_200203.html)

This is more reader friendly and the search engines will be able to find pages better (title is contained in filename). Of course, all your "old" link to serendipity blogs are now broken. Since I don't want to have two ways of accessing an entry (old way AND new way), you'll have to go through your entries and fix the links. 

Since I'm the only one with 200+ entries, I'm probably the one who'll come up with a script that goes through your db and fixes the links. Eventually.

Also, the pregeneration is now broken, but can be easily fixed (look for "fixme", there's an unlink($filename."*.html") that's supposed to delete a file - since this function doesnt (need to) know the title of the entry, it must delete id_*.html instead of id_title_of_entry.html). Easy fiX.

Does the rest work for you?



Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.php	3 May 2003 13:28:19 -0000	1.8
+++ index.php	25 May 2003 16:36:33 -0000	1.9
@@ -1,18 +1,16 @@
 <?php
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
-// rules to handle archives.  
+// rules to handle archives.
 header("HTTP/1.0 200\r\n");
-session_start();
 include_once("serendipity_config.inc.php");
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
-if (preg_match('@/archives/@', $uri)) {
-    if (preg_match('@/(d_(\d+)\.html)@', $uri, $matches)) {
-        $range = $matches[2];
+if (preg_match('@/archives/(\d+)\.html@', $uri, $matches)) {
+        $range = $matches[1];
         $_GET['serendipity']['action'] = "read";
         $_GET['serendipity']['range'] = $range;
-	
+
 
         if (strlen($range) == 6) {
             $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
@@ -31,36 +29,37 @@
             fwrite($fp, $data);
             fclose($fp);
         }
-        
+
         echo $data;
-    } else if (preg_match('@/(e_(\d+)\.html)@', $uri, $matches)) {
-        $id = $matches[2];
-    
-        serendipity_track_referrer($id);
-        $track_referer = false;
+}
 
-        $_GET['serendipity']['action'] = 'read';
-        $_GET['serendipity']['id'] = $id;
+else if (preg_match('@/(\d+)_\w+\.html@i', $uri, $matches)) {
+   $id = $matches[1];
 
-        $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
+    serendipity_track_referrer($id);
+    $track_referer = false;
+
+   $_GET['serendipity']['action'] = 'read';
+   $_GET['serendipity']['id'] = $id;
+
+   $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
-        $title = $title[0];
-        
-        $serendipity['blogSubTitle'] = htmlspecialchars($title);
+   $title = $title[0];
 
-        ob_start();
-        include_once("serendipity_genpage.inc.php");
-        $data = ob_get_contents();
-        ob_end_clean();
+   $serendipity['blogSubTitle'] = htmlspecialchars($title);
 
-        if ($serendipity['pregenerate']) {
-            $fp = fopen("./archives/{$matches[1]}", "w");
-            fwrite($fp, $data);
-            fclose($fp);
-        }
+   ob_start();
+   include_once("serendipity_genpage.inc.php");
+   $data = ob_get_contents();
+   ob_end_clean();
+
+   if ($serendipity['pregenerate']) {
+        $fp = fopen("./archives/{$matches[1]}", "w");
+        fwrite($fp, $data);
+        fclose($fp);
+   }
+   print $data;
 
-        print $data;
-    }
 } else if (preg_match('@/feeds/@', $uri)) {
     if (preg_match('@/index.(rss|rdf|rss2)$@', $uri, $matches)) {
         switch ($matches[1]) {
@@ -84,7 +83,7 @@
             fwrite($fp, $data);
             fclose($fp);
         }
-        
+
         print $data;
     }
 } else if (preg_match('@/admin$@', $uri)) {

Index: search.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- search.php	29 Mar 2003 16:44:46 -0000	1.2
+++ search.php	25 May 2003 16:36:33 -0000	1.3
@@ -1,5 +1,5 @@
 <?php
-session_start();
+
 include_once("serendipity_config.inc.php");
 include_once("serendipity_genpage.inc.php");
 ?>

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin.php	21 May 2003 15:49:50 -0000	1.8
+++ serendipity_admin.php	25 May 2003 16:36:33 -0000	1.9
@@ -1,4 +1,5 @@
 <?php
+ini_set("session.use_trans_sid",1);
 session_start();
 if (file_exists("./serendipity_config_local.inc.php")) {
     include("serendipity_config.inc.php");

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_config.inc.php	24 May 2003 01:51:52 -0000	1.10
+++ serendipity_config.inc.php	25 May 2003 16:36:33 -0000	1.11
@@ -1,7 +1,7 @@
 <?php
 define('IN_serendipity', true);
 include_once('compat.php');
-
+ini_set("session.use_trans_sid",0);
 $serendipity['production'] = 1;
 if (!isset($serendipity['serendipityPath'])) {
 	$serendipity['serendipityPath'] = './';

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_functions.inc.php	24 May 2003 22:04:22 -0000	1.51
+++ serendipity_functions.inc.php	25 May 2003 16:36:33 -0000	1.52
@@ -110,7 +110,7 @@
 <TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='serendipity_calendarHeader'><B><nobr>
 <?php
 		if ($serendipity["rewrite"]==true) {
-        	$link = $serendipity["serendipityHTTPPath"]."archives/d_".$year.sprintf("%02d",$month).".html";
+        	$link = $serendipity["serendipityHTTPPath"]."archives/".$year.sprintf("%02d",$month).".html";
         }
         else {
         	$link = "fixme";
@@ -152,7 +152,7 @@
 
                     // Print day
                     if ($serendipity["rewrite"]==true)
-                    	$link = $serendipity["serendipityHTTPPath"]."archives/d_".date("Ymd", mktime(0,0,0, $month, $currDay, $year)).".html";
+                    	$link = $serendipity["serendipityHTTPPath"]."archives/".date("Ymd", mktime(0,0,0, $month, $currDay, $year)).".html";
                     else
                     	$link = "fixme!";
                     if (date("m") == $month && date("Y") == $year && $currDay == date("j")) echo "<I>";
@@ -257,6 +257,12 @@
 	return serendipity_db_query($querystring);
 }
 
+/**
+*  Creates a filename that consists of [a-zA-z0-9_] (with some custom adjustments (space -> _, ä -> ae and such)
+**/
+function serendipity_makeFilename($str) {
+	return preg_replace('#[^\w]#', '', str_replace(" ", "_" , $str));
+}
 
 /**
 * Prints the entries you fetched with serendipity_fetchEntries/searchEntries in HTML.
@@ -296,16 +302,16 @@
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='serendipity_time'><a href=\""
 					. $serendipity['serendipityHTTPPath']
-					. "archives/e_"
+					. "archives/"
 					. $entry['id']
-					. ".html#extended\">View Extended Entry</a></div><br>";
+					. "_".serendipity_makeFilename($entry['title']).".html#extended\">View Extended Entry</a></div><br>";
 			}
 
 			echo "<div class='serendipity_time'><br><a href=\""
 				. $serendipity['serendipityHTTPPath']
-				. "archives/e_"
+				. "archives/"
 				. $entry['id']
-				. ".html\">".POSTED_BY." "
+				. "_".serendipity_makeFilename($entry['title']).".html\">".POSTED_BY." "
 				. htmlentities($entry['username'])
 				. ($entry['category_name']?(" in ${entry['category_name']}"):"")
                 ." at "
@@ -335,7 +341,7 @@
             echo "  rdf:about=\"{$serendipity['baseURL']}feeds/ei_{$entry['id']}.rdf\"\n";
             echo "  trackback:ping=\"{$serendipity['baseURL']}comment.php?type=trackback&entry_id={$entry['id']}\"\n";
             echo "  dc:title=\"{$entry['title']}\"\n";
-            echo "  dc:identifier=\"{$serendipity['baseURL']}archives/e_{$entry['id']}.html\" />\n";
+            echo "  dc:identifier=\"{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html\" />\n";
             echo "</rdf:RDF>\n";
             echo "-->\n";
 
@@ -562,7 +568,7 @@
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
-            echo "<link>{$serendipity['baseURL']}archives/e_{$entry['id']}.html</link>\n";
+            echo "<link>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</link>\n";
             if ($version == '2.0') {
                 // extract author information
                 $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
@@ -572,7 +578,7 @@
                 echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
                 echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
-                echo "<guid>{$serendipity['baseURL']}e_{$entry['id']}.html</guid>\n";
+                echo "<guid>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</guid>\n";
             } else {
                 echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
             }
@@ -681,10 +687,11 @@
         $dated = date("Ymd", $timestamp);
         $datem = date("Ym", $timestamp);
 
-        @unlink("{$serendipity['serendipityPath']}/archives/d_{$dated}.html");
-        @unlink("{$serendipity['serendipityPath']}/archives/d_{$datem}.html");
+        @unlink("{$serendipity['serendipityPath']}/archives/{$dated}.html");
+        @unlink("{$serendipity['serendipityPath']}/archives/{$datem}.html");
     }
-    @unlink("{$serendipity['serendipityPath']}/archives/e_{$id}.html");
+	// Fixme (the _* part) !
+    @unlink("{$serendipity['serendipityPath']}/archives/{$id}_*.html");
     @unlink("{$serendipity['serendipityPath']}/feeds/index.rss");
     @unlink("{$serendipity['serendipityPath']}/feeds/index.rss2");
     @unlink("{$serendipity['serendipityPath']}/index.html");
@@ -1727,7 +1734,7 @@
          for($x=1; $x<13; $x++) {
               $entries = serendipity_postAmount($currYear, $x);
               if ($entries>0) {
-                  $a = "<a href='{$serendipity['serendipityHTTPPath']}archives/d_$currYear".sprintf("%02s",$x).".html'>";
+                  $a = "<a href='{$serendipity['serendipityHTTPPath']}archives/$currYear".sprintf("%02s",$x).".html'>";
                   $b = "($entries entries)</a>";
               }
               else {

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_sidebar_items.php	24 May 2003 10:23:06 -0000	1.12
+++ serendipity_sidebar_items.php	25 May 2003 16:36:33 -0000	1.13
@@ -64,7 +64,7 @@
 		for($x=0; $x<3; $x++) {
 			$ts-=1;
 			if ($serendipity["rewrite"] === true)
-				$link = $serendipity["serendipityHTTPPath"]."archives/d_".date("Ym", $ts).".html";
+				$link = $serendipity["serendipityHTTPPath"]."archives/".date("Ym", $ts).".html";
 			else
 				$link = "fixme";
 			echo "<a href='$link'>".$serendipity["months"][date("n", $ts)]." ".date("Y", $ts)."</a><br />";

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
w00ps... need to use GET

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_images.inc.php	22 May 2003 23:19:33 -0000	1.5
+++ serendipity_admin_images.inc.php	25 May 2003 01:55:35 -0000	1.6
@@ -87,32 +87,33 @@
     		break;
 
 	case "DoDelete":
-		$fThumb = serendipity_parseFileName($serendipity["fname"]);
+		$file = $serendipity['GET']['fname'];
+		$fThumb = serendipity_parseFileName($file);
 		$fThumb = $fThumb[0].".".$serendipity["thumbSuffix"].".".$fThumb[1];
-		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
-			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
-				echo "Deleted the image entitled <b>". $serendipity['fname'] ."</b>";
+		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
+			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
+				echo "Deleted the image entitled <b>". $file ."</b>";
 			} else {
-				echo "Unable to delete <b>". $serendipity['fname'] ."</b>";
+				echo "Unable to delete <b>". $file ."</b>";
 			}
 			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$fThumb) ) {
 				echo "<br>Deleted the thumbnail entitled <b>". $fThumb ."</b>";
 			}
 																	 
 		} else {
-			echo "I was unable to locate the file entitled <b>". $serendipity['fname'] ."</b>, maybe it has already been deleted?";
+			echo "I was unable to locate the file entitled <b>". $file ."</b>, maybe it has already been deleted?";
 		}
 
 		break;	
 	case "delete":
-		$file = $serendipity['fname'];
+		$file = $serendipity['GET']['fname'];
 		
 		
 		echo "You are about to delete <b>$file</b><br>";
 		echo "If you are using this file in some of your entries, it will cause dead images<br>";
 		echo "Are you sure you wish to proceed?<p>";
 		
-		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $serendipity['fname'];
+		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $file;
 		echo "<input type='button' value='Delete the image' onClick='location.href=\"$newLoc\"'>";
 			 	 
 		echo str_repeat("&nbsp;", 10);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.50,1.51 serendipity_editor.js,1.1.1.1,1.2

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_editor.js 
Log Message:
This is the new non-WYSIWYG editor.
Since it is only working in Mozilla and IE, we have a small regular-based condition to only show it, if the UA contains "Mozilla" or "IE",
If you know of any other browsers which can handle this new non-WYSIWYG editor, let me know.

It has much better handling of positioning of inserted text and can also work with selections etc.
You can now select some text and wrap it with links or apply text-formating to the selection.

Please test it as much as you can, and report back.
The old non-WYSIWYG editor is still active to anyone who does not have Mozilla or IE


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_functions.inc.php	24 May 2003 20:35:08 -0000	1.50
+++ serendipity_functions.inc.php	24 May 2003 22:04:22 -0000	1.51
@@ -485,7 +485,7 @@
     $name = serendipity_db_escape_string($commentInfo['name']);
     $url = serendipity_db_escape_string($commentInfo['url']);
     $email = serendipity_db_escape_string($commentInfo['email']);
-    
+
     $t = time();
     $query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title)";
     $query .= " VALUES ('$id', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title')";
@@ -1207,6 +1207,7 @@
 function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = array(), $errMsg = "") {
 	global $serendipity;
 
+	$serendipity['EditorBrowsers'] = "(IE|Mozilla)";
 	$cats = serendipity_fetchCategories();
 
 	$cat_list = "<select name=\"serendipity[categoryid]\"><option value=\"0\">[".NO_CATEGORY."]</option>\n";
@@ -1236,42 +1237,43 @@
 		echo '<input type="hidden" name="serendipity[id]" value="'.$entry["id"]."\">\n";
 		echo '<input type="hidden" name="serendipity[timestamp]" value="'.$entry["timestamp"]."\">\n";
             ?>
-			<tr>
-				<td align="left">
-                	<input type="text" name="serendipity[title]" value="<?=$entry["title"]?>" size=30>
+	<tr>
+		<td align="left">
+                	<input type="text" name="serendipity[title]" value="<?=$entry["title"]?>" size="30">
+                	<input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
                 </td>
 				<td><?=Category?> <?= $cat_list ?></td>
-    		</tr>
-            <tr>
+	</tr>
+	<tr>
                 <td colspan="2"><?=ENTRY_BODY?></td>
-            </tr>
-    		<tr>
-				<td colspan="2">
+        </tr>
+    	<tr>
+		<td colspan="2">
                 	<textarea name="serendipity[body]" id="serendipity[body]" cols=80 rows=20><?=$entry["body"]?></textarea>
                 </td>
-    		</tr>
-            <tr>
+    	</tr>
+        <tr>
                 <td colspan="2"><?=EXTENDED_BODY?></td>
-            </tr>
-    		<tr>
-				<td colspan="2">
+        </tr>
+    	<tr>
+		<td colspan="2">
                 	<textarea name="serendipity[extended]" id="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
                 </td>
-    		</tr>
-            <tr>
+    	</tr>
+        <tr>
             	<td colspan="2" align="right">
-                	<input type="submit" value="save">
+                	<input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
                 </td>
-            </tr>
-            </form>
+        </tr>
+        </form>
     	</table>
-    <?php
+<?php
 		serendipity_emit_htmlarea_code("document.forms['serendipityEntry']['serendipity[body]']");
 		serendipity_emit_htmlarea_code("document.forms['serendipityEntry']['serendipity[extended]']");
 	}
 	else
 	{
-	?>
+?>
 	<script language="JavaScript" src="serendipity_editor.js"></script>
    	<font color="#ff0000"><?=$errMsg?></font>
     	<table class='serendipityEntryEdit'>
@@ -1283,39 +1285,59 @@
 		echo '<input type="hidden" name="serendipity[id]" value="'.$entry["id"]."\">\n";
 		echo '<input type="hidden" name="serendipity[timestamp]" value="'.$entry["timestamp"]."\">\n";
             ?>
-			<tr>
-				<td align="left" valign="top">
-                	<input type="text" name="serendipity[title]" value="<?=htmlentities($entry["title"])?>" size=30>
-                </td>
-                <td nowrap="nowrap" align="right" valign="top">
-					<?=CATEGORY?> <?= $cat_list ?></td><tr><td align="left">
-                	<input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
-                    <input type="button" value=" U " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
-                    <input type="button" value=" I " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
-					<input type="button" value="<img>" onClick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
-                    <input type="button" value="<?=IMAGE?>" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
-                    <input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
-		    </td><td align="right">
-		    <input type="submit" value="<?=SAVE?>">
+	<tr>
+		<td align="left" colspan="2">
+                	<input type="text" name="serendipity[title]" value="<?=htmlentities($entry["title"])?>" size="80">
+                	<input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
                 </td>
-    		</tr>
-            <tr>
-                <td colspan="2"><?=ENTRY_BODY?></td>
-            </tr>
-    		<tr>
-				<td colspan="2">
+	</tr>
+	<tr>
+		<td>
+			<?=CATEGORY?> <?= $cat_list ?>
+        	</td>
+		<td align="right">
+		<?php
+		// Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor
+		if ( eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
+		?>
+			<input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')">
+			<input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')">
+			<input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')">
+			<input type="button" name="insJ" value="img" accesskey="j" onClick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])">
+			<input type="button" name="insImage" value="<?= IMAGE ?>" style="" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');">
+			<input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onClick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])">
+		<? } else { ?>
+			<input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
+		        <input type="button" value=" U " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
+			<input type="button" value=" I " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
+			<input type="button" value="<img>" onClick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
+			<input type="button" value="<?=IMAGE?>" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
+			<input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
+		<? } ?>
+		</td>
+    	</tr>
+        <tr>
+        	<td colspan="2"><?=ENTRY_BODY?></td>
+        </tr>
+    	<tr>
+		<td colspan="2">
                 	<textarea name="serendipity[body]" cols=80 rows=20><?=htmlentities($entry["body"])?></textarea>
                 </td>
-    		</tr>
-            <tr>
+    	</tr>
+        <tr>
                 <td colspan="2"><?=EXTENDED_BODY?></td>
-            </tr>
-    		<tr>
-				<td colspan="2">
+        </tr>
+    	<tr>
+		<td colspan="2">
                 	<textarea name="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
                 </td>
-    		</tr>
-            </form>
+    	</tr>
+    	<tr>
+    	        <td colspan="2" align="right">
+                	<input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
+                </td>
+        </tr>
+        </form>
     	</table>
 		<?php
  	}

Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_editor.js	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_editor.js	24 May 2003 22:04:22 -0000	1.2
@@ -1,4 +1,88 @@
 <!-- // Hide from older browsers
+
+/*
+	Written by chris wetherell
+	http://www.massless.org
+	chris [THE AT SIGN] massless.org
+	
+	warning: it only works for IE4+/Win and Moz1.1+
+	feel free to take it for your site
+	if there are any problems, let chris know.
+*/
+	
+var thisForm;
+
+function getMozSelection(txtarea) {
+	var selLength = txtarea.textLength;
+	var selStart = txtarea.selectionStart;
+	var selEnd = txtarea.selectionEnd;
+	if (selEnd==1 || selEnd==2) selEnd=selLength;
+	return (txtarea.value).substring(selStart, selEnd);
+}
+
+function mozWrap(txtarea, lft, rgt) {
+	var selLength = txtarea.textLength;
+	var selStart = txtarea.selectionStart;
+	var selEnd = txtarea.selectionEnd;
+	if (selEnd==1 || selEnd==2) selEnd=selLength;
+	var s1 = (txtarea.value).substring(0,selStart);
+	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s3 = (txtarea.value).substring(selEnd, selLength);
+	txtarea.value = s1 + lft + s2 + rgt + s3;
+}
+
+function IEWrap(lft, rgt) {
+	strSelection = document.selection.createRange().text;
+	if (strSelection!="") {
+	document.selection.createRange().text = lft + strSelection + rgt;
+	}
+}
+
+function wrapSelection(txtarea, lft, rgt) {
+	if (document.all) {IEWrap(lft, rgt);}
+	else if (document.getElementById) {mozWrap(txtarea, lft, rgt);}
+}
+
+function wrapSelectionWithLink(txtarea) {
+	var my_link = prompt("Enter URL:","http://");
+	if (getMozSelection(txtarea) == "") {
+		var my_desc = prompt("Enter Description");
+	}
+	if (my_link != null) {
+		lft = "<a href=\"" + my_link + "\">";
+		if (my_desc != null && my_desc != "") {
+			rgt = my_desc +"</a>";
+		} else {
+			rgt = "</a>";
+		}
+		wrapSelection(txtarea, lft, rgt);
+	}
+	return;
+}	
+/* end chris w. script */
+
+function mozInsert(txtarea, str) {
+	var selLength = txtarea.textLength;
+	var selStart = txtarea.selectionStart;
+	var selEnd = txtarea.selectionEnd;
+	if (selEnd==1 || selEnd==2) selEnd=selLength;
+	var s1 = (txtarea.value).substring(0,selStart);
+	var s2 = (txtarea.value).substring(selStart, selEnd)
+	var s3 = (txtarea.value).substring(selEnd, selLength);
+	txtarea.value = s1 + str + s2 + s3;
+}
+
+function wrapInsImage (area) 
+{
+    var loc = prompt('Enter the Image Location: ');
+    if (!loc) {
+        return;
+    }
+ 	mozInsert(area,'<img src="'+ loc + '" />');
+}
+
+/* end Better-Editor functions */
+
 function serendipity_insImage (area) 
 {
     var loc = prompt('Enter the Image Location: ');
@@ -11,6 +95,12 @@
     area.focus();
 }
 
+function serendipity_insBasic (area, tag)
+{
+    area.value = area.value + "<" + tag + "></" + tag + ">";
+    area.focus();
+}
+
 function serendipity_insLink (area)
 {
     var loc = prompt('Enter Location: ');
@@ -25,12 +115,6 @@
     area.focus();
 }
 
-function serendipity_insBasic (area, tag)
-{
-    area.value = area.value + "<" + tag + "></" + tag + ">";
-    area.focus();
-}
-
 function serendipity_imageSelector_addToBody (str)
 {
     document.forms['serendipityEntry']['serendipity[body]'].value += str;
@@ -39,6 +123,7 @@
 
 function serendipity_imageSelector_done() 
 {
+
 	var insert = '';
 	var img = '';
     var src = '';