php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/htmlarea/lang - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/htmlarea/lang added to the repository

[php-blog-cvs] serendipity/htmlarea/examples - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/htmlarea/examples added to the repository

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

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

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

Modified Files:
	style.css 
Log Message:
Added new css classes for being able to seperate an entry's body/teaser and extended body.

We need someone documenting all available CSS classes and a short description where they are used to ease up template generation...


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- style.css	15 Mar 2004 08:51:13 -0000	1.13
+++ style.css	22 Mar 2004 17:17:45 -0000	1.14
@@ -132,6 +132,12 @@
     background-color: #FAFFFF;
 }
 
+.serendipity_entry_body_folded,
+.serendipity_entry_body_unfolded,
+.serendipity_entry_extended {
+    /* Inner blocks of .serendipity_entry, can be used for further customization */
+}
+
 div.serendipity_Entry_Date {
     padding: 10px;
     margin: 10px;

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.233,1.234 NEWS,1.94,1.95

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Log Message:
Added new css classes for being able to seperate an entry's body/teaser and extended body.

We need someone documenting all available CSS classes and a short description where they are used to ease up template generation...


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- NEWS	22 Mar 2004 15:19:25 -0000	1.94
+++ NEWS	22 Mar 2004 17:17:45 -0000	1.95
@@ -3,6 +3,15 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Templates: New CSS classes for better customization
+      - 'serendipity_entry_body_folded' for the entry body on the
+         weblog index page
+      - 'serendipity_entry_body_unfolded' for the entry body on
+         article page
+      - 'serendipity_entry_extended' for the extended body on article
+         page
+      (garvinhicking)
+
     * Image upload: Can now specify alternate file name. Renamed
       input field to not cause confusion with COOKIE-variable
       (garvinhicking, isotopp)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- serendipity_functions.inc.php	21 Mar 2004 17:19:29 -0000	1.233
+++ serendipity_functions.inc.php	22 Mar 2004 17:17:45 -0000	1.234
@@ -830,9 +830,11 @@
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
 
                 $html_extended = '';
+                $extended_css = 'serendipity_entry_body_folded';
                 if ($extended && strlen($entry['extended'])) {
-                    $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
-                    $html_extended .= $entry['extended'];
+                    $html_extended = '<span class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
+                    $html_extended .= $entry['extended'] . '</span>';
+                    $extended_css = 'serendipity_entry_body_unfolded';
                 }
 
                 if (isset($entry['exflag']) && $entry['exflag'] && !$extended) {
@@ -843,9 +845,8 @@
         <h4 class="serendipity_title"><a href="<?php echo $entryLink; ?>"><?php echo htmlentities($entry['title']); ?></a></h4>
 
         <div class="serendipity_entry">
-<?php
-                echo $entry['body'] . $html_extended;
-?>
+            <span class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></span>
+            <?php echo $html_extended; ?>
 
             <div class='serendipity_entryFooter'>
 <?php

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.15,1.16 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.21,1.22 serendipity_lang_es.inc.php,1.21,1.22

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
image manager can now upload a file to a specified filename. Fix conflicting
namespace of cookie/post variables.


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_da.inc.php	15 Mar 2004 10:12:47 -0000	1.15
+++ serendipity_lang_da.inc.php	22 Mar 2004 15:19:25 -0000	1.16
@@ -243,8 +243,8 @@
 @define('IMAGE_DELETE', 'Slet dette billede');
 @define('ABORT_NOW', 'Afbryd nu');
 @define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke findes på serveren, er du sikker på URLen: <b>%s</b> er korrekt?');
-@define('FILE_FETCHED', '%s hentet');
-@define('FILE_UPLOADED', 'Filen %s er blevet uploadet');
+@define('FILE_FETCHED', '%s hentet: %s');
+@define('FILE_UPLOADED', 'Filen %s er blevet uploadet: %s');
 @define('WORD_OR', 'eller');
 @define('SCALING_IMAGE', 'Skalérer %s til %s x %s px');
 @define('KEEP_PROPORTIONS', 'Bevar forholdet');
@@ -349,6 +349,7 @@
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignoreret en del af opgraderingen. Undersøg venligst om databasen er korrekt opdateret, og planlagte opgaver udført');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nu opgraderet til version %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke  %shere%s');
+@define('IMAGE_NAME', 'Save the image using filename (empty: use original file name): '); // TRANSLATE
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_de.inc.php	21 Mar 2004 16:35:32 -0000	1.26
+++ serendipity_lang_de.inc.php	22 Mar 2004 15:19:25 -0000	1.27
@@ -241,8 +241,8 @@
 @define('IMAGE_DELETE', 'Bild löschen');
 @define('ABORT_NOW', 'Abbrechen');
 @define('REMOTE_FILE_NOT_FOUND', 'Die Datei konnte auf dem Server nicht gefunden werden, sind Sie sich dass die URL <b>%s</b> korrekt ist?');
-@define('FILE_FETCHED', '%s geladen');
-@define('FILE_UPLOADED', 'Datei %s erfolgreich hochgeladen');
+@define('FILE_FETCHED', '%s geladen als %s');
+@define('FILE_UPLOADED', 'Datei %s erfolgreich als %s hochgeladen');
 @define('WORD_OR', 'Oder');
 @define('SCALING_IMAGE', 'Ändere Größe von %s nach %s x %s px');
 @define('KEEP_PROPORTIONS', 'Proportionen beibehalten');
@@ -340,6 +340,7 @@
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Sie haben den automatischen Aktualisierungsvorgang ignoriert. Bitte stellen Sie sicher, dass die Datenbank anhand der .sql Dateien aktualisiert wird und die geplanten Funktionen aufgerufen werden.');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Ihre Serendipity installation ist nun auf den Stand %s aktualisiert.');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Zurück zum %sblog%s');
+@define('IMAGE_NAME', 'Das Bild mit folgendem Namen speichern (Leer: Originaldateiname verwenden): ');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_en.inc.php	15 Mar 2004 10:13:02 -0000	1.21
+++ serendipity_lang_en.inc.php	22 Mar 2004 15:19:25 -0000	1.22
@@ -245,8 +245,8 @@
 @define('IMAGE_DELETE', 'Delete this image');
 @define('ABORT_NOW', 'Abort now');
 @define('REMOTE_FILE_NOT_FOUND', 'File was not located on the remote server, are you sure the URL: <b>%s</b> is correct?');
-@define('FILE_FETCHED', '%s fetched');
-@define('FILE_UPLOADED', 'File %s successfully uploaded');
+@define('FILE_FETCHED', '%s fetched as %s');
+@define('FILE_UPLOADED', 'File %s successfully uploaded as %s');
 @define('WORD_OR', 'Or');
 @define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
 @define('KEEP_PROPORTIONS', 'Keep proportions');
@@ -340,5 +340,7 @@
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
+@define('IMAGE_NAME', 'Save the image using filename (empty: use original file name): ');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_es.inc.php	15 Mar 2004 10:13:02 -0000	1.21
+++ serendipity_lang_es.inc.php	22 Mar 2004 15:19:25 -0000	1.22
@@ -245,8 +245,8 @@
 @define('IMAGE_DELETE', 'Borra esta imagen');
 @define('ABORT_NOW', 'Salir ahora');
 @define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estas seguro de que la URL: <b>%s</b> es correcta?');
-@define('FILE_FETCHED', '%s enlazado');
-@define('FILE_UPLOADED', 'El archivo %s fue transferido correctamente');
+@define('FILE_FETCHED', '%s enlazado: %s');
+@define('FILE_UPLOADED', 'El archivo %s fue transferido correctamente: %s');
 @define('WORD_OR', 'O bien...');
 @define('SCALING_IMAGE', 'Escalando %s a %s x %s px');
 @define('KEEP_PROPORTIONS', 'Mantener las proporciones');
@@ -335,6 +335,7 @@
 /* TRANSLATE */ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
 /* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
 /* TRANSLATE */ @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
+@define('IMAGE_NAME', 'Save the image using filename (empty: use original file name): '); // TRANSLATE
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity NEWS,1.93,1.94 serendipity_admin_images.inc.php,1.18,1.19

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

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

Modified Files:
	NEWS serendipity_admin_images.inc.php 
Log Message:
image manager can now upload a file to a specified filename. Fix conflicting
namespace of cookie/post variables.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- NEWS	21 Mar 2004 17:19:29 -0000	1.93
+++ NEWS	22 Mar 2004 15:19:25 -0000	1.94
@@ -3,6 +3,10 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Image upload: Can now specify alternate file name. Renamed
+      input field to not cause confusion with COOKIE-variable
+      (garvinhicking, isotopp)
+
     * Image manager popup-window now resizable and with scrollbars
       (garvinhicking)
 

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_admin_images.inc.php	22 Mar 2004 14:26:02 -0000	1.18
+++ serendipity_admin_images.inc.php	22 Mar 2004 15:19:25 -0000	1.19
@@ -96,38 +96,53 @@
 <?php
 
     // First find out whether to fetch a file or accept an upload
-    $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . basename($serendipity['POST']['url']);
-    if ($serendipity['POST']['url'] != '' && $serendipity['POST']['url'] != 'http://') {
-        if (file_exists($checkfile)) {
-            echo ERROR_FILE_EXISTS_ALREADY;
+    if ($serendipity['POST']['imageurl'] != '' && $serendipity['POST']['imageurl'] != 'http://') {
+        if (!empty($serendipity['POST']['target_filename'])) {
+            $tfile   = $serendipity['POST']['target_filename'];
+        } else {
+            $tfile   = basename($serendipity['POST']['imageurl']);
+        }
+        
+        $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
+
+        if (file_exists($target)) {
+            echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY;
         } else {
             // Fetch file
-            if (!$fContent = @file_get_contents($serendipity['POST']['url']) ) {
-                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['url']);
+            if (!$fContent = @file_get_contents($serendipity['POST']['imageurl']) ) {
+                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['imageurl']);
             } else {
-                $fp = fopen($checkfile, 'w');
+                $fp = fopen($target, 'w');
                 fwrite($fp, $fContent);
                 fclose($fp);
 
-                printf(FILE_FETCHED . '<br />', $serendipity['POST']['url']);
+                printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                serendipity_makeThumbnail(basename($serendipity['POST']['url']));
+                serendipity_makeThumbnail($tfile);
                 echo THUMB_CREATED_DONE . '<br />';
             }
         }
     } else {
-        if (file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'])) {
-            echo ERROR_FILE_EXISTS_ALREADY;
+        if (!empty($serendipity['POST']['target_filename'])) {
+            $tfile   = $serendipity['POST']['target_filename'];
+        } else {
+            $tfile   = $_FILES['userfile']['name'];
+        }
+        
+        $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
+
+        if (file_exists($target)) {
+            echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY;
         } else {
             // Accept file
-            if (move_uploaded_file($_FILES['userfile']['tmp_name'], $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'])) {
-                printf(FILE_UPLOADED . '<br />', $_FILES['userfile']['name']);
+            if (move_uploaded_file($_FILES['userfile']['tmp_name'], $target)) {
+                printf(FILE_UPLOADED . '<br />', $_FILES['userfile']['name'], $target);
                 @umask(0000);
-                @chmod($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'], 0664);
+                @chmod($target, 0664);
 
                 // Create thumbnail
-                serendipity_makeThumbnail($_FILES['userfile']['name']);
+                serendipity_makeThumbnail($tfile);
                 echo THUMB_CREATED_DONE . '<br />';
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
@@ -140,7 +155,14 @@
 ?>
     <?php echo ADD_IMAGE_BLAHBLAH; ?>
 
-    <form action="?" method="POST" enctype="multipart/form-data">
+    <script type="text/javascript">
+    function getfilename(field, value) {
+        re = /^.+[\/\\]+?(.+)$/;
+        document.getElementById(field).value = value.replace(re, "$1");
+    }
+    </script>
+    
+    <form action="?" method="POST" id="uploadform" enctype="multipart/form-data">
         <div>
             <input type="hidden" name="MAX_FILE_SIZE"            value="3000000" />
             <input type="hidden" name="serendipity[action]"      value="admin" />
@@ -150,7 +172,7 @@
             <table>
                 <tr>
                     <td nowrap="nowrap"><?php echo ENTER_IMAGE_URL; ?></td>
-                    <td><input type="text" name="serendipity[url]" value="" size="40" /></td>
+                    <td><input type="text" name="serendipity[imageurl]" onblur="getfilename('target_filename', this.value);" onchange="getfilename('target_filename', this.value);" onkeyup="getfilename('target_filename', this.value);" value="" size="40" /></td>
                 </tr>
 
                 <tr>
@@ -159,7 +181,16 @@
 
                 <tr>
                     <td nowrap='nowrap'><?php echo ENTER_IMAGE_TO_UP; ?></td>
-                    <td><input name="userfile" type="file"/></td>
+                    <td><input name="userfile" onchange="getfilename('target_filename', this.value);" onblur="getfilename('target_filename', this.value);" onkeyup="getfilename('target_filename', this.value);" type="file" /></td>
+                </tr>
+
+                <tr>
+                    <td align="center" colspan="2"><br /></td>
+                </tr>
+
+                <tr>
+                    <td nowrap='nowrap'><?php echo IMAGE_NAME; ?></td>
+                    <td><input type="text" id="target_filename" name="serendipity[target_filename]" value="" size="40" /></td>
                 </tr>
 
                 <tr>

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.17,1.18

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

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

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
After discussion and debugging session with Garvin I have reverted this
patch.




Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin_images.inc.php	22 Mar 2004 12:13:07 -0000	1.17
+++ serendipity_admin_images.inc.php	22 Mar 2004 14:26:02 -0000	1.18
@@ -59,13 +59,13 @@
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
         $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
-        if ( $serendipity['GET']['newname']!= '' && file_exists($oldfile) && !file_exists($newfile) ) {
+        if ($serendipity['GET']['newname'] != '' && file_exists($oldfile) && !file_exists($newfile)) {
             // Rename file
             rename($oldfile, $newfile);
 
             // Rename thumbnail
-            rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
-                    $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
+            rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
+                   $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
 
             serendipity_updateImageInDatabase(array('thumbnail_name' => $serendipity['thumbSuffix'], 'name' => $serendipity['GET']['newname']), $serendipity['GET']['fid']);
             // Forward user to overview (we don't want the user's back button to rename things again)
@@ -96,24 +96,23 @@
 <?php
 
     // First find out whether to fetch a file or accept an upload
-    $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . basename($serendipity['POST']['myurl']);
-    if ($serendipity['POST']['myurl'] != '' && $serendipity['POST']['myurl'] != 'http://') {
+    $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . basename($serendipity['POST']['url']);
+    if ($serendipity['POST']['url'] != '' && $serendipity['POST']['url'] != 'http://') {
         if (file_exists($checkfile)) {
-            print "|$checkfile|".$serendipity['POST']['myurl']."|<br />\n";
             echo ERROR_FILE_EXISTS_ALREADY;
         } else {
             // Fetch file
-            if (!$fContent = @file_get_contents($serendipity['POST']['myurl']) ) {
-                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['myurl']);
+            if (!$fContent = @file_get_contents($serendipity['POST']['url']) ) {
+                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['url']);
             } else {
                 $fp = fopen($checkfile, 'w');
                 fwrite($fp, $fContent);
                 fclose($fp);
 
-                printf(FILE_FETCHED . '<br />', $serendipity['POST']['myurl']);
+                printf(FILE_FETCHED . '<br />', $serendipity['POST']['url']);
 
                 // Create thumbnail
-                serendipity_makeThumbnail(basename($serendipity['POST']['myurl']));
+                serendipity_makeThumbnail(basename($serendipity['POST']['url']));
                 echo THUMB_CREATED_DONE . '<br />';
             }
         }
@@ -124,6 +123,8 @@
             // Accept file
             if (move_uploaded_file($_FILES['userfile']['tmp_name'], $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'])) {
                 printf(FILE_UPLOADED . '<br />', $_FILES['userfile']['name']);
+                @umask(0000);
+                @chmod($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'], 0664);
 
                 // Create thumbnail
                 serendipity_makeThumbnail($_FILES['userfile']['name']);

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.16,1.17

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

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

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
Fixes (for me) an obscure bug when trying to upload an image from an URL,
which does not work at all for me, then trying to upload from the same
session an image from a file (which did not work at all before this fix,
when upload via URL was tried first).

Still needs some further debugging re the reason for this (am not reading
cvs list, please reply to me directly).



Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin_images.inc.php	21 Mar 2004 16:35:31 -0000	1.16
+++ serendipity_admin_images.inc.php	22 Mar 2004 12:13:07 -0000	1.17
@@ -59,13 +59,13 @@
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
         $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
-        if ($serendipity['GET']['newname'] != '' && file_exists($oldfile) && !file_exists($newfile)) {
+        if ( $serendipity['GET']['newname']!= '' && file_exists($oldfile) && !file_exists($newfile) ) {
             // Rename file
             rename($oldfile, $newfile);
 
             // Rename thumbnail
-            rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
-                   $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
+            rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
+                    $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
 
             serendipity_updateImageInDatabase(array('thumbnail_name' => $serendipity['thumbSuffix'], 'name' => $serendipity['GET']['newname']), $serendipity['GET']['fid']);
             // Forward user to overview (we don't want the user's back button to rename things again)
@@ -96,23 +96,24 @@
 <?php
 
     // First find out whether to fetch a file or accept an upload
-    $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . basename($serendipity['POST']['url']);
-    if ($serendipity['POST']['url'] != '' && $serendipity['POST']['url'] != 'http://') {
+    $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . basename($serendipity['POST']['myurl']);
+    if ($serendipity['POST']['myurl'] != '' && $serendipity['POST']['myurl'] != 'http://') {
         if (file_exists($checkfile)) {
+            print "|$checkfile|".$serendipity['POST']['myurl']."|<br />\n";
             echo ERROR_FILE_EXISTS_ALREADY;
         } else {
             // Fetch file
-            if (!$fContent = @file_get_contents($serendipity['POST']['url']) ) {
-                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['url']);
+            if (!$fContent = @file_get_contents($serendipity['POST']['myurl']) ) {
+                printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['myurl']);
             } else {
                 $fp = fopen($checkfile, 'w');
                 fwrite($fp, $fContent);
                 fclose($fp);
 
-                printf(FILE_FETCHED . '<br />', $serendipity['POST']['url']);
+                printf(FILE_FETCHED . '<br />', $serendipity['POST']['myurl']);
 
                 // Create thumbnail
-                serendipity_makeThumbnail(basename($serendipity['POST']['url']));
+                serendipity_makeThumbnail(basename($serendipity['POST']['myurl']));
                 echo THUMB_CREATED_DONE . '<br />';
             }
         }
@@ -123,8 +124,6 @@
             // Accept file
             if (move_uploaded_file($_FILES['userfile']['tmp_name'], $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'])) {
                 printf(FILE_UPLOADED . '<br />', $_FILES['userfile']['name']);
-                @umask(0000);
-                @chmod($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'], 0664);
 
                 // Create thumbnail
                 serendipity_makeThumbnail($_FILES['userfile']['name']);

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

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Be nice to certain apache configurations with Aliases.
Patch from Rchiard Thomas Harrison, thanks!


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_config.inc.php	21 Mar 2004 16:35:32 -0000	1.59
+++ serendipity_config.inc.php	22 Mar 2004 07:52:14 -0000	1.60
@@ -81,7 +81,13 @@
  *   Make sure that the file included is in the current directory and not any possible
  *   include path
  */
-include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
+    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+} elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
+    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
+} else {
+    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
+}
 
 /*
  *  Include main functions

[php-blog-cvs] serendipity NEWS,1.92,1.93 serendipity_functions.inc.php,1.232,1.233

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
made image manager popup window resizable and with optional scrollbars


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- serendipity_functions.inc.php	21 Mar 2004 17:06:18 -0000	1.232
+++ serendipity_functions.inc.php	21 Mar 2004 17:19:29 -0000	1.233
@@ -2005,7 +2005,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
-                        <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');" />
+                        <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,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- NEWS	21 Mar 2004 16:35:31 -0000	1.92
+++ NEWS	21 Mar 2004 17:19:29 -0000	1.93
@@ -3,6 +3,9 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Image manager popup-window now resizable and with scrollbars
+      (garvinhicking)
+
     * Serendipity can now be used in shared environments and act as a
       library for VirtualHost'ed Blogs. See README. (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.231,1.232

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed GC routine, which got screwed for MySQL somewhen. Thanks, Jez!

PLEASE CHECK IF THIS WORKS FOR POSTGRESQL!


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- serendipity_functions.inc.php	21 Mar 2004 16:35:32 -0000	1.231
+++ serendipity_functions.inc.php	21 Mar 2004 17:06:18 -0000	1.232
@@ -2188,12 +2188,13 @@
 function serendipity_track_referrer_gc() {
     global $serendipity;
 
-    if($serendipity['dbType'] == "mysql")
+    if ($serendipity['dbType'] == "mysql") {
         $interval = 900;
-    else
+    } else {
         $interval = "interval '900'";
-
-    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() = $interval";
+    }
+    
+    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - $interval";
     serendipity_db_query($gc);
 }
 

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

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

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

Modified Files:
	serendipity_plugin_api.php 
Log Message:
Bugfix for creation of depending plugins. "event"-detection was wrong, fixes problems when inserting templatechooser.


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_plugin_api.php	21 Mar 2004 16:35:32 -0000	1.14
+++ serendipity_plugin_api.php	21 Mar 2004 16:58:31 -0000	1.15
@@ -541,7 +541,7 @@
                 foreach($this->dependencies AS $dependency => $mode) {
                     $exists = serendipity_plugin_api::exists($dependency);
                     if (!$exists) {
-                        if (strncmp($dependency, 'serendipity_event_', 19)) {
+                        if (strncmp($dependency, 'serendipity_event_', 18) == 0) {
                             $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event');
                         } else {
                             $keys[] = serendipity_plugin_api::create_plugin_instance($dependency);

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

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

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

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
Use correct DTD (thanks to r3t0)


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_genpage.inc.php	21 Mar 2004 16:35:32 -0000	1.25
+++ serendipity_genpage.inc.php	21 Mar 2004 16:47:18 -0000	1.26
@@ -4,7 +4,7 @@
     if ($serendipity['XHTML11']) {
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-           "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd" />
+           "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd">
 <?php
     } else {
 ?>

[php-blog-cvs] serendipity/deployment comment.php,NONE,1.1 exit.php,NONE,1.1 index.php,NONE,1.1 rss.php,NONE,1.1 serendipity.css.php,NONE,1.1 serendipity_admin.php,NONE,1.1 serendipity_admin_image_selector.php,NONE,1.1 serendipity_config.inc.php,NONE,1.1 serendipity_define.js.php,NONE,1.1 serendipity_entries.php,NONE,1.1 serendipity_xmlrpc.php,NONE,1.1 wfwcomment.php,NONE,1.1

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

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

Added Files:
	comment.php exit.php index.php rss.php serendipity.css.php 
	serendipity_admin.php serendipity_admin_image_selector.php 
	serendipity_config.inc.php serendipity_define.js.php 
	serendipity_entries.php serendipity_xmlrpc.php wfwcomment.php 
Log Message:
Dummy files for using s9y as shared library


--- NEW FILE: serendipity_admin.php ---
<?php # $Id: serendipity_admin.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity_admin.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity_entries.php ---
<?php # $Id: serendipity_entries.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity_entries.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity_config.inc.php ---
<?php # $Id: serendipity_config.inc.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

#@define('S9Y_INCLUDE_PATH', 's9y/');
require_once 's9y/serendipity_config.inc.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: index.php ---
<?php # $Id: index.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/index.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: rss.php ---
<?php # $Id: rss.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/rss.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity.css.php ---
<?php # $Id: serendipity.css.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity.css.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity_xmlrpc.php ---
<?php # $Id: serendipity_xmlrpc.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity_xmlrpc.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: wfwcomment.php ---
<?php # $Id: wfwcomment.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/wfwcomment.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity_admin_image_selector.php ---
<?php # $Id: serendipity_admin_image_selector.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity_admin_image_selector.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: exit.php ---
<?php # $Id: exit.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/exit.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: serendipity_define.js.php ---
<?php # $Id: serendipity_define.js.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/serendipity_define.js.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: comment.php ---
<?php # $Id: comment.php,v 1.1 2004/03/21 16:38:06 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns [http://www.s9y.org]
# All rights reserved.  See LICENSE file for licensing details.
# Serendipity is provided in managed mode here

require_once 's9y/comment.php';
/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/deployment/archives - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/deployment/archives added to the repository

[php-blog-cvs] serendipity/deployment/uploads - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/deployment/uploads added to the repository

[php-blog-cvs] serendipity/deployment - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/deployment added to the repository

[php-blog-cvs] serendipity/templates/default layout.php,1.14,1.15

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

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

Modified Files:
	layout.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- layout.php	15 Mar 2004 08:51:13 -0000	1.14
+++ layout.php	21 Mar 2004 16:35:33 -0000	1.15
@@ -8,9 +8,9 @@
 # http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
 ##########################################################################
-include_once("serendipity_config.inc.php");
-include_once("serendipity_plugin_api.php");
-include_once("serendipity_sidebar_items.php");
+include_once('serendipity_config.inc.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
 ?>
 <div id="serendipity_banner">
@@ -34,7 +34,7 @@
 ?>
         <td id="content" valign="top">
 <?php
-if (!is_numeric($serendipity['GET']['range'])) {
+if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
     $serendipity['GET']['range'] = date('Ymd');
 }
 

[php-blog-cvs] serendipity NEWS,1.91,1.92 README,1.4,1.5 compat.php,1.12,1.13 index.php,1.36,1.37 rss.php,1.21,1.22 serendipity.css.php,1.24,1.25 serendipity_admin.php,1.33,1.34 serendipity_admin_entries.inc.php,1.18,1.19 serendipity_admin_images.inc.php,1.15,1.16 serendipity_admin_installer.inc.php,1.58,1.59 serendipity_admin_interop.inc.php,1.5,1.6 serendipity_admin_plugins.inc.php,1.19,1.20 serendipity_admin_upgrader.inc.php,1.4,1.5 serendipity_config.inc.php,1.58,1.59 serendipity_db.inc.php,1.9,1.10 serendipity_entries.php,1.24,1.25 serendipity_functions.inc.php,1.230,1.231 serendipity_functions_images.inc.php,1.6,1.7 serendipity_functions_installer.inc.php,1.1,1.2 serendipity_genpage.inc.php,1.24,1.25 serendipity_lang.inc.php,1.9,1.10 serendipity_layout.inc.php,1.8,1.9 serendipity_layout_table.inc.php,1.9,1.10 serendipity_plugin_api.php,1.13,1.14

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

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

Modified Files:
	NEWS README compat.php index.php rss.php serendipity.css.php 
	serendipity_admin.php serendipity_admin_entries.inc.php 
	serendipity_admin_images.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_admin_interop.inc.php 
	serendipity_admin_plugins.inc.php 
	serendipity_admin_upgrader.inc.php serendipity_config.inc.php 
	serendipity_db.inc.php serendipity_entries.php 
	serendipity_functions.inc.php 
	serendipity_functions_images.inc.php 
	serendipity_functions_installer.inc.php 
	serendipity_genpage.inc.php serendipity_lang.inc.php 
	serendipity_layout.inc.php serendipity_layout_table.inc.php 
	serendipity_plugin_api.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_admin_installer.inc.php	21 Mar 2004 16:26:56 -0000	1.58
+++ serendipity_admin_installer.inc.php	21 Mar 2004 16:35:31 -0000	1.59
@@ -1,16 +1,17 @@
 <?php # $Id$
 
 umask(0000);
-$umask = 0770;
-define('IN_installer', true);
+$umask = 0775;
+@define('IN_installer', true);
 
-require_once('serendipity_config.inc.php');
-require_once('serendipity_functions_installer.inc.php');
+require_once($serendipity['serendipityPath'] . 'serendipity_config.inc.php');
+require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
+define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'serendipity_config_local.tpl');
 
 function serendipity_query_default($optname, $default) {
     switch ($optname) {
         case 'serendipityPath':
-            return dirname(__FILE__) .'/';
+            return $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
 
         case 'serendipityHTTPPath':
             return rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/';
@@ -22,7 +23,7 @@
             return sprintf('http%s://%s%s%s',
 
                             $ssl ? 's' : '',
-                            $_SERVER['HTTP_HOST'],
+                            preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']),
                             (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
                             rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/'
                    );
@@ -40,7 +41,7 @@
             $path[] = '/usr/bin';
 
             foreach ($path as $dir) {
-                if (function_exists('is_executable') && is_executable($dir . '/convert') || is_file($dir . '/convert')) {
+                if (function_exists('is_executable') && @is_executable($dir . '/convert') || @is_file($dir . '/convert')) {
                     return $dir . '/convert';
                 }
             }
@@ -55,7 +56,7 @@
     global $serendipity;
     $config = array();
 
-    $t = file($n);
+    $t = file($n, 1);
     for ($x=0; $x<count($t); $x++) {
         $l = $t[$x];
         $l = trim($l);
@@ -140,6 +141,10 @@
 function serendipity_printConfigTemplate($t, $from = false) {
     global $serendipity;
 
+    if (!isset($serendipity['XHTML11'])) {
+        $serendipity['XHTML11'] = FALSE;
+    }
+    
     // If not yet installed, do some magic:
     $abort = false;
     if (IS_installed !== true) {
@@ -157,13 +162,16 @@
             fclose($fp);
 
             // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
-            $sock = fsockopen($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
-            fputs($sock, "GET {$_SERVER['REQUEST_URI']}nonexistant HTTP/1.0\n\n");
+            $sock = fsockopen(preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']), $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
             $response = '';
-            while (!feof($sock) && strlen($response) < 4096) {
-                $response .= fgets($sock, 400);
+
+            if ($sock) {
+                fputs($sock, "GET {$_SERVER['REQUEST_URI']}nonexistant HTTP/1.0\n\n");
+                while (!feof($sock) && strlen($response) < 4096) {
+                    $response .= fgets($sock, 400);
+                }
+                fclose($sock);
             }
-            fclose($sock);
             
             if (preg_match('@^HTTP/\d\.\d 200@', $response)) {
                 $serendipity['rewrite_default'] = 'errordocs';
@@ -171,7 +179,7 @@
                 $serendipity['rewrite_default'] = 'none';
             }
             
-            if ($old_htacces != '') {
+            if (!empty($old_htacces)) {
                 $fp = @fopen('./.htaccess', 'w');
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
@@ -288,51 +296,55 @@
     $in_table = 0;
     $queries = array();
 
-    $fp = fopen($filename, 'r');
-    while (!@feof($fp)) {
-        $line = trim(fgets($fp, 4096));
-        if ($in_table) {
-            $def .= $line;
-            if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
-                $in_table = 0;
-                array_push($queries, $def);
-            }
-        } else {
-            if (preg_match('#^create table \{PREFIX\}\S+\s*\(#i', $line)) {
-                $in_table = 1;
-                $def = $line;
-            }
-
-            if (preg_match('#^create\s*(\{fulltext\}|unique)\s*index#i', $line)) {
-                array_push($queries, $line);
+    $fp = fopen($filename, 'r', 1);
+    if ($fp) {
+        while (!@feof($fp)) {
+            $line = trim(fgets($fp, 4096));
+            if ($in_table) {
+                $def .= $line;
+                if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
+                    $in_table = 0;
+                    array_push($queries, $def);
+                }
+            } else {
+                if (preg_match('#^create table \{PREFIX\}\S+\s*\(#i', $line)) {
+                    $in_table = 1;
+                    $def = $line;
+                }
+    
+                if (preg_match('#^create\s*(\{fulltext\}|unique)\s*index#i', $line)) {
+                    array_push($queries, $line);
+                }
             }
         }
+        fclose($fp);
     }
-    fclose($fp);
-
+    
     return $queries;
 }
 
 function serendipity_checkInstallation() {
     global $serendipity, $umask;
 
+    $errs = array();
+    
     // Check dirs
-    if ( !is_dir($_POST['serendipityPath']) ) {
+    if (!is_dir($_POST['serendipityPath'])) {
         $errs[] = sprintf(DIRECTORY_NON_EXISTANT, $_POST['serendipityPath']);
     }
-    elseif ( !is_writable($_POST['serendipityPath']) ) {
+    elseif (!is_writable($_POST['serendipityPath']) ) {
         $errs[] = sprintf(DIRECTORY_WRITE_ERROR, $_POST['serendipityPath']);
     }
-    elseif ( !is_dir($_POST['serendipityPath'] . $_POST['uploadPath'] ) && @mkdir($_POST['serendipityPath'] . $_POST['uploadPath'], $umask) !== true) {
+    elseif (!is_dir($_POST['serendipityPath'] . $_POST['uploadPath'] ) && @mkdir($_POST['serendipityPath'] . $_POST['uploadPath'], $umask) !== true) {
         $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . $_POST['uploadPath']);
     }
-    elseif ( !is_writable($_POST['serendipityPath'] . $_POST['uploadPath']) ) {
+    elseif (!is_writable($_POST['serendipityPath'] . $_POST['uploadPath'])) {
         $errs[] = sprintf(DIRECTORY_WRITE_ERROR, $_POST['serendipityPath'] . $_POST['uploadPath']);
         $errs[] = sprintf(DIRECTORY_RUN_CMD    , 'chmod go+rws', $_POST['serendipityPath'] . $_POST['uploadPath']);
     }
 
     // Attempt to create the archives directory
-    if ( !is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true ) {
+    if (!is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true) {
         $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES);
         $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'mkdir'      , $_POST['serendipityPath'] . PATH_ARCHIVES);
         $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_ARCHIVES);
@@ -341,17 +353,22 @@
     // plugins directory now part of basic CVS
 
     // Check imagick
-    if ($_POST['magick'] == 'true' && !is_executable($_POST['convert'])) {
+    if ($_POST['magick'] == 'true' && !@is_executable($_POST['convert'])) {
         $errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
     }
 
     $serendipity['dbType'] = $_POST['dbType'];
     // Probe database
     // (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') ) {
+    @include_once($_POST['serendipityPath'] . 'serendipity_db.inc.php');
+    // For shared installations, probe the file on include path
+    @include_once(S9Y_INCLUDE_PATH . 'serendipity_db.inc.php');
+    
+    if (S9Y_DB_INCLUDED) {
         serendipity_db_probe($_POST, $errs);
     }
-    return $errs;
+
+    return (count($errs) > 0 ? $errs : '');
 }
 
 function serendipity_installDatabase() {
@@ -362,20 +379,21 @@
     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('./sql/db.sql');
+    $queries = serendipity_parse_sql_tables($serendipity['serendipityPath'] . 'sql/db.sql');
     $queries = str_replace('{PREFIX}', $_POST['dbPrefix'], $queries);
 
     foreach ($queries as $query) {
         serendipity_db_schema_import($query);
     }
 
-    if($_POST['want_mail'] == true) {
+    if ($_POST['want_mail'] == true) {
         $mail_comments = 1;
     } else {
         $mail_comments = 0;
@@ -400,17 +418,19 @@
                           )";
     serendipity_db_query($query);
 
-    include_once $_POST['serendipityPath'] . '/serendipity_functions_config.inc.php';
+    include_once S9Y_INCLUDE_PATH . 'serendipity_functions_config.inc.php';
 
     $serendipity['dbPrefix'] = $_POST['dbPrefix'];
     serendipity_set_config_var('template', 'default');
 
-    $text = serendipity_db_escape_string(file_get_contents('./serendipity.css'));
+    $text = serendipity_db_escape_string(file_get_contents(S9Y_INCLUDE_PATH . 'serendipity.css'));
     $query = "INSERT into {$_POST['dbPrefix']}css (name, data) values ('default', '$text')";
     return serendipity_db_query($query);
 }
 
 function serendipity_installFiles() {
+    global $serendipity;
+    
     $htaccess = @file_get_contents('./.htaccess');
 
     if ($_POST['rewrite'] == 'rewrite') {
@@ -421,7 +441,7 @@
         $template = 'htaccess.normal.tpl';
     }
 
-    if (!($a = file('./'. $template))) {
+    if (!($a = file($serendipity['serendipityPath'] . $template, 1))) {
         $err[] = ERROR_TEMPLATE_FILE;
     }
 
@@ -481,7 +501,7 @@
     global $serendipity, $umask;
 
     // Save all basic config variables to the database
-    $p = serendipity_parseTemplate("./serendipity_config_local.tpl", true);
+    $p = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, true);
 
     foreach($p as $key => $entry) {
         serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
@@ -510,7 +530,7 @@
             if (is_array($res)) {
                 echo DIAGNOSTIC_ERROR . '<br /><br />';
                 echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
-                serendipity_printConfigTemplate(serendipity_parseTemplate('./serendipity_config_local.tpl'), $_POST);
+                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST);
                 die();
             }
 
@@ -519,7 +539,8 @@
             /* We are good to go, lets install databases etc. */
             echo ATTEMPT_SETUP_DATABASE . "<br />";
             $res = serendipity_installDatabase();
-            if ( $res !== false ) {
+
+            if ($res !== false) {
                 echo ' ' . DATABASE_DONE . '<br />';
             } else {
                 echo '<span style="color: #FF0000">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />';
@@ -528,7 +549,7 @@
             /* Next are the files, .htaccess */
             printf(ATTEMPT_WRITE_FILE, '.htaccess');
             $res = serendipity_installFiles();
-            if ( is_array($res) ) {
+            if (is_array($res)) {
                 echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
                 die();
             } else {
@@ -541,8 +562,12 @@
             /* register default plugins */
             $GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
             $GLOBALS['serendipity']['dbName']   = $_POST['dbName'];
+            $GLOBALS['serendipity']['serendipityHTTPPath'] = $_POST['serendipityHTTPPath'];
+            if (!isset($serendipity['lang'])) {
+                $serendipity['lang'] = 'en';
+            }
 
-            include_once 'serendipity_plugin_api.php';
+            include_once S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php';
             serendipity_plugin_api::register_default_plugins();
 
             printf(
@@ -564,15 +589,15 @@
         }
 
         $res = serendipity_updateConfiguration();
-        if ( is_array($res) ) {
+        if (is_array($res)) {
             echo DIAGNOSTIC_ERROR;
             echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
         } else {
             /* If we have new rewrite rules, then install them */
-            if ( $serendipity['rewrite'] != $_POST['rewrite'] ) {
+            if ($serendipity['rewrite'] != $_POST['rewrite']) {
                 printf(ATTEMPT_WRITE_FILE, '.htaccess');
                 $res = serendipity_installFiles();
-                if ( is_array($res) ) {
+                if (is_array($res)) {
                     echo implode('<br />'. $res);
                 } else {
                     echo DONE .'<br />';
@@ -585,19 +610,19 @@
 
     default:
         /*  Is serendipity already installed=  */
-        if ( file_exists('./serendipity_config_local.inc.php') ) {
+        if (file_exists('./serendipity_config_local.inc.php')) {
             $from = &$serendipity;
         } else {
             define('VERSION_REQUIRED', '4.2.1');
 
             /* Do check for required PHP version */
-            if ( version_compare(PHP_VERSION, VERSION_REQUIRED) == -1 ) {
+            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>';
             }
             $from = false;
         }
 
-        serendipity_printConfigTemplate(serendipity_parseTemplate('./serendipity_config_local.tpl'), $from);
+        serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $from);
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_lang.inc.php	15 Mar 2004 10:12:47 -0000	1.9
+++ serendipity_lang.inc.php	21 Mar 2004 16:35:32 -0000	1.10
@@ -2,19 +2,19 @@
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
-    if ( @include($serendipity['serendipityPath'] .'lang/serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
+    if (@include(S9Y_INCLUDE_PATH .'lang/serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
         // Only here can we truely say the language is loaded
         define('serendipity_LANG_LOADED', true);
-    } elseif ( IS_installed === false || IS_up2date === false ) {   /* -- Auto-Guess -- */
+    } elseif (IS_installed === false || (defined('IS_up2date') && IS_up2date === 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', 'da', 'de', 'es');
-        $possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {
                 $preferred_language = preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang);
                 if (in_array($preferred_language, $supported_languages)) {
-                    @include_once($serendipity['serendipityPath'] . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
+                    @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
                     break;
                 } // endif
             } // endforeach
@@ -22,8 +22,8 @@
     }  //endif
     
     // Do fallback to english
-    if ( (defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true) || IS_installed === false || IS_up2date === false) {
-        @include_once($serendipity['serendipityPath'] .'lang/serendipity_lang_en.inc.php');
+    if ((defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true) || IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {
+        @include_once(S9Y_INCLUDE_PATH .'lang/serendipity_lang_en.inc.php');
     }
 }
 

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_genpage.inc.php	29 Jan 2004 12:08:28 -0000	1.24
+++ serendipity_genpage.inc.php	21 Mar 2004 16:35:32 -0000	1.25
@@ -34,8 +34,8 @@
 } // end if (is serendipity embedded?)
 
 include_once('serendipity_config.inc.php');
-include_once('serendipity_plugin_api.php');
-include_once('serendipity_sidebar_items.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
 if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/layout.php')) {
     include $serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/layout.php';

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_layout_table.inc.php	8 Jul 2003 09:13:27 -0000	1.9
+++ serendipity_layout_table.inc.php	21 Mar 2004 16:35:32 -0000	1.10
@@ -8,9 +8,9 @@
 # http://www.jannis.to/programming/serendipity.html                            #
 #                                                                        #
 ##########################################################################
-include_once("serendipity_config.inc.php");
-include_once("serendipity_plugin_api.php");
-include_once("serendipity_sidebar_items.php");
+include_once('serendipity_config.inc.php");
+include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
 ?>
 <div id="serendipity_banner">

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rss.php	18 Mar 2004 14:45:20 -0000	1.21
+++ rss.php	21 Mar 2004 16:35:31 -0000	1.22
@@ -79,7 +79,7 @@
 $title       = utf8_encode($title);
 $description = utf8_encode($description);
 
-include_once('serendipity_plugin_api.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 $plugins = serendipity_plugin_api::enum_plugins();
 
 if (is_array($plugins)) {

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_config.inc.php	21 Mar 2004 16:26:56 -0000	1.58
+++ serendipity_config.inc.php	21 Mar 2004 16:35:32 -0000	1.59
@@ -2,13 +2,17 @@
 # Copyright (c) 2003-2004, Jannis Hermanns
 # All rights reserved.  See LICENSE file for licensing details
 
+if (!defined('S9Y_INCLUDE_PATH')) {
+    define('S9Y_INCLUDE_PATH', dirname(__FILE__) . '/');
+}
+
 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');
+include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
 $serendipity['version']      = '0.6-CVS';
@@ -16,7 +20,7 @@
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();
 
-if ( $serendipity['production'] == 1 ) {
+if ($serendipity['production'] == 1) {
     error_reporting(E_ALL & ~E_NOTICE);
 } else {
     error_reporting(E_ALL);
@@ -32,7 +36,7 @@
 /*
  *   Load main language file
  */
-include('serendipity_lang.inc.php');
+include($serendipity['serendipityPath'] . 'serendipity_lang.inc.php');
 
 /* URI paths 
  * These could be defined in the language headers, except that would break
@@ -74,13 +78,15 @@
 /*
  *   Load DB configuration information
  *   Load Functions
+ *   Make sure that the file included is in the current directory and not any possible
+ *   include path
  */
-include_once("{$serendipity['serendipityPath']}serendipity_config_local.inc.php");
+include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
 
 /*
  *  Include main functions
  */
-include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
+include_once(S9Y_INCLUDE_PATH . 'serendipity_functions.inc.php');
 
 if (serendipity_FUNCTIONS_LOADED!== true) {
     die(sprintf(INCLUDE_ERROR, 'serendipity_functions.inc.php'));
@@ -114,7 +120,7 @@
 /*
  *   Load main language file again, because now we have the preferred language
  */
-include($serendipity['serendipityPath'] .'serendipity_lang.inc.php');
+include(S9Y_INCLUDE_PATH .'serendipity_lang.inc.php');
 
 /*
  *   Set current locale, if any has been defined
@@ -163,7 +169,7 @@
 }
 
 $old_include = @ini_get('include_path');
-@ini_set('include_path', $serendipity['serendipityPath'] . 'bundled-libs/:' . $old_include);
+@ini_set('include_path', $serendipity['serendipityPath'] . ':' . $serendipity['serendipityPath'] . 'bundled-libs/:' . $old_include);
 
 $serendipity['user']  = isset($_SESSION['serendipityUser'])  ? $_SESSION['serendipityUser']  : '';
 $serendipity['email'] = isset($_SESSION['serendipityEmail']) ? $_SESSION['serendipityEmail'] : '';

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_admin_plugins.inc.php	19 Mar 2004 10:18:39 -0000	1.19
+++ serendipity_admin_plugins.inc.php	21 Mar 2004 16:35:31 -0000	1.20
@@ -5,8 +5,8 @@
 }
 session_start();
 
-include_once 'serendipity_plugin_api.php';
-include_once 'serendipity_sidebar_items.php';
+include_once S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php';
+include_once S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php';
 
 function show_plugins($event_only = false)
 {

Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_db.inc.php	2 Feb 2004 10:19:08 -0000	1.9
+++ serendipity_db.inc.php	21 Mar 2004 16:35:32 -0000	1.10
@@ -1,8 +1,9 @@
 <?php # $Id$
 # Copyright (c) 2003-2004, Jannis Hermanns
 # All rights reserved.  See LICENSE file for licensing details
+@define('S9Y_DB_INCLUDED', TRUE);
 
-include_once("serendipity_db_{$serendipity['dbType']}.inc.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_db_{$serendipity['dbType']}.inc.php");
 
 function serendipity_db_update($table, $keys, $values)
 {

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_plugin_api.php	3 Mar 2004 08:17:59 -0000	1.13
+++ serendipity_plugin_api.php	21 Mar 2004 16:35:32 -0000	1.14
@@ -4,7 +4,7 @@
     die ('Don\'t hack!');
 }
 
-include_once 'serendipity_functions.inc.php';
+include_once S9Y_INCLUDE_PATH . 'serendipity_functions.inc.php';
 
 /* This file defines the plugin API for serendipity.
  * By extending these classes, you can add your own code
@@ -136,32 +136,66 @@
             }
         }
 
-        /* third-party classes next */
-        $ppath = (isset($serendipity['serendipityPath']) ? $serendipity['serendipityPath'] : '') . 'plugins';
+        /* GLOBAL third-party classes next */
+        $ppath = dirname(__FILE__) . '/plugins';
         $d = opendir($ppath);
-        while (($f = readdir($d)) !== false) {
-            if ($f{0} == '.' || $f == 'CVS') {
-                continue;
-            }
-            
-            if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
-                continue;
-            }
-            
-            if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
-                continue;
-            }
-            
-            $existing = array_search('@' . $f, $classes);
-            if ($existing !== null && $existing !== false) {
-                // If an external plugin/event already exists as internal, remove the internal reference because its redundant
-                unset($classes[$existing]);
+        if ($d) {
+            while (($f = readdir($d)) !== false) {
+                if ($f{0} == '.' || $f == 'CVS') {
+                    continue;
+                }
+                
+                if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
+                    continue;
+                }
+                
+                if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
+                    continue;
+                }
+                
+                $existing = array_search('@' . $f, $classes);
+                if ($existing !== null && $existing !== false) {
+                    // If an external plugin/event already exists as internal, remove the internal reference because its redundant
+                    unset($classes[$existing]);
+                }
+                
+                if (file_exists($ppath . '/' . $f . '/' . $f . '.php')) {
+                    $classes[] = $f;
+                }
             }
-            
-            if (file_exists($ppath . '/' . $f . '/' . $f . '.php')) {
-                $classes[] = $f;
+        }
+        
+        /* LOCAL third-party classes next */
+        $local_ppath = $serendipity['serendipityPath'] . 'plugins';
+        if ($ppath != $local_ppath) {
+            $d = @opendir($local_ppath);
+            if ($d) {
+                while (($f = readdir($d)) !== false) {
+                    if ($f{0} == '.' || $f == 'CVS') {
+                        continue;
+                    }
+                    
+                    if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
+                        continue;
+                    }
+                    
+                    if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
+                        continue;
+                    }
+                    
+                    $existing = array_search('@' . $f, $classes);
+                    if ($existing !== null && $existing !== false) {
+                        // If an external plugin/event already exists as internal, remove the internal reference because its redundant
+                        unset($classes[$existing]);
+                    }
+                    
+                    if (file_exists($local_ppath . '/' . $f . '/' . $f . '.php')) {
+                        $classes[] = $f;
+                    }
+                }
             }
         }
+        
         return $classes;
     }
 
@@ -190,15 +224,20 @@
     {
         global $serendipity;
 
-        list($name, $uniq) = explode(':', $instance_id);
+        $instance = explode(':', $instance_id);
+        $name     = $instance[0];
 
         if ($name{0} == '@') {
             $class_name = substr($name, 1);
         } else {
             /* plugin from the plugins/ dir */
             if (!class_exists($name)) {
-
-                include $serendipity['serendipityPath'] . 'plugins/' . $name . '/' . $name . '.php';
+                // First try the local path, and then (if existing) a shared library repository ...
+                if (file_exists($serendipity['serendipityPath'] . 'plugins/' . $name . '/' . $name . '.php')) {
+                    include $serendipity['serendipityPath'] . 'plugins/' . $name . '/' . $name . '.php';
+                } elseif (file_exists(S9Y_INCLUDE_PATH . 'plugins/' . $name . '/' . $name . '.php')) {
+                    include S9Y_INCLUDE_PATH . 'plugins/' . $name . '/' . $name . '.php';
+                }
 
                 if (!class_exists($name)) {
                     return false;
@@ -264,7 +303,7 @@
         // Generate plugin output. Make sure that by probing the plugin, no events are actually called. After that,
         // restore setting of 'no_events'.
         
-        $ne = ($serendipity['no_events'] ? TRUE : FALSE);
+        $ne = (isset($serendipity['no_events']) && $serendipity['no_events'] ? TRUE : FALSE);
         $serendipity['no_events'] = TRUE;
         ob_start();
         $plugin->generate_content($title);
@@ -285,7 +324,7 @@
     function &get_event_plugins($instance = false) {
         global $serendipity;
         
-        if (!is_array($serendipity['event_plugins'])) {
+        if (!isset($serendipity['event_plugins']) || !is_array($serendipity['event_plugins'])) {
             $plugins = serendipity_plugin_api::enum_plugins('event');
             $serendipity['event_plugins'] = array();
 
@@ -319,7 +358,7 @@
 
         // Can be bypassed globally
         // $serendipity['no_events'] = TRUE;
-        if (!$serendipity['no_events']) {
+        if (!isset($serendipity['no_events']) || !$serendipity['no_events']) {
             $plugins = &serendipity_plugin_api::get_event_plugins();
             
             if (is_array($plugins)) {
@@ -483,7 +522,7 @@
     {
         global $serendipity;
         
-        if (is_array($this->dependencies)) {
+        if (isset($this->dependencies) && is_array($this->dependencies)) {
             
             if ($remove) {
                 $dependencies = @explode(';', $this->get_config('dependencies'));
@@ -549,7 +588,7 @@
     }
 }
 
-include_once 'serendipity_sidebar_items.php';
+include_once S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php';
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- NEWS	21 Mar 2004 16:26:56 -0000	1.91
+++ NEWS	21 Mar 2004 16:35:31 -0000	1.92
@@ -3,6 +3,15 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Serendipity can now be used in shared environments and act as a
+      library for VirtualHost'ed Blogs. See README. (garvinhicking)
+
+    * Fixed installer on hosts with non-standard (80) HTTP ports
+      (garvinhicking)
+
+    * Relaxed umask/chmod file and directory creation
+      (garvinhicking)
+
     * Abstract archives/URL locations and regex-patterns in a central 
       place for easier maintenance (zem)
  

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_admin.php	21 Mar 2004 16:26:56 -0000	1.33
+++ serendipity_admin.php	21 Mar 2004 16:35:31 -0000	1.34
@@ -5,10 +5,10 @@
 define('IN_upgrader', true);
 include('serendipity_config.inc.php');
 
-if ($serendipity['GET']['adminModule'] == 'logout'){
+if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout'){
     serendipity_logout();
 } else {
-    if ( IS_installed === true ) {
+    if (IS_installed === true) {
         serendipity_login();
     }
 }
@@ -42,7 +42,7 @@
         <tr valign="top">
 <?php
 if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) {
-    if ( IS_installed === false ) {
+    if (IS_installed === false) {
         $file = 'serendipity_admin_installer.inc.php';
     } elseif ( IS_up2date === false ) {
         $file = 'serendipity_admin_upgrader.inc.php';
@@ -54,7 +54,7 @@
 ?>
     <td class="serendipity_admin">
         <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
-        <p><?php require_once($file); ?>
+        <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?>
 <?php
 } elseif ( !serendipity_userLoggedIn() ) {
     serendipity_printLogin();
@@ -95,23 +95,23 @@
 
     switch($serendipity['GET']['adminModule']) {
         case 'installer':
-            include './serendipity_admin_installer.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_installer.inc.php';
             break;
 
         case 'images':
-            include 'serendipity_admin_images.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php';
             break;
 
         case 'templates':
-            include 'serendipity_admin_templates.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_templates.inc.php';
             break;
 
         case 'plugins':
-            include 'serendipity_admin_plugins.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_plugins.inc.php';
             break;
 
         case 'interop':
-            include 'serendipity_admin_interop.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_interop.inc.php';
             break;
 
         case 'logout':
@@ -119,7 +119,7 @@
             break;
 
         default:
-            include 'serendipity_admin_overview.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_overview.inc.php';
     }
 }
 ?>

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_entries.php	3 Mar 2004 09:07:00 -0000	1.24
+++ serendipity_entries.php	21 Mar 2004 16:35:32 -0000	1.25
@@ -9,7 +9,8 @@
 } else {
     $_SESSION['serendipityAuthedUser'] = true;
 }
-if ($serendipity['GET']['adminModule'] == 'logout'){
+
+if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout'){
     serendipity_logout();
 } else {
     serendipity_login();
@@ -95,15 +96,15 @@
 
     switch($serendipity['GET']['adminModule']) {
         case 'entries':
-            include 'serendipity_admin_entries.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_entries.inc.php';
             break;
 
         case 'images':
-            include 'serendipity_admin_images.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php';
             break;
 
         case 'category':
-            include 'serendipity_admin_category.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_category.inc.php';
             break;
 
         case 'logout':
@@ -111,7 +112,7 @@
         break;
 
         default:
-            include 'serendipity_entries_overview.inc.php';
+            include S9Y_INCLUDE_PATH . 'serendipity_entries_overview.inc.php';
     }
  }
 ?>

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_admin_entries.inc.php	18 Feb 2004 11:48:23 -0000	1.18
+++ serendipity_admin_entries.inc.php	21 Mar 2004 16:35:31 -0000	1.19
@@ -18,7 +18,7 @@
     global $serendipity;
 
     // Prepare variables
-    if (!is_numeric($serendipity['GET']['offset'])) {
+    if (empty($serendipity['GET']['offset']) || !is_numeric($serendipity['GET']['offset'])) {
         $serendipity['GET']['offset'] = 0;
     }
 
@@ -179,9 +179,9 @@
         } else {
             // Only display the preview
             if (!is_numeric($entry['timestamp'])) $entry['timestamp']  = time();
-            if (!$entry['trackbacks'])            $entry['trackbacks'] = 0;
-            if (!$entry['comments'])              $entry['comments']   = 0;
-            if (!$entry['username'])              $entry['username']   = $serendipity['serendipityUser'];
+            if (!isset($entry['trackbacks']) || !$entry['trackbacks']) $entry['trackbacks'] = 0;
+            if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;
+            if (!isset($entry['username']) || !$entry['username'])     $entry['username']   = $serendipity['serendipityUser'];
 
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_images.inc.php	17 Feb 2004 12:10:04 -0000	1.15
+++ serendipity_admin_images.inc.php	21 Mar 2004 16:35:31 -0000	1.16
@@ -59,13 +59,13 @@
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
         $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
-        if ( $serendipity['GET']['newname']!= '' && file_exists($oldfile) && !file_exists($newfile) ) {
+        if ($serendipity['GET']['newname'] != '' && file_exists($oldfile) && !file_exists($newfile)) {
             // Rename file
             rename($oldfile, $newfile);
 
             // Rename thumbnail
-            rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
-                    $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
+            rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
+                   $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
 
             serendipity_updateImageInDatabase(array('thumbnail_name' => $serendipity['thumbSuffix'], 'name' => $serendipity['GET']['newname']), $serendipity['GET']['fid']);
             // Forward user to overview (we don't want the user's back button to rename things again)
@@ -123,6 +123,8 @@
             // Accept file
             if (move_uploaded_file($_FILES['userfile']['tmp_name'], $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'])) {
                 printf(FILE_UPLOADED . '<br />', $_FILES['userfile']['name']);
+                @umask(0000);
+                @chmod($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $_FILES['userfile']['name'], 0664);
 
                 // Create thumbnail
                 serendipity_makeThumbnail($_FILES['userfile']['name']);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- serendipity_functions.inc.php	21 Mar 2004 16:26:56 -0000	1.230
+++ serendipity_functions.inc.php	21 Mar 2004 16:35:32 -0000	1.231
@@ -3,13 +3,13 @@
 # All rights reserved.  See LICENSE file for licensing details
 
 $serendipity['imageList'] = array();
-include_once("${serendipity['serendipityPath']}serendipity_db.inc.php");
-include_once("${serendipity['serendipityPath']}compat.php");
-include_once("${serendipity['serendipityPath']}serendipity_functions_config.inc.php");
-include_once("${serendipity['serendipityPath']}bundled-libs/XML/RPC.php");
-include_once("${serendipity['serendipityPath']}serendipity_plugin_api.php");
-include_once("${serendipity['serendipityPath']}serendipity_functions_images.inc.php");
-include_once("${serendipity['serendipityPath']}serendipity_functions_installer.inc.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_db.inc.php");
+include_once(S9Y_INCLUDE_PATH . "compat.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_functions_config.inc.php");
+include_once(S9Y_INCLUDE_PATH . "bundled-libs/XML/RPC.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_plugin_api.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_functions_images.inc.php");
+include_once(S9Y_INCLUDE_PATH . "serendipity_functions_installer.inc.php");
 
 function serendipity_logout() {
     $_SESSION['serendipityAuthedUser'] = false;
@@ -98,7 +98,7 @@
     global $serendipity;
 
     $directories = array(
-      $serendipity['CONFIG']['template'] . '/',
+      (isset($serendipity['CONFIG']) ? $serendipity['CONFIG']['template'] . '/' : ''),
       'default/'
     );
 
@@ -158,7 +158,7 @@
 <?php
     foreach ($themelist as $theme) {
         $info = serendipity_fetchTemplateInfo($theme);
-        if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png') ) {
+        if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
             $preview = '<img src="templates/' . $theme . '/preview.png" width="100" style="border: 1px #000000 solid" />';
         } else {
             $preview = '&nbsp;';
@@ -210,35 +210,35 @@
     <table border="0" width="100%" cellpadding="3">
         <tr>
             <td class="serendipity_commentsLabel"><?php echo NAME; ?></td>
-            <td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?php echo ($serendipity['POST']['name'] ? $serendipity['POST']['name'] : $serendipity['COOKIE']['name']); ?>" size="30" /></td>
+            <td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?php echo (isset($serendipity['POST']['name']) ? $serendipity['POST']['name'] : isset($serendipity['COOKIE']['name']) ? $serendipity['COOKIE']['name'] : ''); ?>" size="30" /></td>
         </tr>
 
         <tr>
             <td class="serendipity_commentsLabel"><?php echo EMAIL; ?></td>
-            <td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?php echo ($serendipity['POST']['email'] ? $serendipity['POST']['email'] : $serendipity['COOKIE']['email']); ?>" /></td>
+            <td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?php echo (isset($serendipity['POST']['email']) ? $serendipity['POST']['email'] : isset($serendipity['COOKIE']['email']) ? $serendipity['COOKIE']['email'] : ''); ?>" /></td>
         </tr>
 
         <tr>
             <td class="serendipity_commentsLabel"><?php echo HOMEPAGE; ?></td>
-            <td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?php echo ($serendipity['POST']['url'] ? $serendipity['POST']['url'] : $serendipity['COOKIE']['url']); ?>" /></td>
+            <td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?php echo (isset($serendipity['POST']['url']) ? $serendipity['POST']['url'] : isset($serendipity['COOKIE']['url']) ? $serendipity['COOKIE']['url'] : ''); ?>" /></td>
         </tr>
 
         <tr>
             <td class="serendipity_commentsLabel"><?php echo COMMENT; ?></td>
             <td class="serendipity_commentsValue">
-                <textarea rows="10" cols="40" name="serendipity[comment]"><?php echo $serendipity['POST']['comment']; ?></textarea><br />
+                <textarea rows="10" cols="40" name="serendipity[comment]"><?php echo (isset($serendipity['POST']['comment']) ? $serendipity['POST']['comment'] : ''); ?></textarea><br />
                 <?php serendipity_plugin_api::hook_event('frontend_comment', $nullParam); ?>
             </td>
         </tr>
         <tr>
             <td>&nbsp;</td>
             <td class="serendipity_commentsLabel">
-                <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" <?php echo ($serendipity['POST']['remember'] ? 'checked="checked"' : $serendipity['COOKIE']['remember']) ; ?> /><label for="checkbox_remember"> <?php echo REMEMBER_INFO; ?></label>
+                <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" <?php echo (isset($serendipity['POST']['remember']) ? 'checked="checked"' : isset($serendipity['COOKIE']['remember']) ? $serendipity['COOKIE']['remember'] : '') ; ?> /><label for="checkbox_remember"> <?php echo REMEMBER_INFO; ?></label>
 <?php
     if ($serendipity['allowSubscriptions']) {
 ?>
                 <br />
-                <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" <?php echo ($serendipity['POST']['subscribe'] ? 'checked="checked"' : ''); ?> /><label for="checkbox_subscribe"> <?php echo SUBSCRIBE_TO_THIS_ENTRY; ?></label>
+                <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" <?php echo (isset($serendipity['POST']['subscribe']) ? 'checked="checked"' : ''); ?> /><label for="checkbox_subscribe"> <?php echo SUBSCRIBE_TO_THIS_ENTRY; ?></label>
 <?php
     }
 ?>
@@ -516,6 +516,8 @@
 function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp') {
     global $serendipity;
 
+    $and = '';
+    
     if ($full === true) {
         $body = ', e.body, e.extended';
     } else {
@@ -561,7 +563,7 @@
             }
         }
         
-        if ($drafts) {
+        if (!empty($drafts)) {
             if (!empty($and)) {
                 $and .= " AND $drafts";
             } else {
@@ -770,7 +772,7 @@
 
     $query        = serendipity_db_query($querystring);
     $totalEntries = $query[0][0];
-    $totalPages   = ceil($totalEntries / ($serendipity['fetchLimit'] ? $serendipity['fetchLimit'] : 15));
+    $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
 
     if (!isset($serendipity['GET']['page'])) {
         $serendipity['GET']['page'] = 1;
@@ -833,7 +835,7 @@
                     $html_extended .= $entry['extended'];
                 }
 
-                if ($entry['exflag'] && !$extended) {
+                if (isset($entry['exflag']) && $entry['exflag'] && !$extended) {
                     $html_extended = '<br /><a href="' . $entryLink . '#extended">' . VIEW_EXTENDED_ENTRY . '</a><br />';
                 }
 
@@ -847,7 +849,7 @@
 
             <div class='serendipity_entryFooter'>
 <?php
-                echo '                ' . POSTED_BY . ' ' . htmlentities($entry['username']) . ($entry['category_name'] ? ' ' . IN . ' <a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $entry['categoryid'] . '_' . serendipity_makeFilename($entry['category_name']) . '">' . $entry['category_name'] . '</a> ' : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
+                echo '                ' . POSTED_BY . ' ' . htmlentities($entry['username']) . (!empty($entry['category_name']) ? ' ' . IN . ' <a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $entry['categoryid'] . '_' . serendipity_makeFilename($entry['category_name']) . '">' . $entry['category_name'] . '</a> ' : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
 
                 if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0) {
                     if (!isset($serendipity['GET']['id'])) {
@@ -920,7 +922,7 @@
 <?php
                     }
                     
-                    if ($serendipity['GET']['csuccess'] == 'true') {
+                    if (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true') {
 ?>
             <br />
             <div class="serendipity_commentsTitle"><?php echo COMMENT_ADDED; ?></div>
@@ -952,7 +954,7 @@
 
         if (!isset($serendipity['GET']['id']) &&
                (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
-               count($entries) <= ($serendipity['fetchLimit'] ? $serendipity['fetchLimit'] : 15)) {
+               count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15)) {
             serendipity_printEntryFooter();
         }
     } else { // else short mode
@@ -1098,7 +1100,7 @@
         }
 
         /* Link to the user's website, if the URL is valid */
-        if ($comment['type'] != 'trackback' && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^http://', $comment['url'])) {
+        if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^http://', $comment['url'])) {
             echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlentities($comment['url']) . '">Link</a>)';
         }
 
@@ -1117,6 +1119,10 @@
     }
 
     if ($show_admin && $_SESSION['serendipityAuthedUser'] === true) {
+        if (!isset($comment)) {
+            $comment = array('entry_id' => $serendipity['GET']['id']);
+        }
+        
         if (serendipity_db_bool($allow_comments)) {
             echo '<div class="serendipity_comment_source">(<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&amp;serendipity[entry]=' . $comment['entry_id'] . '">' . COMMENTS_DISABLE . '</a>)</div>';
         } else {
@@ -1178,7 +1184,7 @@
     $ca    = serendipity_db_query($query, true);
 
     if (serendipity_db_bool($ca['allow_comments']) || !is_array($ca)) {
-        $title         = serendipity_db_escape_string($commentInfo['title']);
+        $title         = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : '');
         $comments      = $commentInfo['comment'];
         $commentsFixed = serendipity_db_escape_string($commentInfo['comment']);
         $name          = serendipity_db_escape_string($commentInfo['name']);
@@ -1228,10 +1234,12 @@
     $entryURI = serendipity_archiveURL($entry_id, $title);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
+    $pgsql_insert = '';
+    $mysql_insert = '';
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $pgsql_insert = "DISTINCT ON (email)";
+        $pgsql_insert = 'DISTINCT ON (email)';
     } else {
-        $mysql_insert = "GROUP BY email";
+        $mysql_insert = 'GROUP BY email';
     }
 
     $sql = "SELECT $pgsql_insert author, email, type
@@ -1306,7 +1314,7 @@
               . "\n" . strip_tags($comment);
     } else {
         $subject = '[' . $serendipity['blogTitle'] . '] ' . NEW_COMMENT_TO . ' ' . $title;
-        $text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle], $title)
+        $text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity['blogTitle'], $title)
               . "\n" . LINK_TO_ENTRY . ': ' . $entryURI
               . "\n"
               . "\n" . USER . ' ' . IP_ADDRESS . ': ' . $_SERVER['REMOTE_ADDR']
@@ -1532,9 +1540,9 @@
 }
 
 function serendipity_pingback_autodiscover($loc, $body) {
-    if($_SERVER['X-PINGBACK']) {
+    if (!empty($_SERVER['X-PINGBACK'])) {
         $pingback = $_SERVER['X-PINGBACK'];
-    } else if(preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) {
+    } elseif (preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) {
         $pingback = $matches[1];
     } else {
         return;
@@ -1617,7 +1625,7 @@
 
 function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
     $res = @file_get_contents($loc);
-    if ( strlen($res) != 0 ) {
+    if (strlen($res) != 0) {
         serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text);
         serendipity_pingback_autodiscover($loc, $res);
     }
@@ -1767,7 +1775,7 @@
         if ($row[0] > 0) {
             continue;
         }
-        if (!$serendipity['noautodiscovery']) {
+        if (!isset($serendipity['noautodiscovery']) || !$serendipity['noautodiscovery']) {
             serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text));
         }
     }
@@ -1910,7 +1918,7 @@
 
     if (isset($entry['allow_comments']) && (serendipity_db_bool($entry['allow_comments']))) {
         $allow_comments = ' checked="checked"';
-    } elseif ($entry['allow_comments'] !== 'false' && ($serendipity['allowCommentsDefault'] == 'true' || $serendipity['allowCommentsDefault'] === true)) {
+    } elseif ((!isset($entry['allow_comments']) || $entry['allow_comments'] !== 'false') && ($serendipity['allowCommentsDefault'] == 'true' || $serendipity['allowCommentsDefault'] === true)) {
         // This is the default on creation of a new entry and depends on the "allowCommentsDefault" variable of the configuration.
         $allow_comments = ' checked="checked"';
     } else {
@@ -2308,19 +2316,11 @@
 function serendipity_updateEntryCategories($postid, $categories) {
     global $serendipity;
 
-    if(!$postid || !$categories) {
+    if (!$postid || !$categories) {
         return;
     }
     $query = "UPDATE $serendipity[dbPrefix]entries set categoryid = $categories[0] where id = $postid";
     $err = serendipity_db_query($query);
-
-    /* TODO: nuke this */
-    $fp = fopen('/tmp/a', 'w');
-    fwrite($fp,$query);
-    if(is_string($err)) {
-        fwrite($fp, $err);
-    }
-    fclose($fp);
 }
 
 /*

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- index.php	21 Mar 2004 16:26:56 -0000	1.36
+++ index.php	21 Mar 2004 16:35:31 -0000	1.37
@@ -33,7 +33,7 @@
 
     $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date);
     ob_start();
-    include_once('serendipity_genpage.inc.php');
+    include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
@@ -59,7 +59,7 @@
 
     $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date);
     ob_start();
-    include_once('serendipity_genpage.inc.php');
+    include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
@@ -108,7 +108,7 @@
     $serendipity['blogTitle'] = $title;
 
     ob_start();
-    include_once('serendipity_genpage.inc.php');
+    include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
@@ -124,7 +124,7 @@
         $_GET['version'] = serendipity_discover_rss($matches[1], $matches[2]);
 
         ob_start();
-        include_once('rss.php');
+        include_once(S9Y_INCLUDE_PATH . 'rss.php');
         $data = ob_get_contents();
         ob_end_clean();
 
@@ -148,7 +148,7 @@
 } else if (preg_match(PAT_ARCHIVE, $uri)) {
     header('Content-Type: text/html; charset='. LANG_CHARSET);
     $serendipity['GET']['action'] = 'archives';
-    include_once('serendipity_genpage.inc.php');
+    include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
 } else if (preg_match(PAT_CATEGORIES, $uri, $matches) ||
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
@@ -161,7 +161,7 @@
         }
 
         ob_start();
-        include_once('serendipity_genpage.inc.php');
+        include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
         $data = ob_get_contents();
         ob_end_clean();
         if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
@@ -179,7 +179,7 @@
             $serendipity['GET']['action'] = 'read';
             $serendipity['GET']['range'] = $serendipity['GET']['calendarZoom'];
         }
-        include_once('serendipity_genpage.inc.php');
+        include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php');
     }
 } else {
     printf(DOCUMENT_NOT_FOUND, $uri);

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_upgrader.inc.php	17 Mar 2004 08:46:33 -0000	1.4
+++ serendipity_admin_upgrader.inc.php	21 Mar 2004 16:35:32 -0000	1.5
@@ -1,5 +1,5 @@
 <?php
-require_once('serendipity_functions_installer.inc.php');
+require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
 
 $abortLoc   = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=ignore';
 $upgradeLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=upgrade';
@@ -9,7 +9,7 @@
 
 
 /* Fetch SQL files which needs to be run */
-$dir = opendir($serendipity['serendipityPath'] .'sql/');
+$dir = opendir(S9Y_INCLUDE_PATH . 'sql/');
 while (($file = readdir($dir)) !== false ) {
     if (preg_match('@db_update_(.*)_(.*)_'. $serendipity['dbType'] .'.sql@', $file, $res)) {
         if (version_compare($res[1], serendipity_version($serendipity['versionInstalled'])) >= 0) {
@@ -25,7 +25,7 @@
 
     /* Install SQL files */
     foreach ($sqlfiles as $sqlfile) {
-        $sql = file_get_contents($serendipity['serendipityPath'] .'sql/'. $sqlfile);
+        $sql = file_get_contents(S9Y_INCLUDE_PATH .'sql/'. $sqlfile);
         $sql = str_replace('{PREFIX}', $serendipity['dbPrefix'], $sql);
         preg_match_all("@(.*);@iUs", $sql, $res);
         foreach ($res[0] as $sql) {

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity.css.php	3 Mar 2004 08:17:59 -0000	1.24
+++ serendipity.css.php	21 Mar 2004 16:35:31 -0000	1.25
@@ -1,7 +1,6 @@
 <?php # $Id$
 
 session_start();
-include_once('compat.php');
 
 /* This is a small hack to allow CSS display during installations and upgr...
 
[truncated message content]

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.7,1.8

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

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

Modified Files:
	layout.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- layout.php	15 Mar 2004 08:51:12 -0000	1.7
+++ layout.php	21 Mar 2004 16:35:33 -0000	1.8
@@ -60,7 +60,7 @@
 		<td width="100%" valign="top" align="left" class="serendipityContent">
 			<?=$OPENSHADOW?>
 			<?php
-               	if (!is_numeric($serendipity["GET"]["range"]))
+				if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
 	               	$serendipity["GET"]["range"] = date("Ymd");
 
                 // The main area

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,1.2,1.3

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

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

Modified Files:
	serendipity_event_weblogping.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_weblogping.php	25 Feb 2004 08:44:17 -0000	1.2
+++ serendipity_event_weblogping.php	21 Mar 2004 16:35:32 -0000	1.3
@@ -81,7 +81,7 @@
               'name' => 'Blogbot.de',
               'host' => 'xmlrpc.blogbot.de',
               'path' => '/',
-              'supersedes' => 'blo.gs, blogrolling.com, technorati.com, weblogs.com, blogg.de'
+              'supersedes' => 'blo.gs, blogrolling.com, technorati.com, weblogs.com'
             )
         );
 

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.3,1.4

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

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

Modified Files:
	layout.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- layout.php	15 Mar 2004 08:52:10 -0000	1.3
+++ layout.php	21 Mar 2004 16:35:33 -0000	1.4
@@ -1,8 +1,8 @@
 <?php # $Id$
 
-include_once("serendipity_config.inc.php");
-include_once("serendipity_plugin_api.php");
-include_once("serendipity_sidebar_items.php");
+include_once('serendipity_config.inc.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
+include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
     ob_start();
@@ -30,10 +30,10 @@
 </div>
 
 <div id="mainpane">
-    <?php echo $left; ?>
+    <?php echo $left; ?>
     <div id="<?php echo (empty($right) ? 'content_left' : (empty($left) ? 'content_right' : 'content')); ?>">
 <?php
-if (!is_numeric($serendipity['GET']['range'])) {
+if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
     $serendipity['GET']['range'] = date('Ymd');
 }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_textile serendipity_event_textile.php,1.2,1.3

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

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

Modified Files:
	serendipity_event_textile.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_textile.php	26 Feb 2004 12:57:39 -0000	1.2
+++ serendipity_event_textile.php	21 Mar 2004 16:35:32 -0000	1.3
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-require_once $serentipity['serendipityHTTPPath'] . 'plugins/serendipity_event_textile/textile.php';
+require_once S9Y_INCLUDE_PATH . 'plugins/serendipity_event_textile/textile.php';
 
 switch ($serendipity['lang']) {
     case 'de':

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.25,1.26

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
s9y as shared library. 
plus some small bugfixes/code guideline issues which were too hard to seperate from this commit


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_de.inc.php	19 Mar 2004 10:18:39 -0000	1.25
+++ serendipity_lang_de.inc.php	21 Mar 2004 16:35:32 -0000	1.26
@@ -219,7 +219,7 @@
 @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('CHECK_DATABASE_EXISTS', 'Suchen nach bestehender Datenbank. Falls hier ein Fehler bei der SQL-Abfrage erscheint, bitte ignorieren.');
 @define('CREATE_DATABASE', 'Richte Datenbank ein...');
 @define('DATABASE_DONE', 'Einrichtung der Datenbank abgeschlossen.');
 @define('ATTEMPT_WRITE_FILE', 'Probiere die Datei %s zu erstellen...');

[php-blog-cvs] serendipity NEWS,1.90,1.91 htaccess.rewrite.tpl,1.4,1.5 index.php,1.35,1.36 serendipity_admin.php,1.32,1.33 serendipity_admin_installer.inc.php,1.57,1.58 serendipity_config.inc.php,1.57,1.58 serendipity_functions.inc.php,1.229,1.230 serendipity_sidebar_items.php,1.50,1.51 serendipity_xmlrpc.php,1.13,1.14

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

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

Modified Files:
	NEWS htaccess.rewrite.tpl index.php serendipity_admin.php 
	serendipity_admin_installer.inc.php serendipity_config.inc.php 
	serendipity_functions.inc.php serendipity_sidebar_items.php 
	serendipity_xmlrpc.php 
Log Message:
Used zem's patch (as announced at the beginning of this week).
This eases maintenance for later path corrections. Please test.


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_admin_installer.inc.php	2 Mar 2004 17:35:24 -0000	1.57
+++ serendipity_admin_installer.inc.php	21 Mar 2004 16:26:56 -0000	1.58
@@ -332,10 +332,10 @@
     }
 
     // Attempt to create the archives directory
-    if ( !is_dir($_POST['serendipityPath'] . 'archives') && @mkdir($_POST['serendipityPath'] . 'archives', $umask) !== true ) {
-        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . 'archives');
-        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'mkdir'      , $_POST['serendipityPath'] . 'archives');
-        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . 'archives');
+    if ( !is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true ) {
+        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES);
+        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'mkdir'      , $_POST['serendipityPath'] . PATH_ARCHIVES);
+        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_ARCHIVES);
     }
 
     // plugins directory now part of basic CVS
@@ -430,12 +430,30 @@
     $content = str_replace(
                  array(
                    '{PREFIX}',
-                   '{indexFile}'
+                   '{indexFile}',
+                   '{PAT_UNSUBSCRIBE}', '{PATH_UNSUBSCRIBE}',
+                   '{PAT_ARCHIVES}', '{PATH_ARCHIVES}',
+                   '{PAT_ARCHIVES_SHORT}',
+                   '{PAT_FEEDS}', '{PATH_FEEDS}',
+                   '{PAT_FEED}',
+                   '{PAT_ADMIN}', '{PATH_ADMIN}',
+                   '{PAT_ENTRIES}', '{PATH_ENTRIES}',
+                   '{PAT_ARCHIVE}', '{PATH_ARCHIVE}',
+                   '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
                  ),
 
                  array(
                    $_POST['serendipityHTTPPath'],
-                   $_POST['indexFile']
+                   $_POST['indexFile'],
+                   trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE,
+                   trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES,
+                   trim(PAT_ARCHIVES_SHORT, '@/i'),
+                   trim(PAT_FEEDS, '@/i'), PATH_FEEDS,
+                   trim(PAT_FEED, '@/i'),
+                   trim(PAT_ADMIN, '@/i'), PATH_ADMIN,
+                   trim(PAT_ENTRIES, '@/i'), PATH_ENTRIES,
+                   trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE,
+                   trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
                  ),
 
                  implode('', $a)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_config.inc.php	15 Mar 2004 10:12:47 -0000	1.57
+++ serendipity_config.inc.php	21 Mar 2004 16:26:56 -0000	1.58
@@ -34,6 +34,32 @@
  */
 include('serendipity_lang.inc.php');
 
+/* URI paths 
+ * These could be defined in the language headers, except that would break
+ * backwards URL compatibility 
+ */
+@define('PATH_ARCHIVES', 'archives');
+@define('PATH_ARCHIVE', 'archive');
+@define('PATH_UNSUBSCRIBE', 'unsubscribe');
+@define('PATH_FEEDS', 'feeds');
+@define('PATH_ADMIN', 'admin');
+@define('PATH_ENTRIES', 'entries');
+@define('PATH_CATEGORIES', 'categories');
+
+/* URI patterns 
+ * Note that it's important to use @ as the pattern delimiter.
+ */
+@define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@');
+@define('PAT_ARCHIVES', '@/'.PATH_ARCHIVES.'/(\d+)\.html@');
+@define('PAT_ARCHIVES_SHORT', '@/'.PATH_ARCHIVES.'/(\d+)_short\.html@');
+@define('PAT_COMMENTSUB', '@/(\d+)_\w*\.html@i');
+@define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@');
+@define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@');
+@define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@');
+@define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@');
+@define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@');
+@define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(.*)@');
+
 /*
  *   Kill the script if we are not installed, and not inside the installer
  */

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_admin.php	4 Mar 2004 12:39:17 -0000	1.32
+++ serendipity_admin.php	21 Mar 2004 16:26:56 -0000	1.33
@@ -78,7 +78,7 @@
                 </div>
                 <div class="serendipitySideBarItem">
                     <div class="serendipitySideBarContent">
-                        &bull; <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>entries"><?php echo AUTHOR_SUITE; ?></a><br />
+                        &bull; <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES; ?>"><?php echo AUTHOR_SUITE; ?></a><br />
                         &bull; <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php        echo BACK_TO_BLOG; ?></a><br />
                         &bull; <a href="?serendipity[adminModule]=logout"><?php                          echo LOGOUT;       ?></a><br />
                     </div>

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- index.php	15 Mar 2004 09:10:24 -0000	1.35
+++ index.php	21 Mar 2004 16:26:56 -0000	1.36
@@ -13,12 +13,12 @@
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
-if (preg_match('@/unsubscribe/(.*)/([0-9]+)@', $uri, $res)) {
+if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) {
     serendipity_cancelSubscription(urldecode($res[1]), $res[2]);
-    $uri = '/archives/'. $res[2] .'_untitled.html';
+    $uri = '/'.PATH_UNSUBSCRIBE.'/'. $res[2] .'_untitled.html';
 }
 
-if (preg_match('@/archives/(\d+)\.html@', $uri, $matches)) {
+if (preg_match(PAT_ARCHIVES, $uri, $matches)) {
     header('Content-Type: text/html; charset='. LANG_CHARSET);
     $range                             = $matches[1];
     $_GET['serendipity']['action']     = 'read';
@@ -38,13 +38,13 @@
     ob_end_clean();
 
     if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-        $fp = fopen('./archives/' . $matches[1], 'w');
+        $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
 
     echo $data;
-} else if (preg_match('@/archives/(\d+)_short\.html@', $uri, $matches)) {
+} else if (preg_match(PAT_ARCHIVES_SHORT, $uri, $matches)) {
     header('Content-Type: text/html; charset='. LANG_CHARSET);
     $range = $matches[1];
     $_GET['serendipity']['action'] = 'read';
@@ -70,7 +70,7 @@
     }
 
     echo $data;
-} else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
+} else if (preg_match(PAT_COMMENTSUB, $uri, $matches)) {
     serendipity_rememberComment();
 
     if (!empty($serendipity['POST']['submit'])) {
@@ -113,12 +113,12 @@
     ob_end_clean();
 
     if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-        $fp = fopen('./archives/' . $matches[1], 'w');
+        $fp = fopen('./'.PATH_ARCHIVES.'/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
     print $data;
-} else if (preg_match('@/feeds/@', $uri)) {
+} else if (preg_match(PAT_FEEDS, $uri)) {
     header('Content-Type: text/html; charset=utf-8');
     if (preg_match('@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@', $uri, $matches)) {
         $_GET['version'] = serendipity_discover_rss($matches[1], $matches[2]);
@@ -131,7 +131,7 @@
         $data = ltrim($data);
 
         if ($serendipity['pregenerate']) {
-            $fp = fopen('./feeds/index.' . $matches[1], 'w');
+            $fp = fopen('./'.PATH_FEEDS.'/index.' . $matches[1], 'w');
             fwrite($fp, $data);
             fclose($fp);
         }
@@ -139,17 +139,17 @@
         print $data;
         exit;
     }
-} else if (preg_match('@/admin$@', $uri)) {
+} else if (preg_match(PAT_ADMIN, $uri)) {
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
     exit;
-} else if (preg_match('@/entries$@', $uri)) {
+} else if (preg_match(PAT_ENTRIES, $uri)) {
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
     exit;
-} else if (preg_match('@/archive$@', $uri)) {
+} else if (preg_match(PAT_ARCHIVE, $uri)) {
     header('Content-Type: text/html; charset='. LANG_CHARSET);
     $serendipity['GET']['action'] = 'archives';
     include_once('serendipity_genpage.inc.php');
-} else if (preg_match('@/categories/(.*)@', $uri, $matches) ||
+} else if (preg_match(PAT_CATEGORIES, $uri, $matches) ||
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
 

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess.rewrite.tpl	4 Mar 2004 09:50:11 -0000	1.4
+++ htaccess.rewrite.tpl	21 Mar 2004 16:26:56 -0000	1.5
@@ -3,16 +3,16 @@
 DirectoryIndex {PREFIX}{indexFile}
 
 RewriteEngine On
-RewriteRule ^archives/([0-9]+)\.html {indexFile}?url=/archives/$1.html [L,QSA]
-RewriteRule ^archives/([0-9]+)_short*\.html {indexFile}?url=/archives/$1_short.html [L,NC,QSA]
+RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
+RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1_short.html [L,NC,QSA]
 RewriteRule ^([0-9]+)_[0-9a-z_]*\.html {indexFile}?url=$1_article.html [L,NC,QSA]
-RewriteRule ^feeds/(.*) {indexFile}?url=/feeds/$1 [L,QSA]
-RewriteRule ^unsubscribe/(.*)/([0-9]+) {indexFile}?url=/unsubscribe/$1/$2 [L,QSA]
-RewriteRule ^admin serendipity_admin.php [L,QSA]
-RewriteRule ^entries serendipity_entries.php [L,QSA]
-RewriteRule ^archive {indexFile}?url=/archive [L,QSA]
-RewriteRule ^categories/(.*) {indexFile}?url=categories/$1 [L,QSA]
-RewriteRule ^(atom|index|rss|b2rss|b2rdf)\.(rss|xml|rdf|rss2) rss.php?file=$1&ext=$2
+RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
+RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]
+RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA]
+RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA]
+RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]
+RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
+RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
@@ -31,4 +31,4 @@
 <Files sqlite.db>
     deny from all
 </Files>
-# END s9y
\ No newline at end of file
+# END s9y

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_xmlrpc.php	7 Jan 2004 17:45:55 -0000	1.13
+++ serendipity_xmlrpc.php	21 Mar 2004 16:26:56 -0000	1.14
@@ -250,8 +250,8 @@
           'mt_convert_breaks' => new XML_RPC_Value('', 'string'),
           'mt_keywords' => new XML_RPC_Value('', 'string'),
           'title'             => new XML_RPC_Value($entry['title'],'string'),
-          'permalink'         => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/archives/' . $postid . '_.html', 'string'),
-          'link'              => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/archives/' . $postid . '_.html', 'string'));
+          'permalink'         => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'),
+          'link'              => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'));
     $entry = new XML_RPC_Value($tmp, 'struct');
     return  new XML_RPC_Response($entry);
 }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- NEWS	16 Mar 2004 09:25:37 -0000	1.90
+++ NEWS	21 Mar 2004 16:26:56 -0000	1.91
@@ -3,6 +3,9 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Abstract archives/URL locations and regex-patterns in a central 
+      place for easier maintenance (zem)
+ 
     * Optimized db indizes on 'entries' (zem)
 
     * Added shoutbox plugin (Matthias Lange, garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- serendipity_functions.inc.php	19 Mar 2004 11:05:13 -0000	1.229
+++ serendipity_functions.inc.php	21 Mar 2004 16:26:56 -0000	1.230
@@ -391,7 +391,7 @@
     }
     $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month)));
     // Prepare the table
-    $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $year . sprintf('%02d', $month) . '.html' . $base_query;
+    $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $year . sprintf('%02d', $month) . '.html' . $base_query;
 ?>
 <table width="100%" class="serendipity_calendar" cellspacing="1">
     <tr>
@@ -468,7 +468,7 @@
                 }
 
                 // Print day
-                $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query;
+                $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html' . $base_query;
 
                 if (date('m')    == $month
                     && date('Y') == $year
@@ -1499,14 +1499,14 @@
         $dated = date('Ymd', $timestamp);
         $datem = date('Ym',  $timestamp);
 
-        @unlink("{$serendipity['serendipityPath']}/archives/{$dated}.html");
-        @unlink("{$serendipity['serendipityPath']}/archives/{$datem}.html");
+        @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$dated}.html");
+        @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$datem}.html");
     }
 
     // Fixme (the _* part) !
-    @unlink("{$serendipity['serendipityPath']}/archives/{$id}_*.html");
-    @unlink("{$serendipity['serendipityPath']}/feeds/index.rss");
-    @unlink("{$serendipity['serendipityPath']}/feeds/index.rss2");
+    @unlink("{$serendipity['serendipityPath']}/".PATH_ARCHIVES."/{$id}_*.html");
+    @unlink("{$serendipity['serendipityPath']}/".PATH_FEEDS."/index.rss");
+    @unlink("{$serendipity['serendipityPath']}/".PATH_FEEDS."/index.rss2");
     @unlink("{$serendipity['serendipityPath']}/index.html");
 }
 
@@ -1730,7 +1730,7 @@
 function serendipity_archiveURL($id, $title, $key = 'baseURL') {
 global $serendipity;
 
-    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . $id . '_' . serendipity_makeFilename($title) . '.html';
+    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title) . '.html';
 }
 
 /**
@@ -2356,10 +2356,10 @@
          for($x=1; $x<13; $x++) {
             $entries = serendipity_postAmount($currYear, $x);
             if ($entries > 0) {
-                    $a = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '.html\'>';
+                    $a = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>';
                     $b = '</a>';
-                    $c = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '_short.html\'>';
-                    $d = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archives/$currYear" . sprintf('%02s', $x) . '.html\'>';
+                    $c = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '_short.html\'>';
+                    $d = "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES."/$currYear" . sprintf('%02s', $x) . '.html\'>';
             } else {
                 $a = $c = '<span style="color: #CDCDCD">';
                 $b = $d = '</span>';

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_sidebar_items.php	16 Mar 2004 09:03:04 -0000	1.50
+++ serendipity_sidebar_items.php	21 Mar 2004 16:26:56 -0000	1.51
@@ -95,7 +95,7 @@
         for($x = 0; $x < 3; $x++) {
             $ts -= 1;
 
-            $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'archives/' . date('Ym', $ts) . '.html';
+            $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES.'/' . date('Ym', $ts) . '.html';
 
             $ts_title = ucfirst(strftime("%B %Y", $ts));
 
@@ -105,7 +105,7 @@
         }
 
         echo "<a href='{$serendipity['serendipityHTTPPath']}'>" . RECENT . "</a><br />\n";
-        echo "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "archive'>" . OLDER . "</a>\n";
+        echo "<a href='{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVE."'>" . OLDER . "</a>\n";
     }
 }
 
@@ -401,7 +401,7 @@
         global $serendipity;
 
         $title = SUPERUSER . ':';
-        echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . "entries\" title=\"$title\">\$ su -</a>";
+        echo "<a href=\"{$serendipity['serendipityHTTPPath']}" . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES."\" title=\"$title\">\$ su -</a>";
     }
 }
 
@@ -530,7 +530,7 @@
                   htmlentities($category['category_description']),
                   ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
                   serendipity_getTemplateFile('img/xml.gif'),
-                  $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $category['categoryid'] . '_' . $category_id,
+                  $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES.'/' . $category['categoryid'] . '_' . $category_id,
                   htmlentities($category['category_description']),
                   htmlentities($category['category_name'])
                 );