php-blog-cvs — Serendipity commit list

Re: [php-blog-cvs] serendipity/templates/newspaper layout.php,1.4, 1.5

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

Hi All!

> apart from that, feel free to release. contact sterling or garvin to make a
> release, i'm now going to berlin. have a nice weekend.

I'd love to do a release, but my SF account for the php-blog project does not allow me
to publish a release. So everything's left to Sterling. Who's going to voice-call him,
as he's not reading mail anymore? ;-)))

Regards,
Garvin.

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.159,1.160

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
When there are no entries in the blog, the archive overview fails with a 
division by zero and then prints empty navigation items until 1970. 

Thanks to Till Gerken


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- serendipity_functions.inc.php	1 Oct 2003 11:38:22 -0000	1.159
+++ serendipity_functions.inc.php	1 Oct 2003 15:50:51 -0000	1.160
@@ -2343,6 +2343,10 @@
          $currYear--;
     }
 
+    if (!$max) {
+        return;
+    }
+
     $barwidth = 40;
     $fac = $barwidth/$max;
 ?>

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.4,1.5

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

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

Modified Files:
	layout.php 
Log Message:
Random title is now moved out of there, both left- and rightsidebar are located on the left side.

if you think this confuses anyone, change it before the release.

apart from that, feel free to release. contact sterling or garvin to make a
release, i'm now going to berlin. have a nice weekend.


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- layout.php	12 Sep 2003 17:22:20 -0000	1.4
+++ layout.php	1 Oct 2003 15:31:03 -0000	1.5
@@ -28,10 +28,18 @@
 	<tr>
 		<td colspan="2" width="100%" class="serendipityBanner">
 			<div id="serendipity_banner">
-				<h1><?= htmlentities($serendipity['blogTitle']) ?></h1>
-			<h2><?php
-                                include("/www/apache/htdocs/diary.jannis.to/randomtitle.php");
-			?></h2>
+				<h1><?php echo htmlentities($serendipity['blogTitle']); ?></h1>
+			<h2>
+<?php
+$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
+if (strlen($sub)) {
+?>
+    <h2><?php echo $sub ?></h2>
+<?php
+}
+?>
+
+</h2>
 			</div>	
 		</td>
 	</tr>
@@ -45,6 +53,7 @@
 			
 			<?php
 				serendipity_plugin_api::generate_plugins('left', 'span');
+serendipity_plugin_api::generate_plugins('right', 'span');
 			?>
 			
 		</td>

[php-blog-cvs] serendipity/templates/sebastian style.css,1.3,1.4

[<ber...@us...>]

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

Modified Files:
	style.css 
Log Message:
I HATE PIXELPUSHING.

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/sebastian/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	20 Sep 2003 09:15:07 -0000	1.3
+++ style.css	1 Oct 2003 15:16:57 -0000	1.4
@@ -11,8 +11,8 @@
 body {
 	background-color: #f0f0f0;
 	color: #000000;
-	font-family: serif;
-	font-size: 15.4px;
+	font-family: "Bitstream Vera Sans Serif", Verdana, Arial, Helvetica, Geneva, SunSans-Regular, sans-serif;
+	font-size: 100%;
 	line-height: 20px;
   margin-left: 0px;
   margin-right: 0px;
@@ -32,8 +32,7 @@
 }
 
 #serendipity_banner h1 {
-  font-family: sans-serif;
-  font-size: 18px;
+  font-size: 120%;
   font-weight: bold;
   color: #666666;
   text-decoration: none;
@@ -43,8 +42,7 @@
 }
 
 #serendipity_banner h2 {
-  font-family: sans-serif;
-  font-size: 18px;
+  font-size: 110%;
   font-weight: bold;
   color: #aaaaaa;
   text-decoration: none;
@@ -87,7 +85,7 @@
 }
 
 div.serendipitySideBarTitle {
-  font-size: 12px;
+  font-size: 75%;
   font-weight: bold;
   margin-bottom: 8px;
 }
@@ -95,7 +93,7 @@
 div.serendipitySideBarItem {
 	background-color: #e6eaee;
   border: 1px dashed #d0d0d0;
-  font-size: 12px;
+  font-size: 75%;
   padding-left: 10px;
   padding-right: 10px;
   padding-bottom: 10px;
@@ -112,7 +110,7 @@
 }
 
 .serendipity_title {
-   font-size: 20px;
+   font-size: 105%;
    color: #1a3c5a;
    font-weight: bold;
    border: 1px;
@@ -137,7 +135,6 @@
     display: block;
     width: 100%;
     color: #000080;
-    font-size: 18px;
     font-weight: bold;
 }
 
@@ -147,19 +144,19 @@
     width: 100%;
     border: 0px;
     color: #404040;
-    font-size: 16px;
+    font-size: 90%;
     padding-left:8px;
 }
 
 .serendipity_time {
     display: block;
     margin-top: 8px;
-    font-size: 12px;
+    font-size: 90%;
     font-weight: bold;
 }
 
 TD.serendipity_commentsLabel {
-    font-size: 12px;
+    font-size: 90%;
     font-weight: bold;
     width: 10%;
     vertical-align: top;
@@ -167,7 +164,7 @@
 
 TD.serendipity_comment {
     padding-left:8px;
-    font-size: 13px;
+    font-size: 90%;
     margin-bottom: 12px;
     color: #404040;
 }
@@ -187,7 +184,7 @@
 }
 
 TABLE.serendipity_calendar TD {
-    font-size:12px;
+    font-size: 90%;
     padding: 3px;
 }
 TABLE.serendipity_calendar A {
@@ -201,12 +198,12 @@
 
 TD.serendipity_weekDayName {
     background-color: #dddddd;
-    font-size: 12px;
+    font-size: 90%;
     font-weight: bold;
 }
 
 div.serendipityPlug, div.serendipityPlug A {
-    font-size: 11px;
+    font-size: 90%;
 }
 
 
@@ -216,13 +213,12 @@
 
 
 div.serendipity_admin_title {
-    font-size: 22px;
+    font-size: 120%;
     font-weight: bold;
     margin-bottom: 12px;
 }
 
 div.serendipity_admin_list_title {
-    font-size: 12px;
     font-weight: bold;
     margin-bottom: 8px;
 }
@@ -235,7 +231,7 @@
 div.serendipity_entryFooter {
     clear: both;
     color: #000000;
-    font-size: 12px;
+    font-size: 90%;
     padding-top: 5px;
     padding-bottom: 4px;
 }

Re: [php-blog-cvs] serendipity serendipity_config_local.tpl,1.19, 1.20

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

> Release?
+42

Re: [php-blog-cvs] serendipity serendipity_config_local.tpl,1.19,1.20

[Joseph T. <jt...@dr...>]

jhe...@us... wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv26074
> 
> Modified Files:
> 	serendipity_config_local.tpl 
> Log Message:
> WYSIWYG editor is still in an experimental stage. Just did a fresh install,
> everything seems fine. Release?
> 
> [x] Yes
> [ ] No
> 

+1

Jannis, will you please fix your "newspaper" style so that it doesn't 
include a file from your personal home directory?  It's bugging me big time.

Joseph

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.19,1.20

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

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

Modified Files:
	serendipity_config_local.tpl 
Log Message:
WYSIWYG editor is still in an experimental stage. Just did a fresh install,
everything seems fine. Release?

[x] Yes
[ ] No

Please vote!


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_config_local.tpl	1 Oct 2003 09:29:02 -0000	1.19
+++ serendipity_config_local.tpl	1 Oct 2003 14:32:53 -0000	1.20
@@ -34,7 +34,7 @@
 // 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['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0}';               // Do you want to use the experimental 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)
 $serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!
 $serendipity['track_exits']          = '{Track exit URLs|track_exits|bool|1}';                              // Do you want to track exit targets?

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.158,1.159 serendipity_admin_image_selector.php,1.11,1.12 NEWS,1.30,1.31

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_image_selector.php NEWS 
Log Message:
Jannis made some points about the previous patch for transforming relative paths to absolute paths and problems when later changing s9y's paths.

So I reverted the patch and instead do the transformation for the RSS-feed only, with some RegEx magic. As this is possibly introducing some BC-problems I deactivated this for our 0.3 release and we should try it for 0.4

And I removed the 'fix' from the NEWS-ChangeLog.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- serendipity_functions.inc.php	30 Sep 2003 01:24:59 -0000	1.158
+++ serendipity_functions.inc.php	1 Oct 2003 11:38:22 -0000	1.159
@@ -1125,6 +1125,11 @@
             } else {
                 $ext = '';
             }
+            
+            // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI
+            // garvin: As this could introduce some problems, this is commented out right now.
+            // TODO: ACTIVATE FOR 0.4 RELEASE!
+            // $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')( |>)@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6', $entry['body']);
 ?>
 <item>
     <title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_admin_image_selector.php	30 Sep 2003 21:40:15 -0000	1.11
+++ serendipity_admin_image_selector.php	1 Oct 2003 11:38:22 -0000	1.12
@@ -98,9 +98,9 @@
 switch ($serendipity['GET']['step']) {
     case '1':
         $f         = serendipity_parseFileName($serendipity["GET"]["image"]);
-        $imgsrc    = $serendipity['baseURL'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $imgName   = $serendipity['baseURL'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
-        $thumbName = $serendipity['baseURL'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $imgsrc    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $imgName   = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
+        $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
@@ -131,7 +131,7 @@
                 <br />
                 <input type="radio" name="serendipity[isLink]" checked="checked" /> <?php echo I_WANT_NO_LINK; ?><br />
                 <input type="radio" name="serendipity[isLink]" /> <?php echo I_WANT_IT_TO_LINK; ?>
-                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['baseURL'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
+                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
                 <br />
 
                 <input type="button" value="<?php echo BACK; ?>" onClick="history.go(-1);" />

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- NEWS	1 Oct 2003 09:29:02 -0000	1.30
+++ NEWS	1 Oct 2003 11:38:22 -0000	1.31
@@ -3,7 +3,6 @@
 Version 0.3 (October 1, 2003)
 ------------------------------------
     * Fixed evaluation of the 'embed' variable and added a small 'HowTo' to the INSTALL file (garvinhicking)
-    * Fixed links to images now containing absolute URI to maintain RSS-feed validity. Relative URIs are not allowed/visible within RSS feeds. (garvinhicking)
     * Fixed problem with escaping single quotes during installation (tomsommer)
     * Fixed problem with dual-trailing slashes in paths during installation (tomsommer)
     * Configuration/installation will now save the current s9y version to the config file... Thereby allowing upgrades at a later point (tomsommer)

[php-blog-cvs] serendipity INSTALL,1.6,1.7 NEWS,1.29,1.30 serendipity_config.inc.php,1.34,1.35 serendipity_config_local.tpl,1.18,1.19 serendipity_genpage.inc.php,1.16,1.17

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

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

Modified Files:
	INSTALL NEWS serendipity_config.inc.php 
	serendipity_config_local.tpl serendipity_genpage.inc.php 
Log Message:
Fixed the evaluation of the 'embed' directive, which was incorrect. Also wrote a small HowTo on how to use the 'embed' option.


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/serendipity/INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- INSTALL	9 Sep 2003 20:13:21 -0000	1.6
+++ INSTALL	1 Oct 2003 09:29:02 -0000	1.7
@@ -70,6 +70,79 @@
    HTML header and includes layout.php
 
 ###############################################################################
+
+###############################################################################
+# THE 'embed' CONFIGURATION DIRECTIVE                                         #
+###############################################################################
+
+In your serendipity configuration, you can set an 'embed' option to true or false.
+
+This defines, whether you use your blog as a standalone webpage - or if you have
+different content wrapped around your blog, like the menu of your usual homepage.
+
+By setting the 'embed' option to true, you have to make sure the following things to
+get everything to work well:
+
+1. 'indexFile' option.
+
+   This configuration option needs to be set to the wrapper file you want to use.
+   Let's say you normally have a 'content.php' file for your webpage. This
+   'content.php' file sets up your internal templates, your menu structure and such.
+   Now you want this file to be used to include your weblog. A simple content.php
+   could look like this:
+   
+   <?php
+   $homepage = new Template_Class;
+   $homepage->set_template($_REQUEST['page']);
+   $homepage->output_header();
+   $homepage->output_content();
+   $homepage->output_footer();
+   $homepage->track_statistics();
+   ?>
+   
+   So normally your file would be called with 'content.php?page=about' to display your
+   'about' page of your personal homepage.
+   
+   Now we want this file to be displayed, having the 'page' variable being set to 'blog'.
+   
+   For this, we set up a 'wrapper.php' file:
+   
+   <?php
+   $_REQUEST['page'] = 'blog';
+   // Let serendipity generate our content:
+   ob_start();
+   require 'index.php';
+   $blog_data = ob_get_contents();
+   ob_end_clean();
+   
+   // Now we include our normal content building file.
+   // This one has to make use of your $blog_data variable to print
+   // the content where appropriate!
+   require 'content.php';
+   ?>
+   
+   You would then set your 'indexFile' serendipity-option to the 'wrapper.php' file.
+   
+  2. Plugin panes & HTML-headers
+  
+   With the example above, we only get the main blog data printed. One of the most visible
+   actions when using the 'embed' option is that the plugin panes are not generated.
+   And HTML headers/foooters are also not provided by s9y in this case, as this should be done
+   by your 'content.php' file.
+   
+   So you have to include them in your 'content.php' file, to have them visible in your
+   embedded setup.
+   
+   You can use this snippet:
+   <?php 
+   serendipity_plugin_api::generate_plugins('left','div');
+   serendipity_plugin_api::generate_plugins('right','div');
+   ?>
+   somewhere in your 'content.php' file.
+  
+The 'embed' option is therefore only recommended to be used by advanced users going for a most flexible setup!
+
+###############################################################################
 Serendipity Weblog - http://s9y.org
 
 Licensed under the BSD License

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- NEWS	30 Sep 2003 21:40:15 -0000	1.29
+++ NEWS	1 Oct 2003 09:29:02 -0000	1.30
@@ -2,6 +2,7 @@
 
 Version 0.3 (October 1, 2003)
 ------------------------------------
+    * Fixed evaluation of the 'embed' variable and added a small 'HowTo' to the INSTALL file (garvinhicking)
     * Fixed links to images now containing absolute URI to maintain RSS-feed validity. Relative URIs are not allowed/visible within RSS feeds. (garvinhicking)
     * Fixed problem with escaping single quotes during installation (tomsommer)
     * Fixed problem with dual-trailing slashes in paths during installation (tomsommer)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_config.inc.php	30 Sep 2003 21:22:00 -0000	1.34
+++ serendipity_config.inc.php	1 Oct 2003 09:29:02 -0000	1.35
@@ -72,7 +72,7 @@
  */
 include($serendipity['serendipityPath'] .'serendipity_lang.inc.php');
 
-if ($serendipity['embed']) {
+if ($serendipity['embed'] && ($serendipity['embed'] == 'true' || $serendipity['embed'] === true)) {
     $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
 }
 

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_config_local.tpl	30 Sep 2003 20:17:07 -0000	1.18
+++ serendipity_config_local.tpl	1 Oct 2003 09:29:02 -0000	1.19
@@ -36,7 +36,7 @@
 $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)
-$serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers.
+$serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!
 $serendipity['track_exits']          = '{Track exit URLs|track_exits|bool|1}';                              // Do you want to track exit targets?
 $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!
 

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_genpage.inc.php	19 Aug 2003 16:06:57 -0000	1.16
+++ serendipity_genpage.inc.php	1 Oct 2003 09:29:03 -0000	1.17
@@ -1,5 +1,5 @@
 <?php # $Id$
-if (!$serendipity['embed']) {
+if (!$serendipity['embed'] || $serendipity['embed'] == 'false' || $serendipity['embed'] === false) {
     // serendipity is embedded into an existing structure. No need to output headers then.
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
@@ -34,7 +34,7 @@
     include $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/layout.php';
 }
 
-if (!$serendipity['embed']) {
+if (!$serendipity['embed'] || $serendipity['embed'] == 'false' || $serendipity['embed'] === false) {
 ?>
 </body>
 </html>

[php-blog-cvs] serendipity/templates/default layout.php,1.9,1.10

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

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

Modified Files:
	layout.php 
Log Message:
Fixed the evaluation of the 'embed' directive, which was incorrect. Also wrote a small HowTo on how to use the 'embed' option.


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- layout.php	8 Aug 2003 23:18:47 -0000	1.9
+++ layout.php	1 Oct 2003 09:29:03 -0000	1.10
@@ -28,7 +28,7 @@
 <table id="mainpane">
     <tr>
 <?php
-if (!$serendipity['embed']) {
+if (!$serendipity['embed'] || $serendipity['embed'] == 'false' || $serendipity['embed'] === false) {
     serendipity_plugin_api::generate_plugins('left', 'td');
 }
 ?>
@@ -80,7 +80,7 @@
         </td>
 <?php
 /* Find any plugins for the RHS */
-if (!$serendipity['embed']) {
+if (!$serendipity['embed'] || $serendipity['embed'] == 'false' || $serendipity['embed'] === false) {
     serendipity_plugin_api::generate_plugins('right', 'td');
 }
 ?>

[php-blog-cvs] serendipity NEWS,1.28,1.29 serendipity_admin_image_selector.php,1.10,1.11

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

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

Modified Files:
	NEWS serendipity_admin_image_selector.php 
Log Message:
RSS feeds didn't validate when relative links where used within a blog
entry. The s9y image selector returned relative links. Fixed.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- NEWS	30 Sep 2003 21:21:59 -0000	1.28
+++ NEWS	30 Sep 2003 21:40:15 -0000	1.29
@@ -2,6 +2,7 @@
 
 Version 0.3 (October 1, 2003)
 ------------------------------------
+    * Fixed links to images now containing absolute URI to maintain RSS-feed validity. Relative URIs are not allowed/visible within RSS feeds. (garvinhicking)
     * Fixed problem with escaping single quotes during installation (tomsommer)
     * Fixed problem with dual-trailing slashes in paths during installation (tomsommer)
     * Configuration/installation will now save the current s9y version to the config file... Thereby allowing upgrades at a later point (tomsommer)

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_image_selector.php	8 Aug 2003 10:00:18 -0000	1.10
+++ serendipity_admin_image_selector.php	30 Sep 2003 21:40:15 -0000	1.11
@@ -98,9 +98,9 @@
 switch ($serendipity['GET']['step']) {
     case '1':
         $f         = serendipity_parseFileName($serendipity["GET"]["image"]);
-        $imgsrc    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $imgName   = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
-        $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $imgsrc    = $serendipity['baseURL'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $imgName   = $serendipity['baseURL'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
+        $thumbName = $serendipity['baseURL'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
@@ -131,7 +131,7 @@
                 <br />
                 <input type="radio" name="serendipity[isLink]" checked="checked" /> <?php echo I_WANT_NO_LINK; ?><br />
                 <input type="radio" name="serendipity[isLink]" /> <?php echo I_WANT_IT_TO_LINK; ?>
-                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
+                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['baseURL'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
                 <br />
 
                 <input type="button" value="<?php echo BACK; ?>" onClick="history.go(-1);" />

[php-blog-cvs] serendipity NEWS,1.27,1.28 compat.php,1.5,1.6 serendipity_admin.php,1.19,1.20 serendipity_admin_installer.inc.php,1.42,1.43 serendipity_config.inc.php,1.33,1.34 serendipity_db.inc.php,1.6,1.7 serendipity_lang.inc.php,1.5,1.6

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

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

Modified Files:
	NEWS compat.php serendipity_admin.php 
	serendipity_admin_installer.inc.php serendipity_config.inc.php 
	serendipity_db.inc.php serendipity_lang.inc.php 
Log Message:
* Fixed the problems with no translation being displayed when asked to run the installer
* Fixed problem with escaping single quotes during installation
* Fixed problem with dual-trailing slashes in paths during installation
* Save s9y version to _config_local.inc.php to be used later during upgrades
* Rewrote much of the "installer VS config.inc.php" behaviour

* We are now ready for 0.3, date is set for October 1st in NEWS..


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- NEWS	30 Sep 2003 17:00:09 -0000	1.27
+++ NEWS	30 Sep 2003 21:21:59 -0000	1.28
@@ -1,14 +1,17 @@
 # $Id$
 
-Version 0.3 ()
+Version 0.3 (October 1, 2003)
 ------------------------------------
+    * Fixed problem with escaping single quotes during installation (tomsommer)
+    * Fixed problem with dual-trailing slashes in paths during installation (tomsommer)
+    * Configuration/installation will now save the current s9y version to the config file... Thereby allowing upgrades at a later point (tomsommer)
     * Include <slash:comments> in RSS-Feed. Shows amount of comments available
     * Differentiate subscription mails between regular comment and trackback and adjust the mail's content corresponding to this (garvinhicking)
-    * Verbose output for DB creation on installation, PostgreSQL DB-setup fixes (jtate)
+    * Added verbose output for DB creation on installation, PostgreSQL DB-setup fixes (jtate)
     * Made XHTML-compatibility fix to radio buttons of the installer (garvinhicking)
-    * Browse categories (on multiple pages) and have per-category RSS-feed (garvinhicking+sbergmann)
+    * Allow for browseing of categories (on multiple pages) and have per-category RSS-feed (garvinhicking+sbergmann)
     * Fixed display of category in full article (garvinhicking)
-    * Display all config options in installer when s9y is first installed (garvinhicking)
+    * Expand all config categories in installer when s9y is first installed (garvinhicking)
     * Added select-dropdown configuration directive for the plugins (garvinhicking)
     * Prepended language defines with a '@' to suppress error messages for fallback-language (garvinhicking)
     * Fixed search results not displaying all content (garvinhicking)
@@ -40,7 +43,7 @@
     * Restrict calendar to only browse between the dates you have comments available for (garvinhicking)
     * Added external plugin to display the latest comments on a sidebar (experimental, garvinhicking)
     * Add Link to extended entry in RSS-feed, if existing (garvinhicking)
-    * Unified admin login functionality (tomsommer)
+    * Unified and optimized admin login functionality (tomsommer)
     * Fixed trackback functionality (tomsommer)
     * Send User-Agent "Serendipity/v" when trackbacking (tomsommer)
     * New default theme (tomsommer)

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- compat.php	18 Sep 2003 12:57:46 -0000	1.5
+++ compat.php	30 Sep 2003 21:21:59 -0000	1.6
@@ -12,6 +12,7 @@
     }
 }
 
+
 if (!isset($_POST)) {
     $_POST = &$HTTP_POST_VARS;
 }
@@ -31,5 +32,58 @@
 if (!isset($_SERVER)) {
     $_SERVER = &$HTTP_SERVER_VARS;
 }
+
+/*
+ *  Avoid magic_quotes_gpc issues
+ *  courtesy of il...@ph...
+ */
+function serendipity_strip_quotes(&$var)
+{
+    if (is_array($var)) {
+        foreach ($var as $k => $v) {
+            if (is_array($v)) {
+                array_walk($var[$k], 'serendipity_strip_quotes');
+            } else {
+                $var[$k] = stripslashes($v);
+            }
+        }
+    } else {
+        $var = stripslashes($var);
+    }
+}
+
+if (ini_get('magic_quotes_gpc')) {
+    if (@count($_GET)) {
+        array_walk($_GET,     'serendipity_strip_quotes');
+    }
+
+    if (@count($_POST)) {
+        array_walk($_POST,    'serendipity_strip_quotes');
+    }
+
+    if (@count($_COOKIES)) {
+        array_walk($_COOKIES, 'serendipity_strip_quotes');
+    }
+
+    if (@count($_FILES)) {
+        array_walk($_FILES,   'serendipity_strip_quotes');
+    }
+}
+
+// Merge get and post into the serendipity array
+$serendipity['GET']    = &$_GET['serendipity'];
+$serendipity['POST']   = &$_POST['serendipity'];
+$serendipity['COOKIE'] = &$_COOKIE['serendipity'];
+
+
+/*
+ *  Some defaults for our config vars.
+ *  They are likely to be overwritten later in the code
+ */
+$serendipity['templatePath'] = 'templates/';
+$serendipity['serendipityPath'] = './';
+$serendipity['indexFile'] = 'index.php';
+$serendipity['allowDateManipulation'] = true;
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_admin.php	18 Sep 2003 12:58:00 -0000	1.19
+++ serendipity_admin.php	30 Sep 2003 21:21:59 -0000	1.20
@@ -1,15 +1,7 @@
 <?php # $Id$
-
-ini_set('session.use_trans_sid', 1);
-session_start();
-if (file_exists('./serendipity_config_local.inc.php')) {
+    session_start();
+    define('IN_installer', true);
     include('serendipity_config.inc.php');
-} else {
-    // If no config file is loaded, language includes are not available.
-    // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-    include_once 'serendipity_lang.inc.php';
-    $_SESSION['serendipityAuthedUser'] = true;
-}
 ?>
 <html>
     <head>
@@ -39,12 +31,11 @@
     <table id="mainpane">
         <tr id="content" valign="top">
 <?php
-if (!isset($serendipity['serendipityPath']) || !file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php') ) {
-    // User just installed serendipity, let him go to configure mode
+if (!isset($serendipity['serendipityPath']) || IS_installed === false ) {
 ?>
     <td class="serendipity_admin">
         <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
-        <p><?php include('serendipity_admin_installer.inc.php'); ?>
+        <p><?php require_once('serendipity_admin_installer.inc.php'); ?>
 <?php
 } elseif ( !serendipity_userLoggedIn() ) {
     serendipity_printLogin();

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serendipity_admin_installer.inc.php	20 Sep 2003 03:43:56 -0000	1.42
+++ serendipity_admin_installer.inc.php	30 Sep 2003 21:21:59 -0000	1.43
@@ -2,28 +2,27 @@
 
 umask(0000);
 $umask = 0770;
-include_once('compat.php');
-
+define('IN_installer', true);
+include_once('serendipity_config.inc.php');
 function serendipity_query_default($optname, $default)
 {
     switch ($optname) {
         case 'serendipityPath':
-            return dirname(__FILE__) . '/';
+            return dirname(__FILE__) .'/';
 
         case 'serendipityHTTPPath':
-            return dirname($_SERVER['PHP_SELF']) . '/';
+            return rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/';
 
         case 'baseURL':
             $ssl  = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on';
             $port = $_SERVER['SERVER_PORT'];
 
-            return sprintf(
-                     'http%s://%s%s%s/',
-
-                     $ssl ? 's' : '',
-                     $_SERVER['HTTP_HOST'],
-                     (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
-                     dirname($_SERVER['PHP_SELF'])
+            return sprintf('http%s://%s%s%s',
+                            
+                            $ssl ? 's' : '',
+                            $_SERVER['HTTP_HOST'],
+                            (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
+                            rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/'
                    );
 
         case 'convert':
@@ -119,7 +118,7 @@
 }
 
 function serendipity_printConfigTemplate($t, $from = false) {
-    global $serendipity, $installed;
+    global $serendipity;
 ?>
 <script type="text/javascript" language="JavaScript">
 function showConfig(id) {
@@ -175,7 +174,7 @@
 
             <tr>
                 <td>
-                    <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo ($installed ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
+                    <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo (IS_installed === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
                         <tr>
                             <td style="padding-left: 20px;" colspan="2">
                                 <?php echo $t['descriptions'][$key] ?>
@@ -278,13 +277,11 @@
     }
 
     $serendipity['dbType'] = $_POST['dbType'];
-
-    include_once $_POST['serendipityPath'] . '/serendipity_db.inc.php';
-
     // Probe database
-    // (do it after the dir stuff, as we need to be able to create the sqlite database)
-    serendipity_db_probe($_POST, $errs);
-
+    // (do it after the dir stuff, as we need to be able to create the sqlite database)            
+    if ( @include_once($_POST['serendipityPath'] . '/serendipity_db.inc.php') ) {
+        serendipity_db_probe($_POST, $errs);
+    }
     return $errs;
 }
 
@@ -398,12 +395,13 @@
     }
 
     fwrite($configfp, "<?php\n");
-    fwrite($configfp, "\t\$serendipity['dbName']   = '{$_POST['dbName']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPrefix'] = '{$_POST['dbPrefix']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbHost']   = '{$_POST['dbHost']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbUser']   = '{$_POST['dbUser']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPass']   = '{$_POST['dbPass']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbType']   = '{$_POST['dbType']}';\n");
+    fwrite($configfp, "\t\$serendipity['versionInstalled']  = '{$serendipity['version']}';\n\n");
+    fwrite($configfp, "\t\$serendipity['dbName']            = '{$_POST['dbName']}';\n");
+    fwrite($configfp, "\t\$serendipity['dbPrefix']          = '{$_POST['dbPrefix']}';\n");
+    fwrite($configfp, "\t\$serendipity['dbHost']            = '{$_POST['dbHost']}';\n");
+    fwrite($configfp, "\t\$serendipity['dbUser']            = '{$_POST['dbUser']}';\n");
+    fwrite($configfp, "\t\$serendipity['dbPass']            = '{$_POST['dbPass']}';\n");
+    fwrite($configfp, "\t\$serendipity['dbType']            = '{$_POST['dbType']}';\n");
     fwrite($configfp, "?>\n");
 
     fclose($configfp);

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_config.inc.php	18 Sep 2003 12:58:14 -0000	1.33
+++ serendipity_config.inc.php	30 Sep 2003 21:22:00 -0000	1.34
@@ -1,33 +1,37 @@
 <?php # $Id$
 
-define('IN_serendipity', true);
+define('IS_installed', file_exists((isset($serendipity['serendipityPath']) ? $serendipity['serendipityPath'] : '') . 'serendipity_config_local.inc.php'));
+
+if ( IS_installed === true ) {
+    define('IN_serendipity', true);
+}
+
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
 $serendipity['version']    = '0.3';
 $serendipity['production'] = 1;
 $serendipity['rewrite']    = true;
-$installed                 = file_exists((isset($serendipity['serendipityPath']) ? $serendipity['serendipityPath'] : '') . 'serendipity_config_local.inc.php');
 
-
-/* Load main language file */
+/* 
+ *   Load main language file 
+ */
 include('serendipity_lang.inc.php');
 
-
-// We need this if people want to upgrade s9y
-if (!isset($serendipity['templatePath'])) {
-    $serendipity['templatePath'] = 'templates/';
-}
-
-if (!isset($serendipity['serendipityPath'])) {
-    $serendipity['serendipityPath'] = './';
-}
-
-if (!$installed) {
+/*
+ *   Kill the script if we are not installed, and not inside the installer
+ */
+if ( !defined('IN_installer') && IS_installed === false ) {
     die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
+if ( defined('IN_installer') && IS_installed === false) {
+    return 1;
+}
 
-// Load DB configuration information
+/*
+ *   Load DB configuration information
+ *   Load Functions
+ */
 include_once("{$serendipity['serendipityPath']}serendipity_config_local.inc.php");
 include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
 
@@ -35,45 +39,43 @@
     die(sprintf(INCLUDE_ERROR, 'serendipity_functions.inc.php'));
 }
 
-// Connect to database
+/*
+ *   Attempt to connect to the database
+ */
 if (!serendipity_db_connect()) {
     die(DATABASE_ERROR);
 }
 
-$translation = array(
-                        'true'  => true,
-                        'false' => false
-                    );
+$translation = array('true'  => true,
+                     'false' => false);
 
-// Load Configuration options from the database
+/*
+ *   Load Configuration options from the database
+ */
 $rows = serendipity_db_query("SELECT name,value
                                 FROM {$serendipity['dbPrefix']}config");
 foreach ($rows as $row) {
     /* fixme: temp. workaround */
     $serendipity['CONFIG'][$row['name']] = $row['value'];
 
-    /* Convert 'true' and 'false' in to booleans */
+    /* 
+     *   Convert 'true' and 'false' into booleans 
+     */
     if ( isset($translation[$row['value']]) ) {
         $row['value'] = $translation[$row['value']];
     }
     $serendipity[$row['name']] = $row['value'];
 }
 
-
-/* Load main language file again, because now we have the preferred language */
+/* 
+ *   Load main language file again, because now we have the preferred language 
+ */
 include($serendipity['serendipityPath'] .'serendipity_lang.inc.php');
 
 if ($serendipity['embed']) {
     $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
 }
 
-// defaults for newly added configuration directives. Should be removed after first release.
-if (!isset($serendipity['indexFile'])) {
-    $serendipity['indexFile'] = 'index.php';
-}
-
-$serendipity['allowDateManipulation'] = TRUE;
-
 // A Set of emoticons to rewrite
 $serendipity['smiles'] = array( ":'("  => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',
                                 ':-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
@@ -91,54 +93,6 @@
                                 ';)'   => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
                                 ':P'   => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
 );
-
-
-// Avoid magic_quotes_gpc issues
-// courtesy of il...@ph...
-function serendipity_strip_quotes(&$var)
-{
-    if (is_array($var)) {
-        foreach ($var as $k => $v) {
-            if (is_array($v)) {
-                array_walk($var[$k], 'serendipity_strip_quotes');
-            } else {
-                $var[$k] = stripslashes($v);
-            }
-        }
-    } else {
-        $var = stripslashes($var);
-    }
-}
-
-if (ini_get('magic_quotes_gpc')) {
-    if (@count($_GET)) {
-        array_walk($_GET,     'serendipity_strip_quotes');
-    }
-
-    if (@count($_POST)) {
-        array_walk($_POST,    'serendipity_strip_quotes');
-    }
-
-    if (@count($_COOKIES)) {
-        array_walk($_COOKIES, 'serendipity_strip_quotes');
-    }
-
-    if (@count($_FILES)) {
-        array_walk($_FILES,   'serendipity_strip_quotes');
-    }
-}
-
-// Merge get and post into the serendipity array
-$serendipity['GET']    =    &$_GET['serendipity'];
-$serendipity['POST']   =   &$_POST['serendipity'];
-$serendipity['COOKIE'] = &$_COOKIE['serendipity'];
-
-// We want our config vars cached... will save us lots of SQL queries
-$sql = "SELECT * FROM {$serendipity['dbPrefix']}config";
-$rs = serendipity_db_query($sql);
-foreach ($rs as $var) {
-    $serendipity['CONFIG'][$var['name']] = $var['value'];
-}
 
 // We don't care who tells us what to do
 if (!isset($serendipity['GET']['action'])) {

Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_db.inc.php	21 Jul 2003 02:34:36 -0000	1.6
+++ serendipity_db.inc.php	30 Sep 2003 21:22:00 -0000	1.7
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-include_once("./serendipity_db_{$serendipity['dbType']}.inc.php");
+@include_once($serendipity['serendipityHTTPPath'] ."serendipity_db_{$serendipity['dbType']}.inc.php");
 
 function serendipity_db_update($table, $keys, $values)
 {

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang.inc.php	18 Sep 2003 12:58:26 -0000	1.5
+++ serendipity_lang.inc.php	30 Sep 2003 21:22:00 -0000	1.6
@@ -1,14 +1,13 @@
 <?php # $Id$
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
-    // Try and include preferred language from configurated setting
+    // Try and include preferred language from the configurated setting
     if ( @include('serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
         // Only here can we truely say the language is loaded
         define('serendipity_LANG_LOADED', true);
 
 
-    } elseif (!isset($installed) || !$installed) {   /* -- Auto-Guess -- */
-
+    } elseif ( IS_installed === false ) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
         $supported_languages = array('en', 'de');
@@ -26,7 +25,7 @@
 
 
     // Do fallback to english
-    if ( defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true || !isset($installed)) {
+    if ( (defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true) || IS_installed === false) {
         include_once('serendipity_lang_en.inc.php');
     }
 }

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.17,1.18

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

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

Modified Files:
	serendipity_config_local.tpl 
Log Message:
typo


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_config_local.tpl	18 Sep 2003 12:58:14 -0000	1.17
+++ serendipity_config_local.tpl	30 Sep 2003 20:17:07 -0000	1.18
@@ -11,7 +11,7 @@
 
 // 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['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/}';          // The full and absolute 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/'
 $serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/}';           // The path to the folder containing your templates - Relative to the 'relative path'

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.11,1.12

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Fixed plugin configuration. The new 'select' option was on the wrong place.


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_admin_plugins.inc.php	18 Sep 2003 12:58:52 -0000	1.11
+++ serendipity_admin_plugins.inc.php	30 Sep 2003 19:59:09 -0000	1.12
@@ -116,13 +116,6 @@
 <?php
                 break;
 
-            case 'boolean':
-                $radio['value'][] = 'true';
-                $radio['desc'][]  = YES;
-
-                $radio['value'][] = 'false';
-                $radio['desc'][]  = NO;
-
             case 'select':
                 $select = $plugin->select_values;
 ?>
@@ -155,7 +148,14 @@
 <?php
                 break;
 
-            case 'radio':
+            case 'boolean':
+                $radio['value'][] = 'true';
+                $radio['desc'][]  = YES;
+
+                $radio['value'][] = 'false';
+                $radio['desc'][]  = NO;
+
+           case 'radio':
                 if (!count($radio) > 0) {
                     $radio = $cbag->get('radio');
                 }

[php-blog-cvs] serendipity NEWS,1.26,1.27

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

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

Modified Files:
	NEWS 
Log Message:
Fixed tabs. Thanks Tom for noticing. Never did look downwards enough. ;-)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- NEWS	26 Sep 2003 18:39:21 -0000	1.26
+++ NEWS	30 Sep 2003 17:00:09 -0000	1.27
@@ -96,55 +96,55 @@
     * Enhanced the insertion of emoticons (jhermanns)
     * Removed static text and made some RSS regexps case-insensitive (jhermanns)
     * Added link to entry in emails, sent when comments or trackbacks are made (tomsommer)
-	* Escape potential HTML characters in <title> in RSS feeds (Joyce P & gschlossnagle)
-	* HTML is no longer allowed in comments, all HTML is formatted to plain-text (tomsommer)
-	* Added direct link, to an entry, in the trackback dialog (tomsommer)
-	* Top Referrers and Exits are now click-able (tomsommer)
-	* Admin area now uses the same styles as the rest of the blog (tomsommer)
-	* New layout in the installer/configuration section (tomsommer)
-	* Fixed bug not showing the 6th row in the calendar, if the first day of the month was a Sunday (tomsommer)
-	* Both emails and URLs, submitted with comments, are now shown. E-mails are spam-secured, and URLs are checked for validity (tomsommer)
-	* Avoid removing static files if pregenerate is not set (Joyce P & tomsommer)
-	* Beautified the archives (jhermanns)
-	* RSS 2.0 is now default type of feed (sterling)
-	* Submitted mails in comments are now click-able (tomsommer)
-	* Added support for using *.gif in Image Manager, even if PHP is compiled with read-only gif (tomsommer)
-	* Fixing bug #720632 (exit-links in html_nuggets plugin aren't counted) (tomsommer)
-	* We now send different notification emails if the comment is a trackback. (tomsommer)
-	* Stripped mail from HTML tags (tomsommer)
-	* When viewing a single entry, page <title> becomes entry's title. (jhermanns)
-	* Links to entries are now called /archives/id_title_of_entry.html (used to be /archives/e_id.html) (jhermanns)
-	* Time-ranges are now accessed like this: /archives/200203.html (used to be /archives/d_200203.html) (jhermanns)
-	* Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)
-	* Added validation to trackback-detection (tomsommer)
-	* You can now delete comments and trackbacks if you are logged in (tomsommer)
-	* New logo in "Powered By" plugin (jhermanns & tomsommer)
-	* Sorting Comments & trackbacks by ID (tomsommer)
-	* We now remember comment details in cookies if requested, and delete them if wanted (tomsommer)
-	* Added link back to main page (tomsommer)
-	* Added support for deletion in blogger and metaweblog APIs (gschlossnagle)
-	* Added lots of error-handling to image manager (tomsommer)
-	* We now show trackbacks in a separate window, and count them separately (jhermanns)
-	* Superuser-login initially sends you to authoring suit now (jhermanns)
-	* Beautified mails (tomsommer)
-	* In Admin-module 'Edit entries' is now called 'Authoring Suite' (tomsommer)
-	* Improved imagick thumbnail generation (jhermanns)
-	* You can now delete images in image manager (tomsommer)
-	* Fixed lots of missing translations (jhermanns)
-	* Added notice if search-string is smaller than 4 chars (tomsommer)
-	* Link to the archives is now /archive (jhermanns)
-	* Disallow empty comments (tomsommer)
-	* Fixed broken auto-trackback discovery (gschlossnagle)
-	* Fixed problem with echoing of .htaccess and paths, if installation fails (tomsommer)
-	* Added CSS to installation-screen (tomsommer)
-	* Fixed bug when displaying individual days by clicking on the calendar (tomsommer)
-	* Fixed bug #719016 - (entry-title does not escape correctly) (tomsommer)
-	* Allow the showing of *complete* archived months (tomsommer)
-	* Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)
-	* Prevent the Admin interface to be logged as referrer when using the 'Back to Blog' link (bergmann)
-	* Added full language support - English, German (jhermanns)
- 	* Keep track of which blog entry was linked from or referred to (bergmann)
-	* Regenerate the .htaccess file, if installation fails (sterling & muesli)
+    * Escape potential HTML characters in <title> in RSS feeds (Joyce P & gschlossnagle)
+    * HTML is no longer allowed in comments, all HTML is formatted to plain-text (tomsommer)
+    * Added direct link, to an entry, in the trackback dialog (tomsommer)
+    * Top Referrers and Exits are now click-able (tomsommer)
+    * Admin area now uses the same styles as the rest of the blog (tomsommer)
+    * New layout in the installer/configuration section (tomsommer)
+    * Fixed bug not showing the 6th row in the calendar, if the first day of the month was a Sunday (tomsommer)
+    * Both emails and URLs, submitted with comments, are now shown. E-mails are spam-secured, and URLs are checked for validity (tomsommer)
+    * Avoid removing static files if pregenerate is not set (Joyce P & tomsommer)
+    * Beautified the archives (jhermanns)
+    * RSS 2.0 is now default type of feed (sterling)
+    * Submitted mails in comments are now click-able (tomsommer)
+    * Added support for using *.gif in Image Manager, even if PHP is compiled with read-only gif (tomsommer)
+    * Fixing bug #720632 (exit-links in html_nuggets plugin aren't counted) (tomsommer)
+    * We now send different notification emails if the comment is a trackback. (tomsommer)
+    * Stripped mail from HTML tags (tomsommer)
+    * When viewing a single entry, page <title> becomes entry's title. (jhermanns)
+    * Links to entries are now called /archives/id_title_of_entry.html (used to be /archives/e_id.html) (jhermanns)
+    * Time-ranges are now accessed like this: /archives/200203.html (used to be /archives/d_200203.html) (jhermanns)
+    * Better non-WYSIWYG editor for Mozilla and IE users (tomsommer)
+    * Added validation to trackback-detection (tomsommer)
+    * You can now delete comments and trackbacks if you are logged in (tomsommer)
+    * New logo in "Powered By" plugin (jhermanns & tomsommer)
+    * Sorting Comments & trackbacks by ID (tomsommer)
+    * We now remember comment details in cookies if requested, and delete them if wanted (tomsommer)
+    * Added link back to main page (tomsommer)
+    * Added support for deletion in blogger and metaweblog APIs (gschlossnagle)
+    * Added lots of error-handling to image manager (tomsommer)
+    * We now show trackbacks in a separate window, and count them separately (jhermanns)
+    * Superuser-login initially sends you to authoring suit now (jhermanns)
+    * Beautified mails (tomsommer)
+    * In Admin-module 'Edit entries' is now called 'Authoring Suite' (tomsommer)
+    * Improved imagick thumbnail generation (jhermanns)
+    * You can now delete images in image manager (tomsommer)
+    * Fixed lots of missing translations (jhermanns)
+    * Added notice if search-string is smaller than 4 chars (tomsommer)
+    * Link to the archives is now /archive (jhermanns)
+    * Disallow empty comments (tomsommer)
+    * Fixed broken auto-trackback discovery (gschlossnagle)
+    * Fixed problem with echoing of .htaccess and paths, if installation fails (tomsommer)
+    * Added CSS to installation-screen (tomsommer)
+    * Fixed bug when displaying individual days by clicking on the calendar (tomsommer)
+    * Fixed bug #719016 - (entry-title does not escape correctly) (tomsommer)
+    * Allow the showing of *complete* archived months (tomsommer)
+    * Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)
+    * Prevent the Admin interface to be logged as referrer when using the 'Back to Blog' link (bergmann)
+    * Added full language support - English, German (jhermanns)
+    * Keep track of which blog entry was linked from or referred to (bergmann)
+    * Regenerate the .htaccess file, if installation fails (sterling & muesli)
 
 Version 0.2 (April 4, 2003)
 ------------------------------------

[php-blog-cvs] serendipity TODO,1.9,1.10

[<jt...@us...>]

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

Modified Files:
	TODO 
Log Message:
updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TODO	13 Sep 2003 22:17:46 -0000	1.9
+++ TODO	30 Sep 2003 01:39:58 -0000	1.10
@@ -14,6 +14,7 @@
 * Allow for superuser auto-login (Cookies)
 * Allow for blogging in Mozilla/Firebird sidebars
 * Allow for blogging from GNOME Blog (http://www.gnome.org/~seth/gnome-blog/)
+* Instead of keeping track of how many comments in the entries table, do some kind of JOIN with the comments table.
 
 ! Don't trackback files (zip, rar etc.) (Check headers for content-type? or just file extension?)
 ! Allow for upgrades of Serendipity in the installer

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.157,1.158

[<jt...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed the comment notification query for postgresql

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- serendipity_functions.inc.php	26 Sep 2003 18:39:20 -0000	1.157
+++ serendipity_functions.inc.php	30 Sep 2003 01:24:59 -0000	1.158
@@ -1009,12 +1009,17 @@
     $entryURI = serendipity_archiveURL($entry_id, $title);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
-    $sql = "SELECT author, email, type
+    if (strtolower($serendipity['dbType']) == 'postgres') {
+        $pgsql_insert = "DISTINCT ON (email)";
+    } else {
+        $mysql_insert = "GROUP BY email";
+    }
+
+    $sql = "SELECT $pgsql_insert author, email, type
             FROM {$serendipity['dbPrefix']}comments
             WHERE entry_id = $entry_id
               AND email <> '$posterMail'
-              AND subscribed = 'true'
-            GROUP BY email";
+              AND subscribed = 'true' $mysql_insert";
     $subscribers = serendipity_db_query($sql);
 
     if (!is_array($subscribers)) {

[php-blog-cvs] serendipity serendipity_lang_en.inc.php,1.41,1.42

[<jt...@us...>]

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
fugbix typo


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_lang_en.inc.php	20 Sep 2003 12:19:06 -0000	1.41
+++ serendipity_lang_en.inc.php	30 Sep 2003 00:36:42 -0000	1.42
@@ -256,7 +256,7 @@
 @define('UNSUBSCRIBE_OK', "%s is now unsubscribed from this entry");
 @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'New comment to subscribed entry "%s"');
 @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('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackbacke was added 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('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added 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');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.156,1.157 rss.php,1.13,1.14 NEWS,1.25,1.26

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

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

Modified Files:
	serendipity_functions.inc.php rss.php NEWS 
Log Message:
<slash:comments> included in RSS-feed


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- serendipity_functions.inc.php	20 Sep 2003 13:37:18 -0000	1.156
+++ serendipity_functions.inc.php	26 Sep 2003 18:39:20 -0000	1.157
@@ -1135,6 +1135,7 @@
 ?>
     <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
     <comments><?php echo $guid; ?></comments>
+    <slash:comments><?php echo $entry['comments']; ?></slash:comments>
     <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
     <content:encoded>
         <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext))))); ?>

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rss.php	18 Sep 2003 12:57:46 -0000	1.13
+++ rss.php	26 Sep 2003 18:39:21 -0000	1.14
@@ -130,6 +130,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:slash="http://purk.org/rss/1.0/modules/slash/"
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
    xmlns:robot="http://www.edwardbear.org/def/xml/robot">
 <channel>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- NEWS	20 Sep 2003 12:19:06 -0000	1.25
+++ NEWS	26 Sep 2003 18:39:21 -0000	1.26
@@ -2,6 +2,7 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Include <slash:comments> in RSS-Feed. Shows amount of comments available
     * Differentiate subscription mails between regular comment and trackback and adjust the mail's content corresponding to this (garvinhicking)
     * Verbose output for DB creation on installation, PostgreSQL DB-setup fixes (jtate)
     * Made XHTML-compatibility fix to radio buttons of the installer (garvinhicking)

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.155,1.156

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
* Changed how previous & next page was displayed
* Fixed layout in the Authoring Suite -> Entries


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- serendipity_functions.inc.php	20 Sep 2003 12:19:06 -0000	1.155
+++ serendipity_functions.inc.php	20 Sep 2003 13:37:18 -0000	1.156
@@ -640,21 +640,18 @@
     }
 ?>
 <div class='serendipity_entryFooter' style="text-align: center">
-<br />
-&nbsp;&nbsp;
-(<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)<br />
-&nbsp;&nbsp;
 <?php
     if ($serendipity['GET']['page'] > 1) {
 ?>
-<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">&laquo; <?php echo PREVIOUS_PAGE; ?></a>&nbsp;&nbsp;|&nbsp;&nbsp;
+<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">&laquo; <?php echo PREVIOUS_PAGE; ?></a>&nbsp;&nbsp;
 <?php
     }
 ?>
+(<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)
 <?php
     if ($serendipity['GET']['page'] < $totalPages) {
 ?>
-<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> &raquo;</a>
+&nbsp;&nbsp;<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> &raquo;</a>
 <?php
     }
 ?>
@@ -1951,41 +1948,51 @@
 
         <table class="serendipityEntryEdit" border="0">
             <tr>
-                <td align="left" <?php echo (!$serendipity['wysiwyg'] ? 'colspan="2"' : ''); ?>>
-                    <div>
-                        <b><?php echo TITLE?>:</b> <input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlentities($entry['title']) : ''; ?>" size="<?php echo ($serendipity['wysiwyg'] ? '30' : '80'); ?>" />
-                    </div>
+                <td>
+                   <b><?php echo TITLE; ?>:</b>
+                </td>
+                <td colspan="2">
+                    <table width="100%" cellspacing="0" cellpadding="0" border="0">
+                        <tr>
+                            <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlentities($entry['title']) : ''; ?>" size="72" /></td>
+                            <td align="right align="right""><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>
+                        </tr>
+                    </table>
                 </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>
-                        <?php
-                        if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation']) {
-                        ?>
-                        &nbsp;<b><?php echo DATE; ?>:</b>
-                        <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
-                        <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
-                        <?php
-                        }
-                        ?>
-                    </td>
-                    <td align="right"><b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
+<?php
+        if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation']) {
+?>
+                <td>
+                    <b><?php echo DATE; ?>:</b>
+                </td>
+                <td>
+                    <input type="hidden" name="serendipity[chk_timestamp]" value="<?php echo (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time()); ?>" />
+                    <input type="text" name="serendipity[new_timestamp]" value="<?php echo date(DATE_FORMAT_2, (isset($entry['timestamp']) && $entry['timestamp'] > 0 ? $entry['timestamp'] : time())); ?>" />
+                </td>
+                <td align="right">
+<?php
+        } else {
+?>
+                <td align="right" colspan="3">
+<?php   
+        }
+?>
+                    <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']) {
 ?>
-                    <div>
+                <td colspan="2"><b><?php echo ENTRY_BODY; ?></b></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
+        /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
         if (!$serendipity['wysiwyg'] && 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>')" />
@@ -1994,40 +2001,43 @@
                         <input type="button" name="insJ" value="img" accesskey="j" onClick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
                         <input type="button" name="insImage" value="<?php echo 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]'])" />
-<?php   } elseif (!$serendipity['wysiwyg']) { ?>
+<?php   
+        /* Do the "old" non-WYSIWYG editor */
+        } elseif (!$serendipity['wysiwyg']) { ?>
                         <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="<?php echo 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]'])">
-<?php   } ?>
-                    </div>
-<?php
-    }
+<?php   } 
+    } else {
 ?>
+            <td colspan="3"><b><?php echo ENTRY_BODY; ?></b>
+
+<?php } ?>
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2">
+                <td colspan="3">
                     <textarea name="serendipity[body]" id="serendipity[body]" cols="80" rows="20"><?php echo isset($entry['body']) ? htmlentities($entry['body']) : ''; ?></textarea>
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2" align="right">
+                <td colspan="3" align="right">
                     <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
                     <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                 </td>
             </tr>
 
             <tr>
-                <td colspan="2"><b><?php echo EXTENDED_BODY; ?></b></td>
+                <td colspan="3"><b><?php echo EXTENDED_BODY; ?></b></td>
             </tr>
 
             <tr>
-                <td colspan="2">
+                <td colspan="3">
                     <textarea name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlentities($entry['extended']) : ''; ?></textarea>
                 </td>
             </tr>

[php-blog-cvs] serendipity NEWS,1.24,1.25 serendipity_lang_en.inc.php,1.40,1.41 serendipity_lang_de.inc.php,1.32,1.33 serendipity_functions.inc.php,1.154,1.155

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

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

Modified Files:
	NEWS serendipity_lang_en.inc.php serendipity_lang_de.inc.php 
	serendipity_functions.inc.php 
Log Message:
ALternate subscription mail for TRACKBACKs


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- NEWS	18 Sep 2003 12:57:46 -0000	1.24
+++ NEWS	20 Sep 2003 12:19:06 -0000	1.25
@@ -2,6 +2,8 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Differentiate subscription mails between regular comment and trackback and adjust the mail's content corresponding to this (garvinhicking)
+    * Verbose output for DB creation on installation, PostgreSQL DB-setup fixes (jtate)
     * Made XHTML-compatibility fix to radio buttons of the installer (garvinhicking)
     * Browse categories (on multiple pages) and have per-category RSS-feed (garvinhicking+sbergmann)
     * Fixed display of category in full article (garvinhicking)

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_en.inc.php	20 Sep 2003 03:43:56 -0000	1.40
+++ serendipity_lang_en.inc.php	20 Sep 2003 12:19:06 -0000	1.41
@@ -256,6 +256,7 @@
 @define('UNSUBSCRIBE_OK', "%s is now unsubscribed from this entry");
 @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'New comment to subscribed entry "%s"');
 @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('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackbacke was added 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');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_de.inc.php	20 Sep 2003 12:07:30 -0000	1.32
+++ serendipity_lang_de.inc.php	20 Sep 2003 12:19:06 -0000	1.33
@@ -257,6 +257,7 @@
 @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('SUBSCRIPTION_TRACKBACK_MAIL', "Hallo %s,\n\nEin neues Trackback 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');

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- serendipity_functions.inc.php	20 Sep 2003 03:43:56 -0000	1.154
+++ serendipity_functions.inc.php	20 Sep 2003 12:19:06 -0000	1.155
@@ -1012,7 +1012,7 @@
     $entryURI = serendipity_archiveURL($entry_id, $title);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
-    $sql = "SELECT author, email
+    $sql = "SELECT author, email, type
             FROM {$serendipity['dbPrefix']}comments
             WHERE entry_id = $entry_id
               AND email <> '$posterMail'
@@ -1025,16 +1025,29 @@
     }
 
     foreach ($subscribers as $subscriber) {
-        $text = sprintf(
-                  SUBSCRIPTION_MAIL,
+        if ($subscriber['type'] == 'TRACKBACK') {
+            $text = sprintf(
+                      SUBSCRIPTION_TRACKBACK_MAIL,
 
-                  $subscriber['author'],
-                  $serendipity['blogTitle'],
-                  $title,
-                  $poster,
-                  $entryURI,
-                  $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
-                );
+                      $subscriber['author'],
+                      $serendipity['blogTitle'],
+                      $title,
+                      $poster,
+                      $entryURI,
+                      $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
+            );
+        } else {
+            $text = sprintf(
+                      SUBSCRIPTION_MAIL,
+
+                      $subscriber['author'],
+                      $serendipity['blogTitle'],
+                      $title,
+                      $poster,
+                      $entryURI,
+                      $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
+            );
+        }
 
         mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
     }

[php-blog-cvs] serendipity serendipity_lang_de.inc.php,1.31,1.32

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
translation


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_de.inc.php	20 Sep 2003 03:43:56 -0000	1.31
+++ serendipity_lang_de.inc.php	20 Sep 2003 12:07:30 -0000	1.32
@@ -223,15 +223,15 @@
 @define('DATABASE_ERROR', 'serendipity Fehler: Kann keine Verbindung zur Datenbank herstellen - wird beendet.');
 @define('ATTEMPT_SETUP_DATABASE', 'Probiere Datenbank einzurichten...');
 @define('CHECK_DATABASE_EXISTS', 'Checking to see if the database is already in place.  If you see a database query error here, ignore it...');
-@define('CREATE_DATABASE', 'Creating default database setup...');
-@define('DATABASE_DONE', 'Done creating database');
+@define('CREATE_DATABASE', 'Richte Datenbank ein...');
+@define('DATABASE_DONE', 'Einrichtung der Datenbank abgeschlossen.');
 @define('ATTEMPT_WRITE_FILE', 'Probiere die Datei %s zu erstellen...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity wurde erfolgreich aufh Ihrem System eingerichtet.%s Bitte merken Sie sich Ihr Passwort: "%s", Ihr Benutzername ist "%s".%sSie können Ihr neues PHP blog <a href="%s">genau hier</a> finden');
 @define('WRITTEN_N_SAVED', 'Konfiguration geschrieben und gesichert');
 @define('IMAGE_ALIGNMENT', 'Bildausrichtung');
 @define('ENTER_NEW_NAME', 'Bitte einen neuen Namen eingeben für: ');
 @define('IMAGE_MANAGER', 'Bildmanager');
-@define('RESIZING', 'Anpassung der Bildgrö0e');
+@define('RESIZING', 'Anpassung der Bildgröße');
 @define('RESIZE_DONE', 'Fertig (%s Bildgrößen angepaßt).');
 @define('DELETE_IMAGE', 'Bild namens <b>%s</b> gelöscht');
 @define('DELETE_IMAGE_FAIL' , 'Kann Bild namens <b>%s</b> nicht löschen');

[php-blog-cvs] serendipity db.sql,1.22,1.23 db_update-0.2-0.3.sql,1.2,1.3 serendipity_admin_installer.inc.php,1.41,1.42 serendipity_db_mysql.inc.php,1.14,1.15 serendipity_db_postgres.inc.php,1.7,1.8 serendipity_functions.inc.php,1.153,1.154 serendipity_lang_de.inc.php,1.30,1.31 serendipity_lang_en.inc.php,1.39,1.40 serendipity_sidebar_items.php,1.29,1.30

[<jt...@us...>]

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

Modified Files:
	db.sql db_update-0.2-0.3.sql 
	serendipity_admin_installer.inc.php 
	serendipity_db_mysql.inc.php serendipity_db_postgres.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_sidebar_items.php 
Log Message:
db.sql, db_update-*:  Modified the trackback stuff so that it works with postgresql.  Added comments in the update on how to create the changes.

serendipity_admin_installer.inc.php: Made the installer more verbose, i.e. warning that a query error is normal.

serendipity_db_mysql.inc.php: Change for the db update.  enum() is unsupported under postgres, but boolean is.
serendipity_db_postgres.inc.php: ditto

serendipity_funcitons.inc.php: fixed b0rk3n SQL query and return an error if entries can't be saved for any reason.

serendipity_lang_en/de.inc.php: added constants for the more verbose installer.  Please translate to German!

serendipity_sidebar_items.php: fix error when no categories are defined.



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- db.sql	31 Aug 2003 21:41:49 -0000	1.22
+++ db.sql	20 Sep 2003 03:43:56 -0000	1.23
@@ -26,7 +26,7 @@
   ip varchar(15) default null,
   body text,
   type varchar(100) default 'regular',
-  subscribed enum('true', 'false') not null default 'false'
+  subscribed {BOOLEAN}
 );
 
 CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body);
@@ -47,7 +47,7 @@
   author varchar(20) default null,
   authorid int(11) default null,
   categoryid int(11) default null,
-  isdraft enum('true', 'false') not null default 'false'
+  isdraft {BOOLEAN}
 );
 
 CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);

Index: db_update-0.2-0.3.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db_update-0.2-0.3.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update-0.2-0.3.sql	8 Sep 2003 21:29:27 -0000	1.2
+++ db_update-0.2-0.3.sql	20 Sep 2003 03:43:56 -0000	1.3
@@ -1,8 +1,12 @@
 ALTER TABLE serendipity_entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER 'comments';
 
 ALTER TABLE serendipity_entries ADD COLUMN isdraft ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER 'categoryid';
+/* ENUM('true', 'false') NOT NULL DEFAULT 'false'
+    should be replaced by BOOLEAN NOT NULL for postgresql */
 
 ALTER TABLE serendipity_comments ADD COLUMN subscribed ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER 'type';
+/* ENUM('true', 'false') NOT NULL DEFAULT 'false'
+    should be replaced by BOOLEAN NOT NULL for postgresql */
 
 INSERT INTO serendipity_config (name, value) VALUES ('allowSubscriptions', 'false');
 

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_admin_installer.inc.php	18 Sep 2003 16:35:26 -0000	1.41
+++ serendipity_admin_installer.inc.php	20 Sep 2003 03:43:56 -0000	1.42
@@ -293,12 +293,14 @@
 
     /* Try and check if the database/tables are already installed,
        if they are... exit the function */
+    echo CHECK_DATABASE_EXISTS;
     $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors");
+    echo ' ' . DONE . '<br />';
     if (is_array($t)) {
         return false;
     }
 
-
+    echo CREATE_DATABASE;
     // Create tables
     $queries = serendipity_parse_sql_tables('./db.sql');
     $queries = str_replace('{PREFIX}', $_POST['dbPrefix'], $queries);
@@ -312,6 +314,7 @@
     } else {
         $mail_comments = 0;
     }
+    echo ' ' . DONE . '<br />';
 
     /*
         ------------- Install main author ------------
@@ -430,10 +433,10 @@
             echo '<br />';
 
             /* We are good to go, lets install databases etc. */
-            echo ATTEMPT_SETUP_DATABASE;
+            echo ATTEMPT_SETUP_DATABASE . "<br />";
             $res = serendipity_installDatabase();
             if ( $res !== false ) {
-                echo ' ' . DONE . '<br />';
+                echo ' ' . DATABASE_DONE . '<br />';
             } else {
                 echo '<span style="color: #FF0000">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />';
             }

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_db_mysql.inc.php	18 Sep 2003 12:58:14 -0000	1.14
+++ serendipity_db_mysql.inc.php	20 Sep 2003 03:43:56 -0000	1.15
@@ -97,10 +97,10 @@
 
 function serendipity_db_schema_import($query)
 {
-    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}');
+    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', 
+        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT');
+        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_db_postgres.inc.php	25 Jul 2003 01:03:18 -0000	1.7
+++ serendipity_db_postgres.inc.php	20 Sep 2003 03:43:56 -0000	1.8
@@ -92,8 +92,8 @@
 function serendipity_db_schema_import($query)
 {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',
-        '{FULLTEXT}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
-    static $replace = array('SERIAL', 'primary key', '', '', 'int2', 
+        '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
+    static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2', 
         'int4', 'int4', 'int4');
     
     return serendipity_db_query(str_replace($search, $replace, $query));

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- serendipity_functions.inc.php	18 Sep 2003 14:20:57 -0000	1.153
+++ serendipity_functions.inc.php	20 Sep 2003 03:43:56 -0000	1.154
@@ -424,7 +424,7 @@
     }
 
     if ($fetchDrafts == 'false') {
-        $drafts = 'isdraft LIKE "false"';
+        $drafts = "isdraft = 'false'";
     }
 
     if (is_numeric($range)) {
@@ -1673,7 +1673,12 @@
 
         $res = serendipity_db_insert('entries', $entry);
 
-        $entry['id'] = serendipity_db_insert_id();
+        if ($res) 
+            $entry['id'] = serendipity_db_insert_id();
+        else {
+            //Some error message here
+            return ENTRIES_NOT_SUCCESSFULLY_INSERTED;
+        }
         $newEntry    = 1;
     } else {
         /* we need to update */

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_de.inc.php	18 Sep 2003 12:58:26 -0000	1.30
+++ serendipity_lang_de.inc.php	20 Sep 2003 03:43:56 -0000	1.31
@@ -20,6 +20,7 @@
     $serendipity['weekDayAbb'] = array('Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So');
 }
 
+
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfl&auml;che');
 @define('HAVE_TO_BE_LOGGED_ON', 'Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:');
 @define('APPEARANCE', 'Aussehen');
@@ -221,6 +222,9 @@
 @define('INCLUDE_ERROR', 'serendipity Fehler: Kann Datei %s nicht einbinden - wird beendet.');
 @define('DATABASE_ERROR', 'serendipity Fehler: Kann keine Verbindung zur Datenbank herstellen - wird beendet.');
 @define('ATTEMPT_SETUP_DATABASE', 'Probiere Datenbank einzurichten...');
+@define('CHECK_DATABASE_EXISTS', 'Checking to see if the database is already in place.  If you see a database query error here, ignore it...');
+@define('CREATE_DATABASE', 'Creating default database setup...');
+@define('DATABASE_DONE', 'Done creating database');
 @define('ATTEMPT_WRITE_FILE', 'Probiere die Datei %s zu erstellen...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity wurde erfolgreich aufh Ihrem System eingerichtet.%s Bitte merken Sie sich Ihr Passwort: "%s", Ihr Benutzername ist "%s".%sSie können Ihr neues PHP blog <a href="%s">genau hier</a> finden');
 @define('WRITTEN_N_SAVED', 'Konfiguration geschrieben und gesichert');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_lang_en.inc.php	18 Sep 2003 12:58:26 -0000	1.39
+++ serendipity_lang_en.inc.php	20 Sep 2003 03:43:56 -0000	1.40
@@ -222,6 +222,9 @@
 @define('INCLUDE_ERROR', 'serendipity error: could not include %s - exiting.');
 @define('DATABASE_ERROR', 'serendipity error: unable to connect to database - exiting.');
 @define('ATTEMPT_SETUP_DATABASE', 'Attemping to setup database...');
+@define('CHECK_DATABASE_EXISTS', 'Checking to see if the database is already in place.  If you see a database query error here, ignore it...');
+@define('CREATE_DATABASE', 'Creating default database setup...');
+@define('DATABASE_DONE', 'Done creating database');
 @define('ATTEMPT_WRITE_FILE', 'Attemping to write %s file...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity was successfully installed on your system.%s Please remember your password: "%s", your username is "%s".%sYou can find your new PHP blog <a href="%s">right here</a>');
 @define('WRITTEN_N_SAVED', 'Configuration written &amp; saved');

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_sidebar_items.php	18 Sep 2003 12:58:52 -0000	1.29
+++ serendipity_sidebar_items.php	20 Sep 2003 03:43:56 -0000	1.30
@@ -361,7 +361,7 @@
         $title      = CATEGORIES;
         $html       = '';
 
-        if (is_array($categories)) {
+        if (is_array($categories) && count($categories)) {
             foreach ($categories as $category) {
                 $category_id = serendipity_makeFilename($category['category_name']);
 

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.40,1.41

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Lower required PHP version


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_admin_installer.inc.php	18 Sep 2003 12:58:00 -0000	1.40
+++ serendipity_admin_installer.inc.php	18 Sep 2003 16:35:26 -0000	1.41
@@ -495,9 +495,9 @@
             if ( !eregi('apache', $_SERVER['SERVER_SOFTWARE']) ) {
                 echo '<br /><font color="#FF000">WARNING!<br />You are about to attempt to install Serendipity on a non-apache webserver.<br />Serendipity requires the Apache Werbserver to function correctly!</font>';
             }
-
-            define('VERSION_REQUIRED', '4.3.0');
-
+            
+            define('VERSION_REQUIRED', '4.2.1');
+            
             /* Do check for required PHP version */
             if ( version_compare(PHP_VERSION, VERSION_REQUIRED) == -1 ) {
                 echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.152,1.153

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Added link to corresponding category for an entry


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- serendipity_functions.inc.php	18 Sep 2003 12:58:14 -0000	1.152
+++ serendipity_functions.inc.php	18 Sep 2003 14:20:57 -0000	1.153
@@ -482,7 +482,8 @@
                     e.*,
                     a.username,
                     a.email,
-                    c.category_name
+                    c.category_name,
+                    c.categoryid
               FROM
                     ({$serendipity['dbPrefix']}entries AS e
                         LEFT JOIN {$serendipity['dbPrefix']}category c
@@ -513,6 +514,7 @@
     $querystring = "SELECT
                             *,
                             c.category_name,
+                            c.categoryid,
                             a.username,
                             a.email
                     FROM
@@ -708,7 +710,7 @@
 
             <div class='serendipity_entryFooter'>
 <?php
-                echo '                ' . POSTED_BY . ' ' . htmlentities($entry['username']) . ($entry['category_name'] ? ' ' . IN . " ${entry['category_name']} " : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
+                echo '                ' . POSTED_BY . ' ' . htmlentities($entry['username']) . ($entry['category_name'] ? ' ' . IN . ' <a href="' . $serendipity['serendipityHTTPPath'] . 'categories/' . $entry['categoryid'] . '_' . serendipity_makeFilename($entry['category_name']) . '">' . $entry['category_name'] . '</a> ' : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
 
                 if (!isset($serendipity['GET']['id'])) {
                     $label = $entry['comments'] == 1 ? COMMENT : COMMENTS;