php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_functions_config.inc.php,1.6,1.7 serendipity_functions_installer.inc.php,1.3,1.4

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

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

Modified Files:
	serendipity_functions_config.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
Darn linebreaks. Makes me want to kill my windows/komodo machine :)


Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_functions_config.inc.php	4 Apr 2004 16:24:47 -0000	1.6
+++ serendipity_functions_config.inc.php	7 Apr 2004 07:41:02 -0000	1.7
@@ -73,5 +73,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
-
+?>
\ No newline at end of file

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_functions_installer.inc.php	4 Apr 2004 16:24:47 -0000	1.3
+++ serendipity_functions_installer.inc.php	7 Apr 2004 07:41:02 -0000	1.4
@@ -264,7 +264,7 @@
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
             } else {
-                unlink('./.htaccess');
+                @unlink('./.htaccess');
             }
         }
     }
@@ -627,5 +627,4 @@
         return true;
     }
 }
-?>
-
+?>
\ No newline at end of file

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

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

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

Modified Files:
	serendipity_lang.inc.php 
Log Message:
removed trailing whitespace


Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang.inc.php	4 Apr 2004 16:23:29 -0000	1.11
+++ serendipity_lang.inc.php	7 Apr 2004 07:33:21 -0000	1.12
@@ -31,4 +31,3 @@
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
-

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.21,1.22

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:

Report errors on "invalid" plugins



Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_admin_plugins.inc.php	4 Apr 2004 16:23:29 -0000	1.21
+++ serendipity_admin_plugins.inc.php	7 Apr 2004 06:53:42 -0000	1.22
@@ -33,24 +33,33 @@
         <select name="serendipity[plugin_to_add]">
             <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
 <?php
+    $errorstack = array();
     foreach ($classes as $class_name) {
         $plugin =& serendipity_plugin_api::load_plugin($class_name);
+        if (is_object($plugin)) {
+            /* query for its name, description and configuration data */
+            $bag = new serendipity_property_bag;
+            $plugin->introspect($bag);
 
-        /* query for its name, description and configuration data */
-        $bag = new serendipity_property_bag;
-        $plugin->introspect($bag);
-
-        $name = $bag->get('name');
-        $desc = $bag->get('description');
+            $name = $bag->get('name');
+            $desc = $bag->get('description');
 ?>
             <option value="<?php echo $class_name; ?>"><?php echo $name . ' - ' . $desc; ?></option>
 <?php
+        } else {
+            $errorstack[] = $class_name;
+        }
     }
 ?>
         </select>
         <input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /><label for="all_authors"><?php echo ALL_AUTHORS; ?></label>
         <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
         <br />
+<?php
+foreach($errorstack as $e_idx => $e_name) {
+    echo ERROR . ': ' . $class_name . '<br />';
+}
+?>
         <br />
 
         <table border="0" cellpadding="5" cellspacing="0">
@@ -168,19 +177,19 @@
 
 function ownership($authorid, $name, $readonly = false) {
     global $serendipity;
-    
+
     static $users = array();
     if (empty($users)) {
         $users = serendipity_fetchUsers();
     }
-    
+
     if (!$readonly) {
 ?>
 <select name="serendipity[ownership][<?php echo $name; ?>]">
     <option value="0"><?php echo ALL_AUTHORS; ?></option>
 <?php
     }
-    
+
     foreach($users AS $user) {
         if ($readonly && $user['authorid'] == $authorid) {
             $username = htmlentities($user['username']);
@@ -190,7 +199,7 @@
 <?php
         }
     }
-    
+
     if (!$readonly) {
 ?>
 </select>
@@ -263,7 +272,7 @@
     if (!($plugin->protected === FALSE || $plugin->serendipity_owner == '0' || $plugin->serendipity_owner == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) {
         return;
     }
-    
+
     $bag  = new serendipity_property_bag;
     $plugin->introspect($bag);
     $name = htmlentities($bag->get('name'));
@@ -458,7 +467,7 @@
                 addslashes($plugin_name),
                 addslashes($placement)
             );
-            
+
             serendipity_plugin_api::update_plugin_owner(
                 addslashes($plugin_name),
                 addslashes($_POST['serendipity']['ownership'][$plugin_name])
@@ -471,7 +480,7 @@
         if (isset($_POST['serendipity']['all_authors']) && $_POST['serendipity']['all_authors'] == 'true') {
             $authorid = '0';
         }
-        
+
         if (isset($_POST['serendipity']['event_plugin'])) {
             $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'event', $authorid);
         } else {
@@ -483,7 +492,7 @@
     if (isset($_POST['REMOVE'])) {
         foreach ($_POST['serendipity']['plugin_to_remove'] as $key) {
             $plugin =& serendipity_plugin_api::load_plugin($key);
-        
+
             if ($plugin->serendipity_owner == '0' || $plugin->serendipity_owner == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
                 serendipity_plugin_api::remove_plugin_instance($key);
             }

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.20,1.20.4.1

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

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

Modified Files:
      Tag: branch_0_6
	serendipity_admin_plugins.inc.php 
Log Message:
Report errors on "invalid" plugins


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -d -r1.20 -r1.20.4.1
--- serendipity_admin_plugins.inc.php	21 Mar 2004 16:35:31 -0000	1.20
+++ serendipity_admin_plugins.inc.php	7 Apr 2004 06:53:12 -0000	1.20.4.1
@@ -29,23 +29,32 @@
         <select name="serendipity[plugin_to_add]">
             <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
 <?php
+    $errorstack = array();
     foreach ($classes as $class_name) {
         $plugin =& serendipity_plugin_api::load_plugin($class_name);
+        if (is_object($plugin)) {
+            /* query for its name, description and configuration data */
+            $bag = new serendipity_property_bag;
+            $plugin->introspect($bag);
 
-        /* query for its name, description and configuration data */
-        $bag = new serendipity_property_bag;
-        $plugin->introspect($bag);
-
-        $name = $bag->get('name');
-        $desc = $bag->get('description');
+            $name = $bag->get('name');
+            $desc = $bag->get('description');
 ?>
             <option value="<?php echo $class_name; ?>"><?php echo $name . ' - ' . $desc; ?></option>
 <?php
+        } else {
+            $errorstack[] = $class_name;
+        }
     }
 ?>
         </select>
         <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
         <br />
+<?php
+foreach($errorstack as $e_idx => $e_name) {
+    echo ERROR . ': ' . $class_name . '<br />';
+}
+?>
         <br />
 
         <table border="0" cellpadding="5" cellspacing="0">

[php-blog-cvs] serendipity upgrade.sh,NONE,1.1.2.1 README,1.6,1.6.4.1

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

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

Modified Files:
      Tag: branch_0_6
	README 
Added Files:
      Tag: branch_0_6
	upgrade.sh 
Log Message:
upgrade script (MFH)


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -d -r1.6 -r1.6.4.1
--- README	4 Apr 2004 15:10:24 -0000	1.6
+++ README	7 Apr 2004 06:43:11 -0000	1.6.4.1
@@ -10,7 +10,12 @@
 
 The automatic update script should find and execute any necessary
 changes to the database layout made in different s9y versions beginning
-from 0.5.
+from 0.5. The upgrader will perform its automatic actions, as soon as you
+have copied the new s9y files over your old installation and access the start
+page of your blog.
+You can speed up the process of backing up your data and copying the files by 
+using the supplied "upgrade.sh" script. Be sure to edit the file and change 
+the variables to your needs.
 
 Usually all DB schema upgrades in previous versions will be used. So
 when you upgrade from 0.5 to 0.7 you will get upgrades from 0.5 -> 0.6

--- NEW FILE: upgrade.sh ---
#!/bin/sh
# File: serendipity_safe_upgrade.sh
# Author: Jez Hancock
#
# Description:
# This shell script performs a backup of the serendipity MySQL database and
# files prior to upgrading from one version to another.

########################################################################
# Configuration options start
########################################################################
# Change this to the IP address from which you will be updgrading the blog from
# in a browser.  This IP address will be used in a .htaccess file to restrict
# access during the upgrade process:
ip=192.168.0.1
ip=213.152.51.196

# Change this to the directory containing the current serendipity web files:
blog_dir=/usr/local/www/htdocs/serendipity
blog_dir=/web/jez.hancock-family.com

# Change this to the directory containing the new serendipity web files:
# This should be the directory containing the cvs version of s9y or the s9y
# tarball contents:
import_dir=/home/username/serendipity
import_dir=/home/munk/cvs/php-blog/serendipity

# Change this to the directory you wish your weblog files and database to be
# backed up to.  A subdirectory 's9y.YYYYMMDD' will be created under here into
# which a tarball will be created containing the backed up webfiles and
# database.  

# For example if your backup_dir is set to '/home/user/backup', a directory
# called '/home/user/backup/serendipity.20040406' will be created to contain
# the backup tarball 'serendipity_backup.tar.gz' and the backup database file
# 'serendipity_backup.sql'.
# Note if the backup directory already contains a backup from the current day,
# the script will exit without doing anything.
backup_dir=/home/username/backup
backup_dir=/opt/backup

# Change this to match your database user/name.  Note you will be prompted for
# your password on the commandline.
db_name="serendipity"
db_user="serendipity"

########################################################################
# Configuration options end
# You should not need to modify anything below here!
########################################################################

ok() { 
	echo "[OK]" ; echo ""
}

nl() {
	echo ""
}

# the date ... ymd=20040331 etc ... used in backup
ymd=`date "+%Y%m%d"`

# Our backup directory:
backup_dir=$backup_dir/serendipity.$ymd

# if the backup dir exists already, exit gracefully:
if [ -d $backup_dir ];then
	echo "$backup_dir already exists - exiting."
	exit
fi

# make backup dir:
echo "Creating backup directory:"
nl
echo "$backup_dir"
mkdir $backup_dir && ok

# backup current weblog to a tarball in the backup dir:
echo "Backing up weblog files from:"
nl
echo "$blog_dir"
nl
echo "to the tarball:"
nl
echo "$backup_dir/serendipity_backup.tar.gz"
set `echo "$blog_dir" | sed -e 's,\(.*\)/\(.*\),\1 \2,'`
tar zcf $backup_dir/serendipity_backup.tar.gz -C $1 $2 && ok

echo "Backing up database $db_name to file:"
nl
echo "$backup_dir/serendipity_backup.sql"
nl
echo -n "MySQL user $db_user - "
mysqldump -u$db_user -p $db_name > $backup_dir/serendipity_backup.sql \
	&& ok

# make backup dir safe:
echo "Changing perms on $backup_dir to 700"
chmod 700 $backup_dir && ok

# move current blogdir out of way:
echo "Moving:"
nl
echo "$blog_dir"
nl
echo "to:"
nl
echo "$blog_dir.$ymd"
mv $blog_dir $blog_dir.$ymd && ok

# now copy in the new files:
echo "Copying files from:"
nl
echo "$import_dir"
nl
echo "to:"
nl
echo "$blog_dir"
cp -R $import_dir $blog_dir && ok

# check if a .htaccess file exists in old blog dir - if so copy over:
if [ -f "$blog_dir.$ymd/.htaccess" ]; then
	cp $blog_dir.$ymd/.htaccess $blog_dir
fi

# allow only our ip during upgrade - remember to remove these lines 
# after you've finished updating!:
echo "Adding .htaccess directives to restrict browser access to blog to $ip"
echo "during upgrade process"
exec >> $blog_dir/.htaccess
echo 'deny from all' 
echo 'allow from $ip'
echo 'ErrorDocument 403 "Upgrading, please check back soon!!!'
exec > /dev/tty
ok

# copy old uploads folder over:
if [ -d $blog_dir.$ymd/uploads ];then
	echo "Copying old uploads folder from:"
	nl
	echo "$blog_dir.$ymd/uploads"
	nl
	echo "to:"
	nl
	echo "$blog_dir/uploads"
	cp -R $blog_dir.$ymd/uploads $blog_dir/uploads && ok
fi


# most importantly don't forget the local config file - this is checked
# to see whether or not your current config setup needs upgrading or
# not:
echo "Copying $blog_dir.$ymd/serendipity_config_local.inc.php to $blog_dir"
cp $blog_dir.$ymd/serendipity_config_local.inc.php $blog_dir \
	&& ok

echo "########################################################################"
echo "Important!"
echo "########################################################################"
echo "Backup is now complete.  Continue to upgrade your serendipity"
echo "installation by browsing to it in a web browser - you will be prompted"
echo "with instructions from there."
nl
echo "After completing the upgrade via a browser, remember to remove the lines"
echo "starting:"
nl
echo "deny from all"
echo "allow from $ip"
echo "ErrorDocument 403 ..."
nl
echo "from the .htaccess file:"
nl
echo "$blog_dir/.htaccess"
nl
nl
echo "A copy of the original serendipity web folder can be found here:"
nl
echo "$blog_dir.$ymd"
nl
echo "After confirming the upgrade was successful, you can safely remove"
echo "this directory."

# Uncomment/modify the following line if you run the server:
#chown -R www:www $blog_dir && chmod 600 $blog_dir/serendipity_config_local.inc.php

[php-blog-cvs] serendipity upgrade.sh,NONE,1.1 README,1.7,1.8

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

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

Modified Files:
	README 
Added Files:
	upgrade.sh 
Log Message:
added upgrade shellscript from Jez


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README	4 Apr 2004 16:26:54 -0000	1.7
+++ README	7 Apr 2004 06:42:50 -0000	1.8
@@ -10,7 +10,12 @@
 
 The automatic update script should find and execute any necessary
 changes to the database layout made in different s9y versions beginning
-from 0.5.
+from 0.5. The upgrader will perform its automatic actions, as soon as you
+have copied the new s9y files over your old installation and access the start
+page of your blog.
+You can speed up the process of backing up your data and copying the files by 
+using the supplied "upgrade.sh" script. Be sure to edit the file and change
+the variables to your needs.
 
 Usually all DB schema upgrades in previous versions will be used. So
 when you upgrade from 0.5 to 0.7 you will get upgrades from 0.5 -> 0.6

--- NEW FILE: upgrade.sh ---
#!/bin/sh
# File: serendipity_safe_upgrade.sh
# Author: Jez Hancock
#
# Description:
# This shell script performs a backup of the serendipity MySQL database and
# files prior to upgrading from one version to another.

########################################################################
# Configuration options start
########################################################################
# Change this to the IP address from which you will be updgrading the blog from
# in a browser.  This IP address will be used in a .htaccess file to restrict
# access during the upgrade process:
ip=192.168.0.1
ip=213.152.51.196

# Change this to the directory containing the current serendipity web files:
blog_dir=/usr/local/www/htdocs/serendipity
blog_dir=/web/jez.hancock-family.com

# Change this to the directory containing the new serendipity web files:
# This should be the directory containing the cvs version of s9y or the s9y
# tarball contents:
import_dir=/home/username/serendipity
import_dir=/home/munk/cvs/php-blog/serendipity

# Change this to the directory you wish your weblog files and database to be
# backed up to.  A subdirectory 's9y.YYYYMMDD' will be created under here into
# which a tarball will be created containing the backed up webfiles and
# database.  

# For example if your backup_dir is set to '/home/user/backup', a directory
# called '/home/user/backup/serendipity.20040406' will be created to contain
# the backup tarball 'serendipity_backup.tar.gz' and the backup database file
# 'serendipity_backup.sql'.
# Note if the backup directory already contains a backup from the current day,
# the script will exit without doing anything.
backup_dir=/home/username/backup
backup_dir=/opt/backup

# Change this to match your database user/name.  Note you will be prompted for
# your password on the commandline.
db_name="serendipity"
db_user="serendipity"

########################################################################
# Configuration options end
# You should not need to modify anything below here!
########################################################################

ok() { 
	echo "[OK]" ; echo ""
}

nl() {
	echo ""
}

# the date ... ymd=20040331 etc ... used in backup
ymd=`date "+%Y%m%d"`

# Our backup directory:
backup_dir=$backup_dir/serendipity.$ymd

# if the backup dir exists already, exit gracefully:
if [ -d $backup_dir ];then
	echo "$backup_dir already exists - exiting."
	exit
fi

# make backup dir:
echo "Creating backup directory:"
nl
echo "$backup_dir"
mkdir $backup_dir && ok

# backup current weblog to a tarball in the backup dir:
echo "Backing up weblog files from:"
nl
echo "$blog_dir"
nl
echo "to the tarball:"
nl
echo "$backup_dir/serendipity_backup.tar.gz"
set `echo "$blog_dir" | sed -e 's,\(.*\)/\(.*\),\1 \2,'`
tar zcf $backup_dir/serendipity_backup.tar.gz -C $1 $2 && ok

echo "Backing up database $db_name to file:"
nl
echo "$backup_dir/serendipity_backup.sql"
nl
echo -n "MySQL user $db_user - "
mysqldump -u$db_user -p $db_name > $backup_dir/serendipity_backup.sql \
	&& ok

# make backup dir safe:
echo "Changing perms on $backup_dir to 700"
chmod 700 $backup_dir && ok

# move current blogdir out of way:
echo "Moving:"
nl
echo "$blog_dir"
nl
echo "to:"
nl
echo "$blog_dir.$ymd"
mv $blog_dir $blog_dir.$ymd && ok

# now copy in the new files:
echo "Copying files from:"
nl
echo "$import_dir"
nl
echo "to:"
nl
echo "$blog_dir"
cp -R $import_dir $blog_dir && ok

# check if a .htaccess file exists in old blog dir - if so copy over:
if [ -f "$blog_dir.$ymd/.htaccess" ]; then
	cp $blog_dir.$ymd/.htaccess $blog_dir
fi

# allow only our ip during upgrade - remember to remove these lines 
# after you've finished updating!:
echo "Adding .htaccess directives to restrict browser access to blog to $ip"
echo "during upgrade process"
exec >> $blog_dir/.htaccess
echo 'deny from all' 
echo 'allow from $ip'
echo 'ErrorDocument 403 "Upgrading, please check back soon!!!'
exec > /dev/tty
ok

# copy old uploads folder over:
if [ -d $blog_dir.$ymd/uploads ];then
	echo "Copying old uploads folder from:"
	nl
	echo "$blog_dir.$ymd/uploads"
	nl
	echo "to:"
	nl
	echo "$blog_dir/uploads"
	cp -R $blog_dir.$ymd/uploads $blog_dir/uploads && ok
fi


# most importantly don't forget the local config file - this is checked
# to see whether or not your current config setup needs upgrading or
# not:
echo "Copying $blog_dir.$ymd/serendipity_config_local.inc.php to $blog_dir"
cp $blog_dir.$ymd/serendipity_config_local.inc.php $blog_dir \
	&& ok

echo "########################################################################"
echo "Important!"
echo "########################################################################"
echo "Backup is now complete.  Continue to upgrade your serendipity"
echo "installation by browsing to it in a web browser - you will be prompted"
echo "with instructions from there."
nl
echo "After completing the upgrade via a browser, remember to remove the lines"
echo "starting:"
nl
echo "deny from all"
echo "allow from $ip"
echo "ErrorDocument 403 ..."
nl
echo "from the .htaccess file:"
nl
echo "$blog_dir/.htaccess"
nl
nl
echo "A copy of the original serendipity web folder can be found here:"
nl
echo "$blog_dir.$ymd"
nl
echo "After confirming the upgrade was successful, you can safely remove"
echo "this directory."

# Uncomment/modify the following line if you run the server:
#chown -R www:www $blog_dir && chmod 600 $blog_dir/serendipity_config_local.inc.php

[php-blog-cvs] serendipity/lang serendipity_config_local_fr.tpl,NONE,1.1 serendipity_config_user_fr.tpl,NONE,1.1 serendipity_lang_fr.inc.php,NONE,1.1 serendipity_config_local_da.tpl,1.1,1.2 serendipity_config_local_de.tpl,1.1,1.2 serendipity_config_local_en.tpl,1.1,1.2 serendipity_config_local_es.tpl,1.1,1.2

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

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

Modified Files:
	serendipity_config_local_da.tpl 
	serendipity_config_local_de.tpl 
	serendipity_config_local_en.tpl 
	serendipity_config_local_es.tpl 
Added Files:
	serendipity_config_local_fr.tpl serendipity_config_user_fr.tpl 
	serendipity_lang_fr.inc.php 
Log Message:
added french language, thanks to renaud lavigne


Index: serendipity_config_local_en.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_en.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_en.tpl	4 Apr 2004 16:12:38 -0000	1.1
+++ serendipity_config_local_en.tpl	5 Apr 2004 09:08:46 -0000	1.2
@@ -28,7 +28,7 @@
 $serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
 $serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
 $serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
-$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French|0}';      // Select the language for your blog
 
 // Appearance and options
 # Customize how Serendipity looks and feels

Index: serendipity_config_local_es.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_es.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_es.tpl	4 Apr 2004 16:12:38 -0000	1.1
+++ serendipity_config_local_es.tpl	5 Apr 2004 09:08:46 -0000	1.2
@@ -28,7 +28,7 @@
 $serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
 $serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
 $serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
-$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French|0}';      // Select the language for your blog
 
 // Appearance and options
 # Customize how Serendipity looks and feels

--- NEW FILE: serendipity_config_user_fr.tpl ---
<?php # $Id: serendipity_config_user_fr.tpl,v 1.1 2004/04/05 09:08:46 garvinhicking Exp $

// Personal details
# Your account details
$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
?>

--- NEW FILE: serendipity_lang_fr.inc.php ---
<?php # $Id: serendipity_lang_fr.inc.php,v 1.1 2004/04/05 09:08:46 garvinhicking Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

@define('LANG_CHARSET', 'ISO-8859-1');
@define('DATE_LOCALES', 'french, fr, en_US');
@define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');

@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration (Suite)');
@define('HAVE_TO_BE_LOGGED_ON', 'Vous devez être loggué pour voir cette page:');
@define('WRONG_USERNAME_OR_PASSWORD', 'Vous avez entré un nom d\'utilisateur ou un mot de passe erroné');
@define('APPEARANCE', 'Apparence');
@define('MANAGE_STYLES', 'Configurer les Styles');
@define('CONFIGURE_PLUGINS', 'Configurer les Plugins');
@define('ADMIN', 'Administrateur:');
@define('CONFIGURATION', 'Configuration');
@define('IMPORT_EXPORT_ENTRIES', 'Importer/Exporter des news');
@define('BACK_TO_BLOG', 'Revenir au Weblog');
@define('LOGIN', 'Se connecter');
@define('LOGOUT', 'Se déconnecter');
@define('LOGGEDOUT', 'Déconnecté.');
@define('CREATE', 'Créer');
@define('EDIT_THIS_CAT', 'Editer "%s - %s"');
@define('SAVE', 'Enregistrer');
@define('NAME', 'Nom');
@define('CLICK_CAT_TO_EDIT', 'Cliquez sur une catégorie pour l\'éditer');
@define('CREATE_NEW_CAT', 'Créer une nouvelle catégorie');
@define('SELECT_IMAGE', 'Sélectionnez une image');
@define('I_WANT_THUMB', 'Je veux utiliser un aperçu d\'images dans ma news.');
@define('I_WANT_BIG_IMAGE', 'Je veux utiliser l\'image la plus large dans ma news.');
@define('I_WANT_NO_LINK', ' Je veux l\'afficher comme une étant une image');
@define('I_WANT_IT_TO_LINK', 'Je veux l\'afficher comme étant un lien vers cette adresse internet:');
@define('BACK', 'Précédent');
@define('FORWARD', 'Suivant');
@define('ANONYMOUS', 'Anonymes');
@define('LINK_TO_COMMENT', 'Lien vers le commentaire #');
@define('SEND_MAIL_TO', 'Envoyer un mail à');
@define('NEW_TRACKBACK_TO', 'Nouveau traçage fait sur');
@define('NEW_COMMENT_TO', 'Nouveau commentaire posté sur');
@define('RECENT', 'Récemment...');
@define('OLDER', 'Précédemment...');
@define('DONE', 'Effectué');
@define('CLICK_IMAGE_TO_INSERT', 'Cliquez sur l\'image que vous voulez insérer:');
@define('WELCOME_BACK', 'Bienvenue,');
@define('RUNNING', 'Vous utilisez Serendipity v.');
@define('ADD_PLUGIN', 'Ajouter un plugin');
@define('TITLE', 'Titre');
@define('PLUGIN', 'Plugin');
@define('DESCRIPTION', 'Description');
@define('PLACEMENT', 'Emplacement');
@define('DELETE', 'Supprimer');
@define('SAVE', 'Enregistrer');
@define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez un plugin à ajouter');
@define('UP', 'REMONTER');
@define('DOWN', 'DESCENDRE');
@define('ENTRIES', 'News:');
@define('NEW_ENTRY', 'Poster une news');
@define('AUTHOR_SUITE', 'Suite des auteurs');
@define('EDIT_ENTRIES', 'Editer les news');
@define('DELETE_ENTRIES', 'Supprimer les news');
@define('CATEGORIES', 'Catégories');
@define('EDIT_CATEGORIES', 'Configurer les catégories');
@define('IMAGES', 'Images:');
@define('ADD_IMAGES', 'Ajout d\'images');
@define('WARNING_THIS_BLAHBLAH', "ATTENTION:\\nCela peut prendre du temps si vous avez beaucoup d\'images.");
@define('CREATE_THUMBS', 'Reconstruire les aperçus');
@define('MANAGE_IMAGES', 'Configurer les images');
@define('ADMIN_INTERFACE', 'Interface administrateur');
@define('SERENDIPITY_AUTHORING_SUITE', 'Suite de l\'administration Serendipity');
@define('NAME', 'Nom');
@define('EMAIL', 'Email');
@define('HOMEPAGE', 'Page web');
@define('COMMENT', 'Commentaire');
@define('REMEMBER_INFO', 'Enregistrer ses informations?');
@define('SUBMIT_COMMENT', 'Poster le commentaire');
@define('NO_ENTRIES_TO_PRINT', 'Aucune news à afficher.');
@define('COMMENTS', 'Commentaires');
@define('ADD_COMMENT', 'Ajouter un commentaire');
@define('NO_COMMENTS', 'Pas de commentaires.');
@define('POSTED_BY', 'Posté par');
@define('TRACKBACK_FROM', 'Suivi de');
@define('ON', 'sur');
@define('A_NEW_COMMENT_BLAHBLAH', 'Un nouveau commentaire a été posté sur votre blog "%s", dans la news intitulée "%s".');
@define('A_NEW_TRACKBACK_BLAHBLAH', 'Un nouveau suivi a été fait sur votre blog à la news intitulée "%s".');
@define('NO_CATEGORY', 'Pas de Catégorie');
@define('ENTRY_BODY', 'Corps de la news');
@define('EXTENDED_BODY', 'Extension de la news');
@define('CATEGORY', 'Catégorie:');
@define('TEMPLATE_NAME', 'Nom du thème');
@define('CHOOSE_STYLESHEET', 'Choisissez un style....');
@define('EDIT', 'Editer');
@define('MAKE_DEFAULT', 'Par défaut');
@define('CREATE_NEW_STYLESHEET', 'Créer un nouveau style');
@define('NO_ENTRIES_BLAHBLAH', 'Aucune news trouvée pour la requête %s' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Votre recherche pour %s a donné %s résultats:');
@define('SEARCH_TOO_SHORT', 'Votre recherche-requête doit être supérieure à 3 caractères');
@define('IMAGE', 'Image');
@define('ERROR_FILE_NOT_EXISTS', 'Erreur: Le fichier n\'existe pas!');
@define('ERROR_FILE_EXISTS', 'Erreur: Le fichier est déjà pris, prenez en un autre !');
@define('ERROR_SOMETHING', 'Erreur: Quelque chose ne va pas.');
@define('ADDING_IMAGE', 'Ajout d\'une image...');
@define('THUMB_CREATED_DONE', 'Aperçu crée.<br>Terminé.');
@define('ERROR_FILE_EXISTS_ALREADY', 'Erreur: Le fichier existe déjà sur votre machine!');
@define('ERROR_UNKNOWNE_NOUPLOAD', 'Erreur inconnue survenur, le fichier n\'a pas été uploadé...');
@define('ADD_IMAGE_BLAHBLAH', '<b>Ajoutez une image dans votre visualisateur:</b><p>Ici vous pouvez uploader des images, ou me demander de les prendre pour vous sur le web! Si vous n\'avez pas l\'image appropriée, faites une recherche sur google pour la trouver. Essayez <a href="http://images.google.com" target="_blank">le chercheur d\'images de google</a>, les résultats sont souvent utiles et toujours amusants :)<p><b>Choissisez la méthode:</b><br>');
@define('ENTER_IMAGE_URL', 'Entrez l\'URL de l\'image à prendre sur le web:');
@define('ENTER_IMAGE_TO_UP', 'Sélectionnez une image que vous souhaitez uploader:');
@define('GO', 'Go!');
@define('NEWSIZE', 'Nouvelle taille: ');
@define('RESIZE_BLAHBLAH', '<b>Redimensionner %s</b><p>');
@define('ORIGINAL_SIZE', 'Taille d\'origine: <i>%sx%s</i> pixel');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Ici vous pouvez ajuster la nouvelle taille des images. Si vous voulez conserver les proportions, entrez juste une valeur et pressez la touche TAB, je calculerais la nouvelle taille donc les proportions ne seront pas oubliées:');
@define('CALENDAR', 'Calendrier');
@define('QUICKJUMP_CALENDAR', 'Saut rapide vers le Calendrier');
@define('QUICKSEARCH', 'Recherche rapide');
@define('SEARCH_FOR_ENTRY', 'Recherche d\'une news');
@define('ARCHIVES', 'Archives');
@define('BROWSE_ARCHIVES', 'Afficher les archives par mois');
@define('TOP_REFERRER', 'Top des liens entrants');
@define('SHOWS_TOP_SITES', 'Montrer le top de sites qui affichent un lien vers votre blog');
@define('TOP_EXITS', 'Top des liens sortants');
@define('SHOWS_TOP_EXIT', 'Montrer le top des liens de sites qui sortent de votre blog');
@define('SYNDICATION', 'Syndication');
@define('SHOWS_RSS_BLAHBLAH', 'Montrer les liens de syndication RSS');
@define('ALLOWS_YOU_BLAHBLAH', 'Vous autorise à configurer et publier votre blog');
@define('PLUG', 'Plug');
@define('ADVERTISES_BLAHBLAH', 'Publicité sur l\'origine de votre blog');
@define('HTML_NUGGET', 'Bloc en HTML');
@define('HOLDS_A_BLAHBLAH', 'Affiche quelque chose en HTML sur le côté');
@define('TITLE_FOR_NUGGET', 'Titre du bloc');
@define('THE_NUGGET', 'Contenu du bloc HTML!');
@define('SYNDICATE_THIS_BLOG', 'Syndiquer Ce Blog');
@define('QUICKJUMP', 'Saut rapide');
@define('YOU_CHOSE', 'Vous avez choisi %s');
@define('IMAGE_SIZE', 'Taille de l\'image');
@define('IMAGE_AS_A_LINK', 'Insérer l\'image');
@define('POWERED_BY', 'Powered by');
@define('SUPERUSER', 'Accès Administrateur');
@define('TRACKBACKS', 'Suivis');
@define('TRACKBACK', 'Suivi');
@define('NO_TRACKBACKS', 'Pas de suivis');
@define('TOPICS_OF', 'Sujets de');
@define('VIEW_FULL', 'Voir la totalité');
@define('VIEW_TOPICS', 'Voir les sujets');
@define('AT', 'à');
@define('SET_AS_TEMPLATE', 'Définir comme thème');
@define('VIEW_EXTENDED_ENTRY', 'Voir la suite de la news');
@define('IN', 'dans');
@define('EXCERPT', 'Excepté');
@define('TRACKED', 'Traqué');
@define('LINK_TO_ENTRY', 'Liens vers la news');
@define('LINK_TO_REMOTE_ENTRY', 'Lien vers la news haute');
@define('IP_ADDRESS', 'Adresse IP');
@define('USER', 'Utilisateur');
@define('THUMBNAIL_USING_OWN', 'Utiliser %s comme aperçu car elle est déjà trop petite.');
@define('THUMBNAIL_FAILED_COPY', 'Essai d\'utilisation de %s comme aperçu, mais copie échouée!');
@define('AUTHOR', 'Auteur');
@define('LAST_UPDATED', 'Dernière mise à jour');
@define('TRACKBACK_SPECIFIC', 'Suivi spécifique de l\'url de cette news');
@define('DIRECT_LINK', 'Lien direct pour cette news');
@define('COMMENT_ADDED', 'Votre commentaire a été ajouté avec succès.');
@define('COMMENT_ADDED_CLICK', 'Cliquez %sici pour retourner%s aux commentaires, et %sici pour fermer%s cette fenêtre.');
@define('COMMENT_NOT_ADDED', 'Votre commentaire n\'a pas pû être ajouté, car les commentaires pour cette news ont été désactivés. ');
@define('COMMENT_NOT_ADDED_CLICK', 'Cliquez %sici pour retourner%s aux commentaires, et %sici pour fermer%s cette fenêtre.');
@define('COMMENTS_DISABLE', 'Ne pas autoriser de commentaires pour cette news');
@define('COMMENTS_ENABLE', 'Autoriser des commentaires pour cette news');
@define('COMMENTS_CLOSED', 'L\'auteur n\'a pas autorisé de commentaires pour cette news');
@define('EMPTY_COMMENT', 'Votre commentaire est vide, donc %sretournez en arrière%s et réessayez');
@define('ENTRIES_FOR', 'News pour %s');
@define('TOPICS_FOR', 'Sujets pour %s');
@define('DOCUMENT_NOT_FOUND', 'Le document %s n\'a pas été trouvé.');
@define('USERNAME', 'Nom d\'utilisateur');
@define('PASSWORD', 'Mot de passe');
@define('AUTOMATIC_LOGIN', 'Enregistrer les informations');
@define('SERENDIPITY_INSTALLATION', 'Installation de Serendipity');
@define('LEFT', 'gauche');
@define('RIGHT', 'droite');
@define('HIDDEN', 'caché');
@define('REMOVE_TICKED_PLUGINS', 'Supprimer les plugins cochés');
@define('SAVE_CHANGES_TO_LAYOUT', 'Enregistrer les changements');
@define('COMMENTS_FROM', 'Commentaires de');
@define('ERROR', 'Erreur');
@define('ENTRY_SAVED', 'News enregistrée');
@define('DELETE_SURE', 'Etes vous sûr de vouloir supprimer #%s définitivement?');
@define('NOT_REALLY', 'Pas vraiment...');
@define('DUMP_IT', 'A mort!');
@define('RIP_ENTRY', 'La news #%s est annihilée');
@define('CATEGORY_DELETED', 'Catégorie #%s supprimée. Les anciens articles ont été déplacés dans la catégorie #%s');
@define('CATEGORY_REMAINING', 'Delete this category and move its entries to this category: %s');
@define('INVALID_CATEGORY', 'Aucune catégorie sélectionnée pour la suppression');
@define('CATEGORY_SAVED', 'Catégorie sauvegardée');
@define('SELECT_TEMPLATE', 'Sélectionnez le thème que vous voulez utiliser pour votre blog');
@define('ENTRIES_SUCCESSFULLY_INSERTED', 'News insérées avec succès!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Les news n\'ont pas été insérées!');
@define('VIEW_FEED_EXPORT', 'Voir l\'export');
@define('IMPORT', 'Importer');
@define('EXPORT', 'Exporter');
@define('YES', 'Oui');
@define('NO', 'Non');
@define('CHECK_N_SAVE', 'Vérifier &amp; sauvegarder');
@define('DIRECTORY_NOT_EXISTANT', 'Le répertoire %s n\'existe pas. Le créer.');
@define('DIRECTORY_WRITE_ERROR', 'Ne peut écrire dans le répertoire %s. Vérifiez les permissions.');
@define('DIRECTORY_CREATE_ERROR', 'Le répertoire %s n\'existe pas et ne peux être crée. Merci de créer le répertoire manuellement');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; exécute <i>%s %s</i>');
@define('CANT_EXECUTE_BINARY', 'Ne peux exécuter le binaire %s');
@define('FILE_WRITE_ERROR', 'Ne peux écrire sur le fichier %s.');
@define('FILE_CREATE_YOURSELF', 'Merci de créer le fichier vous même ou de vérifier les permissions');
@define('COPY_CODE_BELOW', '<br />* Copiez juste le code ci dessous et placez le %s dans votre %s répertoire:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', 'Changer www pour l\'utilisateur apache utilisé comme (exemple : personne).');
@define('BROWSER_RELOAD', 'Une fois ceci effectué, faites un refresh en pressant la touche "F5".');
@define('DIAGNOSTIC_ERROR', 'Plusieurs erreurs détectées lorsque la vérification des informations que vous avez entrées a été lancée:');
@define('ALL_VALID', 'Toutes les informations saisies semblent être valides.');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity n\'est pas encore intallé. <a href="%s">Cliquez ici pour l\'installer immédiatement</a>.');
@define('INCLUDE_ERROR', 'Erreur serendipity: ne peux inclure %s - fermeture.');
@define('DATABASE_ERROR', 'Erreur serendipity: ne peux se connecter à la base de données - fermeture.');
@define('ATTEMPT_SETUP_DATABASE', 'Attente de l\'installation de la base de données...');
@define('CHECK_DATABASE_EXISTS', 'Vérification en cours pour voir si la base de données est en place. Si vous voyez une requête d\'erreur ici, ignorez la...');
@define('CREATE_DATABASE', 'Création de la base de données par défaut...');
@define('DATABASE_DONE', 'Création de la base de données effectuée');
@define('ATTEMPT_WRITE_FILE', 'Attente de l\'écriture du fichier %s ...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity a été installé avec succès sur votre système.%s Merci de vous souvenir de votre mot de passe: "%s", votre nom d\'utilisateur est "%s".%sVous pouvez visualiser votre nouveau blog PHP <a href="%s">en cliquant ici</a>');
@define('WRITTEN_N_SAVED', 'Configuration écrite &amp; sauvegardée');
@define('IMAGE_ALIGNMENT', 'Alignement de l\'image');
@define('ENTER_NEW_NAME', 'Entrez le nouveau nom pour: ');
@define('IMAGE_MANAGER', 'Administration des images');
@define('RESIZING', 'Redimensionnement');
@define('RESIZE_DONE', 'Terminé (redimensionné %s images).');
@define('SYNCING', 'Synchronisation de la base de données avec le répertoire des images');
@define('SYNC_DONE', 'Terminé (synchronisé %s images).');
@define('DELETE_IMAGE', 'Supprimer l\'image intitulée <b>%s</b>');
@define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image <b>%s</b>');
@define('DELETE_THUMBNAIL', 'Suppression de l\'aperçu de l\'image intitulée <b>%s</b>');
@define('FILE_NOT_FOUND', 'Impossible de trouver le fichier intitulé <b>%s</b>, peut etre a t il déjà été supprimé?');
@define('ABOUT_TO_DELETE_FILE', 'Vous allez supprimer <b>%s</b><br />Si vous utilisez ce fichier dans des news, cela causera des liens morts<br />Etes vous sûr de vouloir continuer?<br /><br />');
@define('IMAGE_FULLSIZE', 'Pleine taille');
@define('IMAGE_RENAME', 'Renommer cette image');
@define('IMAGE_RESIZE', 'Redimensionner cette image');
@define('IMAGE_DELETE', 'Supprimer cette image');
@define('ABORT_NOW', 'Annuler maintenant');
@define('REMOTE_FILE_NOT_FOUND', 'Le fichier n\'a pas été trouvé sur le serveur, êtes vous sûr que l\'URL: <b>%s</b> est correcte?');
@define('FILE_FETCHED', '%s transformé en %s');
@define('FILE_UPLOADED', 'Le fichier %s a été uploadé avec succès en %s');
@define('WORD_OR', 'Ou');
@define('SCALING_IMAGE', 'Transformation %s en %s x %s px');
@define('KEEP_PROPORTIONS', 'Conserver les proportions');
@define('REALLY_SCALE_IMAGE', 'Réellement transformer l\'image ? Aucun moyen de retour, attention !');
@define('TOGGLE_ALL', 'Développer tous les menus');
@define('TOGGLE_OPTION', 'Développer ce menu');
@define('SUBSCRIBE_TO_THIS_ENTRY', 'S\'inscrire à cette news');
@define('UNSUBSCRIBE_OK', "%s est maintenant désinscrit de cette news");
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Nouveau commentaire à votre inscription de news "%s"');
@define('SUBSCRIPTION_MAIL', "Bonjour %s,\n\nUn nouveau commentaire a été posté dans la news que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo du posteur est: %s\n\nVous pouvez trouver la news ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "Bonjour %s,\n\nUn nouveau suivi a été enregistré dans la news que vous surveillez \"%s\", intitulé \"%s\"\nLe pseudo du posteur est: %s\n\nVous pouvez trouver la news ici: %s\n\nVous pouvez vous désinscrire en cliquant sur ce lien: %s\n");
@define('SIGNATURE', "\n-- \n%s existe grâce à Serendipity.\nLe blog des blog, que vous pouvez aussi utiliser!.\nAllez sur <http://s9y.org> le site officiel.");
@define('DATABASE_ALREADY_INSTALLED', 'PASSE: La base de données est déjà installée');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91');
@define('SYNDICATION_PLUGIN_10', 'RSS 1.0');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0');
@define('SYNDICATION_PLUGIN_20c', 'Commentaires RSS 2.0');
@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Champ "EditeurAdministration"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Champ "Webmaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'Image pour les liens RSS');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Largeur de l\'image');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Hauteur de l\'image');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'Adresse E-Mail du webmaster, si disponible. (vide: caché) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'Adresse E-Mail de l\'éditeur d\'administration, si disponible. (vide: caché) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL d\'une image au format GIF/JPEG/PNG, si disponible. (vide: logo serendipity)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'En pixels, max.144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'En pixels, max. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Champ "ttl" (temps-réel)');
@define('SYNDICATION_PLUGIN_TTL_DESC', 'Temps en minutes après lequel votre blog ne devrait pas être caché des autres programmes/sites (vide: caché) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Champ "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Est ce que le champ "pubDate"-doit être relu régulièrement pour un channel RSS, pour montrer la date de la dernière news?');
@define('CONTENT', 'Contenu');
@define('TYPE', 'Type');
@define('DRAFT', 'Programmer');
@define('PUBLISH', 'Publier');
@define('PREVIEW', 'Prévisualiser');
@define('DATE', 'Date');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'Attention: La date entrée est invalide. Elle doit être donnée au format YYYY-MM-DD HH:MM .');
@define('CATEGORY_PLUGIN_DESC', 'Montrer la liste des catégories.');
@define('ALL_AUTHORS', 'Tous les auteurs');
@define('CATEGORIES_TO_FETCH', 'Catégories à diviser');
@define('CATEGORIES_TO_FETCH_DESC', 'Diviser les catégories par auteur?');
@define('PAGE_BROWSE', 'La page %s de %s, totalise %s news');
@define('PREVIOUS_PAGE', 'Page précédente');
@define('NEXT_PAGE', 'Page suivante');
@define('ALL_CATEGORIES', 'Toutes les catégories');
@define('DO_MARKUP', 'Transformations de code');
@define('DO_MARKUP_DESCRIPTION', 'Appliquer les transformations de code au texte (smileys, raccourcis via *, /, _, ...). Le désactiver préserva tout le code HTML dans le texte. "Oui" est par défaut.');
@define('GENERAL_PLUGIN_DATEFORMAT', 'Format de la date');
@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Le format de date des news actuelles, utilisant la variable PHPs strftime(). (Défaut: "%s")');
@define('GENERAL_PLUGIN_LANGUAGE', 'Language');
@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Quel est votre language utilisé pour la date et le format du texte? ("en|de", défaut "en")');
@define('ERROR_TEMPLATE_FILE', 'Impossible d\'ouvrir le fichier du thème, merci de mettre Serendipity à jour!');
@define('ADVANCED_OPTIONS', 'Options avancées');
@define('EDIT_ENTRY', 'Editer les news');
@define('HTACCESS_ERROR', 'Pour vérifier votre installation locale de serveur web, serendipity doit être autorisé à réécrire le fichier ".htaccess". Cela n\'a pas pû être possible à cause d\'erreurs de permission. Merci d\'ajuster les permissions comme ceci: <br />&nbsp;&nbsp;%s<br />et rechargez cette page en pressant la touche "F5".');
@define('SIDEBAR_PLUGINS', 'Plugins sur le côté');
@define('EVENT_PLUGINS', 'Plugins d\'évènements');
@define('SORT_ORDER', 'Trier par ordre');
@define('SORT_ORDER_NAME', 'Nom du fichier');
@define('SORT_ORDER_EXTENSION', 'Extension du fichier');
@define('SORT_ORDER_SIZE', 'Taille du fichier');
@define('SORT_ORDER_WIDTH', 'Largeur de l\'image');
@define('SORT_ORDER_HEIGHT', 'Hauteur de l\'image');
@define('SORT_ORDER_DATE', 'Date de l\'upload');
@define('SORT_ORDER_ASC', 'Ascendant');
@define('SORT_ORDER_DESC', 'Descendant');
@define('THUMBNAIL_SHORT', 'Aperçu');
@define('ORIGINAL_SHORT', 'Orig.');
@define('IMAGES_PER_PAGE', 'Images par page');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prévenir les liens HTTP cachés');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
@define('APPLY_MARKUP_TO', 'Appliquer la marque à %s');
@define('CALENDAR_BEGINNING_OF_WEEK', 'Début de la semaine');
@define('CALENDAR_BOW_DESC', 'Une fonction intégrée qui décrit quel jour de la semaine la semaine démarre, Les valeurs sont: 0 = Dimanche, 1 = Lundi ... 6 = Samedi (défaut: 1)');
@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity a détecté que votre configuration est actuellement installée en version %s, et Serendipity lui même est installé en version %s, vous devez le mettre à jour! <a href="%s">Cliquez ici</a>');
@define('SERENDIPITY_UPGRADER_WELCOME', 'Bonjour, et bienvenue dans l\'agent de mise à jour de Serendipity.');
@define('SERENDIPITY_UPGRADER_PURPOSE', 'Je suis ici pour vous aider à mettre à jour votre installation %s de Serendipity.');
@define('SERENDIPITY_UPGRADER_WHY', 'Vous voyez ce message car vous avez juste installé Serendipity %s, mais vous n\'avez pas encore mis à jour la base de données pour ladite version');
@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Mises à jour de la base de données (%s)');
@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'J\'ai trouvé le fichier .sql qui a besoin d\'être lancé avant de continuer l\'opération en cours de Serendipity');
@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Tâche spécifiques à la version');
@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Aucune tâches spécifiques à la version n\'ont été trouvées');
@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Voulez vous que je réalise les tâches suivantes?');
@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Non, je vais le faire manuellement');
@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Oui, faites le s\'il vous plait');
@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Il apparait que vous n\'avez besoin d\'aucune mise à jour pour fonctionner');
@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Considérez Serendipity comme mis à jour');
@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Vous avez ignoré la mise à jour de Serendipity, merci de vérifier que votre base de données est installée correctement, et les fonctions planifiées s\'éxecuteront');
@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Votre installation de Serendipity est maintenant mise à jour à la version %s');
@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Vous pouvez retourner sur votre blog en %scliquant ici%s');
@define('IMAGE_NAME', 'Sauvegarder l\'image qui utilise le nom de fichier (vide: utilise le nom de fichier d\'origine): ');

/* TRANSLATE */
@define('MANAGE_USERS', 'Manage users');
@define('EDIT_USERS', 'Edit users');
@define('CREATE_USERS', 'Create users');
@define('CREATE_NEW_USER', 'Create new user');
@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
@define('CREATED_USER', 'A new user %s has been created');
@define('MODIFIED_USER', 'The properties of user %s have been changed');
@define('USER_SELF_INFO', 'You are: #%d %s, userlevel %s');
@define('USER_LEVEL', 'Userlevel: %s');
@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
@define('DELETED_USER', 'User #%d %s deleted.');

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



Index: serendipity_config_local_da.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_da.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_da.tpl	4 Apr 2004 16:12:38 -0000	1.1
+++ serendipity_config_local_da.tpl	5 Apr 2004 09:08:46 -0000	1.2
@@ -28,7 +28,7 @@
 $serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
 $serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
 $serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
-$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French|0}';      // Select the language for your blog
 
 // Appearance and options
 # Customize how Serendipity looks and feels

--- NEW FILE: serendipity_config_local_fr.tpl ---
<?php # $Id: serendipity_config_local_fr.tpl,v 1.1 2004/04/05 09:08:46 garvinhicking Exp $

// Database Settings
#  Here you can enter all your database information. Serendipity needs this to be able to function
$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Hostname
$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_

// Paths
# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index

// General settings
# Customize how Serendipity behaves
$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French|0}';      // Select the language for your blog

// Appearance and options
# Customize how Serendipity looks and feels
$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.

// Imageconversion Settings
# Enter general information about how serendipity should handle Images
$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
?>

Index: serendipity_config_local_de.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_de.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_de.tpl	4 Apr 2004 16:12:38 -0000	1.1
+++ serendipity_config_local_de.tpl	5 Apr 2004 09:08:46 -0000	1.2
@@ -28,7 +28,7 @@
 $serendipity['allowSubscriptions']   = '{Abonnieren von Einträgen erlauben?|allowSubscriptions|bool|1|255}'    // Soll es den Besuchern des Blogs möglich sein, einen Eintrag zu abonnieren und so alle neuen Kommentare dazu per E-Mail erhalten?
 $serendipity['blogTitle']            = '{Blog Titel|blogTitle|string|Max Mustermanns Blog|1|global}';             // Der Titel des Blogs
 $serendipity['blogDescription']      = '{Blog Beschreibung|blogDescription|string|Mein kleiner Platz im Web...|1|global}';   // Die Beschreibung des Blogs
-$serendipity['lang']                 = '{Sprache|lang|list|en=>Englisch,de=>Deutsch,da=>Dänish,es=>Spanisch|0}';      // Wählen Sie die Sprache des Blogs
+$serendipity['lang']                 = '{Sprache|lang|list|en=>Englisch,de=>Deutsch,da=>Dänish,es=>Spanisch,fr=>Französisch|0}';      // Wählen Sie die Sprache des Blogs
 
 // Design und Optionen
 # Legt fest wie Serendipity aussieht

[php-blog-cvs] serendipity NEWS,1.104,1.105

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

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

Modified Files:
	NEWS 
Log Message:
added french language, thanks to renaud lavigne


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- NEWS	4 Apr 2004 16:26:24 -0000	1.104
+++ NEWS	5 Apr 2004 09:08:45 -0000	1.105
@@ -3,6 +3,11 @@
 Version 0.6.1 ()
 ------------------------------------------------------------------------
 
+    * Added french language, translated by Renaud Lavigne
+
+    * Fixed some issues on windows servers. Patch by Richard Thomas
+      Harrison
+
     * Improvements for multi-user interface:
        - Configuration is stored per-user (language, WYSIWYG-preference,
          and possibly others)
@@ -71,9 +76,9 @@
     * Relaxed umask/chmod file and directory creation
       (garvinhicking)
 
-    * Abstract archives/URL locations and regex-patterns in a central 
+    * 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)

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.4,1.5

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

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
patches for windows compatibility, by Richard Thomas Harrison


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_plugin_recententries.php	3 Apr 2004 17:36:19 -0000	1.4
+++ serendipity_plugin_recententries.php	5 Apr 2004 08:07:54 -0000	1.5
@@ -9,7 +9,7 @@
         @define('PLUGIN_RECENTENTRIES_NUMBER', 'Anzahl der Einträge');
         @define('PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH', 'Wieviele Einträge sollen angezeigt werden? (Standard: 10)');
         break;
-    
+
     case 'en':
     case 'es':
     default:
@@ -73,17 +73,19 @@
                                        ORDER BY timestamp DESC
                                           LIMIT $number");
 
-        foreach ($entries as $k => $entry) {
-            $entryLink = serendipity_archiveURL(
-                           $entry['id'],
-                           $entry['title'],
-                           'serendipityHTTPPath'
-                        );
+        if (isset($entries) && is_array($entries)) {
+            foreach ($entries as $k => $entry) {
+                $entryLink = serendipity_archiveURL(
+                               $entry['id'],
+                               $entry['title'],
+                               'serendipityHTTPPath'
+                            );
 
-            echo '<a href="' . $entryLink . '" title="' . htmlentities($entry['title']) . '">' . $entry['title'] . '</a><br />'
-                 . '<div class="serendipitySideBarDate">'
-                 . htmlentities(strftime($dateformat, $entry['timestamp']))
-                 . '</div><br />';
+                echo '<a href="' . $entryLink . '" title="' . htmlentities($entry['title']) . '">' . $entry['title'] . '</a><br />'
+                     . '<div class="serendipitySideBarDate">'
+                     . htmlentities(strftime($dateformat, $entry['timestamp']))
+                     . '</div><br />';
+            }
         }
     }
 }

[php-blog-cvs] serendipity compat.php,1.15,1.16 serendipity_config.inc.php,1.65,1.66

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

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

Modified Files:
	compat.php serendipity_config.inc.php 
Log Message:
patches for windows compatibility, by Richard Thomas Harrison


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- serendipity_config.inc.php	4 Apr 2004 16:59:06 -0000	1.65
+++ serendipity_config.inc.php	5 Apr 2004 08:07:53 -0000	1.66
@@ -176,7 +176,7 @@
 }
 
 $old_include = @ini_get('include_path');
-@ini_set('include_path', $serendipity['serendipityPath'] . ':' . $serendipity['serendipityPath'] . 'bundled-libs/:' . $old_include);
+@ini_set('include_path', $serendipity['serendipityPath'] . PATH_SEPARATOR . $serendipity['serendipityPath'] . 'bundled-libs/' . PATH_SEPARATOR . $old_include);
 
 $serendipity['user']  = isset($_SESSION['serendipityUser'])  ? $_SESSION['serendipityUser']  : '';
 $serendipity['email'] = isset($_SESSION['serendipityEmail']) ? $_SESSION['serendipityEmail'] : '';

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- compat.php	4 Apr 2004 16:24:46 -0000	1.15
+++ compat.php	5 Apr 2004 08:07:53 -0000	1.16
@@ -12,7 +12,7 @@
         }
 
         return $data;
-    } 
+    }
 }
 
 if (!isset($_REQUEST)) {
@@ -74,7 +74,7 @@
         array_walk($_COOKIE, 'serendipity_strip_quotes');
     }
 
-    if (@count($_FILES)) {
+    if (@count($_FILES) && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
         array_walk($_FILES,   'serendipity_strip_quotes');
     }
 }
@@ -89,13 +89,13 @@
 function serendipity_get_bool($item) {
     $translation = array('true'  => true,
                          'false' => false);
-                         
+
     if (isset($translation[$item])) {
         return $translation[$item];
     } else {
         return $item;
     }
-} 
+}
 
 function serendipity_version($version) {
     return preg_replace('@\-.+$@', '', $version);

[php-blog-cvs] serendipity serendipity_config.inc.php,1.64,1.65

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Fix problem with upgrade text not being shown when an upgrade is needed


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- serendipity_config.inc.php	4 Apr 2004 16:24:46 -0000	1.64
+++ serendipity_config.inc.php	4 Apr 2004 16:59:06 -0000	1.65
@@ -33,6 +33,8 @@
 $serendipity['allowCommentsDefault'] = true;
 
 
+define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
+
 /*
  *   Load main language file
  */
@@ -155,8 +157,6 @@
 /*
  *  Check if the installed version is highter than the version of the config
  */
-define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
-
 if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) {
     die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], 'serendipity_admin.php'));
 }

[php-blog-cvs] serendipity README,1.6,1.7

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

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

Modified Files:
	README 
Log Message:
Multi-user


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	4 Apr 2004 15:10:24 -0000	1.6
+++ README	4 Apr 2004 16:26:54 -0000	1.7
@@ -373,6 +373,69 @@
 feed URLs from your blog.
 
 ########################################################################
+# USER MANAGEMENT                                                      #
+########################################################################
+
+New users can be created by inserting them to the 'authors' table.
+
+The field 'userlevel' is a special field describing which actions a
+user may have:
+
+- Userlevel 0:   Standard editor. Cannot apply many administrative tasks
+
+- Userlevel 1:   Chief editor. Can apply some administrative tasks (like
+                 title of the blog, ...
+
+- Userlevel 255: Admin. Can change everything.
+
+Userlevels are cumulative, thus a user with level '30' can do anything
+which users of a lower level can do. Currently only the levels mentioned
+above are used.
+
+Here is a short chart of what users can do:
+
+ACTION                                               |editor|chief|admin
+-----------------------------------------------------|------|-----|-----
+Manage private plugins                               |   -     +     +
+Manage global plugins                                |   -     -     +
+Manage order of plugins                              |   -     +     +
+Manage configuration of private plugins              |   -     +     +
+Manage configuration of all protected plugins        |   -     -     +
+Manage configuration of private protected plugins    |   +     +     +
+
+Manage all categories                                |   -     +     +
+Manage public categories                             |   +     +     +
+Manage private categories                            |   +     +     +
+Manage global configuration                          |   -     -     +
+
+Manage basic configuration                           |   -     +     +
+Manage private configuration                         |   +     +     +
+
+Manage templates                                     |   -     +     +
+
+Manage 'admin' users                                 |   -     -     +
+Manage 'chief' users                                 |   -     +     +
+Manage 'editor' users                                |   -     +     +
+
+Manage private entries                               |   +     +     +
+Manage others entries                                |   -     +     +
+Manage comments/trackbacks to private entries        |   +     +     +
+Manage comments/trackbacks to others entries         |   -     +     +
+
+View/Link/Upload all pictures                        |   +     +     +
+View/Link/Upload private pictures                    |   +     +     +
+View/Link/Upload public pictures                     |   +     +     +
+
+Edit all pictures                                    |   -     +     +
+Edit public pictures                                 |   +     +     +
+Edit private pictures                                |   +     +     +
+------------------------------------------------------------------------
+
+It is advised that in shared setups only the webmaster has an admin-
+access. The users should be given a chief-login, and them theirselves
+can distribute user logins.
+
+########################################################################
 
 Serendipity Weblog - http://s9y.org
 

[php-blog-cvs] serendipity NEWS,1.103,1.104

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

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

Modified Files:
	NEWS 
Log Message:
That's my multi-user proposal. My machine wasn't diffing subdirectories,
must be some debian sarge issue, so I decided to immediately commit it.

Please raise your voice and tell me your opinions. Was some piece of hard
work! :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- NEWS	2 Apr 2004 09:09:28 -0000	1.103
+++ NEWS	4 Apr 2004 16:26:24 -0000	1.104
@@ -1,5 +1,26 @@
 # $Id$
 
+Version 0.6.1 ()
+------------------------------------------------------------------------
+
+    * Improvements for multi-user interface:
+       - Configuration is stored per-user (language, WYSIWYG-preference,
+         and possibly others)
+       - passwords/usernames/E-Mail adresses can be changed
+       - introduction of userlevels (admin, chief, editor)
+       - public/private categories
+       - plugins are stored per-user. Admin-created plugins cannot be
+         removed by chiefs/users, protected plugins (HTML nuggets) can
+         only be configured by the owner or admin users
+       - manage/create users
+       - entries are stored per-user and can only be changed by the
+         author or chief/admin users. Comments can only be toggled on/
+         off and removed by the author or chief/admin users.
+       - public/private images
+       (garvinhicking)
+
+    * Configuration is now language-dependant. (garvinhicking)
+
 Version 0.6 ()
 ------------------------------------------------------------------------
 

[php-blog-cvs] serendipity serendipity_admin_users.inc.php,NONE,1.1 compat.php,1.14,1.15 rss.php,1.23,1.24 serendipity_admin_category.inc.php,1.8,1.9 serendipity_admin_images.inc.php,1.20,1.21 serendipity_admin_installer.inc.php,1.59,1.60 serendipity_admin_templates.inc.php,1.4,1.5 serendipity_config.inc.php,1.63,1.64 serendipity_entries.php,1.27,1.28 serendipity_functions.inc.php,1.248,1.249 serendipity_functions_config.inc.php,1.5,1.6 serendipity_functions_images.inc.php,1.8,1.9 serendipity_functions_installer.inc.php,1.2,1.3 serendipity_config_local.tpl,1.36,NONE

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

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

Modified Files:
	compat.php rss.php serendipity_admin_category.inc.php 
	serendipity_admin_images.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_admin_templates.inc.php serendipity_config.inc.php 
	serendipity_entries.php serendipity_functions.inc.php 
	serendipity_functions_config.inc.php 
	serendipity_functions_images.inc.php 
	serendipity_functions_installer.inc.php 
Added Files:
	serendipity_admin_users.inc.php 
Removed Files:
	serendipity_config_local.tpl 
Log Message:
multi-user #5


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_admin_installer.inc.php	21 Mar 2004 16:35:31 -0000	1.59
+++ serendipity_admin_installer.inc.php	4 Apr 2004 16:24:46 -0000	1.60
@@ -6,515 +6,12 @@
 
 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 $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
-
-        case 'serendipityHTTPPath':
-            return rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/';
-
-        case 'baseURL':
-            $ssl  = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on';
-            $port = $_SERVER['SERVER_PORT'];
-
-            return sprintf('http%s://%s%s%s',
-
-                            $ssl ? 's' : '',
-                            preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']),
-                            (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
-                            rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/'
-                   );
-
-        case 'convert':
-            if (isset($_EVN['PATH'])) {
-                $path = explode(':', $_ENV['PATH']);
-            } else {
-                $path = '';
-            }
-
-            /* add some other possible locations to the path while we are at it,
-             * as these are not always included in the apache path */
-            $path[] = '/usr/X11R6/bin';
-            $path[] = '/usr/bin';
-
-            foreach ($path as $dir) {
-                if (function_exists('is_executable') && @is_executable($dir . '/convert') || @is_file($dir . '/convert')) {
-                    return $dir . '/convert';
-                }
-            }
-            return $default;
-
-        default:
-            return $default;
-    }
-}
-
-function serendipity_parseTemplate($n, $raw = false) {
-    global $serendipity;
-    $config = array();
-
-    $t = file($n, 1);
-    for ($x=0; $x<count($t); $x++) {
-        $l = $t[$x];
-        $l = trim($l);
-
-        if ($l != '') {
-            switch ($l[0]) {
-
-                // New Configure section
-                case '/':
-                    if ($l[1] == '/') {
-                        $current = trim(substr($l, 2));
-                        $config['categories'][$current] = array();
-                    }
-                    break;
-
-                case '#':
-                    $config['descriptions'][$current] =  trim(substr($l, 1));
-                    break;
-
-                // A configure option
-                case '$':
-                    // Grep out the name, type and default
-                    preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
-                    $c    = explode('|', $match[1]);
-                    $cdef = serendipity_query_default($c[1], $c[3]);
-                    $config['categories'][$current][] = $configRaw[] = array(
-                                            'longname'    => $c[0],
-                                            'name'        => $c[1],
-                                            'type'        => $c[2],
-                                            'default'     => $cdef,
-                                            'distdefault' => $c[3],
-                                            'desc'        => $match[3]
-                                          );
-                    break;
-            }
-        }
-    }
-
-    if ($raw) {
-        return $configRaw;
-    } else {
-        return $config;
-    }
-}
-
-function serendipity_guessInput($type, $name, $value='', $default='') {
-global $serendipity;
-
-    if ($name == 'rewrite' && $default == $value && isset($serendipity['rewrite_default']) && $serendipity['rewrite_default'] != '') {
-        $value = $serendipity['rewrite_default'];
-    }
-    
-    switch ($type) {
-        case 'bool' :
-            $value = serendipity_get_bool($value);
-            echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
-            echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label>&nbsp;';
-            echo '<input id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
-            echo (($value == true) ? '' : 'checked="checked"'). ' /><label for="radio_cfg_' . $name . '_no"> ' . NO . '</label>';
-            break;
-
-        case 'protected' :
-            echo '<input type="password" size="30" name="' . $name . '" value="' . htmlentities($value) . '" />';
-            break;
-        case 'list' :
-            preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $default, $res);
-            echo '<select name="'. $name .'">';
-            for ($x=0; $x<sizeof($res[1]); $x++) {
-                printf('<option value="%s"%s>%s</option>'. "\n",
-                      $res[1][$x], 
-                      (($res[1][$x] == $value) ? ' selected="selected"' : ''), 
-                      $res[2][$x]);
-            }
-            echo '</select>';
-            break;
-        default :
-            echo '<input type="text" size="30" name="' . $name . '" value="' . htmlentities($value) . '" />';
-            break;
-    }
-}
-
-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) {
-        $old_htaccess = @file_get_contents('./.htaccess');
-        $fp = @fopen('./.htaccess', 'w');
-        $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
-
-        if (!$fp) {
-            printf(HTACCESS_ERROR,
-              '<b>chmod go+rwx ' . getcwd() . '/</b>'
-            );
-            $abort = true;
-        } else {
-            fwrite($fp, 'ErrorDocument 404 ' . $serendipity_root . 'index.php');
-            fclose($fp);
-
-            // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
-            $sock = fsockopen(preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']), $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
-            $response = '';
-
-            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);
-            }
-            
-            if (preg_match('@^HTTP/\d\.\d 200@', $response)) {
-                $serendipity['rewrite_default'] = 'errordocs';
-            } else {
-                $serendipity['rewrite_default'] = 'none';
-            }
-            
-            if (!empty($old_htacces)) {
-                $fp = @fopen('./.htaccess', 'w');
-                fwrite($fp, $old_htaccess);
-                fclose($fp);
-            } else {
-                unlink('./.htaccess');
-            }
-        }
-    }
-    
-    if ($abort === false) {
-?>
-<script type="text/javascript" language="JavaScript">
-function showConfig(id) {
-    if (document.getElementById) {
-        el = document.getElementById(id);
-        if (el.style.display == 'none') {
-            document.getElementById('option' + id).src = 'pixel/minus.png';
-            el.style.display = '';
-        } else {
-            document.getElementById('option' + id).src = 'pixel/plus.png';
-            el.style.display = 'none';
-        }
-    }
-}
-
-var state='';
-function showConfigAll(count) {
-    if (document.getElementById) {
-        for (i = 1; i <= count; i++) {
-            document.getElementById('el' + i).style.display = state;
-            document.getElementById('optionel' + i).src = 'pixel/' + (state == '' ? 'minus.png' : 'plus.png');
-        }
-
-        if (state == '') {
-            document.getElementById('optionall').src = 'pixel/minus.png';
-            state = 'none';
-        } else {
-            document.getElementById('optionall').src = 'pixel/plus.png';
-            state = '';
-        }
-    }
-}
-</script>
-
-<form action="?" method="POST">
-    <div>
-        <input type="hidden" name="serendipity[adminModule]" value="installer" />
-        <input type="hidden" name="installAction" value="check" />
-        <br />
-        <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
-        </div>
-<?php
-        $el_count = 0;
-        foreach ($t['categories'] as $key => $value) {
-            $el_count++;
-?>
-        <table width="100%" cellspacing="2">
-            <tr>
-                <th align="left" colspan="2" style="padding-left: 15px;">
-                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
-            </tr>
-
-            <tr>
-                <td>
-                    <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo (IS_installed === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
-                        <tr>
-                            <td style="padding-left: 20px;" colspan="2">
-                                <?php echo $t['descriptions'][$key] ?>
-                            </td>
-                        </tr>
-
-
-<?php
-            for ($x=0; $x<count($value); $x++) {
-                /* If we have a valuelist, then use the value from there */
-                if (@is_array($from)) {
-                    $value[$x]['value'] = $from[$value[$x]['name']];
-                }
-                
-                /* If the value is never assigned in the valuelist, then use our default value */
-                if (!isset($from[$value[$x]['name']])) {
-                    $value[$x]['value'] = $value[$x]['default'];
-                }
-?>
-                        <tr>
-                            <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">
-                                <strong><?php echo $value[$x]['longname']; ?></strong>
-                                <br />
-                                <span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
-                            </td>
-                            <td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="25%">
-                                <?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $value[$x]['value'], $value[$x]['distdefault']); ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?>
-                            </td>
-                        </tr>
-<?php
-            }
-?>
-                    </table><br /><br />
-                </td>
-            </tr>
-        </table>
-<?php
-        }
-?>
-        <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" />
-    </div>
-</form>
-<?php
-    }
-}
-
-function serendipity_parse_sql_tables($filename) {
-    $in_table = 0;
-    $queries = array();
-
-    $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);
-    }
-    
-    return $queries;
-}
-
-function serendipity_checkInstallation() {
-    global $serendipity, $umask;
-
-    $errs = array();
-    
-    // Check dirs
-    if (!is_dir($_POST['serendipityPath'])) {
-        $errs[] = sprintf(DIRECTORY_NON_EXISTANT, $_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) {
-        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_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) {
-        $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
-
-    // Check imagick
-    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)
-    @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 (count($errs) > 0 ? $errs : '');
-}
-
-function serendipity_installDatabase() {
-    global $serendipity;
-
-    /* Try and check if the database/tables are already installed,
-       if they are... exit the function */
-    echo CHECK_DATABASE_EXISTS;
-    $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors");
-    echo ' ' . DONE . '<br />';
-
-    if (is_array($t)) {
-        return false;
-    }
-
-    echo CREATE_DATABASE;
-    // Create tables
-    $queries = serendipity_parse_sql_tables($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) {
-        $mail_comments = 1;
-    } else {
-        $mail_comments = 0;
-    }
-    echo ' ' . DONE . '<br />';
-
-    /*
-        ------------- Install main author ------------
-    */
-    $enc_pass = md5($_POST['pass']);
-    $query = "INSERT INTO {$_POST['dbPrefix']}authors (
-                            username,
-                            password,
-                            email,
-                            mail_comments
-                          )
-                  VALUES  (
-                            '{$_POST['user']}',
-                            '$enc_pass',
-                            '{$_POST['email']}',
-                            $mail_comments
-                          )";
-    serendipity_db_query($query);
-
-    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(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') {
-        $template = 'htaccess.rewrite.tpl';
-    } elseif ($_POST['rewrite'] == 'errordocs') {
-        $template = 'htaccess.errordocs.tpl';
-    } else {
-        $template = 'htaccess.normal.tpl';
-    }
-
-    if (!($a = file($serendipity['serendipityPath'] . $template, 1))) {
-        $err[] = ERROR_TEMPLATE_FILE;
-    }
-
-    $fp = @fopen('./.htaccess', 'w');
-
-    $content = str_replace(
-                 array(
-                   '{PREFIX}',
-                   '{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'],
-                   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)
-              );
-
-    if (!$fp) {
-        $errs[] = sprintf(FILE_WRITE_ERROR, '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', htmlspecialchars($content));
-        return $errs;
-    } else {
-        // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.
-        if ($htaccess != '' && preg_match('@^(.*)#\s+BEGIN\s+s9y.*#\s+END\s+s9y(.*)$@isU', $htaccess, $match)) {
-            // Code outside from s9y-code was found.
-            fwrite($fp, $match[1] . $content . $match[2]);
-        } else {
-            fwrite($fp, $content);
-        }
-        fclose($fp);
-        return true;
-    }
-
-}
-
-function serendipity_updateConfiguration() {
-    global $serendipity, $umask;
-
-    // Save all basic config variables to the database
-    $p = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, true);
-
-    foreach($p as $key => $entry) {
-        serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
-    }
-    
-    return serendipity_updateLocalConfig($_POST['dbName'], 
-                                         $_POST['dbPrefix'], 
-                                         $_POST['dbHost'], 
-                                         $_POST['dbUser'], 
-                                         $_POST['dbPass'], 
-                                         $_POST['dbType'], 
-                                         'serendipity_config_local.inc.php', 
-                                         $_POST['serendipityPath']);
+if (isset($serendipity['lang']) && !empty($serendipity['lang']) && file_exists(S9Y_INCLUDE_PATH . 'lang/serendipity_config_local_' . $serendipity['lang'] . '.tpl')) {
+    define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_local_' . $serendipity['lang'] . '.tpl');
+    define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_user_' . $serendipity['lang'] . '.tpl');
+} else {
+    define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_local_en.tpl');
+    define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_user_en.tpl');
 }
 
 if (!isset($_POST['installAction'])) {
@@ -594,7 +91,7 @@
             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 (isset($_POST['rewrite']) && $serendipity['serendipityUserLevel'] >= USERLEVEL_ADMIN && $serendipity['rewrite'] != $_POST['rewrite']) {
                 printf(ATTEMPT_WRITE_FILE, '.htaccess');
                 $res = serendipity_installFiles();
                 if (is_array($res)) {
@@ -622,7 +119,14 @@
             $from = false;
         }
 
-        serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $from);
+        $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);
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_admin_templates.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_templates.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_templates.inc.php	5 Aug 2003 14:07:40 -0000	1.4
+++ serendipity_admin_templates.inc.php	4 Apr 2004 16:24:46 -0000	1.5
@@ -4,6 +4,10 @@
     die ("Don't hack!");
 }
 
+if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+    return;
+}
+
 if ($serendipity['GET']['adminAction'] == 'save' ) {
     serendipity_saveTemplateSelection($serendipity['POST']['theme']);
 }

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_entries.php	26 Mar 2004 16:47:22 -0000	1.27
+++ serendipity_entries.php	4 Apr 2004 16:24:47 -0000	1.28
@@ -42,7 +42,7 @@
 <?php
 }
 ?>
-
+    <h2>[<?php printf(USER_SELF_INFO, $serendipity['authorid'], $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']); ?>]</h2>
     </div>
 
     <table id="mainpane">

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_admin_images.inc.php	3 Apr 2004 17:36:16 -0000	1.20
+++ serendipity_admin_images.inc.php	4 Apr 2004 16:24:46 -0000	1.21
@@ -40,6 +40,11 @@
 
     case 'delete':
         $file     = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+            return;
+        }
+
         $abortLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_entries.php?serendipity[adminModule]=images';
         $newLoc   = $abortLoc . '&serendipity[adminAction]=DoDelete&serendipity[fid]=' . $serendipity['GET']['fid'];
 
@@ -57,6 +62,11 @@
 
     case 'rename':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+            return;
+        }
+
         $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)) {
@@ -95,6 +105,8 @@
     <br /><br />
 <?php
 
+    $authorid = (isset($serendipity['POST']['all_authors']) && $serendipity['POST']['all_authors'] == 'true') ? '0' : $serendipity['authorid'];
+
     // First find out whether to fetch a file or accept an upload
     if ($serendipity['POST']['imageurl'] != '' && $serendipity['POST']['imageurl'] != 'http://') {
         if (!empty($serendipity['POST']['target_filename'])) {
@@ -119,7 +131,7 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                serendipity_makeThumbnail($tfile);
+                serendipity_makeThumbnail($tfile, false, $authorid);
                 echo THUMB_CREATED_DONE . '<br />';
             }
         }
@@ -142,7 +154,7 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                serendipity_makeThumbnail($tfile);
+                serendipity_makeThumbnail($tfile, false, $authorid);
                 echo THUMB_CREATED_DONE . '<br />';
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
@@ -194,7 +206,7 @@
                 </tr>
 
                 <tr>
-                    <td align="right" colspan="2"><input type="submit" value="<?php echo GO; ?>" /></td>
+                    <td align="right" colspan="2"><input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /><label for="all_authors"><?php echo ALL_AUTHORS; ?></label> <input type="submit" value="<?php echo GO; ?>" /></td>
                 </tr>
             </table>
         </div>
@@ -204,6 +216,11 @@
 
     case 'scale':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+            return;
+        }
+
         printf(
           SCALING_IMAGE . '<br />',
 
@@ -224,6 +241,11 @@
 
     case 'scaleSelect':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+            return;
+        }
+
         $s = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $file['name'] .'.'. $file['extension']);
 ?>
     <script type="text/javascript" language="javascript">

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- serendipity_functions.inc.php	2 Apr 2004 12:34:58 -0000	1.248
+++ serendipity_functions.inc.php	4 Apr 2004 16:24:47 -0000	1.249
@@ -29,8 +29,7 @@
     }
 
     if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
-
-        if ( empty($serendipity['POST']['auto']) ) {
+        if (empty($serendipity['POST']['auto'])) {
             serendipity_deleteCookie('author_information');
             return false;
         } else {
@@ -41,7 +40,7 @@
         }
     } elseif ( isset($serendipity['COOKIE']['author_information']) ) {
         $cookie = unserialize(base64_decode($serendipity['COOKIE']['author_information']));
-        if ( serendipity_authenticate_author($cookie['username'], $cookie['password']) ) {
+        if (serendipity_authenticate_author($cookie['username'], $cookie['password'])) {
             return true;
         } else {
             serendipity_deleteCookie('author_information');
@@ -98,7 +97,7 @@
     global $serendipity;
 
     $directories = array(
-      (isset($serendipity['CONFIG']) ? $serendipity['CONFIG']['template'] . '/' : ''),
+      (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''),
       'default/'
     );
 
@@ -597,6 +596,14 @@
         }
     }
 
+    if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+        if (!empty($and)) {
+            $and .= " AND e.authorid = '" . $serendipity['authorid'] . "'";
+        } else {
+            $and = "WHERE e.authorid = '" . $serendipity['authorid'] . "'";
+        }
+    }
+
     $query = "SELECT
                     e.id,
                     e.title,
@@ -646,6 +653,11 @@
     if ($fetchDrafts == 'false') {
         $drafts = "AND isdraft = 'false'";
     }
+    
+    $admin = '';
+    if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+        $admin = " AND e.authorid = '" . $serendipity['authorid'] . "'";
+    }
 
     $querystring = "SELECT
                             *,
@@ -661,6 +673,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND $key LIKE $val
+                            $admin
                             $drafts
                     LIMIT 1";
 
@@ -674,20 +687,32 @@
     global $serendipity;
 
     if (!isset($authorid) || $authorid === null) {
-        $authorid = (isset($serendipity['authorid']) ? $serendipity['authorid'] : 1);
+        $authorid = ((isset($serendipity['authorid']) && !empty($serendipity['GET']['adminModule'])) ? $serendipity['authorid'] : 1);
     }
 
     if ($authorid != 'all') {
-        $where = "WHERE authorid = $authorid";
+        $where = " AND (authorid = $authorid OR authorid = 0)";
     } else {
         $where = '';
     }
 
-    $querystring = "SELECT * FROM {$serendipity['dbPrefix']}category $where ORDER BY category_name";
+    $querystring = "SELECT c.*, a.username FROM {$serendipity['dbPrefix']}category AS c LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON c.authorid = a.authorid $where ORDER BY category_name";
 
     return serendipity_db_query($querystring);
 }
 
+function serendipity_fetchUsers($user = '') {
+    global $serendipity;
+    
+    $where = '';
+    if (!empty($user)) {
+        $where = 'WHERE authorid = ' . serendipity_db_escape_string($user);
+    }
+    
+    $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY username ASC";
+
+    return serendipity_db_query($querystring);
+}
 
 /**
 * Give it a raw searchstring, it'll search
@@ -870,7 +895,7 @@
                     echo '>' . $label . ' (' . $entry['trackbacks'] . ')</a>';
                 }
 
-                if ($_SESSION['serendipityAuthedUser'] === true) {
+                if ($_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $entry['authorid'])) {
                     echo ' | <a href="' . $serendipity['baseURL'] . 'serendipity_entries.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=' . $entry['id'] . '">' . EDIT_ENTRY . '</a>';
                 }
 ?>
@@ -982,11 +1007,16 @@
 {
     global $serendipity;
 
-    if ($_SESSION['serendipityAuthedUser'] === true ) {
-        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = $entry_id AND id = $id";
+    if ($_SESSION['serendipityAuthedUser'] === true) {
+        $admin = '';
+        if ($_SESSION['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            $admin = ' AND authorid = ' . $_SESSION['serendipityAuthorid'];
+        }
+
+        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = $entry_id AND id = $id $admin";
         serendipity_db_query($query);
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = $entry_id";
+        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = $entry_id $admin";
         serendipity_db_query($query);
         header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
@@ -997,8 +1027,13 @@
 function serendipity_allowCommentsToggle($entry_id, $switch = 'disable') {
     global $serendipity;
 
-    if ($_SESSION['serendipityAuthedUser'] === true ) {
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = $entry_id";
+    if ($_SESSION['serendipityAuthedUser'] === true) {
+        $admin = '';
+        if ($_SESSION['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            $admin = ' AND authorid = ' . $_SESSION['serendipityAuthorid'];
+        }
+
+        $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = $entry_id $admin";
         serendipity_db_query($query);
         header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
@@ -1011,7 +1046,7 @@
     global $serendipity;
 
     if (!empty($limit)) {
-        if ( strtolower($serendipity['dbType']) == 'postgres' ) {
+        if (strtolower($serendipity['dbType']) == 'postgres') {
             $limit = 'LIMIT ' . join (' OFFSET ', split(',', $limit));
         } else {
             $limit = 'LIMIT '. $limit;
@@ -1029,6 +1064,7 @@
                     co.author AS username,
                     e.title,
                     e.id AS entryid,
+                    e.authorid,
                     co.id AS commentid,
                     c.category_name
               FROM
@@ -1082,7 +1118,7 @@
     foreach ($comments as $comment) {
         $x++;
         /* Protect submitted mails against spam, by replacing @ with [at]*/
-        if ( !empty($comment['email']) ) {
+        if (!empty($comment['email'])) {
             $comment['email'] = str_replace('@', '[at]', $comment['email']);
         }
 
@@ -1114,7 +1150,7 @@
         /* Show when the entry was made */
         echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
 
-        if ($show_admin && $_SESSION['serendipityAuthedUser'] === true) {
+        if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
             echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';
         }
 ?>
@@ -1125,7 +1161,7 @@
 <?php
     }
 
-    if ($show_admin && $_SESSION['serendipityAuthedUser'] === true) {
+    if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
         if (!isset($comment)) {
             $comment = array('entry_id' => $serendipity['GET']['id']);
         }
@@ -1170,7 +1206,7 @@
                 <b>Weblog: </b> <?php echo strip_tags($name); ?><br />
                 <b><?php echo TRACKED; ?>: </b> <?php echo date('M d, h:i', $comment['timestamp']); ?>
 <?php
-        if ($_SESSION["serendipityAuthedUser"] === true) {
+        if ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
             echo '                (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=trackbacks">' . DELETE . '</a>)';
         }
 ?>
@@ -1875,8 +1911,10 @@
 
     $entry['exflag']   = $exflag;
     $entry['author']   = $serendipity['user'];
-    $entry['authorid'] = $serendipity['authorid'];
-
+    if (!isset($entry['authorid']) || empty($entry['authorid'])) {
+        $entry['authorid'] = $serendipity['authorid'];
+    }
+    
     if (!is_numeric($entry['id'])) {
         /* we need to insert */
 
@@ -1894,6 +1932,10 @@
         $newEntry    = 1;
     } else {
         /* we need to update */
+        if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $entry['authorid'] != $serendipity['authorid']) {
+            // Only chiefs and admins can change other's entry. Else update fails.
+            return;
+        }
 
         $res = serendipity_db_update('entries', array('id' => $entry['id']), $entry);
         $newEntry = 0;
@@ -1903,7 +1945,7 @@
         return $res;
     }
 
-    if ( $entry['isdraft'] == 'false' ) {
+    if ($entry['isdraft'] == 'false') {
         serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['body'] . $entry['extended'], $newEntry);
     }
 
@@ -1929,7 +1971,13 @@
     }
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
+    $result = serendipity_db_query("SELECT timestamp, authorid FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
+
+    if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $result[1] != $serendipity['authorid']) {
+        // Only admins and chief users can delete entries which do not belong to the author
+        return;
+    }
+    
     serendipity_purgeEntry($id, $result[0]);
 
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id");
@@ -2136,11 +2184,10 @@
 function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false) {
     global $serendipity;
 
-    if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityEmail']) && isset($_SESSION['serendipityAuthorid']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) {
-        $serendipity['serendipityUser']     = $username = $_SESSION['serendipityUser'];
-        $serendipity['serendipityEmail']    = $_SESSION['serendipityEmail'];
-        $serendipity['authorid']            = $_SESSION['serendipityAuthorid'];
-        $serendipity['serendipityPassword'] = $password = $_SESSION['serendipityPassword'];
+    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;
     }
 
@@ -2150,7 +2197,7 @@
         }
 
         $query = "SELECT DISTINCT
-                    email, authorid
+                    email, authorid, userlevel
                   FROM
                     $serendipity[dbPrefix]authors
                   WHERE
@@ -2163,7 +2210,9 @@
             $_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;
+            serendipity_load_configuration($serendipity['authorid']);
             return true;
         } else {
             $_SESSION['serendipityAuthedUser'] = false;
@@ -2562,6 +2611,29 @@
     return $ver;
 }
 
+function serendipity_load_configuration($author = null) {
+    global $serendipity;
+
+    if (!empty($author)) {
+        // Replace default configuration directives with user-relevant data
+        $rows = serendipity_db_query("SELECT name,value
+                                        FROM {$serendipity['dbPrefix']}config
+                                        WHERE authorid = $author");
+    } else {
+        // Only get default variables, user-independent (frontend)
+        $rows = serendipity_db_query("SELECT name,value
+                                        FROM {$serendipity['dbPrefix']}config
+                                        WHERE authorid = 0");
+    }
+
+    if (is_array($rows)) {
+        foreach ($rows as $row) {
+            // Convert 'true' and 'false' into booleans
+            $serendipity[$row['name']] = serendipity_get_bool($row['value']);
+        }
+    }
+}
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rss.php	2 Apr 2004 09:09:28 -0000	1.23
+++ rss.php	4 Apr 2004 16:24:46 -0000	1.24
@@ -108,7 +108,7 @@
 <title>$title</title>
 <link>{$serendipity['baseURL']}</link>
 <description>$description</description>
-<language>{$serendipity['CONFIG']['lang']}</language>
+<language>{$serendipity['lang']}</language>
 {$additional_fields['image']}
 
 HEAD;
@@ -136,7 +136,7 @@
     <link>{$serendipity['baseURL']}</link>
     <description>$description</description>
     <dc:language>{$serendipity['lang']}</dc:language>
-    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
+    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" />
 
     {$additional_fields['image_rss1.0_channel']}
     
@@ -167,7 +167,7 @@
     <link>{$serendipity['baseURL']}</link>
     <description>$description</description>
     <dc:language>{$serendipity['lang']}</dc:language>
-    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
+    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" />
     <generator>Serendipity {$serendipity['version']} - http://www.s9y.org/</generator>
     {$additional_fields['channel']}
     {$additional_fields['image']}
@@ -193,7 +193,7 @@
     <modified>$modified</modified>
     <generator url="http://www.s9y.org/" version="{$serendipity['version']}">Serendipity {$serendipity['version']} - http://www.s9y.org/</generator>
     <dc:language>{$serendipity['lang']}</dc:language>
-    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" /> 
+    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" /> 
     <info mode="xml" type="text/html">
         <div xmlns="http://www.w3.org/1999/xhtml">You are viewing an ATOM formatted XML site feed. Usually this file is inteded to be viewed in an aggregator or syndication software. If you want to know more about ATOM, please visist <a href="http://atomenabled.org/">Atomenabled.org</a></div>
     </info>

--- NEW FILE: serendipity_admin_users.inc.php ---
<?php # $Id: serendipity_admin_users.inc.php,v 1.1 2004/04/04 16:24:46 garvinhicking Exp $

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

if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
    return;
}

require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_local_' . $serendipity['lang'] . '.tpl');
define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'lang/serendipity_config_user_' . $serendipity['lang'] . '.tpl');

/*
 * User information
 */
?>

<h3><?php printf(USER_SELF_INFO, $serendipity['authorid'], $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']); ?></h2>
<br />

<?php
/*
 * User actions
 */

if (!empty($_POST['DELETE_YES'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
    } else {
        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authos WHERE authorid={$serendipity['POST']['user']}");
        printf('<strong>' . DELETED_USER . '</strong>', $serendipity['POST']['user'], $user[0]['username']);
    }
}

if (!empty($_POST['SAVE_NEW'])) {
    if ($serendipity['POST']['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } else {
        $enc_pass = md5($_POST['pass']);
        $query = "INSERT INTO {$serendipity['dbPrefix']}authors (
                                username,
                                password
                              )
                      VALUES  (
                                '{$_POST['username']}',
                                '$enc_pass'
                              )";
        serendipity_db_query($query);
        $serendipity['POST']['user'] = serendipity_db_insert_id();
        printf('<strong>' . CREATED_USER . '</strong>', '#' . $serendipity['POST']['user'] . ', ' . $_POST['username']);
    }
    echo '<br />';
}

if (!empty($_POST['SAVE']) || !empty($_POST['SAVE_NEW'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['authorid']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
    } else {
        $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
        foreach($u AS $key => $entry) {
            serendipity_set_user_var(
              $entry['name'],
              $_POST[$entry['name']],
              $serendipity['POST']['user'],
              ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false)
            );
        }
        printf('<strong>' . MODIFIED_USER . '</strong>', $_POST['username']);
    }
}


/*
 * User chooser
 */
?>
<hr />

<form action="?serendipity[adminModule]=users" method="post">
    <table>
        <tr>
            <th><?php echo EDIT_USERS; ?>:</th>
            <td><div>
                <select name="serendipity[user]">
<?php
$users = serendipity_fetchUsers();
foreach($users AS $user) {
    if ($user['userlevel'] < $serendipity['serendipityUserlevel'] || $user['authorid'] == $serendipity['authorid']) {
?>
                    <option value="<?php echo $user['authorid']; ?>"<?php echo ($user['authorid'] == $serendipity['POST']['user'] ? ' selected="selected"' : ''); ?>><?php echo htmlentities($user['username']); ?> (<?php printf(USER_LEVEL, $user['userlevel']); ?>) </option>
<?php
    }
}
?>
                </select></div>
            </td>

            <td><div>
                <input type="submit" name="EDIT"   value="<?php echo EDIT; ?>" />
                <input type="submit" name="DELETE" value="<?php echo DELETE; ?>" /></div>
            </td>
        </tr>

        <tr>
            <th colspan="3"><br />- <?php echo WORD_OR; ?> -<br /><br /></td>
        </tr>

        <tr>
            <th><?php echo CREATE_USERS; ?>:</th>
            <td>&nbsp;</td>
            <td><div>
                <input type="submit" name="NEW"   value="<?php echo CREATE_NEW_USER; ?>" />
            </td>
        </tr>
    </table>
</form>

<hr />

<?php
/*
 * User editing/creation
 */

if (!empty($_POST['NEW']) || !empty($_POST['EDIT'])) {
?>
<form action="?serendipity[adminModule]=users" method="post">
    <div>
    <h3>
<?php
if (!empty($_POST['EDIT'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel']) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong><br />';
        echo CREATE;
        $from = array();
    } else {
        echo EDIT;
        $from = &$user[0];
        unset($from['password']);
        echo '<input type="hidden" name="serendipity[user]" value="' . $from['authorid'] . '" />';
    }
} else {
    echo CREATE;
    $from = array();
}
?>
    </h3>

<?php
$t = array();
$t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, &$t, false);
serendipity_printConfigTemplate($t, $from, true, false);

if (!empty($_POST['EDIT'])) { ?>
        <input type="submit" name="SAVE"   value="<?php echo SAVE; ?>" />
<?php } else { ?>
        <input type="submit" name="SAVE_NEW"   value="<?php echo CREATE_NEW_USER; ?>" />
<?php } ?>

    </div>
</form>
<?php
} elseif (!empty($_POST['DELETE'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
?>
<form action="?serendipity[adminModule]=users" method="post">
    <div>
    <?php printf(DELETE_USER, $serendipity['POST']['user'], $user[0]['username']); ?>
        <br /><br />
        <input type="hidden" name="serendipity[user]" value="<?php echo $serendipity['POST']['user']; ?>" />
        <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" />
        <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" />
    </div>
</form>
<?php
}

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

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_config.inc.php	4 Apr 2004 15:59:27 -0000	1.63
+++ serendipity_config.inc.php	4 Apr 2004 16:24:46 -0000	1.64
@@ -38,9 +38,9 @@
  */
 include($serendipity['serendipityPath'] . 'serendipity_lang.inc.php');
 
-/* URI paths 
+/* URI paths
  * These could be defined in the language headers, except that would break
- * backwards URL compatibility 
+ * backwards URL compatibility
  */
 @define('PATH_ARCHIVES', 'archives');
 @define('PATH_ARCHIVE', 'archive');
@@ -50,7 +50,7 @@
 @define('PATH_ENTRIES', 'entries');
 @define('PATH_CATEGORIES', 'categories');
 
-/* URI patterns 
+/* URI patterns
  * Note that it's important to use @ as the pattern delimiter.
  */
 @define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@');
@@ -64,6 +64,10 @@
 @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@');
 @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/(.*)@');
 
+@define('USERLEVEL_ADMIN', 255);
+@define('USERLEVEL_CHIEF', 1);
+@define('USERLEVEL_EDITOR', 0);
+
 /*
  *   Kill the script if we are not installed, and not inside the installer
  */
@@ -71,7 +75,8 @@
     die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
 
-if ( defined('IN_installer') && IS_installed === false) {
+if (defined('IN_installer') && IS_installed === false) {
+    $serendipity['lang'] = $serendipity['autolang'];
     return 1;
 }
 
@@ -109,18 +114,14 @@
 /*
  *   Load Configuration options from the database
  */
-$rows = serendipity_db_query("SELECT name,value
-                                FROM {$serendipity['dbPrefix']}config");
-foreach ($rows as $row) {
-    /* fixme: temp. workaround */
-    $serendipity['CONFIG'][$row['name']] = $row['value'];
 
-    /*
-     *   Convert 'true' and 'false' into booleans
-     */
-    $row['value'] = serendipity_get_bool($row['value']);
+serendipity_load_configuration();
 
-    $serendipity[$row['name']] = $row['value'];
+/*
+ * If a user is logged in, fetch his preferences. He possibly wants to have a different language
+ */
+if (isset($_SESSION['serendipityAuthorid'])) {
+    serendipity_load_configuration($_SESSION['serendipityAuthorid']);
 }
 
 /*
@@ -156,7 +157,7 @@
  */
 define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
 
-if ( IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader') ) {
+if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) {
     die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], 'serendipity_admin.php'));
 }
 
@@ -190,3 +191,4 @@
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
+

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_functions_config.inc.php	4 Sep 2003 16:23:46 -0000	1.5
+++ serendipity_functions_config.inc.php	4 Apr 2004 16:24:47 -0000	1.6
@@ -1,11 +1,11 @@
 <?php # $Id$
 
-function serendipity_set_config_var($name, $val) {
+function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "'");
-        $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val));
-        $serendipity['CONFIG'][$name] = $val;
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . serendipity_db_escape_string($authorid));
+        $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
+        $serendipity[$name] = $val;
         if (is_string($r)) {
             echo $r;
         }
@@ -13,12 +13,65 @@
 
 function serendipity_get_config_var($name, $defval = false) {
     global $serendipity;
-        if ( isset($serendipity['CONFIG'][$name]) ) {
-            return $serendipity['CONFIG'][$name];
+        if (isset($serendipity[$name])) {
+            return $serendipity[$name];
         } else {
             return $defval;
         }
 }
 
+function serendipity_get_user_var($name, $authorid, $default) {
+    global $serendipity;
+
+    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . serendipity_db_escape_string($authorid), true);
+
+    if (is_array($r)) {
+        return $r[0];
+    } else {
+        return $default;
+    }
+}
+
+function serendipity_set_user_var($name, $val, $authorid, $copy_to_s9y = true) {
+    global $serendipity;
+
+    // When inserting a DB value, this array maps the new values to the corresponding s9y variables
+    static $user_map_array = array(
+        'username'  => 'serendipityUser',
+        'email'     => 'serendipityEmail',
+        'userlevel' => 'serendipityUserlevel'
+    );
+
+    // Special case for inserting a password
+    switch($name) {
+        case 'password':
+            if (empty($val)) {
+                return;
+            }
+
+            $val = md5($val);
+            $copy_to_s9y = false;
+            break;
+
+        case 'mail_comments':
+        case 'mail_trackbacks':
+            $val = (serendipity_db_bool($val) ? 1 : '0');
+            break;
+    }
+
+    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . serendipity_db_escape_string($authorid));
+
+    if ($copy_to_s9y) {
+        if (isset($user_map_array[$name])) {
+            $key = $user_map_array[$name];
+        } else {
+            $key = 'serendipity' . ucfirst($name);
+        }
+
+        $_SESSION[$key] = $serendipity[$key] = $val;
+    }
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
+

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_functions_images.inc.php	3 Apr 2004 17:36:16 -0000	1.8
+++ serendipity_functions_images.inc.php	4 Apr 2004 16:24:47 -0000	1.9
@@ -15,7 +15,7 @@
         $ordermode = 'DESC';
     }
 
-    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images ORDER BY $order $ordermode", false, 'assoc');
+    $rs = serendipity_db_query("SELECT i.*, a.username AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a on i.authorid = a.authorid ORDER BY $order $ordermode", false, 'assoc');
     if (!is_array($rs)) {
         return array();
     }
@@ -35,12 +35,18 @@
 
 function serendipity_updateImageInDatabase($updates, $id) {
     global $serendipity;
+
+    $admin = '';
+    if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+        $admin = ' AND (authorid = ' . $serendipity['authorid'] . ' OR authorid = 0)';
+    }
+    
     $i=0;
     if (sizeof($updates) > 0) {
-        foreach ( $updates as $k => $v ) {
+        foreach ($updates as $k => $v) {
             $q[] = $k ." = '". $v ."'";
         }
-        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = ". $id);
+        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = $id $admin");
         $i++;
     }
     return $i;
@@ -52,6 +58,12 @@
     $dFile = $file['name'] .'.'. $file['extension'];
     $dThumb = $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension'];
 
+    $admin = '';
+    if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+        // A non-admin user may not delete private files from other users.
+        return;
+    }
+
     if (file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile)) {
         if (@unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile)) {
             printf(DELETE_IMAGE . '<br />', $dFile);
@@ -91,11 +103,11 @@
 
 }
 
-function serendipity_insertImageInDatabase($filename, $extension, $mimetype, $filesize, $width, $height, $thumbnail, $date) {
+function serendipity_insertImageInDatabase($filename, $extension, $mimetype, $filesize, $width, $height, $thumbnail, $date, $authorid) {
     global $serendipity;
     $sql = serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}images
-                                    (name, extension, mime, size, dimensions_width, dimensions_height, thumbnail_name, date)
-                                    VALUES('". $filename ."', '". $extension ."', '". $mimetype ."', ". $filesize .", ". $width.", ". $height .", '". $thumbnail ."', ". $date .")");
+                                    (name, extension, mime, size, dimensions_width, dimensions_height, thumbnail_name, date, authorid)
+                             ...
 
[truncated message content]

[php-blog-cvs] serendipity serendipity_lang.inc.php,1.10,1.11 serendipity_plugin_api.php,1.16,1.17 serendipity_sidebar_items.php,1.52,1.53 serendipity_admin_plugins.inc.php,1.20,1.21 serendipity_admin.php,1.34,1.35

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

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

Modified Files:
	serendipity_lang.inc.php serendipity_plugin_api.php 
	serendipity_sidebar_items.php 
	serendipity_admin_plugins.inc.php serendipity_admin.php 
Log Message:
multi-user #4


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin.php	21 Mar 2004 16:35:31 -0000	1.34
+++ serendipity_admin.php	4 Apr 2004 16:23:29 -0000	1.35
@@ -26,7 +26,7 @@
 ?>
     </head>
 
-<body id="serendipity_admin_page">
+<body id="serendipity_admin_page" onload="if (self.Spawnnugget) { Spawnnugget(); }">
     <div id="serendipity_banner">
         <h1><?php echo (isset($serendipity['blogTitle']) ? $serendipity['blogTitle'] : ''); ?></h1>
 <?php
@@ -37,6 +37,7 @@
 <?php
 }
 ?>
+    <h2>[<?php printf(USER_SELF_INFO, $serendipity['authorid'], $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']); ?>]</h2>
     </div>
     <table id="mainpane">
         <tr valign="top">
@@ -61,6 +62,7 @@
 } else {
 ?>
             <td id="serendipityLeftSideBar">
+<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
                 <div class="serendipitySideBarItem">
                     <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div>
                     <div class="serendipitySideBarContent">
@@ -68,11 +70,14 @@
                         &bull; <a href="?serendipity[adminModule]=plugins"><?php   echo CONFIGURE_PLUGINS; ?></a><br />
                     </div>
                 </div>
-
+<?php } ?>
                 <div class="serendipitySideBarItem">
                     <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
                     <div class="serendipitySideBarContent">
                         &bull; <a href="?serendipity[adminModule]=installer"><?php echo CONFIGURATION;         ?></a><br />
+<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
+                        &bull; <a href="?serendipity[adminModule]=users"><?php echo MANAGE_USERS;         ?></a><br />
+<?php } ?>
                         &bull; <a href="?serendipity[adminModule]=interop"><?php   echo IMPORT_EXPORT_ENTRIES; ?></a><br />
                     </div>
                 </div>
@@ -110,6 +115,10 @@
             include S9Y_INCLUDE_PATH . 'serendipity_admin_plugins.inc.php';
             break;
 
+        case 'users':
+            include S9Y_INCLUDE_PATH . 'serendipity_admin_users.inc.php';
+            break;
+
         case 'interop':
             include S9Y_INCLUDE_PATH . 'serendipity_admin_interop.inc.php';
             break;

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_plugin_api.php	23 Mar 2004 16:11:34 -0000	1.16
+++ serendipity_plugin_api.php	4 Apr 2004 16:23:29 -0000	1.17
@@ -54,7 +54,7 @@
      * of the same class, then the persistent state will be copied.
      * This allows the user to clone a plugin.
      */
-    function create_plugin_instance($plugin_class_id, $copy_from_instance = null, $default_placement = 'right')
+    function create_plugin_instance($plugin_class_id, $copy_from_instance = null, $default_placement = 'right', $authorid = '0')
     {
         global $serendipity;
 
@@ -70,13 +70,13 @@
             $nextidx = 0;
         }
         
-        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement) values ('$key', $nextidx, '$default_placement')");
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement, authorid) values ('$key', $nextidx, '$default_placement', '$authorid')");
 
         /* Check for multiple dependencies */
         $plugin =& serendipity_plugin_api::load_plugin($key);
         $bag    = new serendipity_property_bag;
         $plugin->introspect($bag);
-        $plugin->register_dependencies(false);
+        $plugin->register_dependencies(false, $authorid);
         
         return $key;
     }
@@ -254,6 +254,10 @@
         }
 
         $p =& new $class_name($instance_id);
+        
+        $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'";
+        $owner = serendipity_db_query($sql, true);
+        $p->serendipity_owner = $owner[0];
 
         return $p;
     }
@@ -273,6 +277,24 @@
         return serendipity_db_query($sql);
     }
 
+    function update_plugin_owner($name, $authorid)
+    {
+        global $serendipity;
+
+        if (empty($authorid) && $authorid != '0') {
+            return;
+        }
+
+        $admin = '';
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
+            $admin = " AND (authorid = 0 OR authorid = {$serendipity['authorid']})";
+        }
+        
+        $sql = "UPDATE {$serendipity['dbPrefix']}plugins SET authorid='$authorid' WHERE name='$name' $admin";
+
+        return serendipity_db_query($sql);
+    }
+
     function generate_plugins($side, $tagname = 'div')
     {
         $plugins = serendipity_plugin_api::enum_plugins($side);
@@ -439,6 +461,7 @@
 
 class serendipity_plugin {
     var $instance      = null;
+    var $protected     = false;
     var $wrap_class    = 'serendipitySideBarItem';
     var $title_class   = 'serendipitySideBarTitle';
     var $content_class = 'serendipitySideBarContent';
@@ -468,6 +491,9 @@
         //     'foo bar'
         //   )
         // );
+
+        $this->protected = FALSE; // If set to TRUE, only allows the owner of the plugin to modify its configuration
+
         return true;
     }
 
@@ -524,7 +550,7 @@
         return true;
     }
     
-    function register_dependencies($remove = false)
+    function register_dependencies($remove = false, $authorid = '0')
     {
         global $serendipity;
         
@@ -548,9 +574,9 @@
                     $exists = serendipity_plugin_api::exists($dependency);
                     if (!$exists) {
                         if (strncmp($dependency, 'serendipity_event_', 18) == 0) {
-                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event');
+                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event', $authorid);
                         } else {
-                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency);
+                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'right', $authorid);
                         }
                     } else {
                         $keys[] = $exists;

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang.inc.php	21 Mar 2004 16:35:32 -0000	1.10
+++ serendipity_lang.inc.php	4 Apr 2004 16:23:29 -0000	1.11
@@ -8,6 +8,7 @@
     } 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.
+        $serendipty['autolang'] = 'en';
         $supported_languages = array('en', 'da', 'de', 'es');
         $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
@@ -15,12 +16,13 @@
                 $preferred_language = preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang);
                 if (in_array($preferred_language, $supported_languages)) {
                     @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
+                    $serendipity['autolang'] = $preferred_language;
                     break;
                 } // endif
             } // endforeach
         } // endif
     }  //endif
-    
+
     // Do fallback to english
     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');
@@ -29,3 +31,4 @@
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
+

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_admin_plugins.inc.php	21 Mar 2004 16:35:31 -0000	1.20
+++ serendipity_admin_plugins.inc.php	4 Apr 2004 16:23:29 -0000	1.21
@@ -8,6 +8,10 @@
 include_once S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php';
 include_once S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php';
 
+if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+    return;
+}
+
 function show_plugins($event_only = false)
 {
     global $serendipity;
@@ -44,6 +48,7 @@
     }
 ?>
         </select>
+        <input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /><label for="all_authors"><?php echo ALL_AUTHORS; ?></label>
         <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
         <br />
         <br />
@@ -56,7 +61,7 @@
 <?php
     if (!$event_only) {
 ?>
-                <th><?php echo PLACEMENT; ?></th>
+                <th colspan="2"><?php echo PLACEMENT; ?></th>
 <?php
     }
 ?>
@@ -98,7 +103,7 @@
 
             $title = serendipity_plugin_api::get_plugin_title($plugin, '&nbsp;');
 
-            if ($bag->is_set('configuration')) {
+            if ($bag->is_set('configuration') && ($plugin->protected === FALSE || $plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) {
                 $url   = '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $key;
                 $desc  = '<a href="' . $url . '">' . $desc  . '</a>';
                 $name  = '<a href="' . $url . '">' . $name  . '</a>';
@@ -121,14 +126,29 @@
             <tr>
                 <td style="border-bottom: 1px solid #000000">
                     <div>
+                    <?php if ($plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) { ?>
                         <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>">
+                    <?php } else { ?>
+                        &nbsp;
+                    <?php } ?>
                     </div>
                 </td>
 
                 <td style="border-bottom: 1px solid #000000"><?php echo $title; ?></td>
                 <td style="border-bottom: 1px solid #000000"><?php echo $desc; ?></td>
                 <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
-                    <div><?php echo $place . $moveup . $movedown; ?></div>
+                    <div>
+                    <?php
+                    if ($plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
+                        ownership($plugin_data['authorid'], $plugin_data['name']);
+                    } else {
+                        ownership($plugin_data['authorid'], $plugin_data['name'], true);
+                    }
+                    ?>
+                    </div>
+                </td>
+                <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
+                    <div><?php echo $place . $moveup . $movedown;?></div>
                 </td>
             </tr>
 <?php
@@ -146,6 +166,40 @@
 <?php
 }
 
+function ownership($authorid, $name, $readonly = false) {
+    global $serendipity;
+    
+    static $users = array();
+    if (empty($users)) {
+        $users = serendipity_fetchUsers();
+    }
+    
+    if (!$readonly) {
+?>
+<select name="serendipity[ownership][<?php echo $name; ?>]">
+    <option value="0"><?php echo ALL_AUTHORS; ?></option>
+<?php
+    }
+    
+    foreach($users AS $user) {
+        if ($readonly && $user['authorid'] == $authorid) {
+            $username = htmlentities($user['username']);
+        } elseif (!$readonly) {
+?>
+    <option value="<?php echo $user['authorid']; ?>"<?php echo ($user['authorid'] == $authorid ? ' selected="selected"' : ''); ?>><?php echo htmlentities($user['username']); ?></option>
+<?php
+        }
+    }
+    
+    if (!$readonly) {
+?>
+</select>
+<?php
+    } else {
+        echo (empty($username) ? ALL_AUTHORS : $username);
+    }
+}
+
 function placement_box($name, $val)
 {
     static $opts = array(
@@ -206,6 +260,10 @@
     /* configure a specific instance */
     $plugin =& serendipity_plugin_api::load_plugin($_GET['serendipity']['plugin_to_conf']);
 
+    if (!($plugin->protected === FALSE || $plugin->serendipity_owner == '0' || $plugin->serendipity_owner == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) {
+        return;
+    }
+    
     $bag  = new serendipity_property_bag;
     $plugin->introspect($bag);
     $name = htmlentities($bag->get('name'));
@@ -374,12 +432,12 @@
         <tr>
             <td colspan="2">
                 <div>
-                    <textarea name="serendipity[plugin][<?php echo $config_item; ?>]" rows="20" cols="80"><?php echo $hvalue; ?></textarea>
+                    <textarea style="width: 100%" id="nugget" name="serendipity[plugin][<?php echo $config_item; ?>]" rows="20" cols="80"><?php echo $hvalue; ?></textarea>
                 </div>
             </td>
         </tr>
 <?php
-                serendipity_emit_htmlarea_code("document.forms['serendipityPluginConfigure']['serendipity[plugin][$config_item]']");
+                serendipity_emit_htmlarea_code('nugget', 'nugget');
                 break;
         }
     }
@@ -400,21 +458,35 @@
                 addslashes($plugin_name),
                 addslashes($placement)
             );
+            
+            serendipity_plugin_api::update_plugin_owner(
+                addslashes($plugin_name),
+                addslashes($_POST['serendipity']['ownership'][$plugin_name])
+            );
         }
     }
 
     if (isset($_POST['NEW']) && $_POST['serendipity']['plugin_to_add'] != '0') {
+        $authorid = $serendipity['authorid'];
+        if (isset($_POST['serendipity']['all_authors']) && $_POST['serendipity']['all_authors'] == 'true') {
+            $authorid = '0';
+        }
+        
         if (isset($_POST['serendipity']['event_plugin'])) {
-            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'event');
+            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'event', $authorid);
         } else {
-            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add']);
+            $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'right', $authorid);
         }
         /* TODO: redirect to configuration for that instance */
     }
 
     if (isset($_POST['REMOVE'])) {
         foreach ($_POST['serendipity']['plugin_to_remove'] as $key) {
-            serendipity_plugin_api::remove_plugin_instance($key);
+            $plugin =& serendipity_plugin_api::load_plugin($key);
+        
+            if ($plugin->serendipity_owner == '0' || $plugin->serendipity_owner == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
+                serendipity_plugin_api::remove_plugin_instance($key);
+            }
         }
     }
 

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_sidebar_items.php	1 Apr 2004 14:19:01 -0000	1.52
+++ serendipity_sidebar_items.php	4 Apr 2004 16:23:29 -0000	1.53
@@ -436,6 +436,8 @@
                                         'markup',
                                        )
         );
+
+        $this->protected = TRUE; // If set to TRUE, only allows the owner of the plugin to modify its configuration
     }
 
     function introspect_config_item($name, &$propbag)
@@ -514,7 +516,8 @@
     function generate_content(&$title) {
         global $serendipity;
 
-        $categories = serendipity_fetchCategories($this->get_config('authorid'));
+        $which_category = $this->get_config('authorid');
+        $categories = serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category);
         $title      = CATEGORIES;
         $html       = '';
 

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.19,1.20 serendipity_lang_de.inc.php,1.28,1.29 serendipity_lang_en.inc.php,1.22,1.23 serendipity_lang_es.inc.php,1.22,1.23

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
multi-user #3


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_da.inc.php	3 Apr 2004 17:36:16 -0000	1.19
+++ serendipity_lang_da.inc.php	4 Apr 2004 16:22:21 -0000	1.20
@@ -351,5 +351,19 @@
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke  %shere%s');
 @define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): ');
 
+/* TRANSLATE */
+@define('MANAGE_USERS', 'Manage users');
+@define('EDIT_USERS', 'Edit users');
+@define('CREATE_USERS', 'Create users');
+@define('CREATE_NEW_USER', 'Create new user');
+@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
+@define('CREATED_USER', 'A new user %s has been created');
+@define('MODIFIED_USER', 'The properties of user %s have been changed');
+@define('USER_SELF_INFO', 'You are: #%d %s, userlevel %s');
+@define('USER_LEVEL', 'Userlevel: %s');
+@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
+@define('DELETED_USER', 'User #%d %s deleted.');
+
 /* 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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_de.inc.php	26 Mar 2004 14:25:55 -0000	1.28
+++ serendipity_lang_de.inc.php	4 Apr 2004 16:22:21 -0000	1.29
@@ -341,6 +341,18 @@
 @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): ');
+@define('MANAGE_USERS', 'Benutzerverwaltung');
+@define('EDIT_USERS', 'Benutzer bearbeiten');
+@define('CREATE_USERS', 'Benutzer anlegen');
+@define('CREATE_NEW_USER', 'Einen neuen Benutzer anlegen');
+@define('CREATE_NOT_AUTHORIZED', 'Sie können keine Benutzer mit demselben Userlevel wie ihrem eigenen bearbeiten');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Sie können keine Benutzer mit einem höheren Benutzerlevel als ihrem anlegen');
+@define('CREATED_USER', 'Der neue Benutzer %s wurde angelegt');
+@define('MODIFIED_USER', 'Die Eigenschaften von Benutzer %s wurden geändert');
+@define('USER_SELF_INFO', 'Sie sind: #%d %s, Userlevel %s');
+@define('USER_LEVEL', 'Userlevel: %s');
+@define('DELETE_USER', 'Sie wollen den Benutzer #%d %s löschen. Sind sie sicher? Dadurch werden seine Artikel nicht mehr auf der Oberfläche angezeigt.');
+@define('DELETED_USER', 'Benutzer #%d %s gelöscht.');
 
 /* 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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_en.inc.php	22 Mar 2004 15:19:25 -0000	1.22
+++ serendipity_lang_en.inc.php	4 Apr 2004 16:22:21 -0000	1.23
@@ -341,6 +341,18 @@
 @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): ');
+@define('MANAGE_USERS', 'Manage users');
+@define('EDIT_USERS', 'Edit users');
+@define('CREATE_USERS', 'Create users');
+@define('CREATE_NEW_USER', 'Create new user');
+@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
+@define('CREATED_USER', 'A new user %s has been created');
+@define('MODIFIED_USER', 'The properties of user %s have been changed');
+@define('USER_SELF_INFO', 'You are: #%d %s, userlevel %s');
+@define('USER_LEVEL', 'Userlevel: %s');
+@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
+@define('DELETED_USER', 'User #%d %s deleted.');
 
 /* 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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_es.inc.php	22 Mar 2004 15:19:25 -0000	1.22
+++ serendipity_lang_es.inc.php	4 Apr 2004 16:22:21 -0000	1.23
@@ -336,6 +336,18 @@
 /* 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
+@define('MANAGE_USERS', 'Manage users');
+@define('EDIT_USERS', 'Edit users');
+@define('CREATE_USERS', 'Create users');
+@define('CREATE_NEW_USER', 'Create new user');
+@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
+@define('CREATED_USER', 'A new user %s has been created');
+@define('MODIFIED_USER', 'The properties of user %s have been changed');
+@define('USER_SELF_INFO', 'You are: #%d %s, userlevel %s');
+@define('USER_LEVEL', 'Userlevel: %s');
+@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
+@define('DELETED_USER', 'User #%d %s deleted.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/sql db_update_0.6_0.6.1_mysql.sql,NONE,1.1 db_update_0.6_0.6.1_pgsql.sql,NONE,1.1 db.sql,1.5,1.6

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

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

Modified Files:
	db.sql 
Added Files:
	db_update_0.6_0.6.1_mysql.sql db_update_0.6_0.6.1_pgsql.sql 
Log Message:
Multi-user patch, part #2


--- NEW FILE: db_update_0.6_0.6.1_mysql.sql ---
ALTER TABLE {PREFIX}authors ADD userlevel INT(4) UNSIGNED DEFAULT '0';
UPDATE {PREFIX}authors SET userlevel = 255 WHERE authorid = 1;
UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;

ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED DEFAULT '0';
ALTER TABLE {PREFIX}config  ADD INDEX (authorid);

ALTER TABLE {PREFIX}config  DROP PRIMARY KEY;
ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);

ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
ALTER TABLE {PREFIX}plugins  ADD INDEX (authorid);

ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
ALTER TABLE {PREFIX}images  ADD INDEX (authorid);

--- NEW FILE: db_update_0.6_0.6.1_pgsql.sql ---
ALTER TABLE {PREFIX}authors ADD userlevel INT(4) UNSIGNED DEFAULT '0';
UPDATE {PREFIX}authors SET userlevel = 255 WHERE authorid = 1;
UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;

ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED DEFAULT '0';
CREATE INDEX authorid ON {PREFIX}config  (authorid);

DROP INDEX name ON {PREFIX}config;
CREATE INDEX pri ON {PREFIX}config (name, authorid);

ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
CREATE INDEX authorid ON {PREFIX}plugins  (authorid);

ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
CREATE INDEX authorid ON {PREFIX}images  (authorid);

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db.sql	19 Mar 2004 11:22:46 -0000	1.5
+++ db.sql	4 Apr 2004 16:20:15 -0000	1.6
@@ -8,7 +8,8 @@
   authorid {AUTOINCREMENT} {PRIMARY},
   mail_comments int(1) default '1',
   mail_trackbacks int(1) default '1',
-  email varchar(128) not null default ''
+  email varchar(128) not null default '',
+  userlevel int(4) {UNSIGNED} not null default '0'
 );
 
 #
@@ -114,10 +115,13 @@
 #
 
 create table {PREFIX}config (
-  name varchar(255) not null primary key,
-  value text not null
+  name varchar(255) not null,
+  value text not null,
+  authorid int(11) default '0'
 );
 
+CREATE INDEX authorid ON {PREFIX}config (authorid);
+
 CREATE TABLE {PREFIX}suppress (
   ip varchar(15) default NULL,
   scheme varchar(5),
@@ -134,9 +138,12 @@
   name varchar(128) not null,
   placement varchar(6) not null default 'right',
   sort_order int(4) not null default '0',
+  authorid int(11) default '0',
   PRIMARY KEY(name)
 );
 
+CREATE INDEX authorid ON {PREFIX}config (authorid);
+
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
   category_name varchar(255) default NULL,
@@ -153,5 +160,6 @@
   dimensions_width int(11) not null default '0',
   dimensions_height int(11) not null default '0',
   date int(11) not null default '0',
-  thumbnail_name varchar(255) not null default ''
+  thumbnail_name varchar(255) not null default '',
+  authorid int(11) default '0'
 );

[php-blog-cvs] serendipity/lang serendipity_config_local_da.tpl,NONE,1.1 serendipity_config_local_de.tpl,NONE,1.1 serendipity_config_local_en.tpl,NONE,1.1 serendipity_config_local_es.tpl,NONE,1.1 serendipity_config_user_da.tpl,NONE,1.1 serendipity_config_user_de.tpl,NONE,1.1 serendipity_config_user_en.tpl,NONE,1.1 serendipity_config_user_es.tpl,NONE,1.1

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

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

Added Files:
	serendipity_config_local_da.tpl 
	serendipity_config_local_de.tpl 
	serendipity_config_local_en.tpl 
	serendipity_config_local_es.tpl serendipity_config_user_da.tpl 
	serendipity_config_user_de.tpl serendipity_config_user_en.tpl 
	serendipity_config_user_es.tpl 
Log Message:
Multi user improvements, part #1


--- NEW FILE: serendipity_config_local_en.tpl ---
<?php # $Id: serendipity_config_local_en.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Database Settings
#  Here you can enter all your database information. Serendipity needs this to be able to function
$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Hostname
$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_

// Paths
# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index

// General settings
# Customize how Serendipity behaves
$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog

// Appearance and options
# Customize how Serendipity looks and feels
$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.

// Imageconversion Settings
# Enter general information about how serendipity should handle Images
$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
?>

--- NEW FILE: serendipity_config_local_es.tpl ---
<?php # $Id: serendipity_config_local_es.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Database Settings
#  Here you can enter all your database information. Serendipity needs this to be able to function
$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Database host
$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_

// Paths
# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index

// General settings
# Customize how Serendipity behaves
$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog

// Appearance and options
# Customize how Serendipity looks and feels
$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.

// Imageconversion Settings
# Enter general information about how serendipity should handle Images
$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
?>

--- NEW FILE: serendipity_config_local_de.tpl ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: serendipity_config_user_da.tpl ---
<?php # $Id: serendipity_config_user_da.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Personal details
# Your account details
$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
?>

--- NEW FILE: serendipity_config_user_de.tpl ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: serendipity_config_local_da.tpl ---
<?php # $Id: serendipity_config_local_da.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Database Settings
#  Here you can enter all your database information. Serendipity needs this to be able to function
$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Database host
$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_

// Paths
# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index

// General settings
# Customize how Serendipity behaves
$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish|0}';      // Select the language for your blog

// Appearance and options
# Customize how Serendipity looks and feels
$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.

// Imageconversion Settings
# Enter general information about how serendipity should handle Images
$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
?>

--- NEW FILE: serendipity_config_user_en.tpl ---
<?php # $Id: serendipity_config_user_en.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Personal details
# Your account details
$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
?>

--- NEW FILE: serendipity_config_user_es.tpl ---
<?php # $Id: serendipity_config_user_es.tpl,v 1.1 2004/04/04 16:12:38 garvinhicking Exp $

// Personal details
# Your account details
$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
?>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.63,1.63.2.1

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

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

Modified Files:
      Tag: branch_0_6
	serendipity_config.inc.php 
Log Message:
Branch "branch_0_6" is now version 0.6-rc1. Will later be modified to '0.6'


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -d -r1.63 -r1.63.2.1
--- serendipity_config.inc.php	4 Apr 2004 15:59:27 -0000	1.63
+++ serendipity_config.inc.php	4 Apr 2004 16:07:03 -0000	1.63.2.1
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6.1-CVS';
+$serendipity['version']      = '0.6-rc1';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

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

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Wrong branch: This is the new 0.6.1 one :)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_config.inc.php	4 Apr 2004 15:56:21 -0000	1.62
+++ serendipity_config.inc.php	4 Apr 2004 15:59:27 -0000	1.63
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6-rc1';
+$serendipity['version']      = '0.6.1-CVS';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

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

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Bump version on branch


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_config.inc.php	3 Apr 2004 17:36:16 -0000	1.61
+++ serendipity_config.inc.php	4 Apr 2004 15:56:21 -0000	1.62
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6-CVS';
+$serendipity['version']      = '0.6-rc1';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

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

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

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

Modified Files:
	serendipity_admin_upgrader.inc.php 
Log Message:
sort sqlfiles array for chronological sql insertion


Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_upgrader.inc.php	21 Mar 2004 16:35:32 -0000	1.5
+++ serendipity_admin_upgrader.inc.php	4 Apr 2004 15:34:36 -0000	1.6
@@ -13,11 +13,17 @@
 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) {
-            $sqlfiles[] = $file;
+            // Create a usable float as key index for our array to make it sortable
+            $numbers = explode('.', $res[1]);
+            $first   = $numbers[0];
+            unset($numbers[0]);
+            $sqlfiles[$first . '.' . @implode('', $numbers)] = $file;
         }
     }
 }
 
+@ksort($sqlfiles);
+
 if ($serendipity['GET']['action'] == 'ignore') {
     /* Todo: Don't know what to put here? */ 
 

[php-blog-cvs] serendipity/sql db_update_0.5_0.5.1_pgsql.sql,1.2,1.3

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

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

Modified Files:
	db_update_0.5_0.5.1_pgsql.sql 
Log Message:
fixed some more linefeeds


Index: db_update_0.5_0.5.1_pgsql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_pgsql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.5_0.5.1_pgsql.sql	2 Mar 2004 17:57:05 -0000	1.2
+++ db_update_0.5_0.5.1_pgsql.sql	4 Apr 2004 15:10:24 -0000	1.3
@@ -28,7 +28,7 @@
 CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
 UPDATE {PREFIX}entries SET last_modified = timestamp;
 
-INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
-INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
-INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
 INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

[php-blog-cvs] serendipity README,1.5,1.6

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

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

Modified Files:
	README 
Log Message:
fixed some more linefeeds


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	21 Mar 2004 16:35:31 -0000	1.5
+++ README	4 Apr 2004 15:10:24 -0000	1.6
@@ -334,46 +334,46 @@
 
 Serendipity supports an HTTP-cache compatible way of only showing items
 in an RSS feed which where modified since the last request from a
-client.
-
+client.
+
 Typically, an RSS reader fetches your RSS feeds (15 items, per default).
 It then remembers the timestamp when those items where fetched. By the
 time your RSS reader updates the feed (typically after 1 hour)
 Serendipity will now only serve all new or modified items since the last
 time of refresh. If no entries where updated since then, serendipity
 will only serve the 304 Header (Not Modified) and saves a lot of
-bandwidth for both client and server on periodical updates.
-
+bandwidth for both client and server on periodical updates.
+
 Technically an RSS reader catches the "Last-Modified" Header of the RSS
 output as well as a special "ETag"-Header. Both are set to the last
 modification time of your article base. On the next fetch, those
 received headers are sent as "IF_MODIFIED_SINCE" (= Last-Modified) and
 "IF_NONE_MATCH" (= ETag) Headers and will affect your rss feed. This
-saves a lot of bandwidth on both client and server side.
-
+saves a lot of bandwidth on both client and server side.
+
 Users who have been watching your feed and where not able to catch up
 the latest articles may miss some of them, because you usually only get
 15 items per feed. In case your reader provides the IF_MODIFIED_SINCE
 header the client can now catch all items (resp. a maximum of 50
-articles to prevent abuse).
-
+articles to prevent abuse).
+
 If you want to permanently disable that feature (whatever the reasons
 are) you can either set a "$_REQUEST['nocache'] = true" inside your
-rss.php file (first line) or append the '&nocache=true' request variable
+rss.php file (first line) or append the '&nocache=true' request variable
 to your feed so that it looks like:
-http://example.host/serendipity/rss.php?version=2.0&nocache=true.
-
+http://example.host/serendipity/rss.php?version=2.0&nocache=true.
+
 Of course, the usual feed behaviour is not affected if none of the
 caching headers are provided. So if you use syndication methods to embed
 content from a blog inside an application, just tune your application to
 either send the 'nocache'-Variable to a Serendipity blog, or to not send
-the caching headers.
-
+the caching headers.
+
 The syndication plugin can be configured to append that variable to your
-feed URLs from your blog.
-
+feed URLs from your blog.
+
 ########################################################################
-
+
 Serendipity Weblog - http://s9y.org
 
 Licensed under the BSD License

[php-blog-cvs] serendipity/plugins/serendipity_plugin_creativecommons serendipity_plugin_creativecommons.php,1.3,1.4

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

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

Modified Files:
	serendipity_plugin_creativecommons.php 
Log Message:
something seemed to have slipped through the patch/diff commit


Index: serendipity_plugin_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_creativecommons/serendipity_plugin_creativecommons.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_plugin_creativecommons.php	4 Apr 2004 08:04:57 -0000	1.3
+++ serendipity_plugin_creativecommons.php	4 Apr 2004 14:51:39 -0000	1.4
@@ -2,15 +2,15 @@
 
 switch ($serendipity['lang']) {
     case 'de': {
-        @define('PLUGIN_CREATIVECOMMONS_NAME', 'Creative Commons');
-        @define('PLUGIN_CREATIVECOMMONS_DESC', 'Zeigt einen Creative Commons Hinweis an');
+        @define('PLUGIN_SIDEBAR_CREATIVECOMMONS_NAME', 'Creative Commons');
+        @define('PLUGIN_SIDEBAR_CREATIVECOMMONS_DESC', 'Zeigt einen Creative Commons Hinweis an');
     }
     break;
 
     case 'en':
     default: {
-        @define('PLUGIN_CREATIVECOMMONS_NAME', 'Creative Commons');
-        @define('PLUGIN_CREATIVECOMMONS_DESC', 'Display a creative commons notification in the sidebar.');
+        @define('PLUGIN_SIDEBAR_CREATIVECOMMONS_NAME', 'Creative Commons');
+        @define('PLUGIN_SIDEBAR_CREATIVECOMMONS_DESC', 'Display a creative commons notification in the sidebar.');
     }
     break;
 }