php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.67,1.68 serendipity_functions_installer.inc.php,1.12,1.13

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
This is more correct, IIRC


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_admin_installer.inc.php	16 Jun 2004 18:28:58 -0000	1.67
+++ serendipity_admin_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.68
@@ -112,13 +112,7 @@
             if (version_compare(PHP_VERSION, VERSION_REQUIRED) == -1) {
                 echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';
             }
-            $from = array();
-            if ( extension_loaded('mysqli') )
-              $from['dbType'] = 'mysqli';
-            if ( extension_loaded('postgres') )
-              $from['dbType'] = 'postgres';
-            if ( extension_loaded('mysql') )
-              $from['dbType'] = 'mysql';
+            $from = false;
         }
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_functions_installer.inc.php	13 Jun 2004 21:28:20 -0000	1.12
+++ serendipity_functions_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.13
@@ -47,6 +47,19 @@
     }
 
     switch ($optname) {
+
+        case 'dbType' : 
+            if ( extension_loaded('mysqli') ) {
+                $type = 'mysqli';
+            }
+            if ( extension_loaded('postgres') ) {
+                $type = 'postgres';
+            }
+            if ( extension_loaded('mysql') ) {
+                $type = 'mysql';
+            }
+            return $type;
+
         case 'serendipityPath':
             $test_path1 = $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
             $test_path2 = dirname(__FILE__);

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.20,1.21 serendipity_lang_cz.inc.php,1.20,1.21 serendipity_lang_da.inc.php,1.37,1.38 serendipity_lang_de.inc.php,1.47,1.48 serendipity_lang_en.inc.php,1.38,1.39 serendipity_lang_es.inc.php,1.37,1.38 serendipity_lang_fr.inc.php,1.16,1.17

[Evan N. <tad...@us...>]

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Log Message:
Add support for MySQLi

Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_cs.inc.php	14 Jun 2004 18:16:30 -0000	1.20
+++ serendipity_lang_cs.inc.php	16 Jun 2004 18:28:59 -0000	1.21
@@ -404,7 +404,7 @@
 @define('INSTALL_CAT_DB', 'Databáze');
 @define('INSTALL_CAT_DB_DESC', 'Sem vložte všech informace o databázi. Serendipity je potøebuje k funkci.');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Typ databáze (mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Typ databáze');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'Název hostujího serveru');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_lang_da.inc.php	14 Jun 2004 18:16:30 -0000	1.37
+++ serendipity_lang_da.inc.php	16 Jun 2004 18:28:59 -0000	1.38
@@ -379,7 +379,7 @@
 @define('INSTALL_CAT_DB', 'Database settings');
 @define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Database type');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'The hostname for your database');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_fr.inc.php	14 Jun 2004 18:16:30 -0000	1.16
+++ serendipity_lang_fr.inc.php	16 Jun 2004 18:28:59 -0000	1.17
@@ -363,7 +363,7 @@
 @define('INSTALL_CAT_DB', 'Database settings');
 @define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Database type');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'The hostname for your database');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_cz.inc.php	14 Jun 2004 18:16:30 -0000	1.20
+++ serendipity_lang_cz.inc.php	16 Jun 2004 18:28:59 -0000	1.21
@@ -404,7 +404,7 @@
 @define('INSTALL_CAT_DB', 'Databáze');
 @define('INSTALL_CAT_DB_DESC', 'Sem vlo¾te v¹ech informace o databázi. Serendipity je potøebuje k funkci.');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Typ databáze (mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Typ databáze');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'Název hostujího serveru');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_lang_en.inc.php	16 Jun 2004 16:41:50 -0000	1.38
+++ serendipity_lang_en.inc.php	16 Jun 2004 18:28:59 -0000	1.39
@@ -399,7 +399,7 @@
 @define('INSTALL_CAT_DB', 'Database settings');
 @define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Database type');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'The hostname for your database');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_lang_es.inc.php	14 Jun 2004 18:16:30 -0000	1.37
+++ serendipity_lang_es.inc.php	16 Jun 2004 18:28:59 -0000	1.38
@@ -388,7 +388,7 @@
 @define('INSTALL_CAT_DB', 'Database settings');
 @define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
 @define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Database type');
 @define('INSTALL_DBHOST', 'Database host');
 @define('INSTALL_DBHOST_DESC', 'The hostname for your database');
 @define('INSTALL_DBUSER', 'Database user');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_de.inc.php	16 Jun 2004 16:41:50 -0000	1.47
+++ serendipity_lang_de.inc.php	16 Jun 2004 18:28:59 -0000	1.48
@@ -398,7 +398,7 @@
 @define('INSTALL_CAT_DB', 'Datenbankeinstellungen');
 @define('INSTALL_CAT_DB_DESC', 'Konfigurieren Sie hier die Datenbank. Serendipity benötigt die Daten, um lauffähig zu sein.');
 @define('INSTALL_DBTYPE', 'Datenbanktyp');
-@define('INSTALL_DBTYPE_DESC', 'Datenbanktyp (mysql|postgres)');
+@define('INSTALL_DBTYPE_DESC', 'Datenbanktyp');
 @define('INSTALL_DBHOST', 'Datenbank Servername');
 @define('INSTALL_DBHOST_DESC', 'Datenbank Servername');
 @define('INSTALL_DBUSER', 'Datenbank Username');

[php-blog-cvs] serendipity serendipity_db_mysqli.inc.php,NONE,1.1 NEWS,1.150,1.151 serendipity_admin_entries.inc.php,1.26,1.27 serendipity_admin_installer.inc.php,1.66,1.67 serendipity_admin_upgrader.inc.php,1.11,1.12 serendipity_functions.inc.php,1.292,1.293 serendipity_config_local.tpl,1.38,1.39

[Evan N. <tad...@us...>]

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

Modified Files:
	NEWS serendipity_admin_entries.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_admin_upgrader.inc.php 
	serendipity_functions.inc.php serendipity_config_local.tpl 
Added Files:
	serendipity_db_mysqli.inc.php 
Log Message:
Add support for MySQLi

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_admin_installer.inc.php	13 Jun 2004 21:28:20 -0000	1.66
+++ serendipity_admin_installer.inc.php	16 Jun 2004 18:28:58 -0000	1.67
@@ -112,7 +112,13 @@
             if (version_compare(PHP_VERSION, VERSION_REQUIRED) == -1) {
                 echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';
             }
-            $from = false;
+            $from = array();
+            if ( extension_loaded('mysqli') )
+              $from['dbType'] = 'mysqli';
+            if ( extension_loaded('postgres') )
+              $from['dbType'] = 'postgres';
+            if ( extension_loaded('mysql') )
+              $from['dbType'] = 'mysql';
         }
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

--- NEW FILE: serendipity_db_mysqli.inc.php ---
<?php # $Id: serendipity_db_mysqli.inc.php,v 1.1 2004/06/16 18:28:58 tadpole9 Exp $

/* Issues a query to the underlying database;
 * returns:
 *   false if there was an error,
 *   true if the query succeeded but did not generate any rows
 *   array of field values if it returned a single row and $single is true
 *   array of array of field values if it returned row(s)
 */
function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false) {
    global $serendipity;
    $type_map = array('assoc' => MYSQLI_ASSOC, 'num' => MYSQLI_NUM, 'both' => MYSQLI_BOTH);

    $c = mysqli_query($serendipity['dbConn'], $sql);

    if ( mysqli_error($serendipity['dbConn']) != '' ) {
        return mysqli_error($serendipity['dbConn']);
    }

    if (!$c) {
        if (!$serendipity['production']) {
            print mysqli_error($serendipity['dbConn']);
            if (function_exists('debug_backtrace') && $reportErr == true) {
                highlight_string(var_export(debug_backtrace(), 1));
            }
        }

        return false;
    }
    if ($c === true) {
        return true;
    }

    $result_type = $type_map[$result_type];

    switch(mysqli_num_rows($c)) {
        case 0:
            if ($single) {
                return false;
            }
            return true;
        case 1:
            if ($single) {
                return mysqli_fetch_array($c, $result_type);
            }
        default:
            if ($single) {
                return mysqli_fetch_array($c, $result_type);
            }

            $rows = array();
            while ( $row = mysqli_fetch_array($c, $result_type) ) {
                $rows[] = $row;
            }
            return $rows;
    }
}


function serendipity_db_insert_id() {
    global $serendipity;
    return mysqli_insert_id($serendipity['dbConn']);
}

function serendipity_db_affected_rows() {
    global $serendipity;
    return mysqli_affected_rows($serendipity['dbConn']);
}

function serendipity_db_escape_string($string) {
    global $serendipity;
    return mysqli_escape_string($serendipity['dbConn'], $string);
}

function serendipity_db_limit($start, $offset) {
    return $start . ', ' . $offset;
}

function serendipity_db_limit_sql($limitstring) {
    return ' LIMIT ' . $limitstring;
}

function serendipity_db_connect() {
    global $serendipity;

    if (isset($serendipity['dbConn'])) {
        return $serendipity['dbConn'];
    }

    $serendipity['dbConn'] = mysqli_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
    mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);

    return $serendipity['dbConn'];
}

function serendipity_db_schema_import($query) {
    static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
    static $replace = array('int(11) not null auto_increment', 'primary key',
        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');

    return serendipity_db_query(str_replace($search, $replace, $query));
}

/* probes the usability of the DB during installation */
function serendipity_db_probe($hash, &$errs) {
    global $serendipity;

    if (!($c = @mysqli_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
        $errs[] = 'Could not connect to database; check your settings.';
        $errs[] = 'The mySQL error was: ' . mysqli_connect_error();
        return false;
    }

    $serendipity['dbConn'] = $c;

    if ( !@mysqli_select_db($c, $hash['dbName']) ) {
        $errs[] = 'The database you specified does not exist.';
        $errs[] = 'The mySQL error was: ' . mysqli_error($c);
        return false;
    }

    return true;
}

function serendipity_db_concat($string) {
    return 'concat(' . $string . ')';
}

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

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_admin_entries.inc.php	14 Jun 2004 11:41:39 -0000	1.26
+++ serendipity_admin_entries.inc.php	16 Jun 2004 18:28:58 -0000	1.27
@@ -65,7 +65,7 @@
     }
 
     $sort .= '</select> '
-           . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input size="10" type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '')
+           . (preg_match('/^mysqli?/', $serendipity['dbType']) ? CONTENT . ': <input size="10" type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '')
            . ' <input type="submit" name="go" value="' . GO . ' " />';
     return $sort;
 }

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- serendipity_functions.inc.php	16 Jun 2004 16:41:49 -0000	1.292
+++ serendipity_functions.inc.php	16 Jun 2004 18:28:58 -0000	1.293
@@ -2748,7 +2748,7 @@
         if (rand(0, 100) < 1) {
             serendipity_track_referrer_gc();
         }
-        if($serendipity['dbType'] == "mysql")
+        if(preg_match('/^mysqli?/', $serendipity['dbType']))
             $interval = 900;
         else
             $interval = "interval '900'";
@@ -2791,7 +2791,7 @@
 function serendipity_track_referrer_gc() {
     global $serendipity;
 
-    if ($serendipity['dbType'] == "mysql") {
+    if (preg_match('/^mysqli?/', $serendipity['dbType'])) {
         $interval = 900;
     } else {
         $interval = "interval '900'";
@@ -2861,7 +2861,7 @@
     global $serendipity;
 
     /* HACK */
-    if ($serendipity['dbType'] == 'mysql') {
+    if (preg_match('/^mysqli?/', $serendipity['dbType'])) {
         /* Nonportable SQL due to MySQL date functions,
          * but produces rolling 7 day totals, which is more
          * interesting

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- NEWS	14 Jun 2004 11:45:33 -0000	1.150
+++ NEWS	16 Jun 2004 18:28:58 -0000	1.151
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Add support for MySQLi (tadpole9)
+
     * Alphabetically sort list of plugins (tadpole9)
 
     * Tweaks to plugin configuration design (tomsommer)

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_config_local.tpl	13 Jun 2004 12:50:18 -0000	1.38
+++ serendipity_config_local.tpl	16 Jun 2004 18:28:58 -0000	1.39
@@ -2,12 +2,12 @@
 
 // INSTALL_CAT_DB
 # INSTALL_CAT_DB_DESC
-$serendipity['dbType']               = '{INSTALL_DBTYPE|dbType|string|mysql|255}';                 // INSTALL_DBTYPE_DESC
-$serendipity['dbHost']               = '{INSTALL_DBHOST|dbHost|string|localhost|255}';             // INSTALL_DBHOST_DESC
-$serendipity['dbUser']               = '{INSTALL_DBUSER|dbUser|string|serendipity|255}';           // INSTALL_DBUSER_DESC
-$serendipity['dbPass']               = '{INSTALL_DBPASS|dbPass|protected||255}';                   // INSTALL_DBPASS_DESC
-$serendipity['dbName']               = '{INSTALL_DBNAME|dbName|string|serendipity|255}';           // INSTALL_DBNAME_DESC
-$serendipity['dbPrefix']             = '{INSTALL_DBPREFIX|dbPrefix|string|serendipity_|255}';      // INSTALL_DBPREFIX_DESC
+$serendipity['dbType']               = '{INSTALL_DBTYPE|dbType|list|mysql=>MySQL,postgres=>PostgreSQL,mysqli=>MySQLi|255}'; // INSTALL_DBTYPE_DESC
+$serendipity['dbHost']               = '{INSTALL_DBHOST|dbHost|string|localhost|255}';                                      // INSTALL_DBHOST_DESC
+$serendipity['dbUser']               = '{INSTALL_DBUSER|dbUser|string|serendipity|255}';                                    // INSTALL_DBUSER_DESC
+$serendipity['dbPass']               = '{INSTALL_DBPASS|dbPass|protected||255}';                                            // INSTALL_DBPASS_DESC
+$serendipity['dbName']               = '{INSTALL_DBNAME|dbName|string|serendipity|255}';                                    // INSTALL_DBNAME_DESC
+$serendipity['dbPrefix']             = '{INSTALL_DBPREFIX|dbPrefix|string|serendipity_|255}';                               // INSTALL_DBPREFIX_DESC
 
 // INSTALL_CAT_PATHS
 # INSTALL_CAT_PATHS_DESC

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_admin_upgrader.inc.php	7 Jun 2004 14:22:47 -0000	1.11
+++ serendipity_admin_upgrader.inc.php	16 Jun 2004 18:28:58 -0000	1.12
@@ -11,8 +11,9 @@
 
 /* Fetch SQL files which needs to be run */
 $dir = opendir(S9Y_INCLUDE_PATH . 'sql/');
+$dbType = $serendipity['dbType'] == 'mysqli' ? 'mysql' : $serendipity['dbType'];
 while (($file = readdir($dir)) !== false ) {
-    if (preg_match('@db_update_(.*)_(.*)_'. $serendipity['dbType'] .'.sql@', $file, $res)) {
+    if (preg_match('@db_update_(.*)_(.*)_'. $dbType .'.sql@', $file, $res)) {
         if (version_compare($res[1], serendipity_version($serendipity['versionInstalled'])) >= 0) {
             // Create a usable float as key index for our array to make it sortable
             $numbers = explode('.', $res[1]);

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

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Tuned the category-display-plugin to change/disable the xml
button that is displayed before every category. If generateCategoryList()
is used in another place, it will not display the links to 
the xml feeds, as a param has been added. 


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_sidebar_items.php	15 Jun 2004 20:38:45 -0000	1.62
+++ serendipity_sidebar_items.php	16 Jun 2004 16:41:49 -0000	1.63
@@ -536,7 +536,7 @@
 
         $propbag->add('name',        CATEGORIES);
         $propbag->add('description', CATEGORY_PLUGIN_DESC);
-        $propbag->add('configuration', array('authorid'));
+        $propbag->add('configuration', array('authorid', 'image'));
 
         $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
         $authors     = array('all' => ALL_AUTHORS);
@@ -556,7 +556,12 @@
                 $propbag->add('description',  CATEGORIES_TO_FETCH_DESC);
                 $propbag->add('select_values', $this->author_select_values);
                 break;
-
+						case 'image':
+								$propbag->add('type',         'string');
+                $propbag->add('name',         XML_IMAGE_TO_DISPLAY);
+                $propbag->add('description',  XML_IMAGE_TO_DISPLAY_DESC);				
+                				
+						   	break;
             default:
                 return false;
         }
@@ -570,9 +575,12 @@
         $categories = serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category);
         $title      = CATEGORIES;
         $html       = '';
-
+				$image = $this->get_config('image', $image);
+				if (empty($image)) 
+					$image = serendipity_getTemplateFile('img/xml.gif');
+				$image = (($image == "'none'" || $image == 'none') ? '' : $image);
         if (is_array($categories) && count($categories)) {
-            $html .= serendipity_generateCategoryList($categories, array(0), 3, 0);
+            $html .= serendipity_generateCategoryList($categories, array(0), 3, 0, 0, $image);
         }
 
         $html .= sprintf(

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- serendipity_functions.inc.php	14 Jun 2004 18:22:57 -0000	1.291
+++ serendipity_functions.inc.php	16 Jun 2004 16:41:49 -0000	1.292
@@ -2353,7 +2353,21 @@
     return array($f, $suf);
 }
 
-function serendipity_generateCategoryList($cats, $select = array(0), $type = 0, $id = 0, $level = 0) {
+/**
+* Print a list of categories
+*
+* Prints a list of categories for use in forms, the sidebar, or whereever...
+* @param array  An array of categories, typically gathered by serendipity_fetchCategories()
+* @param array  Select
+* @param int    Type
+* @param int    ID
+* @param int    Level
+* @param string Tells the function, whether or not to display the XML button for each category.
+*               If empty, no links to the xml feeds will be displayed; If you want to, you can
+*               pass an image here (this setting is only used, when type==3).
+* @see serendipity_fetchCategories()
+*/
+function serendipity_generateCategoryList($cats, $select = array(0), $type = 0, $id = 0, $level = 0, $xmlImg = '') {
     global $serendipity;
 
     if ( !is_array($cats) || !count($cats) )
@@ -2374,21 +2388,28 @@
                    break;
                 case 3:
                     $category_id = serendipity_makeFilename($cat['category_name']);
+                    if (!empty($xmlImg)) 
                     $ret .= sprintf(
                       '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a>&nbsp;%s' .
                       '<a href="%s" title="%s">%s</a><br />',
-
                       $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
                       htmlspecialchars($cat['category_description']),
                       ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
-                      serendipity_getTemplateFile('img/xml.gif'),
+                      $xmlImg,
                       str_repeat('&nbsp;', $level * 3),
                       $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
                       htmlspecialchars($cat['category_description']),
                       htmlspecialchars($cat['category_name']));
-                      break;
+                    else
+                    	$ret .= sprintf(
+                      '%s<a href="%s" title="%s">%s</a><br />',
+                      str_repeat('&nbsp;', $level * 3),
+                      $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
+                      htmlspecialchars($cat['category_description']),
+                      htmlspecialchars($cat['category_name']));
+                 break;
             }
-            $ret .= serendipity_generateCategoryList($cats, $select, $type, $cat['categoryid'], $level + 1);
+            $ret .= serendipity_generateCategoryList($cats, $select, $type, $cat['categoryid'], $level + 1, $xmlImg);
         }
     }
     return $ret;

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.37,1.38 serendipity_lang_de.inc.php,1.46,1.47

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

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

Modified Files:
	serendipity_lang_en.inc.php serendipity_lang_de.inc.php 
Log Message:
Tuned the category-display-plugin to change/disable the xml
button that is displayed before every category. If generateCategoryList()
is used in another place, it will not display the links to 
the xml feeds, as a param has been added. 


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_lang_en.inc.php	14 Jun 2004 18:16:30 -0000	1.37
+++ serendipity_lang_en.inc.php	16 Jun 2004 16:41:50 -0000	1.38
@@ -363,6 +363,8 @@
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
 @define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'entries per page');
+@define('XML_IMAGE_TO_DISPLAY', 'XML Button');
+@define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
 
 @define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
 @define('ALL_DIRECTORIES', 'all directories');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_de.inc.php	14 Jun 2004 18:16:30 -0000	1.46
+++ serendipity_lang_de.inc.php	16 Jun 2004 16:41:50 -0000	1.47
@@ -391,6 +391,9 @@
 @define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s Kommentar');
 @define('PERMISSIONS', 'Rechte');
 
+@define('XML_IMAGE_TO_DISPLAY', 'XML Knopf');
+@define('XML_IMAGE_TO_DISPLAY_DESC','Dieses Bild führt zu den XML-Feeds. F&uul;r ein Standardbild leer lassen oder \'none\' zum deaktivieren.');
+
 /* DATABASE SETTINGS */
 @define('INSTALL_CAT_DB', 'Datenbankeinstellungen');
 @define('INSTALL_CAT_DB_DESC', 'Konfigurieren Sie hier die Datenbank. Serendipity benötigt die Daten, um lauffähig zu sein.');

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.29,1.30

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
After adding a plugin, move to configuration - if there is something to configure... Fixes TODO


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_admin_plugins.inc.php	15 Jun 2004 20:27:29 -0000	1.29
+++ serendipity_admin_plugins.inc.php	15 Jun 2004 22:03:15 -0000	1.30
@@ -521,7 +521,17 @@
         } else {
             $inst = serendipity_plugin_api::create_plugin_instance($_POST['serendipity']['plugin_to_add'], null, 'right', $authorid);
         }
-        /* TODO: redirect to configuration for that instance */
+
+        /* Load the new plugin */
+        $plugin = &serendipity_plugin_api::load_plugin($inst);
+        $bag  = new serendipity_property_bag;
+        $plugin->introspect($bag);
+
+        /* Only play with the plugin if there is something to play with */
+        if ( $bag->is_set('configuration') ) {
+            header('Location: '. $serendipity['baseurl'] .'?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $inst);
+            die();
+        }
     }
 
     if (isset($_POST['REMOVE'])) {

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.61,1.62

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
This will fix it. If there is no title set, we'll just print nugget - Some people might want a nugget without a title, so we can't force one upen them


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_sidebar_items.php	15 Jun 2004 20:35:02 -0000	1.61
+++ serendipity_sidebar_items.php	15 Jun 2004 20:38:45 -0000	1.62
@@ -515,7 +515,11 @@
 
     function generate_content(&$title)
     {
-        $title = $this->get_config('title',$title); 
+        $title = $this->get_config('title', $title); 
+        // In case we have a nugget without a title
+        if ( empty($title) ) {
+            $title = HTML_NUGGET;
+        }
         if ($this->get_config('markup', 'true') == 'true') {
             $entry = array('html_nugget' => $this->get_config('content'));
             serendipity_plugin_api::hook_event('frontend_display', $entry);

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.60,1.61

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
There has to be some default title set upon plugin creation. How & where?

:)OC


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_sidebar_items.php	15 Jun 2004 20:27:29 -0000	1.60
+++ serendipity_sidebar_items.php	15 Jun 2004 20:35:02 -0000	1.61
@@ -515,7 +515,7 @@
 
     function generate_content(&$title)
     {
-        $title = HTML_NUGGET; 
+        $title = $this->get_config('title',$title); 
         if ($this->get_config('markup', 'true') == 'true') {
             $entry = array('html_nugget' => $this->get_config('content'));
             serendipity_plugin_api::hook_event('frontend_display', $entry);

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.28,1.29 serendipity_sidebar_items.php,1.59,1.60

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
	serendipity_sidebar_items.php 
Log Message:
admin_plugins:
Was somebody else able to add plugins like this? I don't think so. Works for me, now...

sidebar_items:
I probably fux0red things up here, but there seems to be something wrong
with some built-in plugins as the creative commons and html nugget plugins. 
They are missing the "title field". 


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_sidebar_items.php	11 Jun 2004 12:19:05 -0000	1.59
+++ serendipity_sidebar_items.php	15 Jun 2004 20:27:29 -0000	1.60
@@ -515,7 +515,7 @@
 
     function generate_content(&$title)
     {
-        $title = $this->get_config('title', $title);
+        $title = HTML_NUGGET; 
         if ($this->get_config('markup', 'true') == 'true') {
             $entry = array('html_nugget' => $this->get_config('content'));
             serendipity_plugin_api::hook_event('frontend_display', $entry);

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_admin_plugins.inc.php	14 Jun 2004 11:26:44 -0000	1.28
+++ serendipity_admin_plugins.inc.php	15 Jun 2004 20:27:29 -0000	1.29
@@ -61,7 +61,7 @@
     usort($pluginstack, 'serendipity_pluginListSort');
     foreach ( $pluginstack as $plug ) {
 ?>
-                    <option value="<?php echo $plugin['class_name']; ?>"><?php echo $plug['name'] . ' - ' . $plug['desc']; ?></option>
+                    <option value="<?php echo $plug['class_name']; ?>"><?php echo $plug['name'] . ' - ' . $plug['desc']; ?></option>
 <?php
     }
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.290,1.291

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
To me, reverse order makes more sense, when you read from the top and down


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- serendipity_functions.inc.php	14 Jun 2004 18:16:28 -0000	1.290
+++ serendipity_functions.inc.php	14 Jun 2004 18:22:57 -0000	1.291
@@ -3039,7 +3039,7 @@
         <td colspan="6"><h2><?php echo $year; ?></h2></td>
     </tr>
 <?php
-        for($y=1; $y<13; $y++) {
+        for($y=12; $y>0; $y--) {
             if (isset($months[$y]) && $months[$y]) {
                 $time = mktime(0,0,0, $y+1, 0, $year);
 ?>

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.19,1.20 serendipity_lang_cz.inc.php,1.19,1.20 serendipity_lang_da.inc.php,1.36,1.37 serendipity_lang_de.inc.php,1.45,1.46 serendipity_lang_en.inc.php,1.36,1.37 serendipity_lang_es.inc.php,1.36,1.37 serendipity_lang_fr.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Log Message:
Fixed the name of the month not being shown in the archive.
Did a few layout tweaks, more might come :)


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_cs.inc.php	14 Jun 2004 10:45:14 -0000	1.19
+++ serendipity_lang_cs.inc.php	14 Jun 2004 18:16:30 -0000	1.20
@@ -65,7 +65,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte pøidávaný plugin');
 @define('UP', 'Nahoru');
 @define('DOWN', 'Dolù');
-@define('ENTRIES', 'Záznamy:');
+@define('ENTRIES', 'záznamy');
 @define('NEW_ENTRY', 'Nový záznam');
 @define('AUTHOR_SUITE', 'Autorská sekce');
 @define('EDIT_ENTRIES', 'Editovat záznamy');
@@ -509,4 +509,4 @@
 @define('TOP_LEVEL', 'Top level');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_da.inc.php	14 Jun 2004 10:45:15 -0000	1.36
+++ serendipity_lang_da.inc.php	14 Jun 2004 18:16:30 -0000	1.37
@@ -60,7 +60,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vælg det plugin du vil tilføje');
 @define('UP', 'OP');
 @define('DOWN', 'NED');
-@define('ENTRIES', 'Artikler:');
+@define('ENTRIES', 'artikler');
 @define('NEW_ENTRY', 'Ny artikel');
 @define('AUTHOR_SUITE', 'Redaktørsuite');
 @define('EDIT_ENTRIES', 'Rediger artikler');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_fr.inc.php	14 Jun 2004 10:45:15 -0000	1.15
+++ serendipity_lang_fr.inc.php	14 Jun 2004 18:16:30 -0000	1.16
@@ -62,7 +62,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez un plugin à ajouter');
 @define('UP', 'REMONTER');
 @define('DOWN', 'DESCENDRE');
-@define('ENTRIES', 'News:');
+@define('ENTRIES', 'news');
 @define('NEW_ENTRY', 'Poster une news');
 @define('AUTHOR_SUITE', 'Suite des auteurs');
 @define('EDIT_ENTRIES', 'Editer les news');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_cz.inc.php	14 Jun 2004 10:45:14 -0000	1.19
+++ serendipity_lang_cz.inc.php	14 Jun 2004 18:16:30 -0000	1.20
@@ -65,7 +65,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte pøidávaný plugin');
 @define('UP', 'Nahoru');
 @define('DOWN', 'Dolù');
-@define('ENTRIES', 'Záznamy:');
+@define('ENTRIES', 'záznamy');
 @define('NEW_ENTRY', 'Nový záznam');
 @define('AUTHOR_SUITE', 'Autorská sekce');
 @define('EDIT_ENTRIES', 'Editovat záznamy');
@@ -509,4 +509,4 @@
 @define('TOP_LEVEL', 'Top level');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_en.inc.php	14 Jun 2004 10:45:15 -0000	1.36
+++ serendipity_lang_en.inc.php	14 Jun 2004 18:16:30 -0000	1.37
@@ -65,7 +65,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select a plugin to add');
 @define('UP', 'UP');
 @define('DOWN', 'DOWN');
-@define('ENTRIES', 'Entries:');
+@define('ENTRIES', 'entries');
 @define('NEW_ENTRY', 'New entry');
 @define('AUTHOR_SUITE', 'Authoring Suite');
 @define('EDIT_ENTRIES', 'Edit entries');
@@ -496,4 +496,4 @@
 @define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_es.inc.php	14 Jun 2004 10:45:15 -0000	1.36
+++ serendipity_lang_es.inc.php	14 Jun 2004 18:16:30 -0000	1.37
@@ -63,7 +63,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Selecciona el plugin que quieres añadir');
 @define('UP', 'ARRIBA');
 @define('DOWN', 'ABAJO');
-@define('ENTRIES', 'Posts:');
+@define('ENTRIES', 'posts');
 @define('NEW_ENTRY', 'Post nuevo');
 @define('AUTHOR_SUITE', 'Suite de autoría');
 @define('EDIT_ENTRIES', 'Editar posts');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_de.inc.php	14 Jun 2004 10:45:15 -0000	1.45
+++ serendipity_lang_de.inc.php	14 Jun 2004 18:16:30 -0000	1.46
@@ -63,7 +63,7 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin auswählen');
 @define('UP', 'HOCH');
 @define('DOWN', 'RUNTER');
-@define('ENTRIES', 'Einträge:');
+@define('ENTRIES', 'einträge');
 @define('NEW_ENTRY', 'Neuer Eintrag');
 @define('EDIT_ENTRIES', 'Einträge bearbeiten');
 @define('DELETE_ENTRIES', 'Eintrag löschen');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.289,1.290

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed the name of the month not being shown in the archive.
Did a few layout tweaks, more might come :)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- serendipity_functions.inc.php	14 Jun 2004 11:53:28 -0000	1.289
+++ serendipity_functions.inc.php	14 Jun 2004 18:16:28 -0000	1.290
@@ -3031,31 +3031,35 @@
     $barwidth = 40;
     $fac = $barwidth/$max;
 ?>
-<table cellspacing="0">
+<table cellspacing="0" width="500">
 <?php
     foreach($out as $year => $months) {
 ?>
     <tr>
-        <td colspan="4"><h2><?php echo $year; ?></h2></td>
+        <td colspan="6"><h2><?php echo $year; ?></h2></td>
     </tr>
 <?php
         for($y=1; $y<13; $y++) {
             if (isset($months[$y]) && $months[$y]) {
+                $time = mktime(0,0,0, $y+1, 0, $year);
 ?>
     <tr>
         <td>
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" />
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
-                 &nbsp;&nbsp;<?php echo $months[$y][1] . $serendipity['months'][$y] . $months[$y][2] . ' (' . $months[$y][0] . ' ' . ENTRIES . ')'; ?>
+            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" /><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
+        </td>
+        <td>
+            <?php echo $months[$y][1] . serendipity_formatTime('%B', $time) . $months[$y][2]; ?>
+        </td>
+        <td>
+            <?php echo $months[$y][0] . ' ' . ENTRIES; ?>
         </td>
 
         <td>
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="35" hspace="0" vspace="0" alt="" />
                 (<?php echo $months[$y][1] . VIEW_FULL . $months[$y][2]; ?>)
         </td>
 
         <td>
-            &nbsp;(<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
+            (<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
         </td>
     </tr>
 <?php

[php-blog-cvs] serendipity/bundled-libs create_release.sh,NONE,1.1

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

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

Added Files:
	create_release.sh 
Log Message:
Bash-Script for releasing files. Fixing ownership, permissions et al, which
are kept totally meaningless in CVS and cannot be altered. :(


--- NEW FILE: create_release.sh ---
#!/bin/sh
# File: create_release.sh
# Author: Garvin Hicing
# $Id: create_release.sh,v 1.1 2004/06/14 13:13:19 garvinhicking Exp $
#
# Description:
# This file is only used for developers to create a Serendipity release file
# with all the proper file permissions. CVS doesn't track the rightly, so we
# need to fix it before releasing.
#
# Usage:
# As security precaution for any other users just executing this script, there
# are two required input parameters. The first being the basename path of the
# serendipity installation. The second parameter is the target owner of the files.

echo ""
echo "-[serendipity create_release.sh START]---------------------------------"

if [ "x$1" = "x" ] || [ "x$2" = "x" ] || [ "x$3" = "x" ] ;
then
    echo "usage: ./create_release.sh
            [tar.gz dump filename]
            [serendipity installation dirname, without paths]
            [username, i.e. nobody.nogroup]"
    echo ""
    echo "example:"
    echo " $> cd serendipity/bundled-libs/"
    echo " $> ./create_release.sh serendipity-0.7.tar.gz serendipity nobody.nogroup"
    echo ""
    echo "WARNING: Running this script in a productive blog environment will do"
    echo "         serious harm!"
    echo "-[serendipity create_release.sh END]----------------------------------"
    echo ""
    exit 1
else
    if test "../../$2"
    then
        echo "WARNING: Running this script in a productive blog environment will do"
        echo "         serious harm! Only use it, if you are a developer and about"
        echo "         to bundle a new release version!"
        echo ""
        echo "Hit [ENTER] to continue, or abort this script"
        read -n 1

        echo "1. Operating on basedirectory ../../$2"
            cd ../../
            echo "    [DONE]"
            echo ""

        echo "2. Adjusting directory/file ownership to $3"
            chown -R "$3" "$2"
            echo "    [DONE]"
            echo ""

        echo "3. Adjusting all subdirectory permissions to 755"
            find "$2" -type d -exec chmod 755 {} \;
            echo "    [DONE]"
            echo ""

        echo "4. Adjusting core directory permissions to 777"
            chmod 777 "$2"
            echo "    [DONE]"
            echo ""

        echo "5. Adjusting all file permissions to 644"
            find "$2" -type f -exec chmod 644 {} \;
            echo "    [DONE]"
            echo ""

        echo "6. Adjusting special files..."
            echo "   - $2/.htaccess [666]"
            chmod 666 "$2/.htaccess"

            echo "   - $2/upgrade.sh [744]"
            chmod 744 "$2/upgrade.sh"

            echo "   - $2/bundled-libs/create_release.sh [766]"
            chmod 766 "$2/bundled-libs/create_release.sh"
            echo "    [DONE]"
            echo ""

        echo "7. Altering CVS to be useful for anonymous users..."
            echo "   - Removing CVS branch tag, so that a user can upgrade to latest CVS"
            find "$2" -type f -name Tag -exec rm {} \;
            echo "       [DONE]"

            echo "   - Inserting ANONYMOUS user instead of Developer account"
            for i in `find $2 -type f -name Root` ; do
                echo ':pserver:ano...@cv...:/cvsroot/php-blog' > $i;
            done
            echo "       [DONE]"
            echo ""

        echo "8. Creating .tgz file $1"
            tar -czf "$1" "$2"
            echo "    [DONE]"
            echo ""

        echo "9. All Done. Bybe-Bye."
    else
        echo "Basedirectory ../../$2 not found. Check parameters"
    fi
    echo "-[serendipity create_release.sh END]----------------------------------"
    echo ""
fi

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.288,1.289

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed bad compatibility fallback. Showed up in RSS comment feeds where only
the first character of a category was shown.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- serendipity_functions.inc.php	14 Jun 2004 11:41:39 -0000	1.288
+++ serendipity_functions.inc.php	14 Jun 2004 11:53:28 -0000	1.289
@@ -1764,7 +1764,7 @@
             }
 
             if (!is_array($entry['categories'])) {
-                $entry['categories'] = array(0 => $entry['category_name']);
+                $entry['categories'] = array(0 => array('category_name' => $entry['category_name']));
             }
 
             if ($version == 'atom0.3') {

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

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

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

Modified Files:
	textile.php 
Log Message:
fixed more textiliness.


Index: textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/textile.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- textile.php	9 Jun 2004 14:11:13 -0000	1.3
+++ textile.php	14 Jun 2004 11:45:33 -0000	1.4
@@ -349,12 +349,12 @@
                 if ($nl===$tl){
                     $line .= "</li>";
                 } elseif($nl=="*" or $nl=="#") {
-                    $line .= "</li>\n\t</".lT($tl)."l>\n\t</li>";
+                    $line .= "</li>\n\t</".textile_lT($tl)."l>\n\t</li>";
                     unset($lists[$tl]);
                 }
                 if (!$nl) {
                     foreach($lists as $k=>$v){
-                        $line .= "</li>\n\t</".lT($k)."l>";
+                        $line .= "</li>\n\t</".textile_lT($k)."l>";
                         unset($lists[$k]);
                     }
                 }

[php-blog-cvs] serendipity NEWS,1.149,1.150

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

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

Modified Files:
	NEWS 
Log Message:
fixed more textiliness.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- NEWS	14 Jun 2004 10:45:13 -0000	1.149
+++ NEWS	14 Jun 2004 11:45:33 -0000	1.150
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Alphabetically sort list of plugins (tadpole9)
+
     * Tweaks to plugin configuration design (tomsommer)
 
     * Fix bug during installation, which can cause an endless loop

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.287,1.288 serendipity_admin_entries.inc.php,1.25,1.26

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_entries.inc.php 
Log Message:
Needed to revert previous code for fetching categories and do one additional
query instead, because of Bug #971652. 


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- serendipity_functions.inc.php	11 Jun 2004 12:50:50 -0000	1.287
+++ serendipity_functions.inc.php	14 Jun 2004 11:41:39 -0000	1.288
@@ -714,13 +714,7 @@
                     e.last_modified,
 
                     a.username,
-                    a.email,
-
-                    c.categoryid,
-                    c.category_name,
-                    c.category_description,
-                    c.category_icon,
-                    c.parentid
+                    a.email
 
                     $body
               FROM
@@ -731,6 +725,8 @@
                         ON e.id = ec.entryid
                     LEFT JOIN {$serendipity['dbPrefix']}category c
                         ON ec.categoryid = c.categoryid $and
+                    GROUP BY
+                        e.id
                     ORDER BY
                         $orderby
                     $limit";
@@ -742,48 +738,40 @@
     }
 
     if (is_array($ret)) {
-        // We want to save us a few DB query, so we don't group the above query by ids,
-        // and instead populate an array flattened to entry ids, but with all supplemental
-        // category information.
-
-        $return  = array(); // will hold the flattened array
-        $seen_id = array(); // holds information of already seen entries
-        $i       = -1;      // inremental counter for array-compatibility
+        // The article's query LIMIT operates on a flattened entries layer so that
+        // an article having 5 associated categories won't count as 5 entries.
+        // But to store the expanded list of categories, we need to send a new
+        // query once for all entries we have just fetched.
+        // First code for this was sending 15 queries for 15 fetched entries,
+        // this is now limited to just one query per fetched articles group
 
-        foreach ($ret as $_id => $entry) {
+        $search_ids = array(); // An array to hold all ids of the entry we want to fetch.
+        $assoc_ids  = array(); // A temporary key association container to not have to loop through the return array once again.
 
-            if (!isset($seen_id[$entry['id']])) {
-                // check whether there were any associated categories.
-                // if not, store a 'True' value for compatibility.
-                if ($i > -1 && !isset($return[$i]['categories'])) {
-                    $return[$i]['categories'] = array();
-                }
+        foreach($ret AS $i => $entry) {
+            $search_ids[]            = $entry['id'];
+            $ret[$i]['categories']   = array();        // make sure every article gets its category association
+            $assoc_ids[$entry['id']] = $i;             // store temporary reference
+        }
 
-                $i++;
-                $return[$i]            = $entry;
-                $seen_id[$entry['id']] = true;
-            }
+        $query = "SELECT
+                         ec.entryid,
+                         c.categoryid,
+                         c.category_name,
+                         c.category_description,
+                         c.category_icon,
+                         c.parentid
+                    FROM {$serendipity['dbPrefix']}category AS c
+               LEFT JOIN {$serendipity['dbPrefix']}entrycat AS ec
+                      ON ec.categoryid = c.categoryid
+                   WHERE ec.entryid IN (" . implode(', ', $search_ids) . ")";
 
-            if (isset($entry['categoryid'])) {
-                // Only append category array if association is present
-                $return[$i]['categories'][] = array(
-                    'categoryid'           => $entry['categoryid'],
-                    'category_name'        => $entry['category_name'],
-                    'category_description' => $entry['category_description'],
-                    'category_icon'        => $entry['category_icon'],
-                    'parentid'             => $entry['parentid']
-                );
+        $search_ret = serendipity_db_query($query);
+        if (is_array($search_ret)) {
+            foreach($search_ret AS $i => $entry) {
+                $ret[$assoc_ids[$entry['entryid']]]['categories'][] = $entry;
             }
-
-            unset($ret[$_id]); // save some memory, we don't need this array element any more :-)
         }
-
-        if ($i > -1 && !isset($return[$i]['categories'])) {
-            // see above
-            $return[$i]['categories'] = array();
-        }
-
-        return $return;
     }
 
     return $ret;

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_admin_entries.inc.php	7 Jun 2004 18:38:16 -0000	1.25
+++ serendipity_admin_entries.inc.php	14 Jun 2004 11:41:39 -0000	1.26
@@ -154,7 +154,7 @@
 ?>
         <tr>
             <td colspan="<?php echo $halfRowLeft; ?>">
-                <input type="submit" name="serendipity[prevpage]" value="&lt;&lt;&lt;" <?php if ($serendipity['GET']['offset'] <= 0) echo ' disabled' ?> />
+                <input type="submit" name="serendipity[prevpage]" value="&lt;&lt;&lt;" <?php if ($serendipity['GET']['offset'] <= 0) echo ' disabled="disabled"' ?> />
             </td>
 
             <td class="serendipity_admin_filters" align="center">
@@ -163,7 +163,7 @@
             </td>
 
             <td  colspan="<?php echo $halfRowRight; ?>" align="right">
-                <input type="submit" name="serendipity[nextpage]" value="&gt;&gt;&gt;" <?php if ($count != $perPage) echo ' disabled' ?> />
+                <input type="submit" name="serendipity[nextpage]" value="&gt;&gt;&gt;" <?php if ($count != $perPage) echo ' disabled="disabled"'; ?> />
             </td>
         </tr>
     </table>
@@ -363,4 +363,4 @@
         );
 }
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.5,1.6

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
adjust url to not be sprintf()ed when %5D and other html entities are
transferred (like when in searching entries)


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_karma.php	9 Jun 2004 11:49:23 -0000	1.5
+++ serendipity_event_karma.php	14 Jun 2004 11:40:17 -0000	1.6
@@ -475,11 +475,11 @@
                             $url = $_SERVER['REQUEST_URI'] . (stristr($_SERVER['REQUEST_URI'], '?') ? '&' : '?');
                             $karma = (isset($serendipity['COOKIE']['karmaVote']) ? unserialize($serendipity['COOKIE']['karmaVote']) : array());
 
-                            $link_1 = '<a class="serendipity_karmaVoting_link1" href="#" onclick="javascript:location.href=\'' . $url . 'serendipity[karmaVote]=2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_1) . '">++</a>';
-                            $link_2 = '<a class="serendipity_karmaVoting_link2" href="#" onclick="javascript:location.href=\'' . $url . 'serendipity[karmaVote]=1&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_2) . '">+</a>';
-                            $link_3 = '<a class="serendipity_karmaVoting_link3" href="#" onclick="javascript:location.href=\'' . $url . 'serendipity[karmaVote]=0&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_3) . '">0</a>';
-                            $link_4 = '<a class="serendipity_karmaVoting_link4" href="#" onclick="javascript:location.href=\'' . $url . 'serendipity[karmaVote]=-1&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_4) . '">-</a>';
-                            $link_5 = '<a class="serendipity_karmaVoting_link5" href="#" onclick="javascript:location.href=\'' . $url . 'serendipity[karmaVote]=-2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_5) . '">--</a>';
+                            $link_1 = '<a class="serendipity_karmaVoting_link1" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_1) . '">++</a>';
+                            $link_2 = '<a class="serendipity_karmaVoting_link2" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=1&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_2) . '">+</a>';
+                            $link_3 = '<a class="serendipity_karmaVoting_link3" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=0&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_3) . '">0</a>';
+                            $link_4 = '<a class="serendipity_karmaVoting_link4" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=-1&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_4) . '">-</a>';
+                            $link_5 = '<a class="serendipity_karmaVoting_link5" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=-2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_5) . '">--</a>';
 
                             $karma_voting = '
                             <br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>
@@ -530,11 +530,11 @@
                                 }
 
                                 if (isset($karma[$entryid])) {
-                                    $eventData[0]['extended'] .= sprintf($karma_current, $karma[$entryid], $row['points'], $row['votes'], $row['visits']);
+                                    $eventData[0]['extended'] .= sprintf($karma_current, $karma[$entryid], $row['points'], $row['votes'], $row['visits'], $url);
                                 } elseif ($eventData[0]['timestamp'] < ($now - $max_karmatime)) {
-                                    $eventData[0]['extended'] .= sprintf($karma_timeout, $entryid, $row['points'], $row['votes'], $row['visits']);
+                                    $eventData[0]['extended'] .= sprintf($karma_timeout, $entryid, $row['points'], $row['votes'], $row['visits'], $url);
                                 } else {
-                                    $eventData[0]['extended'] .= sprintf($karma_voting, $entryid, $row['points'], $row['votes'], $row['visits']);
+                                    $eventData[0]['extended'] .= sprintf($karma_voting, $entryid, $row['points'], $row['votes'], $row['visits'], $url);
                                 }
                             } elseif (!$this->get_config('extended_only', false)) {
                                 $elements = count($eventData);
@@ -565,11 +565,11 @@
                                     $visits  = (!empty($rows[$entryid]['visits']) ? $rows[$entryid]['visits'] : 0);
 
                                     if (isset($karma[$entryid])) {
-                                        $eventData[$i]['add_footer'] .= sprintf($karma_current, $karma[$entryid], $points, $votes, $visits);
+                                        $eventData[$i]['add_footer'] .= sprintf($karma_current, $karma[$entryid], $points, $votes, $visits, $url);
                                     } elseif ($eventData[$i]['timestamp'] < ($now - $max_karmatime)) {
-                                        $eventData[$i]['add_footer'] .= sprintf($karma_timeout, $entryid, $points, $votes, $visits);
+                                        $eventData[$i]['add_footer'] .= sprintf($karma_timeout, $entryid, $points, $votes, $visits, $url);
                                     } else {
-                                        $eventData[$i]['add_footer'] .= sprintf($karma_voting, $entryid, $points, $votes, $visits);
+                                        $eventData[$i]['add_footer'] .= sprintf($karma_voting, $entryid, $points, $votes, $visits, $url);
                                     }
                                 }
                             }

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.8,1.9

[Evan N. <tad...@us...>]

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
Make plugin play nice with sites already using version 1 of the license.

Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_creativecommons.php	29 May 2004 09:04:20 -0000	1.8
+++ serendipity_event_creativecommons.php	14 Jun 2004 11:29:36 -0000	1.9
@@ -8,8 +8,8 @@
         @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'Zeigt eine kurze Erklärung zu Ihrer individuellen Lizensierung an');
         @define('PLUGIN_CREATIVECOMMONS_CAP',         'Der Inhalt dieses Werkes ist lizensiert unter der <a href="#license_uri#">Creative Commons Lizenz</a>');
         @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Der Inhalt dieses Werkes ist als <a href="#license_url#}">Public Domain</a> gewidmet');
-        @define('PLUGIN_CREATIVECOMMONS_BY',          'Attribution (Nennung als Author) erforderlich?');
-        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung müssen Lizenznehmer den ursprünglichen Authoren nennen.');
+        // @define('PLUGIN_CREATIVECOMMONS_BY',          'Attribution (Nennung als Author) erforderlich?');
+        // @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung müssen Lizenznehmer den ursprünglichen Authoren nennen.');
         @define('PLUGIN_CREATIVECOMMONS_NC',          'Kommerzielle Nutzung des Werkes erlauben?');
         @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung dürfen die Lizenznehmer das Werk nicht in kommerziellem Kontext einsetzen - es sei denn, sie erhalten die ausdrückliche Genehmigung.');
         @define('PLUGIN_CREATIVECOMMONS_ND',          'Veränderungen des Werkes erlauben?');
@@ -25,8 +25,8 @@
         @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'For visible notifications of license status, show a brief explanation of your license choice.');
         @define('PLUGIN_CREATIVECOMMONS_CAP',         'Original content in this work is licensed under a <a href="#license_uri#">Creative Commons License</a>');
         @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Original content in this work is dedicated to the <a href="#license_url#}">Public Domain</a>');
-        @define('PLUGIN_CREATIVECOMMONS_BY',          'Require attribution?');
-        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees must give the original author credit.');
+        // @define('PLUGIN_CREATIVECOMMONS_BY',          'Require attribution?');
+        // @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees must give the original author credit.');
         @define('PLUGIN_CREATIVECOMMONS_NC',          'Allow commercial uses of your work?');
         @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees may not use the work for commercial purposes -- unless they get the licensor\'s permission.');
         @define('PLUGIN_CREATIVECOMMONS_ND',          'Allow modifications of your work?');
@@ -40,7 +40,7 @@
     {
         $propbag->add('name',        PLUGIN_CREATIVECOMMONS_NAME);
         $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
-        $propbag->add('configuration', array('by', 'nc', 'nd', 'txt'));
+        $propbag->add('configuration', array('nc', 'nd', 'txt', 'cc_v2'));
         $propbag->add('event_hooks',
                       array('frontend_display:rss-1.0:per_entry' => true,
                             'frontend_display:rss-1.0:once'      => true,
@@ -54,11 +54,18 @@
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
+            /*
             case 'by':
                 $propbag->add('type',          'boolean');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_BY);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_BY_DESC);
                 break;
+            */
+
+            case 'cc_v2':
+                $propbag->add('type',          'hidden');
+                $propbag->add('value',         'true');
+                break;
 
             case 'nc':
                 $propbag->add('type',          'boolean');
@@ -98,6 +105,7 @@
         global $serendipity;
 
         $license_data    = $this->get_license_data();
+        $license_version = $this->get_config('cc_version', '1.0');
         $license_type    = $license_data['type'];
         $license_string  = $license_data['string'];
         $rdf             = $license_data['rdf'];
@@ -105,7 +113,7 @@
         if ($license_string == '') {
             $license_uri = 'http://web.resource.org/cc/PublicDomain';
         } else {
-            $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/2.0/';
+            $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/'.$license_version.'/';
         }
 
         $cc_visibility = 'invisible';
@@ -182,8 +190,14 @@
 
     function get_license_data() {
         $license_type = array();
+        $license_version = $this->get_config('cc_version', '1.0');
 
-        if (serendipity_db_bool($this->get_config('by', true))) {
+        if ( ($license_version < 2.0) && ($this->get_config('cc_v2', 'false') == 'true') ) {
+          $this->set_config('cc_version', '2.0');
+          $license_version = '2.0';
+        }
+
+        if (($license_version >= 2.0) || serendipity_db_bool($this->get_config('by', true))) {
             $license_type[] = 'by';
         }
 

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.27,1.28

[Evan N. <tad...@us...>]

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Sort the add plugin dropdowns, make the hidden type marginally useful.

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_admin_plugins.inc.php	11 Jun 2004 21:53:32 -0000	1.27
+++ serendipity_admin_plugins.inc.php	14 Jun 2004 11:26:44 -0000	1.28
@@ -12,6 +12,10 @@
     return;
 }
 
+function serendipity_pluginListSort($x, $y) {
+    return strnatcasecmp($x['name'] . ' - ' . $x['desc'], $y['name'] . ' - ' . $y['desc']);
+}
+
 function show_plugins($event_only = false)
 {
     global $serendipity;
@@ -36,6 +40,7 @@
                     <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
 <?php
     $errorstack = array();
+    $pluginstack = array();
     foreach ($classes as $class_name) {
         $plugin =& serendipity_plugin_api::load_plugin($class_name);
         if (is_object($plugin)) {
@@ -45,13 +50,20 @@
 
             $name = $bag->get('name');
             $desc = $bag->get('description');
-?>
-                    <option value="<?php echo $class_name; ?>"><?php echo $name . ' - ' . $desc; ?></option>
-<?php
+
+            $pluginstack[] = array('class_name' => $class_name,
+                                   'name'       => $name,
+                                   'desc'       => $desc);
         } else {
             $errorstack[] = $class_name;
         }
     }
+    usort($pluginstack, 'serendipity_pluginListSort');
+    foreach ( $pluginstack as $plug ) {
+?>
+                    <option value="<?php echo $plugin['class_name']; ?>"><?php echo $plug['name'] . ' - ' . $plug['desc']; ?></option>
+<?php
+    }
 ?>
                 </select>
             </td>
@@ -469,7 +481,7 @@
                 serendipity_emit_htmlarea_code('nugget', 'nugget');
                 break;
             case 'hidden':
-                ?><tr><td colspan="2"><input type="hidden" id="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" /></td></tr><?php
+                ?><tr><td colspan="2"><input type="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $cbag->get('value'); ?>" /></td></tr><?php
                 break;
         }
     }

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.18,1.19 serendipity_lang_cz.inc.php,1.18,1.19 serendipity_lang_da.inc.php,1.35,1.36 serendipity_lang_de.inc.php,1.44,1.45 serendipity_lang_en.inc.php,1.35,1.36 serendipity_lang_es.inc.php,1.35,1.36 serendipity_lang_fr.inc.php,1.14,1.15 serendipity_config_local_cs.tpl,1.2,NONE serendipity_config_local_cz.tpl,1.2,NONE serendipity_config_local_da.tpl,1.3,NONE serendipity_config_local_de.tpl,1.3,NONE serendipity_config_local_es.tpl,1.3,NONE serendipity_config_local_fr.tpl,1.2,NONE serendipity_config_user_cs.tpl,1.3,NONE serendipity_config_user_cz.tpl,1.3,NONE serendipity_config_user_da.tpl,1.2,NONE serendipity_config_user_de.tpl,1.3,NONE serendipity_config_user_es.tpl,1.2,NONE serendipity_config_user_fr.tpl,1.4,NONE

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Removed Files:
	serendipity_config_local_cs.tpl 
	serendipity_config_local_cz.tpl 
	serendipity_config_local_da.tpl 
	serendipity_config_local_de.tpl 
	serendipity_config_local_es.tpl 
	serendipity_config_local_fr.tpl serendipity_config_user_cs.tpl 
	serendipity_config_user_cz.tpl serendipity_config_user_da.tpl 
	serendipity_config_user_de.tpl serendipity_config_user_es.tpl 
	serendipity_config_user_fr.tpl 
Log Message:
Ported other lang files to Tom's new installer scheme:
* German complete
* English complete.
* Czech (cs/cz) is only missing the names for each variable
* French is missing local config
* Danish is missing local and user config
* Spanish is missing nearly everything. ;)


--- serendipity_config_user_cs.tpl DELETED ---

Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_cs.inc.php	11 Jun 2004 12:19:22 -0000	1.18
+++ serendipity_lang_cs.inc.php	14 Jun 2004 10:45:14 -0000	1.19
@@ -14,6 +14,9 @@
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'cz');
+@define('NUMBER_FORMAT_DECIMALS', '2');
+@define('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', ' ');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Administrátorská sekce');
 @define('HAVE_TO_BE_LOGGED_ON', 'Pro zobrazení této stránky musíte být pøihlášen:');
@@ -372,8 +375,6 @@
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
 @define('FILTER', 'Filtr');
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
-
-/* TRANSLATE */
 @define('USER_SELF_INFO', 'pøihlášen jako %s, úroveò %s');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mùžete vytvoøit další podadresáø.');
 @define('ALL_DIRECTORIES', 'všechny adresáøe');
@@ -395,15 +396,117 @@
 @define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
 @define('FOUND_FILE', 'Založit nový/zmìnit soubor: %s.');
+
+/* TRANSLATE */
+@define('PERMISSIONS', 'Permissions');
+
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Databáze');
+@define('INSTALL_CAT_DB_DESC', 'Sem vložte všech informace o databázi. Serendipity je potøebuje k funkci.');
+@define('INSTALL_DBTYPE', 'Database type');
+@define('INSTALL_DBTYPE_DESC', 'Typ databáze (mysql|postgres)');
+@define('INSTALL_DBHOST', 'Database host');
+@define('INSTALL_DBHOST_DESC', 'Název hostujího serveru');
+@define('INSTALL_DBUSER', 'Database user');
+@define('INSTALL_DBUSER_DESC', 'Uživatelské jmého');
+@define('INSTALL_DBPASS', 'Database password');
+@define('INSTALL_DBPASS_DESC', 'Heslo');
+@define('INSTALL_DBNAME', 'Database name');
+@define('INSTALL_DBNAME_DESC', 'Název databáze');
+@define('INSTALL_DBPREFIX', 'Database table prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix pro záznamy v databázi, napø. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Cesty');
+@define('INSTALL_CAT_PATHS_DESC', 'Rùzné cesty k rùzným adresáøùm a souborùm. Nezapomeòte na ukonèovací lomítko pro adresáøe!');
+@define('INSTALL_FULLPATH', 'Full path');
+@define('INSTALL_FULLPATH_DESC', 'Úplná absolutní cesta k vaší instalaci Serendipity.');
+@define('INSTALL_UPLOADPATH', 'Upload path');
+@define('INSTALL_UPLOADPATH_DESC', 'Sem budou smìrovány uploady, relativnì k \'Full path\' - typicky \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relative path');
+@define('INSTALL_RELPATH_DESC', 'Cesta k Serendipity pro vᚠprohlížeè, typicky \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relative template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Cesta k adresáøi, obsahujícímu vzory (templates) - relativní k \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Cesta pro uploady pro prohlížeèe - relativní k \'relative path\'');
+@define('INSTALL_URL', 'URL to blog');
+@define('INSTALL_URL_DESC', 'Základní URL vaší instalace Serendipity');
+@define('INSTALL_INDEXFILE', 'Index file');
+@define('INSTALL_INDEXFILE_DESC', 'Název souboru použitého jako index');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'Základní nastavení');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Upravte správu Serendipity');
+@define('INSTALL_USERNAME', 'Admin username');
+@define('INSTALL_USERNAME_DESC', 'Jméno pro pøihlášení admina');
+@define('INSTALL_PASSWORD', 'Admin password');
+@define('INSTALL_PASSWORD_DESC', 'Heslo pro pøihlášení admina');
+@define('INSTALL_EMAIL', 'Admin email');
+@define('INSTALL_EMAIL_DESC', 'Email pro pøihlášení admina');
+@define('INSTALL_SENDMAIL', 'Send mails to admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Chcete dostávat Emailem zprávy o komentáøích k vašim záznamùm?');
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Umožnit uživatelùm pøihlášení k odbìru komentáøù k záznamùm');
+@define('INSTALL_BLOGNAME', 'Blog name');
+@define('INSTALL_BLOGNAME_DESC', 'Název vašeho weblogu');
+@define('INSTALL_BLOGDESC', 'Blog description');
+@define('INSTALL_BLOGDESC_DESC', 'Popis weblogu');
+@define('INSTALL_LANG', 'Language');
+@define('INSTALL_LANG_DESC', 'Vyberte jazyk vašeho weblogu');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Vzhled a volby');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Upravte vzhled a chování Serendipity');
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Zde mùžete definovat URI stylesheetu, navíc k nastavení v administrátorské sekci (zadejte \'none\', jestliže to nepotøebujete)');
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Chcete používat WYSIWYG editor? (Pracuje v IE5+, èásteènì v Mozille 1.3+)');
+@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
+@define('INSTALL_XHTML11_DESC', 'Chcete plnou kompatibilitu s XHTML 1.1? (mùže zpùsobit problémy ve starších prohlížeèích)');
+@define('INSTALL_POPUP', 'Enable use of popup windows');
+@define('INSTALL_POPUP_DESC', 'Chcete ve weblogu používat vyskakovací okna pro komentáøe, odezvy a pod.?');
+@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED_DESC', 'Pokud chcete umístit weblog do vašich stránek, zvolte ano pro odstranìní všech záhlaví, bude zobrazován jen obsah. Mùžete použít volitelný soubor indexFile pro obalení obsahu vlastními záhlavími a sloupci. Více informací najdete v souboru README!');
+@define('INSTALL_BLOCKREF', 'Blocked Referers');
+@define('INSTALL_BLOCKREF_DESC', 'Chcete zamezit pøístup z urèitých adres? Seznam adres oddìlujte \';\' a pozor, adresy jsou blokovány vèetnì subadres!');
+@define('INSTALL_REWRITE', 'URL Rewriting');
+@define('INSTALL_REWRITE_DESC', 'Urèení pravidel pro tvorbu URL. Zapnutí módu rewrite zajistí správné URL vašeho weblogu a zajistí lepší indexaci pro vyhledávaèe, jako je Google. Vᚠwebserver musí podporovat mod_rewrite nebo "AllowOverride All" v adresáøi pro Serendipity. Default nastavení je automaticky detekováno.');
+
+/* Imageconversion Settings */
+@define('INSTALL_CAT_IMAGECONV', 'Úpravy obrázkù');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Máte instalován Imagemagick?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Úplná cesta a název konverzního souboru Imagemagick');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
+@define('INSTALL_THUMBWIDTH_DESC', 'Pevná šíøka automaticky generovaných náhledù');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Nastavení vašeho úètu');
+@define('USERCONF_USERNAME', 'Your username');
+@define('USERCONF_USERNAME_DESC', 'Vaše uživatelské jméno (pøezdívka)');
+@define('USERCONF_PASSWORD', 'Your password');
+@define('USERCONF_PASSWORD_DESC', 'Vaše heslo');
+@define('USERCONF_USERLEVEL', 'Permissionlevel');
+@define('USERCONF_USERLEVEL_DESC', 'Uživatelská úroveò. Vyberte jednu z: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Hlavní redaktor, [USERLEVEL_EDITOR] - Bìžný autor.');
+@define('USERCONF_EMAIL', 'Your e-mail address');
+@define('USERCONF_EMAIL_DESC', 'VᚠEmail');
+@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Chcete dostávat zprávy o komentáøích Emailem?');
+@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Chcete dostávat zprávy o odezvách na záznamy Emailem?');
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
+
 @define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
 @define('PARENT_CATEGORY', 'Parent category');
 @define('REPLY', 'Reply');
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 
-@define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', ',');
-@define('NUMBER_FORMAT_THOUSANDS', ' ');
-
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

--- serendipity_config_user_de.tpl DELETED ---

--- serendipity_config_user_cz.tpl DELETED ---

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_en.inc.php	11 Jun 2004 21:49:15 -0000	1.35
+++ serendipity_lang_en.inc.php	14 Jun 2004 10:45:15 -0000	1.36
@@ -14,6 +14,9 @@
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
+@define('NUMBER_FORMAT_DECIMALS', '2');
+@define('NUMBER_FORMAT_DECPOINT', '.');
+@define('NUMBER_FORMAT_THOUSANDS', ',');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
 @define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged on to view this page:');
@@ -388,11 +391,6 @@
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
 @define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
-
-@define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', '.');
-@define('NUMBER_FORMAT_THOUSANDS', ',');
-
 @define('PERMISSIONS', 'Permissions');
 
 /* DATABASE SETTINGS */
@@ -497,9 +495,5 @@
 @define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
 @define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
 
-
-
-
-
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

--- serendipity_config_user_da.tpl DELETED ---

--- serendipity_config_local_es.tpl DELETED ---

--- serendipity_config_local_fr.tpl DELETED ---

--- serendipity_config_user_es.tpl DELETED ---

--- serendipity_config_local_cz.tpl DELETED ---

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_da.inc.php	13 Jun 2004 21:05:37 -0000	1.35
+++ serendipity_lang_da.inc.php	14 Jun 2004 10:45:15 -0000	1.36
@@ -373,6 +373,110 @@
 @define('ENTRIES_PER_PAGE', 'artikler per side');
 
 /* TRANSLATE */
+@define('PERMISSIONS', 'Permissions');
+
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Database settings');
+@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
+@define('INSTALL_DBTYPE', 'Database type');
+@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBHOST', 'Database host');
+@define('INSTALL_DBHOST_DESC', 'The hostname for your database');
+@define('INSTALL_DBUSER', 'Database user');
+@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database');
+@define('INSTALL_DBPASS', 'Database password');
+@define('INSTALL_DBPASS_DESC', 'The password matching the above username');
+@define('INSTALL_DBNAME', 'Database name');
+@define('INSTALL_DBNAME_DESC', 'The name of your datbase');
+@define('INSTALL_DBPREFIX', 'Database table prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Paths');
+@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!');
+@define('INSTALL_FULLPATH', 'Full path');
+@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation');
+@define('INSTALL_UPLOADPATH', 'Upload path');
+@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relative path');
+@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relative template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\'');
+@define('INSTALL_URL', 'URL to blog');
+@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation');
+@define('INSTALL_INDEXFILE', 'Index file');
+@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'General settings');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves');
+@define('INSTALL_USERNAME', 'Admin username');
+@define('INSTALL_USERNAME_DESC', 'Username for admin login');
+@define('INSTALL_PASSWORD', 'Admin password');
+@define('INSTALL_PASSWORD_DESC', 'Password for admin login');
+@define('INSTALL_EMAIL', 'Admin email');
+@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator');
+@define('INSTALL_SENDMAIL', 'Send mails to admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?');
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
+@define('INSTALL_BLOGNAME', 'Blog name');
+@define('INSTALL_BLOGNAME_DESC', 'The title of your blog');
+@define('INSTALL_BLOGDESC', 'Blog description');
+@define('INSTALL_BLOGDESC_DESC', 'Description of your blog');
+@define('INSTALL_LANG', 'Language');
+@define('INSTALL_LANG_DESC', 'Select the language for your blog');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Appearance and options');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels');
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)');
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
+@define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
+@define('INSTALL_POPUP', 'Enable use of popup windows');
+@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
+@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED_DESC', '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!');
+@define('INSTALL_BLOCKREF', 'Blocked Referers');
+@define('INSTALL_BLOCKREF_DESC', '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!');
+@define('INSTALL_REWRITE', 'URL Rewriting');
+@define('INSTALL_REWRITE_DESC', '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 */
+@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
+@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Your personal details');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
+@define('USERCONF_USERNAME', 'Your username');
+@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
+@define('USERCONF_PASSWORD', 'Your password');
+@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
+@define('USERCONF_USERLEVEL', 'Permissionlevel');
+@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
+@define('USERCONF_EMAIL', 'Your e-mail address');
+@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
+@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
+@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
+
 @define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
 @define('ALL_DIRECTORIES', 'all directories');
 @define('MANAGE_DIRECTORIES', 'Manage directories');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_fr.inc.php	11 Jun 2004 12:19:22 -0000	1.14
+++ serendipity_lang_fr.inc.php	14 Jun 2004 10:45:15 -0000	1.15
@@ -359,7 +359,110 @@
 @define('DELETE_USER', 'Vous allez supprimer l\'utilisateur #%d %s. Etes vous sérieux? Cela empêchera toute visualisation de ses news sur la page principale.');
 @define('DELETED_USER', 'Utilisateur #%d %s supprimé.');
 
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Database settings');
+@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
+@define('INSTALL_DBTYPE', 'Database type');
+@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBHOST', 'Database host');
+@define('INSTALL_DBHOST_DESC', 'The hostname for your database');
+@define('INSTALL_DBUSER', 'Database user');
+@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database');
+@define('INSTALL_DBPASS', 'Database password');
+@define('INSTALL_DBPASS_DESC', 'The password matching the above username');
+@define('INSTALL_DBNAME', 'Database name');
+@define('INSTALL_DBNAME_DESC', 'The name of your datbase');
+@define('INSTALL_DBPREFIX', 'Database table prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Paths');
+@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!');
+@define('INSTALL_FULLPATH', 'Full path');
+@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation');
+@define('INSTALL_UPLOADPATH', 'Upload path');
+@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relative path');
+@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relative template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\'');
+@define('INSTALL_URL', 'URL to blog');
+@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation');
+@define('INSTALL_INDEXFILE', 'Index file');
+@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'General settings');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves');
+@define('INSTALL_USERNAME', 'Admin username');
+@define('INSTALL_USERNAME_DESC', 'Username for admin login');
+@define('INSTALL_PASSWORD', 'Admin password');
+@define('INSTALL_PASSWORD_DESC', 'Password for admin login');
+@define('INSTALL_EMAIL', 'Admin email');
+@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator');
+@define('INSTALL_SENDMAIL', 'Send mails to admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?');
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
+@define('INSTALL_BLOGNAME', 'Blog name');
+@define('INSTALL_BLOGNAME_DESC', 'The title of your blog');
+@define('INSTALL_BLOGDESC', 'Blog description');
+@define('INSTALL_BLOGDESC_DESC', 'Description of your blog');
+@define('INSTALL_LANG', 'Language');
+@define('INSTALL_LANG_DESC', 'Select the language for your blog');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Appearance and options');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels');
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)');
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
+@define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
+@define('INSTALL_POPUP', 'Enable use of popup windows');
+@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
+@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED_DESC', '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!');
+@define('INSTALL_BLOCKREF', 'Blocked Referers');
+@define('INSTALL_BLOCKREF_DESC', '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!');
+@define('INSTALL_REWRITE', 'URL Rewriting');
+@define('INSTALL_REWRITE_DESC', '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 */
+@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
+@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Détails personnels');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Détails sur votre compte personnel');
+@define('USERCONF_USERNAME', 'Votre nom d\'utilisateur');
+@define('USERCONF_USERNAME_DESC', 'Votre nom d\'utilisateur');
+@define('USERCONF_PASSWORD', 'Votre mot de passe');
+@define('USERCONF_PASSWORD_DESC', 'Votre mot de passe');
+@define('USERCONF_USERLEVEL', 'Niveau d\'utilisateur');
+@define('USERCONF_USERLEVEL_DESC', 'Niveau de l\'utilisateur. Doit être l\'un des suivants: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Rédacteur en chef, [USERLEVEL_EDITOR] - Newser simple (pigiste).');
+@define('USERCONF_EMAIL', 'Votre E-Mail');
+@define('USERCONF_EMAIL_DESC', 'Votre E-Mail');
+@define('USERCONF_SENDCOMMENTS', 'Envoi des commentaires?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Voulez vous recevoir un mail lorsque quelqu\'un poste un commentaire dans votre news?');
+@define('USERCONF_SENDTRACKBACKS', 'Envoi des suivis?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Voulez vous recevoir un mail lorsque quelqu\'un fait un suivi d\'une de vos news?');
+
 // TRANSLATE
+@define('PERMISSIONS', 'Permissions');
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
 @define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'entries per page');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_cz.inc.php	11 Jun 2004 12:19:22 -0000	1.18
+++ serendipity_lang_cz.inc.php	14 Jun 2004 10:45:14 -0000	1.19
@@ -14,6 +14,9 @@
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'cz');
+@define('NUMBER_FORMAT_DECIMALS', '2');
+@define('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', ' ');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Administrátorská sekce');
 @define('HAVE_TO_BE_LOGGED_ON', 'Pro zobrazení této stránky musíte být pøihlá¹en:');
@@ -372,8 +375,6 @@
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
 @define('FILTER', 'Filtr');
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
-
-/* TRANSLATE */
 @define('USER_SELF_INFO', 'pøihlá¹en jako %s, úroveò %s');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mù¾ete vytvoøit dal¹í podadresáø.');
 @define('ALL_DIRECTORIES', 'v¹echny adresáøe');
@@ -395,15 +396,117 @@
 @define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
 @define('FOUND_FILE', 'Zalo¾it nový/zmìnit soubor: %s.');
+
+/* Translate! */
+@define('PERMISSIONS', 'Permissions');
+
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Databáze');
+@define('INSTALL_CAT_DB_DESC', 'Sem vlo¾te v¹ech informace o databázi. Serendipity je potøebuje k funkci.');
+@define('INSTALL_DBTYPE', 'Database type');
+@define('INSTALL_DBTYPE_DESC', 'Typ databáze (mysql|postgres)');
+@define('INSTALL_DBHOST', 'Database host');
+@define('INSTALL_DBHOST_DESC', 'Název hostujího serveru');
+@define('INSTALL_DBUSER', 'Database user');
+@define('INSTALL_DBUSER_DESC', 'U¾ivatelské jmého');
+@define('INSTALL_DBPASS', 'Database password');
+@define('INSTALL_DBPASS_DESC', 'Heslo');
+@define('INSTALL_DBNAME', 'Database name');
+@define('INSTALL_DBNAME_DESC', 'Název databáze');
+@define('INSTALL_DBPREFIX', 'Database table prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix pro záznamy v databázi, napø. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Cesty');
+@define('INSTALL_CAT_PATHS_DESC', 'Rùzné cesty k rùzným adresáøùm a souborùm. Nezapomeòte na ukonèovací lomítko pro adresáøe!');
+@define('INSTALL_FULLPATH', 'Full path');
+@define('INSTALL_FULLPATH_DESC', 'Úplná absolutní cesta k va¹í instalaci Serendipity.');
+@define('INSTALL_UPLOADPATH', 'Upload path');
+@define('INSTALL_UPLOADPATH_DESC', 'Sem budou smìrovány uploady, relativnì k \'Full path\' - typicky \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relative path');
+@define('INSTALL_RELPATH_DESC', 'Cesta k Serendipity pro vá¹ prohlí¾eè, typicky \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relative template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Cesta k adresáøi, obsahujícímu vzory (templates) - relativní k \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Cesta pro uploady pro prohlí¾eèe - relativní k \'relative path\'');
+@define('INSTALL_URL', 'URL to blog');
+@define('INSTALL_URL_DESC', 'Základní URL va¹í instalace Serendipity');
+@define('INSTALL_INDEXFILE', 'Index file');
+@define('INSTALL_INDEXFILE_DESC', 'Název souboru pou¾itého jako index');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'Základní nastavení');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Upravte správu Serendipity');
+@define('INSTALL_USERNAME', 'Admin username');
+@define('INSTALL_USERNAME_DESC', 'Jméno pro pøihlá¹ení admina');
+@define('INSTALL_PASSWORD', 'Admin password');
+@define('INSTALL_PASSWORD_DESC', 'Heslo pro pøihlá¹ení admina');
+@define('INSTALL_EMAIL', 'Admin email');
+@define('INSTALL_EMAIL_DESC', 'Email pro pøihlá¹ení admina');
+@define('INSTALL_SENDMAIL', 'Send mails to admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Chcete dostávat Emailem zprávy o komentáøích k va¹im záznamùm?');
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Umo¾nit u¾ivatelùm pøihlá¹ení k odbìru komentáøù k záznamùm');
+@define('INSTALL_BLOGNAME', 'Blog name');
+@define('INSTALL_BLOGNAME_DESC', 'Název va¹eho weblogu');
+@define('INSTALL_BLOGDESC', 'Blog description');
+@define('INSTALL_BLOGDESC_DESC', 'Popis weblogu');
+@define('INSTALL_LANG', 'Language');
+@define('INSTALL_LANG_DESC', 'Vyberte jazyk va¹eho weblogu');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Vzhled a volby');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Upravte vzhled a chování Serendipity');
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Zde mù¾ete definovat URI stylesheetu, navíc k nastavení v administrátorské sekci (zadejte \'none\', jestli¾e to nepotøebujete)');
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Chcete pou¾ívat WYSIWYG editor? (Pracuje v IE5+, èásteènì v Mozille 1.3+)');
+@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
+@define('INSTALL_XHTML11_DESC', 'Chcete plnou kompatibilitu s XHTML 1.1? (mù¾e zpùsobit problémy ve star¹ích prohlí¾eèích)');
+@define('INSTALL_POPUP', 'Enable use of popup windows');
+@define('INSTALL_POPUP_DESC', 'Chcete ve weblogu pou¾ívat vyskakovací okna pro komentáøe, odezvy a pod.?');
+@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED_DESC', 'Pokud chcete umístit weblog do va¹ich stránek, zvolte ano pro odstranìní v¹ech záhlaví, bude zobrazován jen obsah. Mù¾ete pou¾ít volitelný soubor indexFile pro obalení obsahu vlastními záhlavími a sloupci. Více informací najdete v souboru README!');
+@define('INSTALL_BLOCKREF', 'Blocked Referers');
+@define('INSTALL_BLOCKREF_DESC', 'Chcete zamezit pøístup z urèitých adres? Seznam adres oddìlujte \';\' a pozor, adresy jsou blokovány vèetnì subadres!');
+@define('INSTALL_REWRITE', 'URL Rewriting');
+@define('INSTALL_REWRITE_DESC', 'Urèení pravidel pro tvorbu URL. Zapnutí módu rewrite zajistí správné URL va¹eho weblogu a zajistí lep¹í indexaci pro vyhledávaèe, jako je Google. Vá¹ webserver musí podporovat mod_rewrite nebo "AllowOverride All" v adresáøi pro Serendipity. Default nastavení je automaticky detekováno.');
+
+/* Imageconversion Settings */
+@define('INSTALL_CAT_IMAGECONV', 'Úpravy obrázkù');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Máte instalován Imagemagick?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Úplná cesta a název konverzního souboru Imagemagick');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Náhledy budou pojmenovány original.sufix.ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
+@define('INSTALL_THUMBWIDTH_DESC', 'Pevná ¹íøka automaticky generovaných náhledù');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Osobní nastavení');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Nastavení va¹eho úètu');
+@define('USERCONF_USERNAME', 'Your username');
+@define('USERCONF_USERNAME_DESC', 'Va¹e u¾ivatelské jméno (pøezdívka)');
+@define('USERCONF_PASSWORD', 'Your password');
+@define('USERCONF_PASSWORD_DESC', 'Va¹e heslo');
+@define('USERCONF_USERLEVEL', 'Permissionlevel');
+@define('USERCONF_USERLEVEL_DESC', 'U¾ivatelská úroveò. Vyberte jednu z: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Hlavní redaktor, [USERLEVEL_EDITOR] - Bì¾ný autor.');
+@define('USERCONF_EMAIL', 'Your e-mail address');
+@define('USERCONF_EMAIL_DESC', 'Vá¹ Email');
+@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Chcete dostávat zprávy o komentáøích Emailem?');
+@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Chcete dostávat zprávy o odezvách na záznamy Emailem?');
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
+
 @define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
 @define('PARENT_CATEGORY', 'Parent category');
 @define('REPLY', 'Reply');
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 
-@define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', ',');
-@define('NUMBER_FORMAT_THOUSANDS', ' ');
-
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

--- serendipity_config_local_de.tpl DELETED ---

--- serendipity_config_user_fr.tpl DELETED ---

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_es.inc.php	11 Jun 2004 12:19:22 -0000	1.35
+++ serendipity_lang_es.inc.php	14 Jun 2004 10:45:15 -0000	1.36
@@ -382,6 +382,109 @@
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
 @define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
+@define('PERMISSIONS', 'Permissions');
+
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Database settings');
+@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
+@define('INSTALL_DBTYPE', 'Database type');
+@define('INSTALL_DBTYPE_DESC', 'Database type (Supported are: mysql|postgres)');
+@define('INSTALL_DBHOST', 'Database host');
+@define('INSTALL_DBHOST_DESC', 'The hostname for your database');
+@define('INSTALL_DBUSER', 'Database user');
+@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database');
+@define('INSTALL_DBPASS', 'Database password');
+@define('INSTALL_DBPASS_DESC', 'The password matching the above username');
+@define('INSTALL_DBNAME', 'Database name');
+@define('INSTALL_DBNAME_DESC', 'The name of your datbase');
+@define('INSTALL_DBPREFIX', 'Database table prefix');
+@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Paths');
+@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!');
+@define('INSTALL_FULLPATH', 'Full path');
+@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation');
+@define('INSTALL_UPLOADPATH', 'Upload path');
+@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relative path');
+@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relative template path');
+@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\'');
+@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\'');
+@define('INSTALL_URL', 'URL to blog');
+@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation');
+@define('INSTALL_INDEXFILE', 'Index file');
+@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'General settings');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves');
+@define('INSTALL_USERNAME', 'Admin username');
+@define('INSTALL_USERNAME_DESC', 'Username for admin login');
+@define('INSTALL_PASSWORD', 'Admin password');
+@define('INSTALL_PASSWORD_DESC', 'Password for admin login');
+@define('INSTALL_EMAIL', 'Admin email');
+@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator');
+@define('INSTALL_SENDMAIL', 'Send mails to admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?');
+@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
+@define('INSTALL_BLOGNAME', 'Blog name');
+@define('INSTALL_BLOGNAME_DESC', 'The title of your blog');
+@define('INSTALL_BLOGDESC', 'Blog description');
+@define('INSTALL_BLOGDESC_DESC', 'Description of your blog');
+@define('INSTALL_LANG', 'Language');
+@define('INSTALL_LANG_DESC', 'Select the language for your blog');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Appearance and options');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels');
+@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)');
+@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
+@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
+@define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
+@define('INSTALL_POPUP', 'Enable use of popup windows');
+@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
+@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED_DESC', '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!');
+@define('INSTALL_BLOCKREF', 'Blocked Referers');
+@define('INSTALL_BLOCKREF_DESC', '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!');
+@define('INSTALL_REWRITE', 'URL Rewriting');
+@define('INSTALL_REWRITE_DESC', '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 */
+@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
+@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
+@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
+@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Your personal details');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
+@define('USERCONF_USERNAME', 'Your username');
+@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
+@define('USERCONF_PASSWORD', 'Your password');
+@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
+@define('USERCONF_USERLEVEL', 'Permissionlevel');
+@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
+@define('USERCONF_EMAIL', 'Your e-mail address');
+@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
+@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
+@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
+@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');

--- serendipity_config_local_da.tpl DELETED ---

--- serendipity_config_local_cs.tpl DELETED ---

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_de.inc.php	11 Jun 2004 12:19:22 -0000	1.44
+++ serendipity_lang_de.inc.php	14 Jun 2004 10:45:15 -0000	1.45
@@ -14,6 +14,9 @@
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de');
+@define('NUMBER_FORMAT_DECIMALS', '2');
+@define('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', '.');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
 @define('HAVE_TO_BE_LOGGED_ON', 'Sie müssen angemeldet sein, um diese Seite zu sehen:');
@@ -386,10 +389,109 @@
 @define('TOP_LEVEL', 'Ursprung');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
 @define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s Kommentar');
+@define('PERMISSIONS', 'Rechte');
 
-@define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', ',');
-@define('NUMBER_FORMAT_THOUSANDS', '.');
+/* DATABASE SETTINGS */
+@define('INSTALL_CAT_DB', 'Datenbankeinstellungen');
+@define('INSTALL_CAT_DB_DESC', 'Konfigurieren Sie hier die Datenbank. Serendipity benötigt die Daten, um lauffähig zu sein.');
+@define('INSTALL_DBTYPE', 'Datenbanktyp');
+@define('INSTALL_DBTYPE_DESC', 'Datenbanktyp (mysql|postgres)');
+@define('INSTALL_DBHOST', 'Datenbank Servername');
+@define('INSTALL_DBHOST_DESC', 'Datenbank Servername');
+@define('INSTALL_DBUSER', 'Datenbank Username');
+@define('INSTALL_DBUSER_DESC', 'Datenbank Username');
+@define('INSTALL_DBPASS', 'Datenbank Passwort');
+@define('INSTALL_DBPASS_DESC', 'Datenbank Passwort');
+@define('INSTALL_DBNAME', 'Datenbankname');
+@define('INSTALL_DBNAME_DESC', 'Name der Datenbank');
+@define('INSTALL_DBPREFIX', 'Datenbank-Präfix');
+@define('INSTALL_DBPREFIX_DESC', 'Präfix für Tabellennamen, z.B. serendipity_');
+
+/* PATHS */
+@define('INSTALL_CAT_PATHS', 'Pfade');
+@define('INSTALL_CAT_PATHS_DESC', 'Zahlreiche Pfade zu unterschiedlichen wichtigen Verzeichnissen und Dateien. Unbedingt auf abschließenden Schrägstrich nach Pfaden achten!');
+@define('INSTALL_FULLPATH', 'Voller Pfad');
+@define('INSTALL_FULLPATH_DESC', 'Der volle und absolute Pfad zur Serendipity Installation.');
+@define('INSTALL_UPLOADPATH', 'Upload-Pfad');
+@define('INSTALL_UPLOADPATH_DESC', 'Alle Dateien werden hierhin hochgeladen. Relativ zum vollen Pfad - üblicherweise \'uploads/\'');
+@define('INSTALL_RELPATH', 'Relativer HTTP-Pfad');
+@define('INSTALL_RELPATH_DESC', 'Der HTTP-Pfad zu serendipity für den Browser, üblicherweise \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Relativer Template-Pfad');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Der Pfad zum Verzeichnis, der die Templates enthält - Relativ zum HTTP-Pfad');
+@define('INSTALL_RELUPLOADPATH', 'Relativer Upload-Pfad');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Der Pfad zum Uploadverzeichnis für den Browser - Relativ zum HTTP-Pfad');
+@define('INSTALL_URL', 'URL zum blog');
+@define('INSTALL_URL_DESC', 'Stamm-URL zur Serendipity-Installation');
+@define('INSTALL_INDEXFILE', 'Index-Datei');
+@define('INSTALL_INDEXFILE_DESC', 'Welche Datei wird als Indexdatei verwendet (index.php)');
+
+/* Generel settings */
+@define('INSTALL_CAT_SETTINGS', 'Generelle Einstellungen');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Stellt die Grundeigenschaften von Serendipity ein');
+@define('INSTALL_USERNAME', 'Admin Username');
+@define('INSTALL_USERNAME_DESC', 'Username für den Administrator-Zugang');
+@define('INSTALL_PASSWORD', 'Admin Passwort');
+@define('INSTALL_PASSWORD_DESC', 'Passwort für den Administrator-Zugang');
+@define('INSTALL_EMAIL', 'Admin E-Mail');
+@define('INSTALL_EMAIL_DESC', 'E-Mail des Administrators');
+@define('INSTALL_SENDMAIL', 'Sende E-Mails zum Admin?');
+@define('INSTALL_SENDMAIL_DESC', 'Soll der Administrator E-Mails erhalten, wenn Kommentare zum Blog geschrieben werden?');
+@define('INSTALL_SUBSCRIBE', 'Abonnieren von Einträgen erlauben?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Soll es den Besuchern des Blogs möglich sein, einen Eintrag zu abonnieren und so alle neuen Kommentare dazu per E-Mail erhalten?');
+@define('INSTALL_BLOGNAME', 'Blog Titel');
+@define('INSTALL_BLOGNAME_DESC', 'Der Titel des Blogs');
+@define('INSTALL_BLOGDESC', 'Blog Beschreibung');
+@define('INSTALL_BLOGDESC_DESC', 'Die Beschreibung des Blogs');
+@define('INSTALL_LANG', 'Sprache');
+@define('INSTALL_LANG_DESC', 'Wählen Sie die Sprache des Blogs');
+
+/* Appearance and options */
+@define('INSTALL_CAT_DISPLAY', 'Design und Optionen');
+@define('INSTALL_CAT_DISPLAY_DESC', 'Legt fest wie Serendipity aussieht');
+@define('INSTALL_EXTERNALSTYLE', 'Externe Stylesheets');
+@define('INSTALL_EXTERNALSTYLE_DESC', 'Hier kann ein weiteres externes Stylesheet referenziert werden');
+@define('INSTALL_WYSIWYG', 'Grafischen WYSIWYG-Editor verwenden');
+@define('INSTALL_WYSIWYG_DESC', 'Soll der grafische WYSIWYG-Editor verwendet werden? (Funktioniert im  IE5+, größenteils Mozilla 1.3+)');
+@define('INSTALL_XHTML11', 'XHTML1.1 Standard verwenden');
+@define('INSTALL_XHTML11_DESC', 'Soll der XHTML 1.1 Standard verwendet werden? (führt zu gültigem Code aber kann bei älteren Browsern Schwierigkeiten erzeugen)');
+@define('INSTALL_POPUP', 'Popups für Kommentare, Trackbacks usw. verwenden?');
+@define('INSTALL_POPUP_DESC', 'Sollen die Links zu den Kommentaren, Trackbacks etc. mit Popups geöffnet werden?');
+@define('INSTALL_EMBED', 'Eingebettete Nutzung von Serendipity aktivieren?');
+@define('INSTALL_EMBED_DESC', 'Falls serendipity innerhalb einer normalen Seite eingebettet werden soll, aktivieren Sie diese Option. Serendipity stellt dann nur Inhalte dar, und Sie können sich um Header und Footer kümmern. Lesen Sie die Datei README für weitere Informationen.');
+@define('INSTALL_BLOCKREF', 'Geblockte Referer');
+@define('INSTALL_BLOCKREF_DESC', 'Sollen spezielle Hosts aus der Referrer-Liste gesperrt werden? Hostnamen getrennt mit ";" eingeben. Jeder Hostname wird als Teilstring überprüft, so dass "goo" sowohl "google.com" als auch "googlegroups.com" sperren würde.');
+@define('INSTALL_REWRITE', 'URL-Formung');
+@define('INSTALL_REWRITE_DESC', 'Wählen Sie die Methode zur Erzeugung der URLs. Wenn diese aktiviert werden, können sprechende Namen für jeden Artikel verwendet werden und somit besser von Suchmaschinen indiziert Der Webserver muss entweder mod_rewrite oder die "AllowOverride All"-Direktive unterstützen. Der Standardwert wird automagisch bestimmt');
+
+/* Imageconversion Settings */
+@define('INSTALL_CAT_IMAGECONV', 'Bildkonvertierung');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Wie soll serendipity Bilder handhaben');
+@define('INSTALL_IMAGEMAGICK', 'Imagemagick zur Skalierung verwenden');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Ist ImageMagick installiert? Verwendet ansonsten die GDLib.');
+@define('INSTALL_IMAGEMAGICKPATH', 'Pfad zur convert ImageMagick-Datei');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Voller Pfad und Name zur Image-Magick Datei');
+@define('INSTALL_THUMBSUFFIX', 'Thumbnail-Endung');
+@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails werden nach dem Schema originalname.Suffix.erweiterung benannt.');
+@define('INSTALL_THUMBWIDTH', 'Thumbnailgröße');
+@define('INSTALL_THUMBWIDTH_DESC', 'Maximale Breite/Höhe der automatisch erzeugten Thumbnails');
+
+/* Personal details */
+@define('USERCONF_CAT_PERSONAL', 'Persönliche Einstellungen');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Einstellungen des eigenen Accounts');
+@define('USERCONF_USERNAME', 'Username');
+@define('USERCONF_USERNAME_DESC', 'Ihr Username');
+@define('USERCONF_PASSWORD', 'Passwort');
+@define('USERCONF_PASSWORD_DESC', 'Ihr Passwort');
+@define('USERCONF_USERLEVEL', 'Userlevel');
+@define('USERCONF_USERLEVEL_DESC', 'Userlevel.  Sollte einer der folgenden Werte sein: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chefredakteur, [USERLEVEL_EDITOR] - Einfacher Redakteur.');
+@define('USERCONF_EMAIL', 'E-Mail');
+@define('USERCONF_EMAIL_DESC', 'Ihre E-Mail Adresse');
+@define('USERCONF_SENDCOMMENTS', 'Über Kommentare benachrichtigen?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Wollen Sie eine E-Mail erhalten, sobald ein neuer Kommentar zu Ihrem Eintrag geschrieben wurde?');
+@define('USERCONF_SENDTRACKBACKS', 'Über Trackbacks benachrichtigen?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Wollen Sie eine E-Mail erhalten, sobald ein neues Trackback zu Ihrem Eintrag geschrieben wurde?');
+@define('USERCONF_ALLOWPUBLISH', 'Rechte: Einträge veröffentlichen?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Darf Einträge veröffentlichen?');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity NEWS,1.148,1.149

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

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

Modified Files:
	NEWS 
Log Message:
Ported other lang files to Tom's new installer scheme:
* German complete
* English complete.
* Czech (cs/cz) is only missing the names for each variable
* French is missing local config
* Danish is missing local and user config
* Spanish is missing nearly everything. ;)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- NEWS	13 Jun 2004 21:28:20 -0000	1.148
+++ NEWS	14 Jun 2004 10:45:13 -0000	1.149
@@ -3,7 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * Fix exploit during installtion, which can cause an endless loop
+    * Tweaks to plugin configuration design (tomsommer)
+
+    * Fix bug during installation, which can cause an endless loop
       of connections (tomsommer)
 
     * Added small comments to serendipity_functions.inc.php on how

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,1.4,1.4.4.1

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

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

Modified Files:
      Tag: branch_0_6
	serendipity_event_weblogping.php 
Log Message:
MFH: Blogbot service


Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- serendipity_event_weblogping.php	3 Apr 2004 17:36:18 -0000	1.4
+++ serendipity_event_weblogping.php	14 Jun 2004 10:36:49 -0000	1.4.4.1
@@ -78,10 +78,9 @@
             ),
             
             array(
-              'name' => 'Blogbot.de',
-              'host' => 'xmlrpc.blogbot.de',
-              'path' => '/',
-              'supersedes' => 'blo.gs, blogrolling.com, technorati.com, weblogs.com'
+              'name' => 'Blogbot.dk',
+              'host' => 'blogbot.dk',
+              'path' => '/io/xml-rpc.php'
             )
         );
 

[php-blog-cvs] serendipity NEWS,1.103.4.7,1.103.4.8

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

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

Modified Files:
      Tag: branch_0_6
	NEWS 
Log Message:
MFH: Blogbot service


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.7
retrieving revision 1.103.4.8
diff -u -d -r1.103.4.7 -r1.103.4.8
--- NEWS	14 Jun 2004 10:34:57 -0000	1.103.4.7
+++ NEWS	14 Jun 2004 10:36:49 -0000	1.103.4.8
@@ -5,6 +5,10 @@
 
     * Fix bug during installation, which can cause an endless loop
       of connections (tomsommer)
+    
+    * Removed german blogbot pinging service, it was shut down (nohn)
+    
+    * Allow pinging of blogbot.dk (tomsommer)
       
     Version 0.6-pl2 (May 24th, 2004)
 ------------------------------------------------------------------------

[php-blog-cvs] serendipity NEWS,1.103.4.6,1.103.4.7 serendipity_admin_installer.inc.php,1.59.4.5,1.59.4.6

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

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

Modified Files:
      Tag: branch_0_6
	NEWS serendipity_admin_installer.inc.php 
Log Message:
MFH: Tom's bugfix


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.59.4.5
retrieving revision 1.59.4.6
diff -u -d -r1.59.4.5 -r1.59.4.6
--- serendipity_admin_installer.inc.php	24 May 2004 10:38:00 -0000	1.59.4.5
+++ serendipity_admin_installer.inc.php	14 Jun 2004 10:34:57 -0000	1.59.4.6
@@ -173,7 +173,7 @@
             $response = '';
 
             if ($sock) {
-                fputs($sock, "GET {$_SERVER['REQUEST_URI']}nonexistant HTTP/1.0\n");
+                fputs($sock, "GET {$_SERVER['PHP_SELF']}nonexistant HTTP/1.0\n");
                 fputs($sock, "Host: $serendipity_host\n");
                 fputs($sock, "Connection: close\n\n");
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.6
retrieving revision 1.103.4.7
diff -u -d -r1.103.4.6 -r1.103.4.7
--- NEWS	24 May 2004 10:41:56 -0000	1.103.4.6
+++ NEWS	14 Jun 2004 10:34:57 -0000	1.103.4.7
@@ -1,6 +1,12 @@
 # $Id$
 
-Version 0.6-pl2 (May 24th, 2004)
+Version 0.6-pl3 (June 14th, 2004)
+------------------------------------------------------------------------
+
+    * Fix bug during installation, which can cause an endless loop
+      of connections (tomsommer)
+      
+    Version 0.6-pl2 (May 24th, 2004)
 ------------------------------------------------------------------------
 
     * Fixed security vulnerability on servers with Register_Globals On.