php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include genpage.inc.php,1.6,1.7

[Sebastian N. <no...@us...>]

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

Modified Files:
	genpage.inc.php 
Log Message:
Fixing XSS-Vulnerability


Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- genpage.inc.php	23 Nov 2004 12:24:32 -0000	1.6
+++ genpage.inc.php	1 Dec 2004 13:34:25 -0000	1.7
@@ -39,11 +39,11 @@
             }
 
             if ($r === true) {
-                $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']));
+                $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, strip_tags($serendipity['GET']['searchTerm'])));
                 break;
             }
 
-            $serendipity['smarty']->assign('content_message', sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r)));
+            $serendipity['smarty']->assign('content_message', sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, strip_tags($serendipity['GET']['searchTerm']), count($r)));
             serendipity_printEntries($r);
             break;
 

Re: [php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.32,1.33

[Sebastian N. <seb...@no...>]

Garvin Hicking wrote:
> Hi Sebastian!
> 
> 
>>>+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent
>>>automatted Bots from commentspamming, please enter the string you see in the
>>>image below in the appropriate input box. Only if the strings match, your
>>>comment will be submitted. Please take care that your browser supports
>>>accepting cookies, or your comment cannot be verified correctly.');
>>
>>Should be changed in "the users browser"
> 
> But that is only shown to the user putting a comment on the page - so "your
> browser" should point to "the users browser" as in "my browser". If I change it
> to "the users browser" the actual user may not know that he is meant.

This is misleading. "I have cookies enabled, so everything is fine".

>>user_has_cookies_disabled && blog_uses_captchas { display warning instead of
>>form }
> 
> That's not easy. Checking for cookies can only be done by calling two pages at
> least. So when opening an entry immediately, we cannot tell if the user has
> cookies or not.

Do we really need cookies then? How is this implemented? With Sessions? 
I think so, so just append the Session ID to the image. Or am I wrong?

Sebastian

Re: [php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.32,1.33

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

Hi Sebastian!

>> +        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent
>> automatted Bots from commentspamming, please enter the string you see in the
>> image below in the appropriate input box. Only if the strings match, your
>> comment will be submitted. Please take care that your browser supports
>> accepting cookies, or your comment cannot be verified correctly.');
>
> Should be changed in "the users browser"

But that is only shown to the user putting a comment on the page - so "your
browser" should point to "the users browser" as in "my browser". If I change it
to "the users browser" the actual user may not know that he is meant.

> user_has_cookies_disabled && blog_uses_captchas { display warning instead of
> form }

That's not easy. Checking for cookies can only be done by calling two pages at
least. So when opening an entry immediately, we cannot tell if the user has
cookies or not.

Regards,
Garvin.

-- 
++ Garvin Hicking | Web-Entwickler [PHP]    | www.supergarv.de | ICQ 21392242
++ Developer of   | www.phpMyAdmin.net      | www.s9y.org

++ Make me happy  | http://wishes.garv.info

Re: [php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.32,1.33

[Sebastian N. <seb...@no...>]

Garvin Hicking wrote:
> Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1686/serendipity_event_spamblock
> 
> Modified Files:
> 	serendipity_event_spamblock.php 
> Log Message:
> put a note into the captcha description that it needs cookies
> 
> 
> +        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent automatted Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Only if the strings match, your comment will be submitted. Please take care that your browser supports accepting cookies, or your comment cannot be verified correctly.');

Should be changed in "the users browser"

+ Implement:

user_has_cookies_disabled && blog_uses_captchas {
     display warning instead of form
}

Sebastian

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.32,1.33

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
put a note into the captcha description that it needs cookies


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_event_spamblock.php	24 Nov 2004 15:54:17 -0000	1.32
+++ serendipity_event_spamblock.php	1 Dec 2004 12:17:36 -0000	1.33
@@ -23,7 +23,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST_DESC', 'Eine Liste von zu verwendenden RBLs. Listen mit dynamischen Hosts sollten vermieden werden.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Captchas aktivieren');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Erfordert die Eingabe eines zufälligen Buchstabenfolge vom Benutzer, damit ein Kommentar angenommen wird. Diese Eingabe kann von Spambots nicht getätigt werden und verhindert so automatische Kommentare. Jedoch können behinderte oder blinde Personen mit der Darstellung solcher Eingabegrafiken Probleme haben.');
-        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'Um maschinelle und automatische Übertragung von Spamkommentaren zu verhinden, bitte die Zeichenfolge im dargestellten Bild in der Eingabemaske eintragen. Nur wenn die Zeichenfolge richtig eingegeben wurde, kann der Kommentar angenommen werden: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'Um maschinelle und automatische Übertragung von Spamkommentaren zu verhinden, bitte die Zeichenfolge im dargestellten Bild in der Eingabemaske eintragen. Nur wenn die Zeichenfolge richtig eingegeben wurde, kann der Kommentar angenommen werden. Bitte beachten Sie, dass Ihr Browser Cookies unterstützen muss um dieses Verfahren anzuwenden. ');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2', 'Bitte die dargestellte Zeichenfolge in die Eingabemaske eintragen!');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3', 'Hier die Zeichenfolge der Spamschutz-Grafik eintragen: ');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS', 'Sie haben nicht die richtige Spamschutz-Zeichenfolge eingetragen, die in der Grafik dargestellt wurde. Bitte gucken Sie sich dieses Bild erneut an und tragen die korrekte Zeichenfolge ein.');
@@ -81,7 +81,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_RBLLIST_DESC', 'Blocks comments based on provided RBL lists. Avoid lists with dynamic hosts.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS', 'Enable Captchas');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_DESC', 'Will force the user to input a random string displayed in a specially crafted image. This will disallow automatted submits to your blog. Please remember that people with decreased vision may find it hard to read those captchas.');
-        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent automatted Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Only if the strings match, your comment will be submitted: ');
+        @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC', 'To prevent automatted Bots from commentspamming, please enter the string you see in the image below in the appropriate input box. Only if the strings match, your comment will be submitted. Please take care that your browser supports accepting cookies, or your comment cannot be verified correctly.');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2', 'Enter the string you see here in the input box!');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3', 'Enter the string from the spam-prevention image above: ');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS', 'You did not enter the correct string displayed in the spam-prevention image box. Please look at the image and enter the values displayed there.');

[php-blog-cvs] serendipity/include/admin/importers generic.inc.php,1.2,1.3

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

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18386/include/admin/importers

Modified Files:
	generic.inc.php 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: generic.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/generic.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generic.inc.php	19 Nov 2004 11:05:32 -0000	1.2
+++ generic.inc.php	1 Dec 2004 11:00:56 -0000	1.3
@@ -42,8 +42,10 @@
     function _getCategoryList() {
         $res = serendipity_fetchCategories('all');
         $ret = array(0 => NO_CATEGORY);
-        foreach ($res as $v) {
-            $ret[$v['categoryid']] = $v['category_name'];
+        if (is_array($res)) {
+            foreach ($res as $v) {
+                $ret[$v['categoryid']] = $v['category_name'];
+            }
         }
         return $ret;
     }

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.16,1.17 functions_smarty.inc.php,1.8,1.9

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

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

Modified Files:
	functions_entries.inc.php functions_smarty.inc.php 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_smarty.inc.php	23 Nov 2004 12:24:32 -0000	1.8
+++ functions_smarty.inc.php	1 Dec 2004 11:00:55 -0000	1.9
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-function serendipity_smarty_fetch($block, $file, $echo = false) {
+function &serendipity_smarty_fetch($block, $file, $echo = false) {
     global $serendipity;
 
     $output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
@@ -66,7 +66,7 @@
     }
 }
 
-function serendipity_smarty_printComments($params, &$smarty) {
+function &serendipity_smarty_printComments($params, &$smarty) {
     global $serendipity;
 
     if (!isset($params['entry'])) {

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- functions_entries.inc.php	30 Nov 2004 13:28:02 -0000	1.16
+++ functions_entries.inc.php	1 Dec 2004 11:00:55 -0000	1.17
@@ -379,7 +379,6 @@
            LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a
                         ON c.authorid = a.authorid $where
                   ORDER BY category_name";
-
     return serendipity_db_query($querystring);
 }
 

[php-blog-cvs] serendipity/templates/default index.tpl,1.2,1.3

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

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

Modified Files:
	index.tpl 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: index.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/index.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ index.tpl	1 Dec 2004 11:00:57 -0000	1.3
@@ -1,3 +1,4 @@
+{if $is_embedded != true}
 {if $is_xhtml}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +7,6 @@
            "http://www.w3.org/TR/html4/loose.dtd">
 {/if}
 
-{if $is_embedded != true}
 <html>
 <head>
     <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title>

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.6,1.7

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

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

Modified Files:
	comments.inc.php 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- comments.inc.php	30 Nov 2004 15:53:56 -0000	1.6
+++ comments.inc.php	1 Dec 2004 11:00:56 -0000	1.7
@@ -61,6 +61,9 @@
 /* We are either in edit mode, or preview mode */
 if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminAction'] == 'edit' || isset($serendipity['POST']['preview'])) {
 
+    $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
+    serendipity_smarty_init();
+
     /* If we are not in preview, we need data from our database */
     if (!isset($serendipity['POST']['preview']) ) {
         $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". (int)$serendipity['GET']['id']);
@@ -88,7 +91,7 @@
                 )
               )
             );
-
+        $serendipity['smarty']->display(serendipity_getTemplateFile('comments.tpl', 'serendipityPath'));
     }
 
     serendipity_displayCommentForm(
@@ -96,9 +99,12 @@
       '?serendipity[action]=admin&serendipity[adminModule]=comments&serendipity[adminAction]=doEdit&serendipity[id]=' . $serendipity['GET']['id'] . '&serendipity[entry_id]=' . $serendipity['GET']['entry_id'],
       NULL,
       $data,
+      false,
       false
     );
 
+    $serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath'));
+
     return true;
 }
 

[php-blog-cvs] serendipity/include/admin personal.inc.php,1.3,1.4

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

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

Modified Files:
	personal.inc.php 
Log Message:
- Make sure you cannot raise your userlevel


Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- personal.inc.php	30 Nov 2004 20:34:57 -0000	1.3
+++ personal.inc.php	30 Nov 2004 20:41:35 -0000	1.4
@@ -8,13 +8,17 @@
 
 if ( $serendipity['GET']['adminAction'] == 'save' ) {
     $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
-    foreach($u AS $var) {
-        serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
-    }
-    $from = $_POST;
+    if ((int)$_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
+        echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</div>';
+    } else {
+        foreach($u AS $var) {
+            serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
+        }
+        $from = $_POST;
 ?>
     <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $_POST['username']) ?></div>
-<?php } ?>
+<?php }
+} ?>
 
 <form action="?serendipity[adminModule]=personal&amp;serendipity[adminAction]=save" method="post">
 <?php

[php-blog-cvs] serendipity/include/admin personal.inc.php,1.2,1.3

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

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

Modified Files:
	personal.inc.php 
Log Message:
- Correctly display which user was edited


Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- personal.inc.php	30 Nov 2004 20:33:30 -0000	1.2
+++ personal.inc.php	30 Nov 2004 20:34:57 -0000	1.3
@@ -13,7 +13,7 @@
     }
     $from = $_POST;
 ?>
-    <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $serendipity['author']) ?></div>
+    <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $_POST['username']) ?></div>
 <?php } ?>
 
 <form action="?serendipity[adminModule]=personal&amp;serendipity[adminAction]=save" method="post">

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.6,1.7 personal.inc.php,1.1,1.2

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

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

Modified Files:
	installer.inc.php personal.inc.php 
Log Message:
- Add some "serendipityAdminMsgSuccess"


Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- personal.inc.php	30 Nov 2004 20:30:07 -0000	1.1
+++ personal.inc.php	30 Nov 2004 20:33:30 -0000	1.2
@@ -11,11 +11,11 @@
     foreach($u AS $var) {
         serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
     }
-    printf('<strong>' . MODIFIED_USER . '</strong>', $serendipity['author']);
     $from = $_POST;
-}
-
 ?>
+    <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $serendipity['author']) ?></div>
+<?php } ?>
+
 <form action="?serendipity[adminModule]=personal&amp;serendipity[adminAction]=save" method="post">
 <?php
 $template   = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);

Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- installer.inc.php	30 Nov 2004 20:30:07 -0000	1.6
+++ installer.inc.php	30 Nov 2004 20:33:30 -0000	1.7
@@ -103,7 +103,7 @@
                     echo DONE . '<br />';
                 }
             }
-            echo '<br /><strong>'. WRITTEN_N_SAVED .'</strong>';
+            echo '<br /><div class="serendipityAdminMsgSuccess">'. WRITTEN_N_SAVED .'</div>';
         }
 
         break;

[php-blog-cvs] serendipity/include/admin personal.inc.php,NONE,1.1 installer.inc.php,1.5,1.6

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

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

Modified Files:
	installer.inc.php 
Added Files:
	personal.inc.php 
Log Message:
- Move the page where you change your details, out of the configuration and into its own menuitem and page


--- NEW FILE: personal.inc.php ---
<?php # $Id: personal.inc.php,v 1.1 2004/11/30 20:30:07 tomsommer Exp $

if (IN_serendipity !== true) {
    die ("Don't hack!");
}

$from = array();

if ( $serendipity['GET']['adminAction'] == 'save' ) {
    $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
    foreach($u AS $var) {
        serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
    }
    printf('<strong>' . MODIFIED_USER . '</strong>', $serendipity['author']);
    $from = $_POST;
}

?>
<form action="?serendipity[adminModule]=personal&amp;serendipity[adminAction]=save" method="post">
<?php
$template   = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
$user       = serendipity_fetchUsers($serendipity['authorid']);
$from       = $user[0];
unset($from['password']);
serendipity_printConfigTemplate($template, $from, true, false);
?>
    <div align="right"><input type="submit" name="SAVE"   value="<?php echo SAVE; ?>" /></div>
</form>

<?php
/* vim: set sts=4 ts=4 expandtab : */
?>

Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- installer.inc.php	30 Nov 2004 13:28:02 -0000	1.5
+++ installer.inc.php	30 Nov 2004 20:30:07 -0000	1.6
@@ -124,11 +124,6 @@
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
 
-        // If s9y is installed, append the current userconfiguration
-        if (IS_installed === true) {
-            $t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, $t);
-        }
-
         serendipity_printConfigTemplate($t, $from, false, true);
 }
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.7,1.8

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- Move the page where you change your details, out of the configuration and into its own menuitem and page


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_installer.inc.php	30 Nov 2004 07:50:42 -0000	1.7
+++ functions_installer.inc.php	30 Nov 2004 20:30:06 -0000	1.8
@@ -716,19 +716,6 @@
         );
     }
 
-    // Save all user-relevant data in the usertable. Only when s9y is installed.
-    if (IS_installed === true) {
-        $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
-        foreach($u AS $key => $entry) {
-            serendipity_set_user_var(
-              $entry['name'],
-              $_POST[$entry['name']],
-
-              ($entry['range'] == 'global' ? 0 : $serendipity['authorid'])
-            );
-        }
-    }
-
     if (IS_installed === false || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
         return serendipity_updateLocalConfig($_POST['dbName'],
                                              $_POST['dbPrefix'],

[php-blog-cvs] serendipity/docs NEWS,1.15,1.16

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

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

Modified Files:
	NEWS 
Log Message:
- Move the page where you change your details, out of the configuration and into its own menuitem and page


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NEWS	30 Nov 2004 07:50:41 -0000	1.15
+++ NEWS	30 Nov 2004 20:30:06 -0000	1.16
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Move the page where you change your details out of the
+      configuration and into its own menuitem and page (tomsommer)
+
     * Allow the usage of persistent database connections (tomsommer)
 
     * New configuration directive to let user choose if entries in the

[php-blog-cvs] serendipity serendipity_admin.php,1.46,1.47

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
- Move the page where you change your details, out of the configuration and into its own menuitem and page


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_admin.php	30 Nov 2004 13:28:00 -0000	1.46
+++ serendipity_admin.php	30 Nov 2004 20:30:05 -0000	1.47
@@ -109,6 +109,7 @@
                     <div class="serendipitySideBarItem">
                         <div class="serendipitySideBarContent">
                             <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br />
+                            <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br />
                         </div>
                     </div>
 
@@ -204,6 +205,10 @@
             include S9Y_INCLUDE_PATH . 'include/admin/users.inc.php';
             break;
 
+        case 'personal':
+            include S9Y_INCLUDE_PATH . 'include/admin/personal.inc.php';
+            break;
+
         case 'export':
             include S9Y_INCLUDE_PATH . 'include/admin/export.inc.php';
             break;

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.28,1.29 serendipity_lang_cs.inc.php,1.74,1.75 serendipity_lang_cz.inc.php,1.74,1.75 serendipity_lang_da.inc.php,1.94,1.95 serendipity_lang_de.inc.php,1.114,1.115 serendipity_lang_en.inc.php,1.95,1.96 serendipity_lang_es.inc.php,1.91,1.92 serendipity_lang_fr.inc.php,1.73,1.74 serendipity_lang_it.inc.php,1.14,1.15 serendipity_lang_nl.inc.php,1.50,1.51 serendipity_lang_no.inc.php,1.15,1.16 serendipity_lang_pt.inc.php,1.50,1.51 serendipity_lang_tw.inc.php,1.10,1.11

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_tw.inc.php 
Log Message:
- Move the page where you change your details, out of the configuration and into its own menuitem and page


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- serendipity_lang_cs.inc.php	30 Nov 2004 15:53:56 -0000	1.74
+++ serendipity_lang_cs.inc.php	30 Nov 2004 20:30:07 -0000	1.75
@@ -619,6 +619,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_no.inc.php	30 Nov 2004 15:53:57 -0000	1.15
+++ serendipity_lang_no.inc.php	30 Nov 2004 20:30:10 -0000	1.16
@@ -614,5 +614,6 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_nl.inc.php	30 Nov 2004 15:53:57 -0000	1.50
+++ serendipity_lang_nl.inc.php	30 Nov 2004 20:30:09 -0000	1.51
@@ -624,6 +624,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_lang_en.inc.php	30 Nov 2004 15:53:57 -0000	1.95
+++ serendipity_lang_en.inc.php	30 Nov 2004 20:30:08 -0000	1.96
@@ -616,6 +616,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections');
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended');
 @define('NO_IMAGES_FOUND', 'No images found');
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_tw.inc.php	30 Nov 2004 15:53:57 -0000	1.10
+++ serendipity_lang_tw.inc.php	30 Nov 2004 20:30:10 -0000	1.11
@@ -617,6 +617,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_bg.inc.php	30 Nov 2004 15:53:56 -0000	1.28
+++ serendipity_lang_bg.inc.php	30 Nov 2004 20:30:07 -0000	1.29
@@ -601,6 +601,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_pt.inc.php	30 Nov 2004 15:53:57 -0000	1.50
+++ serendipity_lang_pt.inc.php	30 Nov 2004 20:30:10 -0000	1.51
@@ -620,6 +620,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_it.inc.php	30 Nov 2004 15:53:57 -0000	1.14
+++ serendipity_lang_it.inc.php	30 Nov 2004 20:30:09 -0000	1.15
@@ -619,6 +619,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- serendipity_lang_da.inc.php	30 Nov 2004 15:53:56 -0000	1.94
+++ serendipity_lang_da.inc.php	30 Nov 2004 20:30:08 -0000	1.95
@@ -614,6 +614,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- serendipity_lang_fr.inc.php	30 Nov 2004 15:53:57 -0000	1.73
+++ serendipity_lang_fr.inc.php	30 Nov 2004 20:30:08 -0000	1.74
@@ -622,6 +622,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- serendipity_lang_cz.inc.php	30 Nov 2004 15:53:56 -0000	1.74
+++ serendipity_lang_cz.inc.php	30 Nov 2004 20:30:07 -0000	1.75
@@ -617,6 +617,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_lang_es.inc.php	30 Nov 2004 15:53:57 -0000	1.91
+++ serendipity_lang_es.inc.php	30 Nov 2004 20:30:08 -0000	1.92
@@ -625,6 +625,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_lang_de.inc.php	30 Nov 2004 15:53:56 -0000	1.114
+++ serendipity_lang_de.inc.php	30 Nov 2004 20:30:08 -0000	1.115
@@ -616,6 +616,7 @@
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/default/admin style.css,1.4,1.5

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

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

Modified Files:
	style.css 
Log Message:
- Pretty up the image selector


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	29 Nov 2004 20:43:25 -0000	1.4
+++ style.css	30 Nov 2004 16:02:26 -0000	1.5
@@ -4,6 +4,10 @@
     background-color: #597599;
 }
 
+#serendipityAdminBodyImageSelector {
+    background-color: #FFFFFF;
+}
+
 #serendipityAdminFrame {
     width: 80%;
     min-width: 777px;

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.33,1.34

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
- Pretty up the image selector


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_admin_image_selector.php	19 Nov 2004 11:04:59 -0000	1.33
+++ serendipity_admin_image_selector.php	30 Nov 2004 16:02:25 -0000	1.34
@@ -35,11 +35,11 @@
     <head>
         <title><?php echo SELECT_FILE; ?></title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
+        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_getTemplateFile('admin/style.css') ?>" />
     </head>
-<body class="s9y_wrap" id="serendipity_admin_image_page">
+<body id="serendipityAdminBodyImageSelector">
 
-<div style="margin: 5px">
+<div class="serendipityAdminContent">
 <?php
 switch ($serendipity['GET']['step']) {
     case '1':

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.27,1.28 serendipity_lang_cs.inc.php,1.73,1.74 serendipity_lang_cz.inc.php,1.73,1.74 serendipity_lang_da.inc.php,1.93,1.94 serendipity_lang_de.inc.php,1.113,1.114 serendipity_lang_en.inc.php,1.94,1.95 serendipity_lang_es.inc.php,1.90,1.91 serendipity_lang_fr.inc.php,1.72,1.73 serendipity_lang_it.inc.php,1.13,1.14 serendipity_lang_nl.inc.php,1.49,1.50 serendipity_lang_no.inc.php,1.14,1.15 serendipity_lang_pt.inc.php,1.49,1.50 serendipity_lang_tw.inc.php,1.9,1.10

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_tw.inc.php 
Log Message:
- Unify "X not found" messages
- Don't show navbars in media library, when there are no images


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- serendipity_lang_cs.inc.php	30 Nov 2004 07:50:43 -0000	1.73
+++ serendipity_lang_cs.inc.php	30 Nov 2004 15:53:56 -0000	1.74
@@ -81,7 +81,7 @@
 @define('NO_ENTRIES_TO_PRINT', 'Žádné záznamy k zobrazení');
 @define('COMMENTS', 'Komentáøe');
 @define('ADD_COMMENT', 'Pøidat komentáø');
-@define('NO_COMMENTS', 'Žádné komentáøe.');
+@define('NO_COMMENTS', 'Žádné komentáøe');
 @define('POSTED_BY', 'Vložil');
 @define('ON', 'v');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
@@ -618,6 +618,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_no.inc.php	30 Nov 2004 07:50:44 -0000	1.14
+++ serendipity_lang_no.inc.php	30 Nov 2004 15:53:57 -0000	1.15
@@ -70,10 +70,10 @@
 @define('COMMENT', 'Kommentar');
 @define('REMEMBER_INFO', 'Husk opplysninger?');
 @define('SUBMIT_COMMENT', 'Legg til kommentar');
-@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler å vise.');
+@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler å vise');
 @define('COMMENTS', 'Kommentarer');
 @define('ADD_COMMENT', 'Legg til kommentar');
-@define('NO_COMMENTS', 'Ingen kommentarer.');
+@define('NO_COMMENTS', 'Ingen kommentarr');
 @define('POSTED_BY', 'Skrevet av');
 @define('ON', 'aktiv');
 @define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar har blitt opprettet på din blog "%s", til artiklen med navnet "%s".');
@@ -613,5 +613,6 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 ?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_nl.inc.php	30 Nov 2004 07:50:44 -0000	1.49
+++ serendipity_lang_nl.inc.php	30 Nov 2004 15:53:57 -0000	1.50
@@ -80,10 +80,10 @@
 @define('COMMENT', 'Reacties');
 @define('REMEMBER_INFO', 'Informatie bewaren? ');
 @define('SUBMIT_COMMENT', 'Reactie toevoegen');
-@define('NO_ENTRIES_TO_PRINT', 'Geen logs gevonden.');
+@define('NO_ENTRIES_TO_PRINT', 'Geen logs gevonden');
 @define('COMMENTS', 'Reactie');
 @define('ADD_COMMENT', 'Reactie toevoegen');
-@define('NO_COMMENTS', 'Geen reacties.');
+@define('NO_COMMENTS', 'Geen reacties');
 @define('POSTED_BY', 'Gepost door');
 @define('ON', 'aan');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Een nieuwe reactie werd toegevoegd aan je blog "%s", in de log met titel "%s".');
@@ -623,6 +623,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* 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.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- serendipity_lang_en.inc.php	30 Nov 2004 07:50:44 -0000	1.94
+++ serendipity_lang_en.inc.php	30 Nov 2004 15:53:57 -0000	1.95
@@ -78,10 +78,10 @@
 @define('COMMENT', 'Comment');
 @define('REMEMBER_INFO', 'Remember Information? ');
 @define('SUBMIT_COMMENT', 'Submit Comment');
-@define('NO_ENTRIES_TO_PRINT', 'No entries to print.');
+@define('NO_ENTRIES_TO_PRINT', 'No entries to print');
 @define('COMMENTS', 'Comments');
 @define('ADD_COMMENT', 'Add Comment');
-@define('NO_COMMENTS', 'No comments.');
+@define('NO_COMMENTS', 'No comments');
 @define('POSTED_BY', 'Posted by');
 @define('ON', 'on');
 @define('A_NEW_COMMENT_BLAHBLAH', 'A new comment has been posted on your blog "%s", in the entry entitled "%s".');
@@ -615,6 +615,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.');
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections');
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended');
+@define('NO_IMAGES_FOUND', 'No images found');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_lang_tw.inc.php	30 Nov 2004 07:50:44 -0000	1.9
+++ serendipity_lang_tw.inc.php	30 Nov 2004 15:53:57 -0000	1.10
@@ -78,10 +78,10 @@
 @define('COMMENT', '°jÅT');
 @define('REMEMBER_INFO', '°O¦í¸ê®Æ? ');
 @define('SUBMIT_COMMENT', '¶Ç°e°jÅT');
-@define('NO_ENTRIES_TO_PRINT', '¨S¦³¤å³¹¥i¥HÅã¥Ü.');
+@define('NO_ENTRIES_TO_PRINT', '¨S¦³¤å³¹¥i¥HÅã¥Ü');
 @define('COMMENTS', '°jÅT');
 @define('ADD_COMMENT', '·s¼W°jÅT');
-@define('NO_COMMENTS', '¨S¦³°jÅT.');
+@define('NO_COMMENTS', '¨S¦³°jÅT');
 @define('POSTED_BY', '§@ªÌ');
 @define('ON', '¦b');
 @define('A_NEW_COMMENT_BLAHBLAH', '·s°jÅT¤wµoªí¨ì±zªº¤é°O "%s", ¦b³o­Ó¤å³¹¸Ì­± "%s".');
@@ -616,6 +616,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_bg.inc.php	30 Nov 2004 07:50:43 -0000	1.27
+++ serendipity_lang_bg.inc.php	30 Nov 2004 15:53:56 -0000	1.28
@@ -74,7 +74,7 @@
 @define('COMMENT', 'Êîìåíòàð');
 @define('REMEMBER_INFO', 'Äà çàïîìíÿ ëè äàííèòå? ');
 @define('SUBMIT_COMMENT', 'Âúâåäè êîìåíòàð');
-@define('NO_ENTRIES_TO_PRINT', 'Íÿìà äàííè çà ðàçïå÷àòâàíå.');
+@define('NO_ENTRIES_TO_PRINT', 'Íÿìà äàííè çà ðàçïå÷àòâàíå');
 @define('COMMENTS', 'Êîìåíòàðè');
 @define('ADD_COMMENT', 'Äîáàâè êîìåíòàð');
 @define('NO_COMMENTS', 'Íÿìà êîìåíòàðè');
@@ -600,6 +600,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_pt.inc.php	30 Nov 2004 07:50:44 -0000	1.49
+++ serendipity_lang_pt.inc.php	30 Nov 2004 15:53:57 -0000	1.50
@@ -76,10 +76,10 @@
 @define('COMMENT', 'Comentário');
 @define('REMEMBER_INFO', 'Relembrar Informações? ');
 @define('SUBMIT_COMMENT', 'Enviar Comentário');
-@define('NO_ENTRIES_TO_PRINT', 'Nenhum artigo para imprimir.');
+@define('NO_ENTRIES_TO_PRINT', 'Nenhum artigo para imprimir');
 @define('COMMENTS', 'Comentários');
 @define('ADD_COMMENT', 'Adicionar Comentários');
-@define('NO_COMMENTS', 'Nenhum cmentários.');
+@define('NO_COMMENTS', 'Nenhum cmentários');
 @define('POSTED_BY', 'Enviado por');
 @define('ON', 'em');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Um novo comentário foi enviado para o seu Blog "%s", no artigo entitulada como "%s".');
@@ -619,6 +619,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_it.inc.php	30 Nov 2004 07:50:44 -0000	1.13
+++ serendipity_lang_it.inc.php	30 Nov 2004 15:53:57 -0000	1.14
@@ -79,10 +79,10 @@
 @define('COMMENT', 'Commento');
 @define('REMEMBER_INFO', 'Memorizza le Informazioni? ');
 @define('SUBMIT_COMMENT', 'Manda Comment');
-@define('NO_ENTRIES_TO_PRINT', 'Nessuna notizia da stampare.');
+@define('NO_ENTRIES_TO_PRINT', 'Nessuna notizia da stampare');
 @define('COMMENTS', 'Commenti');
 @define('ADD_COMMENT', 'Aggiungi Commento');
-@define('NO_COMMENTS', 'Nessun commento.');
+@define('NO_COMMENTS', 'Nessun commento');
 @define('POSTED_BY', 'Scritto da');
 @define('ON', 'on');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nuovo commento è stato mandato al tuo blog "%s", nella notizia intitolata "%s".');
@@ -618,6 +618,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- serendipity_lang_da.inc.php	30 Nov 2004 07:50:44 -0000	1.93
+++ serendipity_lang_da.inc.php	30 Nov 2004 15:53:56 -0000	1.94
@@ -73,10 +73,10 @@
 @define('COMMENT', 'Kommentar');
 @define('REMEMBER_INFO', 'Husk oplysninger?');
 @define('SUBMIT_COMMENT', 'Tilføj kommentar');
-@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler at vise.');
+@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler at vise');
 @define('COMMENTS', 'Kommentarer');
 @define('ADD_COMMENT', 'Tilføj kommentar');
-@define('NO_COMMENTS', 'Ingen kommentarer.');
+@define('NO_COMMENTS', 'Ingen kommentarer');
 @define('POSTED_BY', 'Skrevet af');
 @define('ON', 'aktiv');
 @define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
@@ -613,6 +613,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- serendipity_lang_fr.inc.php	30 Nov 2004 07:50:44 -0000	1.72
+++ serendipity_lang_fr.inc.php	30 Nov 2004 15:53:57 -0000	1.73
@@ -80,10 +80,10 @@
 @define('COMMENT', 'Commentaire');
 @define('REMEMBER_INFO', 'Enregistrer ses informations?');
 @define('SUBMIT_COMMENT', 'Poster le commentaire');
-@define('NO_ENTRIES_TO_PRINT', 'Aucun billet à afficher.');
+@define('NO_ENTRIES_TO_PRINT', 'Aucun billet à afficher');
 @define('COMMENTS', 'Commentaires');
 @define('ADD_COMMENT', 'Ajouter un commentaire');
-@define('NO_COMMENTS', 'Pas de commentaires.');
+@define('NO_COMMENTS', 'Pas de commentaires');
 @define('POSTED_BY', 'Posté par');
 @define('ON', 'sur');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nouveau commentaire a été posté sur votre blog "%s", pour le billet intitulé "%s".');
@@ -621,6 +621,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- serendipity_lang_cz.inc.php	30 Nov 2004 07:50:44 -0000	1.73
+++ serendipity_lang_cz.inc.php	30 Nov 2004 15:53:56 -0000	1.74
@@ -81,7 +81,7 @@
 @define('NO_ENTRIES_TO_PRINT', '®ádné záznamy k zobrazení');
 @define('COMMENTS', 'Komentáøe');
 @define('ADD_COMMENT', 'Pøidat komentáø');
-@define('NO_COMMENTS', '®ádné komentáøe.');
+@define('NO_COMMENTS', '®ádné komentáøe');
 @define('POSTED_BY', 'Vlo¾il');
 @define('ON', 'v');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
@@ -616,6 +616,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* 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.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_es.inc.php	30 Nov 2004 07:50:44 -0000	1.90
+++ serendipity_lang_es.inc.php	30 Nov 2004 15:53:57 -0000	1.91
@@ -77,10 +77,10 @@
 @define('COMMENT', 'Comentario');
 @define('REMEMBER_INFO', '¿Recordar la información? ');
 @define('SUBMIT_COMMENT', 'Mandar comentario');
-@define('NO_ENTRIES_TO_PRINT', 'No hay posts.');
+@define('NO_ENTRIES_TO_PRINT', 'No hay posts');
 @define('COMMENTS', 'Comentarios');
 @define('ADD_COMMENT', 'Añadir Comentario');
-@define('NO_COMMENTS', 'No hay Comentarios.');
+@define('NO_COMMENTS', 'No hay Comentarios');
 @define('POSTED_BY', 'Autor');
 @define('ON', 'activado');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nuevo comentario en el blog "%s", para el post "%s".');
@@ -624,6 +624,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // 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.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- serendipity_lang_de.inc.php	30 Nov 2004 07:50:44 -0000	1.113
+++ serendipity_lang_de.inc.php	30 Nov 2004 15:53:56 -0000	1.114
@@ -76,10 +76,10 @@
 @define('COMMENT', 'Kommentar');
 @define('REMEMBER_INFO', 'Daten merken? ');
 @define('SUBMIT_COMMENT', 'Kommentar abschicken');
-@define('NO_ENTRIES_TO_PRINT', 'Keine Einträge vorhanden.');
+@define('NO_ENTRIES_TO_PRINT', 'Keine Einträge vorhanden');
 @define('COMMENTS', 'Kommentare');
 @define('ADD_COMMENT', 'Kommentar schreiben');
-@define('NO_COMMENTS', 'Noch keine Kommentare.');
+@define('NO_COMMENTS', 'Noch keine Kommentare');
 @define('POSTED_BY', 'Geschrieben von');
 @define('ON', 'am');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Im Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
@@ -615,6 +615,7 @@
 @define('INSTALL_SHOWFUTURE_DESC', 'Falls aktiviert, werden Einträge deren Datum in der Zukunft liegt angezeigt. Standardmäßig werden solche Einträge versteckt und erst angezeigt, wenn das eingetragene Datum erreicht wird.');
 @define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
 @define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('NO_IMAGES_FOUND', 'No images found'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.5,1.6

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

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

Modified Files:
	comments.inc.php 
Log Message:
- Unify "X not found" messages
- Don't show navbars in media library, when there are no images


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- comments.inc.php	27 Nov 2004 22:14:15 -0000	1.5
+++ comments.inc.php	30 Nov 2004 15:53:56 -0000	1.6
@@ -232,7 +232,7 @@
 </form>
 <?php
     if (!is_array($sql)) {
-        echo '<div align="center">'. NO_COMMENTS .'</div>';
+        echo '<div align="center">- '. NO_COMMENTS .' -</div>';
     } else {
 ?>
 <form action="" method="POST" name="formMultiDelete" id="formMultiDelete">

[php-blog-cvs] serendipity/include functions_images.inc.php,1.3,1.4

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Unify "X not found" messages
- Don't show navbars in media library, when there are no images


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_images.inc.php	27 Nov 2004 22:14:14 -0000	1.3
+++ functions_images.inc.php	30 Nov 2004 15:53:56 -0000	1.4
@@ -785,6 +785,9 @@
         </tr>
 </table>
 </form>
+<?php if ( sizeof($serendipity['imageList']) == 0 ) { ?>
+    <div align="center">- <?php echo NO_IMAGES_FOUND ?> -</div>
+<?php } else { ?>
 <table border="0" width="100%">
     <tr>
         <td colspan="<?php echo floor($lineBreak); ?>">
@@ -876,6 +879,7 @@
 </table>
 <?php
 }
+} // End serendipity_displayImageList()
 
 function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
 static $n = "<br />\n";

[php-blog-cvs] serendipity/include functions.inc.php,1.6,1.7 functions_config.inc.php,1.2,1.3 functions_entries.inc.php,1.15,1.16

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

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

Modified Files:
	functions.inc.php functions_config.inc.php 
	functions_entries.inc.php 
Log Message:
moved around functions so that they can be used within the installer module.
fresh installations will now no longer fail


Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- functions_config.inc.php	19 Nov 2004 11:05:29 -0000	1.2
+++ functions_config.inc.php	30 Nov 2004 13:28:02 -0000	1.3
@@ -119,5 +119,219 @@
     }
 }
 
+function serendipity_logout() {
+    $_SESSION['serendipityAuthedUser'] = false;
+    @session_destroy();
+    serendipity_deleteCookie('author_information');
+}
+
+function serendipity_login() {
+    global $serendipity;
+
+    if (serendipity_authenticate_author()) {
+        #The session has this data already
+        #we previously just checked the value of $_SESSION['serendipityAuthedUser'] but
+        #we need the authorid still, so call serendipity_authenticate_author with blank
+        #params
+        return true;
+    }
+
+    if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
+        if (empty($serendipity['POST']['auto'])) {
+            serendipity_deleteCookie('author_information');
+            return false;
+        } else {
+            $package = serialize(array('username' => $serendipity['POST']['user'],
+                                       'password' => $serendipity['POST']['pass']));
+            serendipity_setCookie('author_information', base64_encode($package));
+            return true;
+        }
+    } elseif ( isset($serendipity['COOKIE']['author_information']) ) {
+        $cookie = unserialize(base64_decode($serendipity['COOKIE']['author_information']));
+        if (serendipity_authenticate_author($cookie['username'], $cookie['password'])) {
+            return true;
+        } else {
+            serendipity_deleteCookie('author_information');
+            return false;
+        }
+    }
+}
+
+function serendipity_userLoggedIn() {
+    if ($_SESSION['serendipityAuthedUser'] === true && IS_installed) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function serendipity_setCookie($name,$value) {
+    global $serendipity;
+
+    setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
+    $_COOKIE[$name] = $value;
+    $serendipity['COOKIE'][$name] = $value;
+}
+
+function serendipity_deleteCookie($name) {
+    global $serendipity;
+
+    setcookie("serendipity[$name]", '', time()-4000);
+    unset($_COOKIE[$name]);
+    unset($serendipity['COOKIE'][$name]);
+}
+
+function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false) {
+    global $serendipity;
+
+    if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) {
+        $username = $_SESSION['serendipityUser'];
+        $password = $_SESSION['serendipityPassword'];
+        // For safety reasons when multiple blogs are installed on the same host, we need to check the current author each time to not let him log into a different blog with the same sessiondata
+        $is_md5 = true;
+    }
+
+    if ($username != '') {
+        if ($is_md5 === false && !empty($password)) {
+            $password = md5($password);
+        }
+
+        $query = "SELECT DISTINCT
+                    email, authorid, userlevel, right_publish
+                  FROM
+                    $serendipity[dbPrefix]authors
+                  WHERE
+                    username   = '" . serendipity_db_escape_string($username) . "'
+                  AND password = '" . serendipity_db_escape_string($password) . "'";
+        $row = serendipity_db_query($query, true, 'assoc');
+
+        if (is_array($row)) {
+            $_SESSION['serendipityUser']        = $serendipity['serendipityUser']         = $username;
+            $_SESSION['serendipityPassword']    = $serendipity['serendipityPassword']     = $password;
+            $_SESSION['serendipityEmail']       = $serendipity['serendipityEmail']        = $row['email'];
+            $_SESSION['serendipityAuthorid']    = $serendipity['authorid']                = $row['authorid'];
+            $_SESSION['serendipityUserlevel']   = $serendipity['serendipityUserlevel']    = $row['userlevel'];
+            $_SESSION['serendipityAuthedUser']  = $serendipity['serendipityAuthedUser']   = true;
+            $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish'];
+            serendipity_load_configuration($serendipity['authorid']);
+            return true;
+        } else {
+            $_SESSION['serendipityAuthedUser'] = false;
+            @session_destroy();
+        }
+    }
+
+    return false;
+}
+
+function serendipity_is_iframe() {
+    global $serendipity;
+
+    if ($serendipity['GET']['is_iframe'] && is_array($_SESSION['save_entry'])) {
+        // An iframe may NOT contain <html> and </html> tags, that's why we emit different headers here than on serendipity_admin.php
+?>
+    <head>
+        <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" />
+<?php
+        if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
+?>
+        <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" />
+<?php
+        }
+?>
+    </head>
+
+    <body style="padding: 0px; margin: 0px;">
+        <div id="mainpane" style="padding: 0px; margin: 5px auto 5px auto; width: 98%;">
+            <div id="content" style="padding: 5px; margin: 0px;">
+<?php
+        // We need to restore GET/POST variables to that depending plugins inside the iframe
+        // can still fetch all that variables; and we also tighten security by not allowing
+        // to pass any different GET/POST variables to our iframe.
+        $iframe_mode         = $serendipity['GET']['iframe_mode'];
+        $serendipity['POST'] = &$_SESSION['save_entry_POST'];
+        $serendipity['GET']  = &$_SESSION['save_entry_POST']; // GET-Vars are the same as POST to ensure compatibility.
+        ignore_user_abort(true);
+        serendipity_iframe($_SESSION['save_entry'], $iframe_mode);
+?>
+            </div>
+        </div>
+    </body>
+<?php
+        return true;
+    }
+    return false;
+}
+
+function serendipity_iframe(&$entry, $mode = null) {
+    global $serendipity;
+
+    if (empty($mode) || !is_array($entry)) {
+        return false;
+    }
+
+    switch ($mode) {
+        case 'save':
+            echo '<div style="float: left; height: 75px"></div>';
+            $res = serendipity_updertEntry($entry);
+            if (is_string($res)) {
+                echo '<div class="serendipity_msg_error">' . ERROR . ': <b>' . $res . '</b></div>';
+            } else {
+                if (!empty($serendipity['lastSavedEntry'])) {
+                    // Last saved entry must be propagated to entry form so that if the user re-edits it,
+                    // it needs to be stored with the new ID.
+                    echo '<script type="text/javascript">parent.document.forms[\'serendipityEntry\'][\'serendipity[id]\'].value = "' . $serendipity['lastSavedEntry'] . '";</script>';
+                }
+                echo '<div class="serendipityAdminMsgSuccess">' . ENTRY_SAVED . '</div>';
+            }
+            echo '<br style="clear: both" />';
+
+            return true;
+            break;
+
+        case 'preview':
+            echo '<div style="float: left; height: 225px"></div>';
+            $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
+            serendipity_smarty_init();
+            $serendipity['smarty']->assign('is_preview',  true);
+
+            serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
+            echo '<br style="clear: both" />';
+
+            return true;
+            break;
+    }
+
+    return false;
+}
+
+function serendipity_iframe_create($mode, &$entry) {
+    global $serendipity;
+
+    $_SESSION['save_entry']      = $entry;
+    $_SESSION['save_entry_POST'] = $serendipity['POST'];
+
+    // TODO: Use a language constant for those strings
+
+    $attr = '';
+    switch($mode) {
+        case 'save':
+            $attr = ' height="100" ';
+            echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_PREVIEW . '</div><br />';
+            break;
+
+        case 'preview':
+            $attr = ' height="300" ';
+            echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_SAVE . '</div><br />';
+            break;
+    }
+
+    echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&amp;serendipity[iframe_mode]=' . $mode . '" id="serendipity_iframe" name="serendipity_iframe" ' . $attr . ' width="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">'
+         . IFRAME_WARNING
+         . '</iframe><br /><br />';
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions.inc.php	30 Nov 2004 11:27:55 -0000	1.6
+++ functions.inc.php	30 Nov 2004 13:28:01 -0000	1.7
@@ -68,53 +68,6 @@
     return ucfirst(serendipity_strftime($cache[$format], (int)$time, $useOffset));
 }
 
-
-function serendipity_logout() {
-    $_SESSION['serendipityAuthedUser'] = false;
-    @session_destroy();
-    serendipity_deleteCookie('author_information');
-}
-
-function serendipity_login() {
-    global $serendipity;
-
-    if (serendipity_authenticate_author()) {
-        #The session has this data already
-        #we previously just checked the value of $_SESSION['serendipityAuthedUser'] but
-        #we need the authorid still, so call serendipity_authenticate_author with blank
-        #params
-        return true;
-    }
-
-    if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
-        if (empty($serendipity['POST']['auto'])) {
-            serendipity_deleteCookie('author_information');
-            return false;
-        } else {
-            $package = serialize(array('username' => $serendipity['POST']['user'],
-                                       'password' => $serendipity['POST']['pass']));
-            serendipity_setCookie('author_information', base64_encode($package));
-            return true;
-        }
-    } elseif ( isset($serendipity['COOKIE']['author_information']) ) {
-        $cookie = unserialize(base64_decode($serendipity['COOKIE']['author_information']));
-        if (serendipity_authenticate_author($cookie['username'], $cookie['password'])) {
-            return true;
-        } else {
-            serendipity_deleteCookie('author_information');
-            return false;
-        }
-    }
-}
-
-function serendipity_userLoggedIn() {
-    if ($_SESSION['serendipityAuthedUser'] === true && IS_installed) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 function serendipity_fetchTemplates() {
     global $serendipity;
     $dir = opendir($serendipity['serendipityPath'] . $serendipity['templatePath']);
@@ -149,22 +102,6 @@
     return $data;
 }
 
-function serendipity_setCookie($name,$value) {
-    global $serendipity;
-
-    setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
-    $_COOKIE[$name] = $value;
-    $serendipity['COOKIE'][$name] = $value;
-}
-
-function serendipity_deleteCookie($name) {
-    global $serendipity;
-
-    setcookie("serendipity[$name]", '', time()-4000);
-    unset($_COOKIE[$name]);
-    unset($serendipity['COOKIE'][$name]);
-}
-
 function serendipity_fetchUsers($user = '') {
     global $serendipity;
 
@@ -394,49 +331,6 @@
     return array($f, $suf);
 }
 
-function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false) {
-    global $serendipity;
-
-    if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) {
-        $username = $_SESSION['serendipityUser'];
-        $password = $_SESSION['serendipityPassword'];
-        // For safety reasons when multiple blogs are installed on the same host, we need to check the current author each time to not let him log into a different blog with the same sessiondata
-        $is_md5 = true;
-    }
-
-    if ($username != '') {
-        if ($is_md5 === false && !empty($password)) {
-            $password = md5($password);
-        }
-
-        $query = "SELECT DISTINCT
-                    email, authorid, userlevel, right_publish
-                  FROM
-                    $serendipity[dbPrefix]authors
-                  WHERE
-                    username   = '" . serendipity_db_escape_string($username) . "'
-                  AND password = '" . serendipity_db_escape_string($password) . "'";
-        $row = serendipity_db_query($query, true, 'assoc');
-
-        if (is_array($row)) {
-            $_SESSION['serendipityUser']        = $serendipity['serendipityUser']         = $username;
-            $_SESSION['serendipityPassword']    = $serendipity['serendipityPassword']     = $password;
-            $_SESSION['serendipityEmail']       = $serendipity['serendipityEmail']        = $row['email'];
-            $_SESSION['serendipityAuthorid']    = $serendipity['authorid']                = $row['authorid'];
-            $_SESSION['serendipityUserlevel']   = $serendipity['serendipityUserlevel']    = $row['userlevel'];
-            $_SESSION['serendipityAuthedUser']  = $serendipity['serendipityAuthedUser']   = true;
-            $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish'];
-            serendipity_load_configuration($serendipity['authorid']);
-            return true;
-        } else {
-            $_SESSION['serendipityAuthedUser'] = false;
-            @session_destroy();
-        }
-    }
-
-    return false;
-}
-
 function serendipity_track_referrer($entry = 0) {
     global $serendipity;
 
@@ -682,4 +576,4 @@
 
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- functions_entries.inc.php	30 Nov 2004 11:27:56 -0000	1.15
+++ functions_entries.inc.php	30 Nov 2004 13:28:02 -0000	1.16
@@ -1582,111 +1582,3 @@
     serendipity_smarty_fetch('ARCHIVES', 'entries_archives.tpl', true);
 }
 
-function serendipity_is_iframe() {
-    global $serendipity;
-
-    if ($serendipity['GET']['is_iframe'] && is_array($_SESSION['save_entry'])) {
-        // An iframe may NOT contain <html> and </html> tags, that's why we emit different headers here than on serendipity_admin.php
-?>
-    <head>
-        <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" />
-<?php
-        if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') {
-?>
-        <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" />
-<?php
-        }
-?>
-    </head>
-
-    <body style="padding: 0px; margin: 0px;">
-        <div id="mainpane" style="padding: 0px; margin: 5px auto 5px auto; width: 98%;">
-            <div id="content" style="padding: 5px; margin: 0px;">
-<?php
-        // We need to restore GET/POST variables to that depending plugins inside the iframe
-        // can still fetch all that variables; and we also tighten security by not allowing
-        // to pass any different GET/POST variables to our iframe.
-        $iframe_mode         = $serendipity['GET']['iframe_mode'];
-        $serendipity['POST'] = &$_SESSION['save_entry_POST'];
-        $serendipity['GET']  = &$_SESSION['save_entry_POST']; // GET-Vars are the same as POST to ensure compatibility.
-        ignore_user_abort(true);
-        serendipity_iframe($_SESSION['save_entry'], $iframe_mode);
-?>
-            </div>
-        </div>
-    </body>
-<?php
-        return true;
-    }
-    return false;
-}
-
-function serendipity_iframe(&$entry, $mode = null) {
-    global $serendipity;
-
-    if (empty($mode) || !is_array($entry)) {
-        return false;
-    }
-
-    switch ($mode) {
-        case 'save':
-            echo '<div style="float: left; height: 75px"></div>';
-            $res = serendipity_updertEntry($entry);
-            if (is_string($res)) {
-                echo '<div class="serendipity_msg_error">' . ERROR . ': <b>' . $res . '</b></div>';
-            } else {
-                if (!empty($serendipity['lastSavedEntry'])) {
-                    // Last saved entry must be propagated to entry form so that if the user re-edits it,
-                    // it needs to be stored with the new ID.
-                    echo '<script type="text/javascript">parent.document.forms[\'serendipityEntry\'][\'serendipity[id]\'].value = "' . $serendipity['lastSavedEntry'] . '";</script>';
-                }
-                echo '<div class="serendipityAdminMsgSuccess">' . ENTRY_SAVED . '</div>';
-            }
-            echo '<br style="clear: both" />';
-
-            return true;
-            break;
-
-        case 'preview':
-            echo '<div style="float: left; height: 225px"></div>';
-            $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
-            serendipity_smarty_init();
-            $serendipity['smarty']->assign('is_preview',  true);
-
-            serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
-            echo '<br style="clear: both" />';
-
-            return true;
-            break;
-    }
-
-    return false;
-}
-
-function serendipity_iframe_create($mode, &$entry) {
-    global $serendipity;
-
-    $_SESSION['save_entry']      = $entry;
-    $_SESSION['save_entry_POST'] = $serendipity['POST'];
-
-    // TODO: Use a language constant for those strings
-
-    $attr = '';
-    switch($mode) {
-        case 'save':
-            $attr = ' height="100" ';
-            echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_PREVIEW . '</div><br />';
-            break;
-
-        case 'preview':
-            $attr = ' height="300" ';
-            echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_SAVE . '</div><br />';
-            break;
-    }
-
-    echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&amp;serendipity[iframe_mode]=' . $mode . '" id="serendipity_iframe" name="serendipity_iframe" ' . $attr . ' width="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">'
-         . IFRAME_WARNING
-         . '</iframe><br /><br />';
-}

[php-blog-cvs] serendipity serendipity_admin.php,1.45,1.46

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
moved around functions so that they can be used within the installer module.
fresh installations will now no longer fail


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_admin.php	27 Nov 2004 22:14:12 -0000	1.45
+++ serendipity_admin.php	30 Nov 2004 13:28:00 -0000	1.46
@@ -7,6 +7,11 @@
 include('serendipity_config.inc.php');
 header('Content-Type: text/html; charset=' . LANG_CHARSET);
 
+if (IS_installed === false) {
+    require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
+    require_once S9Y_INCLUDE_PATH . 'include/functions_config.inc.php';
+}
+
 if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') {
     serendipity_logout();
 } else {

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.4,1.5

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

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

Modified Files:
	installer.inc.php 
Log Message:
moved around functions so that they can be used within the installer module.
fresh installations will now no longer fail


Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- installer.inc.php	27 Nov 2004 22:14:15 -0000	1.4
+++ installer.inc.php	30 Nov 2004 13:28:02 -0000	1.5
@@ -4,10 +4,6 @@
 $umask = 0775;
 @define('IN_installer', true);
 
-require_once('serendipity_config.inc.php');
-require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
-require_once S9Y_INCLUDE_PATH . 'include/functions_config.inc.php';
-
 if (!isset($_POST['installAction'])) {
     $_POST['installAction'] = '';
 }