php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	personal.inc.php users.inc.php 
Log Message:
- Convert old .tpl files into plain and valid .php files
- Use native PHP array to store configuration templates
- Add flag called "nosave" which will cause the data not to be saved in the database (useful for db vars, leaves a very clean db table)
- Add flag called "hideValue" which will not print the value of the var to the user (for passwords)
- Add flag called "local" which will not save the variable in the database, but only when the var is being saved in the configuration

- Fix bug with autolang (someone misspelled $serendipity, bad bad)
- Convert list of languages to a real array, which is sexy - move it to serendipity_config.inc.php

Tested with installer and config saving.

Please test - any breakage will be fixed ASAP - but please don't commit anything without pinging me.

TODO: Make a function to parse/obey the configuration flags, so we don't have to maintain it 3 places. Will do tomorrow.

NOTE: Do not add any logic to config files, or I will personally hunt you down.


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- users.inc.php	27 Nov 2004 22:14:15 -0000	1.3
+++ users.inc.php	2 Dec 2004 20:57:45 -0000	1.4
@@ -53,14 +53,11 @@
     } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
     } else {
-        $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
-        foreach($u AS $key => $entry) {
-            serendipity_set_user_var(
-              $entry['name'],
-              $_POST[$entry['name']],
-              $serendipity['POST']['user'],
-              ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false)
-            );
+        $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
+        foreach($config as $category) {
+            foreach ($category['items'] as $item) {
+                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
+            }
         }
         printf('<strong>' . MODIFIED_USER . '</strong>', $_POST['username']);
         echo '<br />';
@@ -149,9 +146,8 @@
     </h3>
 
 <?php
-$t = array();
-$t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, $t, false);
-serendipity_printConfigTemplate($t, $from, true, false);
+$config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
+serendipity_printConfigTemplate($config, $from, true, false);
 
 if (!empty($_POST['EDIT'])) { ?>
         <input type="submit" name="SAVE"   value="<?php echo SAVE; ?>" />

Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- personal.inc.php	2 Dec 2004 17:46:56 -0000	1.7
+++ personal.inc.php	2 Dec 2004 20:57:45 -0000	1.8
@@ -7,12 +7,14 @@
 $from = array();
 
 if ( $serendipity['GET']['adminAction'] == 'save' ) {
-    $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
+    $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
     if ((int)$_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</div>';
     } else {
-        foreach($u AS $var) {
-            serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
+        foreach($config as $category) {
+            foreach ($category['items'] as $item) {
+                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
+            }
         }
         $from = $_POST;
 ?>

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,NONE,1.1 config_personal.inc.php,NONE,1.1 config_local.tpl,1.6,NONE config_user.tpl,1.5,NONE

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

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

Added Files:
	config_local.inc.php config_personal.inc.php 
Removed Files:
	config_local.tpl config_user.tpl 
Log Message:
- Convert old .tpl files into plain and valid .php files
- Use native PHP array to store configuration templates
- Add flag called "nosave" which will cause the data not to be saved in the database (useful for db vars, leaves a very clean db table)
- Add flag called "hideValue" which will not print the value of the var to the user (for passwords)
- Add flag called "local" which will not save the variable in the database, but only when the var is being saved in the configuration

- Fix bug with autolang (someone misspelled $serendipity, bad bad)
- Convert list of languages to a real array, which is sexy - move it to serendipity_config.inc.php

Tested with installer and config saving.

Please test - any breakage will be fixed ASAP - but please don't commit anything without pinging me.

TODO: Make a function to parse/obey the configuration flags, so we don't have to maintain it 3 places. Will do tomorrow.

NOTE: Do not add any logic to config files, or I will personally hunt you down.


--- NEW FILE: config_local.inc.php ---
<?php # $Id: config_local.inc.php,v 1.1 2004/12/02 20:57:46 tomsommer Exp $


    $res = array();
    $res[] = array('title'       => INSTALL_CAT_DB,
                   'description' => INSTALL_CAT_DB_DESC,
                   'items' => array(array('var'         => 'dbType',
                                          'title'       => INSTALL_DBTYPE,
                                          'description' => INSTALL_DBTYPE_DESC,
                                          'type'        => 'list',
                                          'default'     => array('mysql'    => 'MySQL',
                                                                 'postgres' => 'PostgreSQL',
                                                                 'mysqli'   => 'MySQLi',
                                                                 'sqlite'   => 'SQLite'),
                                          'flags'       => array('nosave')),

                                    array('var'         => 'dbHost',
                                          'title'       => INSTALL_DBHOST,
                                          'description' => INSTALL_DBHOST_DESC,
                                          'type'        => 'string',
                                          'default'     => 'localhost',
                                          'flags'       => array('nosave')),

                                    array('var'         => 'dbUser',
                                          'title'       => INSTALL_DBUSER,
                                          'description' => INSTALL_DBUSER_DESC,
                                          'type'        => 'string',
                                          'default'     => 'serendipity',
                                          'flags'       => array('nosave')),

                                    array('var'         => 'dbPass',
                                          'title'       => INSTALL_DBPASS,
                                          'description' => INSTALL_DBPASS_DESC,
                                          'type'        => 'protected',
                                          'default'     => '',
                                          'flags'       => array('nosave', 'hideValue')),

                                    array('var'         => 'dbName',
                                          'title'       => INSTALL_DBNAME,
                                          'description' => INSTALL_DBNAME_DESC,
                                          'type'        => 'string',
                                          'default'     => 'serendipity',
                                          'flags'       => array('nosave')),

                                    array('var'         => 'dbPrefix',
                                          'title'       => INSTALL_DBPREFIX,
                                          'description' => INSTALL_DBPREFIX_DESC,
                                          'type'        => 'string',
                                          'default'     => 'serendipity_',
                                          'flags'       => array('nosave')),

                                    array('var'         => 'dbPersistant',
                                          'title'       => INSTALL_DBPERSISTENT,
                                          'description' => INSTALL_DBPERSISTENT_DESC,
                                          'type'        => 'bool',
                                          'default'     => false,
                                          'flags'       => array('nosave'))
                                ));

    $res[] = array('title'          => INSTALL_CAT_PATHS,
                   'description'    => INSTALL_CAT_PATHS_DESC,
                   'items' => array(array('var'         => 'serendipityPath',
                                          'title'       => INSTALL_FULLPATH,
                                          'description' => INSTALL_FULLPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => '/webroot/serendipity/'),

                                    array('var'         => 'uploadPath',
                                          'title'       => INSTALL_UPLOADPATH,
                                          'description' => INSTALL_UPLOADPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => 'uploads/'),

                                    array('var'         => 'serendipityHTTPPath',
                                          'title'       => INSTALL_RELPATH,
                                          'description' => INSTALL_RELPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => '/serendipity/'),

                                    array('var'         => 'templatePath',
                                          'title'       => INSTALL_RELTEMPLPATH,
                                          'description' => INSTALL_RELTEMPLPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => 'templates/'),

                                    array('var'         => 'uploadHTTPPath',
                                          'title'       => INSTALL_RELUPLOADPATH,
                                          'description' => INSTALL_RELUPLOADPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => 'uploads/'),

                                    array('var'         => 'baseURL',
                                          'title'       => INSTALL_URL,
                                          'description' => INSTALL_URL_DESC,
                                          'type'        => 'string',
                                          'default'     => 'http://www.example.com/serendipity/'),

                                    array('var'         => 'indexFile',
                                          'title'       => INSTALL_INDEXFILE,
                                          'description' => INSTALL_INDEXFILE_DESC,
                                          'type'        => 'string',
                                          'default'     => 'index.php'),
                                ));


    $res[] = array('title'          => INSTALL_CAT_SETTINGS,
                   'description'    => INSTALL_CAT_SETTINGS_DESC,
                   'items' => array(array('var'         => 'user',
                                          'title'       => INSTALL_USERNAME,
                                          'description' => INSTALL_USERNAME_DESC,
                                          'type'        => 'string',
                                          'default'     => 'John Doe',
                                          'flags'       => array('installOnly', 'local')),

                                    array('var'         => 'pass',
                                          'title'       => INSTALL_PASSWORD,
                                          'description' => INSTALL_PASSWORD_DESC,
                                          'type'        => 'protected',
                                          'default'     => 'john',
                                          'flags'       => array('installOnly', 'local')),

                                    array('var'         => 'email',
                                          'title'       => INSTALL_EMAIL,
                                          'description' => INSTALL_EMAIL_DESC,
                                          'type'        => 'string',
                                          'default'     => 'jo...@ex...',
                                          'flags'       => array('installOnly', 'local')),

                                    array('var'         => 'want_mail',
                                          'title'       => INSTALL_SENDMAIL,
                                          'description' => INSTALL_SENDMAIL_DESC,
                                          'type'        => 'bool',
                                          'default'     => true,
                                          'flags'       => array('installOnly', 'local')),

                                    array('var'         => 'allowSubscriptions',
                                          'title'       => INSTALL_SUBSCRIBE,
                                          'description' => INSTALL_SUBSCRIBE_DESC,
                                          'type'        => 'bool',
                                          'default'     => true,
                                          'flags'       => array('installOnly')),

                                    array('var'         => 'blogTitle',
                                          'title'       => INSTALL_BLOGNAME,
                                          'description' => INSTALL_BLOGNAME_DESC,
                                          'type'        => 'string',
                                          'default'     => 'John Doe\'s personal blog',
                                          'userlevel'   => USERLEVEL_CHIEF),

                                    array('var'         => 'blogDescription',
                                          'title'       => INSTALL_BLOGDESC,
                                          'description' => INSTALL_BLOGDESC_DESC,
                                          'type'        => 'string',
                                          'default'     => 'My little place on the web...',
                                          'userlevel'   => USERLEVEL_CHIEF),

                                    array('var'         => 'lang',
                                          'title'       => INSTALL_LANG,
                                          'description' => INSTALL_LANG_DESC,
                                          'type'        => 'list',
                                          'default'     => $serendipity['languages']),
                            ));

    $res[] = array('title'          => INSTALL_CAT_DISPLAY,
                   'description'    => INSTALL_CAT_DISPLAY_DESC,
                   'items' => array(array('var'         => 'fetchLimit',
                                          'title'       => INSTALL_FETCHLIMIT,
                                          'description' => INSTALL_FETCHLIMIT_DESC,
                                          'type'        => 'int',
                                          'default'     => 15),

                                    array('var'         => 'useGzip',
                                          'title'       => INSTALL_USEGZIP,
                                          'description' => INSTALL_USEGZIP_DESC,
                                          'type'        => 'bool',
                                          'default'     => true),

                                    array('var'         => 'extCSS',
                                          'title'       => INSTALL_EXTERNALSTYLE,
                                          'description' => INSTALL_EXTERNALSTYLE_DESC,
                                          'type'        => 'string',
                                          'default'     => 'none'),

                                    array('var'         => 'wysiwyg',
                                          'title'       => INSTALL_WYSIWYG,
                                          'description' => INSTALL_WYSIWYG_DESC,
                                          'type'        => 'bool',
                                          'default'     => false,
                                          'userlevel'   => USERLEVEL_CHIEF),

                                    array('var'         => 'XHTML11',
                                          'title'       => INSTALL_XHTML11,
                                          'description' => INSTALL_XHTML11_DESC,
                                          'type'        => 'bool',
                                          'default'     => false),

                                    array('var'         => 'enablePopup',
                                          'title'       => INSTALL_POPUP,
                                          'description' => INSTALL_POPUP_DESC,
                                          'type'        => 'bool',
                                          'default'     => false),

                                    array('var'         => 'embed',
                                          'title'       => INSTALL_EMBED,
                                          'description' => INSTALL_EMBED_DESC,
                                          'type'        => 'bool',
                                          'default'     => 'false'),

                                    array('var'         => 'top_as_links',
                                          'title'       => INSTALL_SHOW_EXTERNAL_LINKS,
                                          'description' => INSTALL_SHOW_EXTERNAL_LINKS_DESC,
                                          'type'        => 'bool',
                                          'default'     => false),

                                    array('var'         => 'blockReferer',
                                          'title'       => INSTALL_BLOCKREF,
                                          'description' => INSTALL_BLOCKREF_DESC,
                                          'type'        => 'string',
                                          'default'     => ';'),

                                    array('var'         => 'rewrite',
                                          'title'       => INSTALL_REWRITE,
                                          'description' => INSTALL_REWRITE,
                                          'type'        => 'list',
                                          'default'     => array('none'      => 'Disable URL Rewriting',
                                                                 'errordocs' => 'Use Apache errorhandling',
                                                                 'rewrite'   => 'Use Apache mod_rewrite')),

                                    array('var'         => 'serverOffsetHours',
                                          'title'       => INSTALL_OFFSET,
                                          'description' => INSTALL_OFFSET_DESC,
                                          'type'        => 'int',
                                          'default'     => 0),

                                    array('var'         => 'showFutureEntries',
                                          'title'       => INSTALL_SHOWFUTURE,
                                          'description' => INSTALL_SHOWFUTURE_DESC,
                                          'type'        => 'bool',
                                          'default'     => false),
                            ));

    $res[] = array('title' => INSTALL_CAT_IMAGECONV,
                   'description' => INSTALL_CAT_IMAGECONV_DESC,
                   'items' => array(array('var'         => 'magick',
                                          'title'       => INSTALL_IMAGEMAGICK,
                                          'description' => INSTALL_IMAGEMAGICK_DESC,
                                          'type'        => 'bool',
                                          'default'     => false),

                                    array('var'         => 'convert',
                                          'title'       => INSTALL_IMAGEMAGICKPATH,
                                          'description' => INSTALL_IMAGEMAGICKPATH_DESC,
                                          'type'        => 'string',
                                          'default'     => '/usr/local/bin/convert'),

                                    array('var'         => 'thumbSuffix',
                                          'title'       => INSTALL_THUMBSUFFIX,
                                          'description' => INSTALL_THUMBSUFFIX_DESC,
                                          'type'        => 'string',
                                          'default'     => 'serendipityThumb'),

                                    array('var'         => 'thumbSize',
                                          'title'       => INSTALL_THUMBWIDTH,
                                          'description' => INSTALL_THUMBWIDTH_DESC,
                                          'type'        => 'int',
                                          'default'     => 110),
                            ));

    return $res;
?>

--- config_local.tpl DELETED ---

--- config_user.tpl DELETED ---

--- NEW FILE: config_personal.inc.php ---
<?php # $Id: config_personal.inc.php,v 1.1 2004/12/02 20:57:46 tomsommer Exp $

    $res = array();
    $res[] = array('title' => USERCONF_CAT_PERSONAL,
                   'description' => USERCONF_CAT_PERSONAL_DESC,
                   'items' => array(array('var'         => 'username',
                                          'title'       => USERCONF_USERNAME,
                                          'description' => USERCONF_USERNAME_DESC,
                                          'type'        => 'string',
                                          'default'     => 'John',
                                          'userlevel'   => USERLEVEL_EDITOR),

                                    array('var'         => 'password',
                                          'title'       => USERCONF_PASSWORD,
                                          'description' => USERCONF_PASSWORD_DESC,
                                          'type'        => 'protected',
                                          'default'     => '',
                                          'userlevel'   => USERLEVEL_EDITOR),

                                    array('var'         => 'userlevel',
                                          'title'       => USERCONF_USERLEVEL,
                                          'description' => USERCONF_USERLEVEL_DESC,
                                          'type'        => 'int',
                                          'default'     => USERLEVEL_EDITOR,
                                          'userlevel'   => USERLEVEL_CHIEF),

                                    array('var'         => 'email',
                                          'title'       => USERCONF_EMAIL,
                                          'description' => USERCONF_EMAIL_DESC,
                                          'type'        => 'string',
                                          'default'     => 'jo...@ex...',
                                          'userlevel'   => USERLEVEL_EDITOR),

                                    array('var'         => 'mail_comments',
                                          'title'       => USERCONF_SENDCOMMENTS,
                                          'description' => USERCONF_SENDCOMMENTS_DESC,
                                          'type'        => 'bool',
                                          'default'     => true,
                                          'userlevel'   => USERLEVEL_EDITOR),

                                    array('var'         => 'mail_trackbacks',
                                          'title'       => USERCONF_SENDTRACKBACKS,
                                          'description' => USERCONF_SENDTRACKBACKS_DESC,
                                          'type'        => 'bool',
                                          'default'     => true,
                                          'userlevel'   => USERLEVEL_EDITOR),

                                    array('var'         => 'right_publish',
                                          'title'       => USERCONF_ALLOWPUBLISH,
                                          'description' => USERCONF_ALLOWPUBLISH_DESC,
                                          'type'        => 'bool',
                                          'default'     => true,
                                          'userlevel'   => USERLEVEL_CHIEF),
                            ));
    return $res;
?>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.106,1.107

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
- Convert old .tpl files into plain and valid .php files
- Use native PHP array to store configuration templates
- Add flag called "nosave" which will cause the data not to be saved in the database (useful for db vars, leaves a very clean db table)
- Add flag called "hideValue" which will not print the value of the var to the user (for passwords)
- Add flag called "local" which will not save the variable in the database, but only when the var is being saved in the configuration

- Fix bug with autolang (someone misspelled $serendipity, bad bad)
- Convert list of languages to a real array, which is sexy - move it to serendipity_config.inc.php

Tested with installer and config saving.

Please test - any breakage will be fixed ASAP - but please don't commit anything without pinging me.

TODO: Make a function to parse/obey the configuration flags, so we don't have to maintain it 3 places. Will do tomorrow.

NOTE: Do not add any logic to config files, or I will personally hunt you down.


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- serendipity_config.inc.php	29 Nov 2004 10:39:23 -0000	1.106
+++ serendipity_config.inc.php	2 Dec 2004 20:57:44 -0000	1.107
@@ -4,8 +4,8 @@
 if (!defined('S9Y_INCLUDE_PATH')) {
     define('S9Y_INCLUDE_PATH', dirname(__FILE__) . '/');
 }
-define('S9Y_CONFIG_TEMPLATE',     S9Y_INCLUDE_PATH . 'include/tpl/config_local.tpl');
-define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_user.tpl');
+define('S9Y_CONFIG_TEMPLATE',     S9Y_INCLUDE_PATH . 'include/tpl/config_local.inc.php');
+define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_personal.inc.php');
 
 define('IS_installed', file_exists('serendipity_config_local.inc.php'));
 
@@ -55,6 +55,24 @@
 // Should IFRAMEs be used for previewing entries and sending trackbacks?
 $serendipity['use_iframe'] = true;
 
+/* Default language for autodetection */
+$serendipity['autolang'] = 'en';
+
+/* Availiable languages */
+$serendipity['languages'] = array('en' => 'English',
+                                  'de' => 'German',
+                                  'da' => 'Danish',
+                                  'es' => 'Spanish',
+                                  'fr' => 'French',
+                                  'cs' => 'Czech (Win-1250)',
+                                  'cz' => 'Czech (ISO-8859-2)',
+                                  'nl' => 'Dutch',
+                                  'pt' => 'Portuguese Brazilian',
+                                  'bg' => 'Bulgarian',
+                                  'no' => 'Norwegian',
+                                  'it' => 'Italian',
+                                  'tw' => 'Traditional Chinese');
+
 /*
  *   Load main language file
  */

[php-blog-cvs] serendipity/include/tpl config_user.tpl,1.4,1.5

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

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

Modified Files:
	config_user.tpl 
Log Message:
- Language and WYSIWYG has no place under Personal settings, since the setting is not personal...


Index: config_user.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_user.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_user.tpl	2 Dec 2004 12:23:09 -0000	1.4
+++ config_user.tpl	2 Dec 2004 17:46:56 -0000	1.5
@@ -6,8 +6,6 @@
 $serendipity['password']        = '{USERCONF_PASSWORD|password|protected||0}';          // USERCONF_PASSWORD_DESC
 $serendipity['userlevel']       = '{USERCONF_USERLEVEL|userlevel|string||1}';           // USERCONF_USERLEVEL_DESC
 $serendipity['email']           = '{USERCONF_EMAIL|email|string|jo...@ex...|0}';   // USERCONF_EMAIL_DESC
-$serendipity['lang']            = '{INSTALL_LANG|lang|list|[LANGUAGE_LIST]|0|config}';                                        // INSTALL_LANG_DESC
-$serendipity['wysiwyg']         = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0|config}';          // INSTALL_WYSIWYG_DESC
 $serendipity['mail_comments']   = '{USERCONF_SENDCOMMENTS|mail_comments|bool|1|0}';     // USERCONF_SENDCOMMENTS_DESC
 $serendipity['mail_trackbacks'] = '{USERCONF_SENDTRACKBACKS|mail_trackbacks|bool|1|0}'; // USERCONF_SENDTRACKBACKS_DESC
 $serendipity['right_publish']   = '{USERCONF_ALLOWPUBLISH|right_publish|bool|1|1}';     // USERCONF_ALLOWPUBLISH_DESC

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

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

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

Modified Files:
	personal.inc.php 
Log Message:
- Language and WYSIWYG has no place under Personal settings, since the setting is not personal...


Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- personal.inc.php	2 Dec 2004 12:23:08 -0000	1.6
+++ personal.inc.php	2 Dec 2004 17:46:56 -0000	1.7
@@ -13,9 +13,6 @@
     } else {
         foreach($u AS $var) {
             serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
-            if (in_array('config', $var['flags'])) {
-                serendipity_set_config_var($var['name'], $_POST[$var['name']], $serendipity['authorid']);
-            }
         }
         $from = $_POST;
 ?>

[php-blog-cvs] serendipity/bundled-libs/Cache/Lite Function.php,NONE,1.1 Output.php,NONE,1.1

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

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

Added Files:
	Function.php Output.php 
Log Message:
updated Net_DNSBL package
bundled Cache_Lite

--- NEW FILE: Output.php ---
<?php

/**
* This class extends Cache_Lite and uses output buffering to get the data to cache.
*
* There are some examples in the 'docs/examples' file
* Technical choices are described in the 'docs/technical' file
*
* @package Cache_Lite
* @version $Id: Output.php,v 1.1 2004/12/02 14:23:52 nohn Exp $
* @author Fabien MARTY <fa...@ph...>
*/

require_once('Cache/Lite.php');

class Cache_Lite_Output extends Cache_Lite
{

    // --- Public methods ---

    /**
    * Constructor
    *
    * $options is an assoc. To have a look at availables options,
    * see the constructor of the Cache_Lite class in 'Cache_Lite.php'
    *
    * @param array $options options
    * @access public
    */
    function Cache_Lite_Output($options)
    {
        $this->Cache_Lite($options);
    }

    /**
    * Start the cache
    *
    * @param string $id cache id
    * @param string $group name of the cache group
    * @return boolean true if the cache is hit (false else)
    * @access public
    */
    function start($id, $group = 'default')
    {
        $data = $this->get($id, $group);
        if ($data !== false) {
            echo($data);
            return true;
        } else {
            ob_start();
            ob_implicit_flush(false);
            return false;
        }
    }

    /**
    * Stop the cache
    *
    * @access public
    */
    function end()
    {
        $data = ob_get_contents();
        ob_end_clean();
        $this->save($data, $this->_id, $this->_group);
        echo($data);
    }

}


?>

--- NEW FILE: Function.php ---
<?php

/**
* This class extends Cache_Lite and can be used to cache the result and output of functions/methods
*
* This class is completly inspired from Sebastian Bergmann's
* PEAR/Cache_Function class. This is only an adaptation to
* Cache_Lite
*
* There are some examples in the 'docs/examples' file
* Technical choices are described in the 'docs/technical' file
*
* @package Cache_Lite
* @version $Id: Function.php,v 1.1 2004/12/02 14:23:52 nohn Exp $
* @author Sebastian BERGMANN <sb...@se...>
* @author Fabien MARTY <fa...@ph...>
*/
 
require_once('Cache/Lite.php');

class Cache_Lite_Function extends Cache_Lite
{

    // --- Private properties ---
    
    /**
    * Default cache group for function caching
    *
    * @var string $_defaultGroup
    */
    var $_defaultGroup = 'Cache_Lite_Function';
    
    // --- Public methods ----
    
    /**
    * Constructor
    *
    * $options is an assoc. To have a look at availables options,
    * see the constructor of the Cache_Lite class in 'Cache_Lite.php'
    *
    * Comparing to Cache_Lite constructor, there is another option :
    * $options = array(
    *     (...) see Cache_Lite constructor
    *     'defaultGroup' => default cache group for function caching (string)
    * );
    *
    * @param array $options options
    * @access public
    */
    function Cache_Lite_Function($options = array(NULL))
    {
        if (isset($options['defaultGroup'])) {
            $this->_defaultGroup = $options['defaultGroup'];
        }
        $this->Cache_Lite($options);
    }
    
    /**
    * Calls a cacheable function or method (or not if there is already a cache for it)
    *
    * Arguments of this method are read with func_get_args. So it doesn't appear
    * in the function definition. Synopsis : 
    * call('functionName', $arg1, $arg2, ...)
    * (arg1, arg2... are arguments of 'functionName')
    *
    * @return mixed result of the function/method
    * @access public
    */
    function call()
    {
        $arguments = func_get_args();
        $id = serialize($arguments); // Generate a cache id
        if (!$this->_fileNameProtection) {
            $id = md5($id);
            // if fileNameProtection is set to false, then the id has to be hashed
            // because it's a very bad file name in most cases
        }
        $data = $this->get($id, $this->_defaultGroup);
        if ($data !== false) {
            $array = unserialize($data);
            $output = $array['output'];
            $result = $array['result'];
        } else {
            ob_start();
            ob_implicit_flush(false);
            $target = array_shift($arguments);
            if (strstr($target, '::')) { // classname::staticMethod
                list($class, $method) = explode('::', $target);
                $result = call_user_func_array(array($class, $method), $arguments);
            } else if (strstr($target, '->')) { // object->method
                // use a stupid name ($objet_123456789 because) of problems when the object
                // name is the same as this var name
                list($object_123456789, $method) = explode('->', $target);
                global $$object_123456789;
                $result = call_user_func_array(array($$object_123456789, $method), $arguments);
            } else { // function
                $result = call_user_func_array($target, $arguments);
            }
            $output = ob_get_contents();
            ob_end_clean();
            $array['output'] = $output;
            $array['result'] = $result;
            $this->save(serialize($array), $id, $this->_defaultGroup);
        }
        echo($output);
        return $result;
    }
    
}

?>

[php-blog-cvs] serendipity/bundled-libs/Net/DNSBL SURBL.php,1.3,1.4

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

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

Modified Files:
	SURBL.php 
Log Message:
updated Net_DNSBL package
bundled Cache_Lite

Index: SURBL.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Net/DNSBL/SURBL.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SURBL.php	2 Dec 2004 10:54:29 -0000	1.3
+++ SURBL.php	2 Dec 2004 14:23:51 -0000	1.4
@@ -29,9 +29,9 @@
  * @author  Sebastian Nohn <seb...@no...>
  * @package Net_DNSBL
  * @license http://www.php.net/license/3_0.txt
- * @version 0.3
+ * @version 0.5.4
  */
-require_once 'Cache.php';
+require_once 'Cache/Lite.php';
 require_once 'HTTP/Request.php';
 require_once 'Net/CheckIP.php';
 require_once 'Net/DNSBL.php';
@@ -41,8 +41,7 @@
     /**     
      * Array of blacklists.
      *
-     * Contain 1-n blacklists to use for checking the status of a
-     * host.
+     * Must have one or more elements.
      *
      * @var    string[]
      * @access protected
@@ -50,7 +49,7 @@
     var $blacklists = array('multi.surbl.org');
 
     /**
-     * File containing whitelisted hosts
+     * File containing whitelisted hosts.
      *
      * There are some whitelisted hosts (co.uk for example). This
      * requires the package to not ask the domain name but the host
@@ -63,7 +62,7 @@
     var $doubleCcTldFile = 'http://spamcheck.freeapp.net/two-level-tlds';
 
     /**
-     * Array of whitelisted hosts
+     * Array of whitelisted hosts.
      *
      * @var    array
      * @see    $twoLevelCcTldFile
@@ -72,18 +71,22 @@
     var $twoLevelCcTld = array();
 
     /**
-     * Check if the last two parts of the FQDN are whitelisted
+     * Check if the last two parts of the FQDN are whitelisted.
      *
      * @param  string Host to check if it is whitelisted
      * @access protected
      * @return boolean True if the host is whitelisted
      */
-    function isDoubleCcTld($fqdn) {
-        // 30 Day should be way enough
-        $options = array('lifeTime' => 2);
+    function isDoubleCcTld($fqdn)
+    {
+        // 30 Days should be way enough
+        $options = array(
+                         'lifeTime' => '2592000',
+                         'automaticSerialization' => true
+                         );
         $id = md5($this->doubleCcTldFile);
 
-        $cache = new Cache('file', $options);
+        $cache = new Cache_Lite($options);
         if ($data = $cache->get($id)) {
             // Cache hit
         } else {
@@ -94,7 +97,7 @@
             }
             $data = explode("\n", $data);
             $data = array_flip($data);
-            $cache->save($id, $data);
+            $cache->save($data, $id);
         } // if 
         if (array_key_exists($fqdn, $data)) {
             return true;
@@ -104,7 +107,7 @@
     } // function
 
     /**
-     * Get Hostname to ask for
+     * Get Hostname to ask for.
      *
      * Performs the following steps:
      *
@@ -114,13 +117,14 @@
      * (3b) IS_FQDN Check if is in "CC-2-level-TLD"
      * (3b1) IS_IN_2LEVEL: we want the last three names
      * (3b2) IS_NOT_2LEVEL: we want the last two names
-     * (4) return the FQDN to query
+     * (4) return the FQDN to query.
      *
      * @param  string URL to check. 
      * @access protected
      * @return string Host to lookup
      */
-    function getHostForLookup($uri, $blacklist) {
+    function getHostForLookup($uri, $blacklist) 
+    {
         $host       = '';
         // (1) Extract the hostname from the given URI
         $parsed_uri = parse_url($uri);
@@ -157,4 +161,4 @@
     } // function
 
 } // class
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/bundled-libs/Cache Lite.php,NONE,1.1

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

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

Added Files:
	Lite.php 
Log Message:
updated Net_DNSBL package
bundled Cache_Lite

--- NEW FILE: Lite.php ---
<?php

/**
* Fast, light and safe Cache Class
*
* Cache_Lite is a fast, light and safe cache system. It's optimized
* for file containers. It is fast and safe (because it uses file
* locking and/or anti-corruption tests).
*
* There are some examples in the 'docs/examples' file
* Technical choices are described in the 'docs/technical' file
*
* A tutorial is available in english at this url :
* http://www.pearfr.org/index.php/en/article/cache_lite
* (big thanks to Pierre-Alain Joye for the translation)
*
* The same tutorial is also available in french at this url :
* http://www.pearfr.org/index.php/fr/article/cache_lite
*
* Memory Caching is from an original idea of
* Mike BENOIT <ip...@sn...>
*
* @package Cache_Lite
* @category Caching
* @version $Id: Lite.php,v 1.1 2004/12/02 14:23:52 nohn Exp $
* @author Fabien MARTY <fa...@ph...>
*/

define('CACHE_LITE_ERROR_RETURN', 1);
define('CACHE_LITE_ERROR_DIE', 8);

class Cache_Lite
{

    // --- Private properties ---

    /**
    * Directory where to put the cache files
    * (make sure to add a trailing slash)
    *
    * @var string $_cacheDir
    */
    var $_cacheDir = '/tmp/';

    /**
    * Enable / disable caching
    *
    * (can be very usefull for the debug of cached scripts)
    *
    * @var boolean $_caching
    */
    var $_caching = true;

    /**
    * Cache lifetime (in seconds)
    *
    * @var int $_lifeTime
    */
    var $_lifeTime = 3600;

    /**
    * Enable / disable fileLocking
    *
    * (can avoid cache corruption under bad circumstances)
    *
    * @var boolean $_fileLocking
    */
    var $_fileLocking = true;

    /**
    * Timestamp of the last valid cache
    *
    * @var int $_refreshTime
    */
    var $_refreshTime;

    /**
    * File name (with path)
    *
    * @var string $_file
    */
    var $_file;

    /**
    * Enable / disable write control (the cache is read just after writing to detect corrupt entries)
    *
    * Enable write control will lightly slow the cache writing but not the cache reading
    * Write control can detect some corrupt cache files but maybe it's not a perfect control
    *
    * @var boolean $_writeControl
    */
    var $_writeControl = true;

    /**
    * Enable / disable read control
    *
    * If enabled, a control key is embeded in cache file and this key is compared with the one
    * calculated after the reading.
    *
    * @var boolean $_writeControl
    */
    var $_readControl = true;

    /**
    * Type of read control (only if read control is enabled)
    *
    * Available values are :
    * 'md5' for a md5 hash control (best but slowest)
    * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
    * 'strlen' for a length only test (fastest)
    *
    * @var boolean $_readControlType
    */
    var $_readControlType = 'crc32';

    /**
    * Pear error mode (when raiseError is called)
    *
    * (see PEAR doc)
    *
    * @see setToDebug()
    * @var int $_pearErrorMode
    */
    var $_pearErrorMode = CACHE_LITE_ERROR_RETURN;
    
    /**
    * Current cache id
    *
    * @var string $_id
    */
    var $_id;

    /**
    * Current cache group
    *
    * @var string $_group
    */
    var $_group;

    /**
    * Enable / Disable "Memory Caching"
    *
    * NB : There is no lifetime for memory caching ! 
    *
    * @var boolean $_memoryCaching
    */
    var $_memoryCaching = false;

    /**
    * Enable / Disable "Only Memory Caching"
    * (be carefull, memory caching is "beta quality")
    *
    * @var boolean $_onlyMemoryCaching
    */
    var $_onlyMemoryCaching = false;

    /**
    * Memory caching array
    *
    * @var array $_memoryCachingArray
    */
    var $_memoryCachingArray = array();

    /**
    * Memory caching counter
    *
    * @var int $memoryCachingCounter
    */
    var $_memoryCachingCounter = 0;

    /**
    * Memory caching limit
    *
    * @var int $memoryCachingLimit
    */
    var $_memoryCachingLimit = 1000;
    
    /**
    * File Name protection
    *
    * if set to true, you can use any cache id or group name
    * if set to false, it can be faster but cache ids and group names
    * will be used directly in cache file names so be carefull with
    * special characters...
    *
    * @var boolean $fileNameProtection
    */
    var $_fileNameProtection = true;
    
    /**
    * Enable / disable automatic serialization
    *
    * it can be used to save directly datas which aren't strings
    * (but it's slower)    
    *
    * @var boolean $_serialize
    */
    var $_automaticSerialization = false;
    
    // --- Public methods ---

    /**
    * Constructor
    *
    * $options is an assoc. Available options are :
    * $options = array(
    *     'cacheDir' => directory where to put the cache files (string),
    *     'caching' => enable / disable caching (boolean),
    *     'lifeTime' => cache lifetime in seconds (int),
    *     'fileLocking' => enable / disable fileLocking (boolean),
    *     'writeControl' => enable / disable write control (boolean),
    *     'readControl' => enable / disable read control (boolean),
    *     'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string),
    *     'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int),
    *     'memoryCaching' => enable / disable memory caching (boolean),
    *     'onlyMemoryCaching' => enable / disable only memory caching (boolean),
    *     'memoryCachingLimit' => max nbr of records to store into memory caching (int),
    *     'fileNameProtection' => enable / disable automatic file name protection (boolean),
    *     'automaticSerialization' => enable / disable automatic serialization (boolean)
    * );
    *
    * @param array $options options
    * @access public
    */
    function Cache_Lite($options = array(NULL))
    {
        $availableOptions = array('automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode');
        foreach($options as $key => $value) {
            if(in_array($key, $availableOptions)) {
                $property = '_'.$key;
                $this->$property = $value;
            }
        }
        $this->_refreshTime = time() - $this->_lifeTime;
    }
    
    /**
    * Test if a cache is available and (if yes) return it
    *
    * @param string $id cache id
    * @param string $group name of the cache group
    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
    * @return string data of the cache (or false if no cache available)
    * @access public
    */
    function get($id, $group = 'default', $doNotTestCacheValidity = false)
    {
        $this->_id = $id;
        $this->_group = $group;
        $data = false;
        if ($this->_caching) {
            $this->_setFileName($id, $group);
            if ($this->_memoryCaching) {
                if (isset($this->_memoryCachingArray[$this->_file])) {
                    if ($this->_automaticSerialization) {
                        return unserialize($this->_memoryCachingArray[$this->_file]);
                    } else {
                        return $this->_memoryCachingArray[$this->_file];
                    }
                } else {
                    if ($this->_onlyMemoryCaching) {
                        return false;
                    }
                }
            }
            if ($doNotTestCacheValidity) {
                if (file_exists($this->_file)) {
                    $data = $this->_read();
                }
            } else {
                if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) {
                    $data = $this->_read();
                }
            }
            if (($data) and ($this->_memoryCaching)) {
                $this->_memoryCacheAdd($this->_file, $data);
            }
            if (($this->_automaticSerialization) and (is_string($data))) {
                $data = unserialize($data);
            }
            return $data;
        }
        return false;
    }
    
    /**
    * Save some data in a cache file
    *
    * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on)
    * @param string $id cache id
    * @param string $group name of the cache group
    * @return boolean true if no problem
    * @access public
    */
    function save($data, $id = NULL, $group = 'default')
    {
        if ($this->_caching) {
            if ($this->_automaticSerialization) {
                $data = serialize($data);
            }
            if (isset($id)) {
                $this->_setFileName($id, $group);
            }
            if ($this->_memoryCaching) {
                $this->_memoryCacheAdd($this->_file, $data);
                if ($this->_onlyMemoryCaching) {
                    return true;
                }
            }
            if ($this->_writeControl) {
                if (!$this->_writeAndControl($data)) {
                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
                    return false;
                } else {
                    return true;
                }
            } else {
                return $this->_write($data);
            }
        }
        return false;
    }

    /**
    * Remove a cache file
    *
    * @param string $id cache id
    * @param string $group name of the cache group
    * @return boolean true if no problem
    * @access public
    */
    function remove($id, $group = 'default')
    {
        $this->_setFileName($id, $group);
        if ($this->_memoryCaching) {
            if (isset($this->_memoryCachingArray[$this->_file])) {
                unset($this->_memoryCachingArray[$this->_file]);
                $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
            }
            if ($this->_onlyMemoryCaching) {
                return true;
            }
        }
        if (!@unlink($this->_file)) {
            $this->raiseError('Cache_Lite : Unable to remove cache !', -3);   
            return false;
        }
        return true;
    }

    /**
    * Clean the cache
    *
    * if no group is specified all cache files will be destroyed
    * else only cache files of the specified group will be destroyed
    *
    * @param string $group name of the cache group
    * @return boolean true if no problem
    * @access public
    */
    function clean($group = false)     
    {
        if ($this->_fileNameProtection) {
            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
        } else {
            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
        }
        if ($this->_memoryCaching) {
            while (list($key, $value) = each($this->_memoryCachingArray)) {
                if (strpos($key, $motif, 0)) {
                    unset($this->_memoryCachingArray[$key]);
                    $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
                }
            }
            if ($this->_onlyMemoryCaching) {
                return true;
            }
        }
        if (!($dh = opendir($this->_cacheDir))) {
            $this->raiseError('Cache_Lite : Unable to open cache directory !', -4);
            return false;
        }
        while ($file = readdir($dh)) {
            if (($file != '.') && ($file != '..')) {
                $file = $this->_cacheDir . $file;
                if (is_file($file)) {
                    if (strpos($file, $motif, 0)) {
                        if (!@unlink($file)) {
                            $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
                            return false;
                        }
                    }
                }
            }
        }
        return true;
    }
    
    /**
    * Set to debug mode
    *
    * When an error is found, the script will stop and the message will be displayed
    * (in debug mode only).
    *
    * @access public
    */
    function setToDebug()
    {
        $this->_pearErrorMode = CACHE_LITE_ERROR_DIE;
    }

    /**
    * Set a new life time
    *
    * @param int $newLifeTime new life time (in seconds)
    * @access public
    */
    function setLifeTime($newLifeTime)
    {
        $this->_lifeTime = $newLifeTime;
        $this->_refreshTime = time() - $newLifeTime;
    }

    /**
    *
    * @access public
    */
    function saveMemoryCachingState($id, $group = 'default')
    {
        if ($this->_caching) {
            $array = array(
                'counter' => $this->_memoryCachingCounter,
                'array' => $this->_memoryCachingState
            );
            $data = serialize($array);
            $this->save($data, $id, $group);
        }
    }

    /**
    *
    * @access public
    */
    function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false)
    {
        if ($this->_caching) {
            if ($data = $this->get($id, $group, $doNotTestCacheValidity)) {
                $array = unserialize($data);
                $this->_memoryCachingCounter = $array['counter'];
                $this->_memoryCachingArray = $array['array'];
            }
        }
    }
    
    /**
    * Return the cache last modification time
    *
    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
    *
    * @return int last modification time
    */
    function lastModified() {
        return filemtime($this->_file);
    }
    
    /**
    * Trigger a PEAR error
    *
    * To improve performances, the PEAR.php file is included dynamically.
    * The file is so included only when an error is triggered. So, in most
    * cases, the file isn't included and perfs are much better.
    *
    * @param string $msg error message
    * @param int $code error code
    * @access public
    */
    function raiseError($msg, $code)
    {
        include_once('PEAR.php');
        PEAR::raiseError($msg, $code, $this->_pearErrorMode);
    }

    // --- Private methods ---

    /**
    *
    * @access private
    */
    function _memoryCacheAdd($id, $data)
    {
        $this->_memoryCachingArray[$this->_file] = $data;
        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
            list($key, $value) = each($this->_memoryCachingArray);
            unset($this->_memoryCachingArray[$key]);
        } else {
            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
        }
    }

    /**
    * Make a file name (with path)
    *
    * @param string $id cache id
    * @param string $group name of the group
    * @access private
    */
    function _setFileName($id, $group)
    {
        if ($this->_fileNameProtection) {
            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'.md5($id));
        } else {
            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
        }
    }
    
    /**
    * Read the cache file and return the content
    *
    * @return string content of the cache file
    * @access private
    */
    function _read()
    {
        $fp = @fopen($this->_file, "rb");
        if ($this->_fileLocking) @flock($fp, LOCK_SH);
        if ($fp) {
            clearstatcache(); // because the filesize can be cached by PHP itself...
            $length = @filesize($this->_file);
            $mqr = get_magic_quotes_runtime();
            set_magic_quotes_runtime(0);
            if ($this->_readControl) {
                $hashControl = @fread($fp, 32);
                $length = $length - 32;
            } 
            $data = @fread($fp, $length);
            set_magic_quotes_runtime($mqr);
            if ($this->_fileLocking) @flock($fp, LOCK_UN);
            @fclose($fp);
            if ($this->_readControl) {
                $hashData = $this->_hash($data, $this->_readControlType);
                if ($hashData != $hashControl) {
                    @touch($this->_file, time() - 2*abs($this->_lifeTime)); 
                    return false;
                }
            }
            return $data;
        }
        $this->raiseError('Cache_Lite : Unable to read cache !', -2);   
        return false;
    }
    
    /**
    * Write the given data in the cache file
    *
    * @param string $data data to put in cache
    * @return boolean true if ok
    * @access private
    */
    function _write($data)
    {
        $fp = @fopen($this->_file, "wb");
        if ($fp) {
            if ($this->_fileLocking) @flock($fp, LOCK_EX);
            if ($this->_readControl) {
                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
            }
            $len = strlen($data);
            @fwrite($fp, $data, $len);
            if ($this->_fileLocking) @flock($fp, LOCK_UN);
            @fclose($fp);
            return true;
        }
        $this->raiseError('Cache_Lite : Unable to write cache !', -1);
        return false;
    }
    
    /**
    * Write the given data in the cache file and control it just after to avoir corrupted cache entries
    *
    * @param string $data data to put in cache
    * @return boolean true if the test is ok
    * @access private
    */
    function _writeAndControl($data)
    {
        $this->_write($data);
        $dataRead = $this->_read($data);
        return ($dataRead==$data);
    }
    
    /**
    * Make a control key with the string containing datas
    *
    * @param string $data data
    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
    * @return string control key
    * @access private
    */
    function _hash($data, $controlType)
    {
        switch ($controlType) {
        case 'md5':
            return md5($data);
        case 'crc32':
            return sprintf('% 32d', crc32($data));
        case 'strlen':
            return sprintf('% 32d', strlen($data));
        default:
            $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
        }
    }
    
} 

?>

[php-blog-cvs] serendipity/bundled-libs/Net DNSBL.php,1.3,1.4

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

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

Modified Files:
	DNSBL.php 
Log Message:
updated Net_DNSBL package
bundled Cache_Lite

Index: DNSBL.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Net/DNSBL.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DNSBL.php	2 Dec 2004 10:54:29 -0000	1.3
+++ DNSBL.php	2 Dec 2004 14:23:51 -0000	1.4
@@ -30,7 +30,7 @@
  * @author  Sebastian Nohn <seb...@no...>
  * @package Net_DNSBL
  * @license http://www.php.net/license/3_0.txt
- * @version 0.3
+ * @version 0.5.3
  */
 require_once 'Net/CheckIP.php';
 
@@ -39,8 +39,7 @@
     /**     
      * Array of blacklists.
      *
-     * Contain 1-n blacklists to use for checking the status of a
-     * host.
+     * Must have one or more elements.
      *
      * @var    array
      * @access protected
@@ -55,7 +54,8 @@
      * @access public
      * @return bool true if the operation was successful
      */
-    function setRBL($blacklists) {
+    function setBlacklists($blacklists)
+    {
         if (is_array($blacklists)) {
             $this->blacklists = $blacklists;
             return true;
@@ -70,19 +70,21 @@
      * @access public
      * @return array Currently set blacklists.
      */
-    function getRBL() {
+    function getBlacklists()
+    {
         return $this->blacklists;
     }
 
     /** 
-     * Checks if the supplied Host is listen in one or more of the
-     * RBLs
+     * Checks if the supplied Host is listed in one or more of the
+     * RBLs.
      *
      * @param  string Host to check for being listed.
      * @access public
-     * @return boolean true if the checked host is listed in some blacklist.
+     * @return boolean true if the checked host is listed in a blacklist.
      */
-    function isListed($host) {
+    function isListed($host)
+    {
         
         $isListed = false;
         
@@ -100,16 +102,18 @@
         return $isListed;
     } // function
 
-    /**
-     * Get thublice host to lookup. Lookup a host if neccessary and get the
-     * complete FQDN to lookup
+    /** 
+     * Get host to lookup. Lookup a host if neccessary and get the
+     * complete FQDN to lookup.
      *
      * @param  string Host OR IP to use for building the lookup.
      * @param  string Blacklist to use for building the lookup.
      * @access protected
      * @return string Ready to use host to lookup
      */    
-    function getHostForLookup($host, $blacklist) {
+    function getHostForLookup($host, $blacklist) 
+    {
+        // Currently only works for v4 addresses.
         if (!Net_CheckIP::check_ip($host)) {
             $ip = gethostbyname($host);
         } else {
@@ -127,20 +131,23 @@
      * @access protected
      * @return string Ready to use host to lookup
      */    
-    function buildLookUpHost($ip, $blacklist) {
+    function buildLookUpHost($ip, $blacklist)
+    {
         return $this->reverseIp($ip).'.'.$blacklist;        
     } // function
 
     /**
-     * Reverse the order of an IP. 127.0.0.1 -> 1.0.0.127
+     * Reverse the order of an IP. 127.0.0.1 -> 1.0.0.127. Currently
+     * only works for v4-adresses
      *
      * @param  string IP to reverse.
      * @access protected
      * @return string Reversed IP
      */    
-    function reverseIp($ip) {        
+    function reverseIp($ip) 
+    {        
         return implode('.', array_reverse(explode('.', $ip)));        
     } // function
 
 } // class
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/bundled-libs/Cache/Lite - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/Cache/Lite added to the repository

[php-blog-cvs] serendipity/bundled-libs/Cache - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/Cache added to the repository

[php-blog-cvs] serendipity/include functions.inc.php,1.8,1.9 functions_comments.inc.php,1.7,1.8 lang.inc.php,1.3,1.4

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

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

Modified Files:
	functions.inc.php functions_comments.inc.php lang.inc.php 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_comments.inc.php	30 Nov 2004 11:27:55 -0000	1.7
+++ functions_comments.inc.php	2 Dec 2004 14:11:27 -0000	1.8
@@ -134,7 +134,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&#160;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&#160;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . serendipity_mb('ucfirst', serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }

Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lang.inc.php	2 Dec 2004 10:54:55 -0000	1.3
+++ lang.inc.php	2 Dec 2004 14:11:28 -0000	1.4
@@ -31,5 +31,45 @@
     }
 }
 
+if (!defined('serendipity_MB_LOADED') && defined('serendipity_LANG_LOADED')) {
+    // Needs to be included here because we need access to constant LANG_CHARSET definied in languages (not available for compat.inc.php)
+
+    // Multibyte string functions wrapper:
+    // strlen(), strpos(), strrpos(), strtolower(), strtoupper(), substr(), ucfirst()
+    function serendipity_mb() {
+        static $mbstring = null;
+
+        if (is_null($mbstring)) {
+            $mbstring = (extension_loaded('mbstring') ? true : false);
+            if ($mbstring) {
+                mb_internal_encoding(LANG_CHARSET);
+            }
+        }
+
+        $args = func_get_args();
+        $func = $args[0];
+        unset($args[0]);
+
+        switch($func) {
+            case 'ucfirst':
+                // there's no mb_ucfirst, so emulate it
+                if ($mbstring) {
+                    return mb_strtoupper(mb_substr($args[1], 0, 1)) . mb_strtolower(mb_substr($args[1], 1));
+                } else {
+                    return ucfirst($args[1]);
+                }
+
+            default:
+                if ($mbstring) {
+                    return call_user_func_array('mb_' . $func, $args);
+                } else {
+                    return call_user_func_array($func, $args);
+                }
+        }
+    }
+
+    define('serendipity_MB_LOADED', true);
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions.inc.php	2 Dec 2004 10:54:55 -0000	1.8
+++ functions.inc.php	2 Dec 2004 14:11:27 -0000	1.9
@@ -17,7 +17,7 @@
 
 function serendipity_truncateString($s, $len) {
     if ( strlen($s) > ($len+3) ) {
-        $s = substr($s, 0, $len) . '...';
+        $s = serendipity_mb('substr', $s, 0, $len) . '...';
     }
     return $s;
 }
@@ -65,7 +65,7 @@
             $cache[$format] = str_replace('%e', '%d', $cache[$format]);
         }
     }
-    return ucfirst(serendipity_strftime($cache[$format], (int)$time, $useOffset));
+    return serendipity_mb('ucfirst', serendipity_strftime($cache[$format], (int)$time, $useOffset));
 }
 
 function serendipity_fetchTemplates() {

[php-blog-cvs] serendipity/docs NEWS,1.20,1.21

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

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

Modified Files:
	NEWS 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- NEWS	2 Dec 2004 10:45:19 -0000	1.20
+++ NEWS	2 Dec 2004 14:11:27 -0000	1.21
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Use mbstring extension where available to correctly utilize PHPs
+      string functions for multibyte chars. This is needed for UTF-8
+      only languages like Chinese (garvinhicking)
+
     * Move the page where you change your details out of the
       configuration and into its own menuitem and page (tomsommer)
 
@@ -186,7 +190,7 @@
 
     * Do not show entries of the future when entering their direct URL
       (garvinhicking)
-          
+
 Version 0.7 (November 8th, 2004)
 ------------------------------------------------------------------------
 

[php-blog-cvs] serendipity serendipity_admin.php,1.50,1.51

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_admin.php	2 Dec 2004 12:23:08 -0000	1.50
+++ serendipity_admin.php	2 Dec 2004 14:11:25 -0000	1.51
@@ -130,7 +130,7 @@
 
 
                     <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?></div>
+                        <div class="serendipitySideBarTitle"><?php echo serendipity_mb('ucfirst', ENTRIES); ?></div>
                         <div class="serendipitySideBarContent">
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a><br />
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a><br />

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.12,1.13

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

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

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_event_blogpdf.php	2 Dec 2004 10:54:59 -0000	1.12
+++ serendipity_event_blogpdf.php	2 Dec 2004 14:11:29 -0000	1.13
@@ -373,7 +373,7 @@
               $this->prep_out(
                 $body . "\n" .
                 '    ' . $name .
-                ' ' . ON . ' ' . ucfirst(serendipity_strftime('%b %e %Y, %H:%M', $comment['timestamp']))
+                ' ' . ON . ' ' . serendipity_mb('ucfirst', serendipity_strftime('%b %e %Y, %H:%M', $comment['timestamp']))
               ) . "\n"
             );
             $this->pdf->Ln();

[php-blog-cvs] serendipity/plugins/serendipity_plugin_history serendipity_plugin_history.php,1.17,1.18

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

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

Modified Files:
	serendipity_plugin_history.php 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: serendipity_plugin_history.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_plugin_history.php	2 Dec 2004 10:55:08 -0000	1.17
+++ serendipity_plugin_history.php	2 Dec 2004 14:11:30 -0000	1.18
@@ -218,7 +218,7 @@
             $date = ($displaydate == '0' ? '' : serendipity_strftime($dateformat, $e[$x]['timestamp']));
             $t    = ($maxlength   == 0 || strlen($e[$x]['title']) <= $maxlength)
                   ? $e[$x]['title']
-                  : trim(substr($e[$x]['title'], 0, $maxlength - 3)) . ' [...]';
+                  : trim(serendipity_mb('substr', $e[$x]['title'], 0, $maxlength - 3)) . ' [...]';
 
             echo $date . '"<a href="' . $url . '" title="' . htmlspecialchars($e[$x]['title']) . '">' . $t . '</a> '
                        . strip_tags($e[$x]['body']) . '<br />';

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

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

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

Modified Files:
	comments.inc.php 
Log Message:
use mb_* functions when available. I patched all strtolower/strtoupper/strlen/strpos/strrpos/substr/ucfirst calls which are related to possible UTF-8 input.
For performance reasons, there are native calls left which don't deal with UTF8 characters.
The callback routines for mb_* functions are inside include/lang.inc.php because we need the LANG_CHARSET constant information for the function, and the function needs to be loaded everywhere. compact.inc.php is loaded before languages, so we can'T put it in there.



Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- comments.inc.php	1 Dec 2004 11:00:56 -0000	1.7
+++ comments.inc.php	2 Dec 2004 14:11:28 -0000	1.8
@@ -274,7 +274,7 @@
     }
 
     $fullBody = nl2br(strip_tags($rs['body']));
-    $summary = substr($fullBody, 0, $summaryLength);
+    $summary = serendipity_mb('substr', $fullBody, 0, $summaryLength);
 
     if (strlen($fullBody) > strlen($summary) ) {
         $summary .= ' ...';
@@ -284,7 +284,7 @@
 ?>
 <tr>
     <td><a name="c<?php echo $rs['id'] ?>"></a>
-        <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(serendipity_strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
+        <?php echo ($rs['type'] == 'NORMAL' ? COMMENT : TRACKBACK) . ' #'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . serendipity_mb('ucfirst', serendipity_strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
     </td>
 </tr>
 <tr>

[php-blog-cvs] serendipity/templates/default entries.tpl,1.5,1.6

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

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

Modified Files:
	entries.tpl 
Log Message:
fix bad escaping


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- entries.tpl	30 Nov 2004 11:27:57 -0000	1.5
+++ entries.tpl	2 Dec 2004 12:30:16 -0000	1.6
@@ -49,7 +49,7 @@
 
                 {if $entry.has_comments}
                     {if $use_popups}
-                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=comments" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=comments" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
                     {else}
                         | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
                     {/if}
@@ -57,7 +57,7 @@
 
                 {if $entry.has_trackbacks}
                     {if $use_popups}
-                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                        | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$entry.id}&amp;serendipity[type]=trackbacks" onclick="window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
                     {else}
                         | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
                     {/if}

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

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

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

Modified Files:
	personal.inc.php 
Log Message:
* fix entering comments in popup screen, wrong variable
* move blogtitle/Description out of personal settings and into config again, make config available to chief editors again (even though they now only can change 2 settings)



Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- personal.inc.php	2 Dec 2004 11:46:36 -0000	1.5
+++ personal.inc.php	2 Dec 2004 12:23:08 -0000	1.6
@@ -13,9 +13,7 @@
     } else {
         foreach($u AS $var) {
             serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
-            if (in_array('global', $var['flags'])) {
-                serendipity_set_config_var($var['name'], $_POST[$var['name']]);
-            } elseif (in_array('config', $var['flags'])) {
+            if (in_array('config', $var['flags'])) {
                 serendipity_set_config_var($var['name'], $_POST[$var['name']], $serendipity['authorid']);
             }
         }

[php-blog-cvs] serendipity comment.php,1.55,1.56 serendipity_admin.php,1.49,1.50

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

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

Modified Files:
	comment.php serendipity_admin.php 
Log Message:
* fix entering comments in popup screen, wrong variable
* move blogtitle/Description out of personal settings and into config again, make config available to chief editors again (even though they now only can change 2 settings)



Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_admin.php	2 Dec 2004 11:46:35 -0000	1.49
+++ serendipity_admin.php	2 Dec 2004 12:23:08 -0000	1.50
@@ -173,7 +173,7 @@
                     <div class="serendipitySideBarItem">
                         <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
                         <div class="serendipitySideBarContent">
-<?php if ($serendipity['serendipityUserlevel'] > USERLEVEL_CHIEF) { ?>
+<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br />
 <?php } ?>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- comment.php	2 Dec 2004 10:54:29 -0000	1.55
+++ comment.php	2 Dec 2004 12:23:08 -0000	1.56
@@ -78,7 +78,6 @@
     }
 } else {
     $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
-
     $serendipity['head_subtitle'] = COMMENTS;
     $serendipity['smarty_file'] = 'commentpopup.tpl';
     serendipity_smarty_init();
@@ -134,7 +133,7 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($id, $comment, 'NORMAL')) {
-                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $id . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
+                $sc_url = $serendipity['baseURL'] . 'comment.php?serendipity[entry_id]=' . $id . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
                 if (serendipity_isResponseClean($sc_url)) {
                     header('Location: ' . $sc_url);
                 }

[php-blog-cvs] serendipity/include/tpl config_user.tpl,1.3,1.4

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

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

Modified Files:
	config_user.tpl 
Log Message:
* fix entering comments in popup screen, wrong variable
* move blogtitle/Description out of personal settings and into config again, make config available to chief editors again (even though they now only can change 2 settings)



Index: config_user.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_user.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_user.tpl	2 Dec 2004 11:46:36 -0000	1.3
+++ config_user.tpl	2 Dec 2004 12:23:09 -0000	1.4
@@ -6,8 +6,6 @@
 $serendipity['password']        = '{USERCONF_PASSWORD|password|protected||0}';          // USERCONF_PASSWORD_DESC
 $serendipity['userlevel']       = '{USERCONF_USERLEVEL|userlevel|string||1}';           // USERCONF_USERLEVEL_DESC
 $serendipity['email']           = '{USERCONF_EMAIL|email|string|jo...@ex...|0}';   // USERCONF_EMAIL_DESC
-$serendipity['blogTitle']       = '{INSTALL_BLOGNAME|blogTitle|string|John Doe's personal blog|1|global}';             // INSTALL_BLOGNAME_DESC
-$serendipity['blogDescription'] = '{INSTALL_BLOGDESC|blogDescription|string|My little place on the web...|1|global}';  // INSTALL_BLOGDESC_DESC
 $serendipity['lang']            = '{INSTALL_LANG|lang|list|[LANGUAGE_LIST]|0|config}';                                        // INSTALL_LANG_DESC
 $serendipity['wysiwyg']         = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0|config}';          // INSTALL_WYSIWYG_DESC
 $serendipity['mail_comments']   = '{USERCONF_SENDCOMMENTS|mail_comments|bool|1|0}';     // USERCONF_SENDCOMMENTS_DESC

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.116,1.117

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
* german translation
* unbreak personal settings to allow overriding WYSIWYG etc.
* hide configuration setting for non-superusers (because everything is now done within personal settings for Chiefs + Editors)



Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_lang_de.inc.php	2 Dec 2004 10:54:57 -0000	1.116
+++ serendipity_lang_de.inc.php	2 Dec 2004 11:46:37 -0000	1.117
@@ -613,10 +613,10 @@
 @define('INSTALL_USEGZIP_DESC', 'Um die Auslieferung von Seiten zu beschleunigen, können diese vorher GZIP komprimiert werden, sofern der Browser des Betrachters dies unterstützt. Diese Einstellung ist empfohlen.');
 @define('INSTALL_SHOWFUTURE', 'Zukünftige Einträge zeigen');
 @define('INSTALL_SHOWFUTURE_DESC', 'Falls aktiviert, werden Einträge deren Datum in der Zukunft liegt angezeigt. Standardmäßig werden solche Einträge versteckt und erst angezeigt, wenn das eingetragene Datum erreicht wird.');
-@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
-@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
-@define('NO_IMAGES_FOUND', 'No images found'); // Translate
-@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Persistente Verbindungen nutzen');
+@define('INSTALL_DBPERSISTENT_DESC', 'Aktiviert die nutzung einer persistenten Datenbankverbindung. Mehr dazu in der <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">PHP-Dokumentation</a>. Üblicherweise wird diese Einstellung nicht empfohlen.');
+@define('NO_IMAGES_FOUND', 'Keine Bilder gefunden');
+@define('PERSONAL_SETTINGS', 'Eigene Einstellungen');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_admin.php,1.48,1.49

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
* german translation
* unbreak personal settings to allow overriding WYSIWYG etc.
* hide configuration setting for non-superusers (because everything is now done within personal settings for Chiefs + Editors)



Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_admin.php	2 Dec 2004 11:16:20 -0000	1.48
+++ serendipity_admin.php	2 Dec 2004 11:46:35 -0000	1.49
@@ -173,7 +173,9 @@
                     <div class="serendipitySideBarItem">
                         <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
                         <div class="serendipitySideBarContent">
+<?php if ($serendipity['serendipityUserlevel'] > USERLEVEL_CHIEF) { ?>
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br />
+<?php } ?>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br />
 <?php } ?>

[php-blog-cvs] serendipity/include/tpl config_user.tpl,1.2,1.3

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

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

Modified Files:
	config_user.tpl 
Log Message:
* german translation
* unbreak personal settings to allow overriding WYSIWYG etc.
* hide configuration setting for non-superusers (because everything is now done within personal settings for Chiefs + Editors)



Index: config_user.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_user.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_user.tpl	19 Nov 2004 11:05:34 -0000	1.2
+++ config_user.tpl	2 Dec 2004 11:46:36 -0000	1.3
@@ -6,6 +6,10 @@
 $serendipity['password']        = '{USERCONF_PASSWORD|password|protected||0}';          // USERCONF_PASSWORD_DESC
 $serendipity['userlevel']       = '{USERCONF_USERLEVEL|userlevel|string||1}';           // USERCONF_USERLEVEL_DESC
 $serendipity['email']           = '{USERCONF_EMAIL|email|string|jo...@ex...|0}';   // USERCONF_EMAIL_DESC
+$serendipity['blogTitle']       = '{INSTALL_BLOGNAME|blogTitle|string|John Doe's personal blog|1|global}';             // INSTALL_BLOGNAME_DESC
+$serendipity['blogDescription'] = '{INSTALL_BLOGDESC|blogDescription|string|My little place on the web...|1|global}';  // INSTALL_BLOGDESC_DESC
+$serendipity['lang']            = '{INSTALL_LANG|lang|list|[LANGUAGE_LIST]|0|config}';                                        // INSTALL_LANG_DESC
+$serendipity['wysiwyg']         = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0|config}';          // INSTALL_WYSIWYG_DESC
 $serendipity['mail_comments']   = '{USERCONF_SENDCOMMENTS|mail_comments|bool|1|0}';     // USERCONF_SENDCOMMENTS_DESC
 $serendipity['mail_trackbacks'] = '{USERCONF_SENDTRACKBACKS|mail_trackbacks|bool|1|0}'; // USERCONF_SENDTRACKBACKS_DESC
 $serendipity['right_publish']   = '{USERCONF_ALLOWPUBLISH|right_publish|bool|1|1}';     // USERCONF_ALLOWPUBLISH_DESC

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

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

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

Modified Files:
	personal.inc.php 
Log Message:
* german translation
* unbreak personal settings to allow overriding WYSIWYG etc.
* hide configuration setting for non-superusers (because everything is now done within personal settings for Chiefs + Editors)



Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- personal.inc.php	30 Nov 2004 20:41:35 -0000	1.4
+++ personal.inc.php	2 Dec 2004 11:46:36 -0000	1.5
@@ -13,6 +13,11 @@
     } else {
         foreach($u AS $var) {
             serendipity_set_user_var($var['name'], $_POST[$var['name']], $serendipity['authorid'], true);
+            if (in_array('global', $var['flags'])) {
+                serendipity_set_config_var($var['name'], $_POST[$var['name']]);
+            } elseif (in_array('config', $var['flags'])) {
+                serendipity_set_config_var($var['name'], $_POST[$var['name']], $serendipity['authorid']);
+            }
         }
         $from = $_POST;
 ?>