php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.56,1.57

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
encode title after having built the parmaschinks


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- functions_entries.inc.php	9 Feb 2005 15:26:04 -0000	1.56
+++ functions_entries.inc.php	18 Feb 2005 16:13:42 -0000	1.57
@@ -582,9 +582,9 @@
             serendipity_plugin_api::hook_event('frontend_display', $entry);
 
             $entry['link']      = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
-            $entry['title']     = htmlspecialchars($entry['title']);
             $entry['commURL']   = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
             $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL');
+            $entry['title']     = htmlspecialchars($entry['title']);
 
             $entry['link_allow_comments']    = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $entry['id'];
             $entry['link_deny_comments']     = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $entry['id'];

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.18,1.19

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
o suppport link to localized page.


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_event_creativecommons.php	9 Feb 2005 16:26:07 -0000	1.18
+++ serendipity_event_creativecommons.php	18 Feb 2005 06:16:06 -0000	1.19
@@ -135,6 +135,11 @@
             $license_uri = 'http://web.resource.org/cc/PublicDomain';
         } else {
             $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/'.$license_version.'/';
+            switch ($serendipity['lang']){
+                case 'ja':
+                    $license_uri .= 'jp/';
+                break;
+            }
         }
 
         $cc_visibility = 'invisible';

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping lang_ja.inc.php,1.1,1.2

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/lang_ja.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_ja.inc.php	8 Jan 2005 12:25:13 -0000	1.1
+++ lang_ja.inc.php	18 Feb 2005 06:14:09 -0000	1.2
@@ -12,7 +12,7 @@
 #                                                                        #
 ##########################################################################
 
-        @define('PLUGIN_EVENT_WEBLOGPING_PING', '(XML-RPC ping による)アナウンス先エントリ:');
+        @define('PLUGIN_EVENT_WEBLOGPING_PING', 'XML-RPC ping のアナウンス先エントリ:');
         @define('PLUGIN_EVENT_WEBLOGPING_SENDINGPING', 'XML-RPC ping をホスト %s に送信中');
         @define('PLUGIN_EVENT_WEBLOGPING_TITLE', 'アナウンスエントリ一覧');
         @define('PLUGIN_EVENT_WEBLOGPING_DESC', '新規エントリの通知をオンラインサービスに送信します。');

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons lang_ja.inc.php,1.1,1.2

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/lang_ja.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_ja.inc.php	8 Jan 2005 12:25:10 -0000	1.1
+++ lang_ja.inc.php	18 Feb 2005 06:14:08 -0000	1.2
@@ -16,8 +16,8 @@
         @define('PLUGIN_CREATIVECOMMONS_DESC',        'あなたのコンテンツのクリエイティブコモンズライセンスの選択と表示をします。');
         @define('PLUGIN_CREATIVECOMMONS_TXT',         'テキストを表示しますか?');
         @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'For visible notifications of license status, show a brief explanation of your license choice.');
-        @define('PLUGIN_CREATIVECOMMONS_CAP',         'Original content in this work is licensed under a <a href="#license_uri#">Creative Commons License</a>');
-        @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Original content in this work is dedicated to the <a href="#license_url#}">Public Domain</a>');
+        @define('PLUGIN_CREATIVECOMMONS_CAP',         'この作業のオリジナルコンテンツは <a href="#license_uri#">クリエイティブ・コモンズ・ライセンス</a> に帰属します。');
+        @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'この作業のオリジナルコンテンツは <a href="#license_url#}">パブリックドメイン</a> に捧げます。');
         // @define('PLUGIN_CREATIVECOMMONS_BY',          'Require attribution?');
         // @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees must give the original author credit.');
         @define('PLUGIN_CREATIVECOMMONS_NC',          'あなたの作品の商業用途を許可しますか?');

[php-blog-cvs] serendipity/plugins/serendipity_plugin_history lang_ja.inc.php,1.1,1.2

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/lang_ja.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_ja.inc.php	4 Jan 2005 10:06:37 -0000	1.1
+++ lang_ja.inc.php	18 Feb 2005 06:14:24 -0000	1.2
@@ -34,7 +34,7 @@
         @define('PLUGIN_HISTORY_SPECIALAGE_DESC', 'If you want to define your own timerange instead of a ready-made, select \'I\'ll define one\' here and adjust the two settings below.');
         @define('PLUGIN_HISTORY_SPECIALAGE_YEAR', 'Display items of exactly one year ago');
         @define('PLUGIN_HISTORY_CUSTOMAGE', 'Let me define the age');
-        @define('PLUGIN_HISTORY_OYA', 'One year ago');
+        @define('PLUGIN_HISTORY_OYA', '1 年前');
         @define('PLUGIN_HISTORY_MYSELF', 'I\'ll define one');
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments lang_ja.inc.php,1.1,1.2

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/lang_ja.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_ja.inc.php	28 Jan 2005 18:10:01 -0000	1.1
+++ lang_ja.inc.php	18 Feb 2005 06:14:09 -0000	1.2
@@ -7,6 +7,6 @@
         @define('PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH', '各コメントで何文字位表示しますか? (デフォルト: 120)');
         @define('PLUGIN_COMMENTS_MAXENTRIES', 'コメントの最大数');
         @define('PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH', 'どれくらいのコメントを表示しますか? (デフォルト: 15)');
-        @define('PLUGIN_COMMENTS_ABOUT', '%s about%s');
+        @define('PLUGIN_COMMENTS_ABOUT', '%s エントリ:%s');
 
 ?>

[php-blog-cvs] serendipity/docs NEWS,1.64,1.65

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

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

Modified Files:
	NEWS 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- NEWS	17 Feb 2005 11:31:03 -0000	1.64
+++ NEWS	17 Feb 2005 17:05:30 -0000	1.65
@@ -3,6 +3,16 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added ability to toggle the amounts of comments per page within
+      a dropdown instead of needing to edit a Serendipity core file.
+      (garvinhicking)
+      
+    * New configuration directive to tell Serendipity if the baseURL
+      shall be autodetected. This can be useful if you use multiple
+      domainnames listening on one blog installation. (Note: This auto-
+      detection was previously already enabled if using 'embedded mode')
+      (garvinhicking)
+
     * Fixed bug for postgreSQL: Comments for entries within multiple
       categories showed up as many times as the entry was within multiple
       categories. Thanks to rickmans from the forums for detecting this.

[php-blog-cvs] serendipity/include functions_images.inc.php,1.33,1.34

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- functions_images.inc.php	15 Feb 2005 23:34:45 -0000	1.33
+++ functions_images.inc.php	17 Feb 2005 17:05:31 -0000	1.34
@@ -1077,7 +1077,15 @@
 		if ( $file != '.' && $file != '..' ) {
 			if ( $onlyDirs === true && is_dir($basedir . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ) {
                 if ( is_null($pattern) || preg_match($pattern, $file) ) {
-    				$files[] = array('name' => $file, 'depth' => $depth, 'relpath' => ltrim($dir, DIRECTORY_SEPARATOR) . basename($file) . DIRECTORY_SEPARATOR);
+    				$files[] = array(
+                        'name'    => $file, 
+                        'depth'   => $depth, 
+                        'relpath' => str_replace(
+                            DIRECTORY_SEPARATOR,
+                            '/',
+                            ltrim($dir, DIRECTORY_SEPARATOR) . basename($file) . DIRECTORY_SEPARATOR
+                        )
+                    );
                 }
 			}
             if ( is_dir($basedir . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ) {

[php-blog-cvs] serendipity serendipity_config.inc.php,1.145,1.146

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- serendipity_config.inc.php	16 Feb 2005 12:36:26 -0000	1.145
+++ serendipity_config.inc.php	17 Feb 2005 17:05:20 -0000	1.146
@@ -247,8 +247,9 @@
                                          USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);
 
 
-if ($serendipity['embed'] && ($serendipity['embed'] === 'true' || $serendipity['embed'] === true)) {
-    $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
+if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
+     (isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {
+    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
 }
 
 /*

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.22,1.23

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

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

Modified Files:
	comments.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- comments.inc.php	30 Jan 2005 18:23:15 -0000	1.22
+++ comments.inc.php	17 Feb 2005 17:05:32 -0000	1.23
@@ -6,7 +6,7 @@
     die ("Don't hack!");
 }
 
-$commentsPerPage = 10;
+$commentsPerPage = (!empty($serendipity['GET']['filter']['perpage']) ? $serendipity['GET']['filter']['perpage'] : 10);
 $summaryLength = 200;
 
 if ( $serendipity['POST']['formAction'] == 'multiDelete' && sizeof($serendipity['POST']['delete']) != 0 ) {
@@ -141,7 +141,7 @@
 $sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = '$c_type' ". $and, true);
 
 $totalComments = $sql['total'];
-$pages = ceil($totalComments/$commentsPerPage);
+$pages = ($commentsPerPage == COMMENTS_FILTER_ALL ? 1 : ceil($totalComments/(int)$commentsPerPage));
 $page = (int)$serendipity['GET']['page'];
 if ( $page == 0 || $page > $pages ) {
     $page = 1;
@@ -150,7 +150,12 @@
 $linkPrevious = 'serendipity_admin.php?serendipity[adminModule]=comments&serendipity[page]='. ($page-1) . $searchString;
 $linkNext = 'serendipity_admin.php?serendipity[adminModule]=comments&serendipity[page]='. ($page+1) . $searchString;
 
-$limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage));
+if ($commentsPerPage == COMMENTS_FILTER_ALL) {
+    $limit = '';
+}else {
+    $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*(int)$commentsPerPage, (int)$commentsPerPage));
+}
+
 $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
                                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                                 WHERE type = '$c_type'
@@ -215,7 +220,16 @@
         <td><input type="text" name="serendipity[filter][referer]" size="15" value="<?php echo $serendipity['GET']['filter']['referer'] ?>" /></td>
     </tr>
     <tr>
-        <td colspan="2">&nbsp;</td>
+        <td><?php echo COMMENTS; ?>:</td>
+        <td><select name="serendipity[filter][perpage]">
+        <?php 
+            $filter_vals = array(10, 20, 50, COMMENTS_FILTER_ALL);
+            foreach($filter_vals AS $filter_val) { ?>
+            <option value="<?php echo $filter_val; ?>" <?php echo ($commentsPerPage == $filter_val ? ' selected="selected"' : ''); ?>><?php echo $filter_val; ?></option>
+        <?php
+            }
+        ?>
+            </select></td>
         <td><?php echo COMMENTS_FILTER_SHOW ?>:</td>
         <td><select name="serendipity[filter][show]">
                 <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option>

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.12,1.13

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

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

Modified Files:
	config_local.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config_local.inc.php	16 Feb 2005 12:36:19 -0000	1.12
+++ config_local.inc.php	17 Feb 2005 17:05:32 -0000	1.13
@@ -97,6 +97,12 @@
                                           'type'        => 'string',
                                           'default'     => 'http://www.example.com/serendipity/'),
 
+                                    array('var'         => 'autodetect_baseURL',
+                                          'title'       => INSTALL_AUTODETECT_URL,
+                                          'description' => INSTALL_AUTODETECT_URL_DESC,
+                                          'type'        => 'bool',
+                                          'default'     => false),
+
                                     array('var'         => 'indexFile',
                                           'title'       => INSTALL_INDEXFILE,
                                           'description' => INSTALL_INDEXFILE_DESC,

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.69,1.70 serendipity_lang_cn.inc.php,1.36,1.37 serendipity_lang_cs.inc.php,1.116,1.117 serendipity_lang_cz.inc.php,1.116,1.117 serendipity_lang_da.inc.php,1.136,1.137 serendipity_lang_de.inc.php,1.157,1.158 serendipity_lang_en.inc.php,1.138,1.139 serendipity_lang_es.inc.php,1.131,1.132 serendipity_lang_fi.inc.php,1.24,1.25 serendipity_lang_fr.inc.php,1.116,1.117 serendipity_lang_it.inc.php,1.55,1.56 serendipity_lang_ja.inc.php,1.35,1.36 serendipity_lang_ko.inc.php,1.24,1.25 serendipity_lang_nl.inc.php,1.92,1.93 serendipity_lang_no.inc.php,1.56,1.57 serendipity_lang_pt.inc.php,1.91,1.92 serendipity_lang_ru.inc.php,1.29,1.30 serendipity_lang_tn.inc.php,1.37,1.38 serendipity_lang_tw.inc.php,1.52,1.53 serendipity_lang_zh.inc.php,1.36,1.37

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
* make HTTP host autodetectable easier
* allow to configure amount of comments to display


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_lang_cs.inc.php	16 Feb 2005 12:36:27 -0000	1.116
+++ serendipity_lang_cs.inc.php	17 Feb 2005 17:05:34 -0000	1.117
@@ -653,6 +653,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_lang_no.inc.php	16 Feb 2005 12:36:29 -0000	1.56
+++ serendipity_lang_no.inc.php	17 Feb 2005 17:05:41 -0000	1.57
@@ -652,5 +652,7 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 ?>

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_zh.inc.php	16 Feb 2005 12:36:30 -0000	1.36
+++ serendipity_lang_zh.inc.php	17 Feb 2005 17:05:43 -0000	1.37
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- serendipity_lang_en.inc.php	16 Feb 2005 12:36:28 -0000	1.138
+++ serendipity_lang_en.inc.php	17 Feb 2005 17:05:36 -0000	1.139
@@ -649,6 +649,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host');
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_ja.inc.php	16 Feb 2005 12:36:29 -0000	1.35
+++ serendipity_lang_ja.inc.php	17 Feb 2005 17:05:40 -0000	1.36
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- serendipity_lang_bg.inc.php	16 Feb 2005 12:36:27 -0000	1.69
+++ serendipity_lang_bg.inc.php	17 Feb 2005 17:05:33 -0000	1.70
@@ -636,6 +636,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_tw.inc.php	16 Feb 2005 12:36:30 -0000	1.52
+++ serendipity_lang_tw.inc.php	17 Feb 2005 17:05:42 -0000	1.53
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_lang_cz.inc.php	16 Feb 2005 12:36:27 -0000	1.116
+++ serendipity_lang_cz.inc.php	17 Feb 2005 17:05:34 -0000	1.117
@@ -653,6 +653,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_lang_pt.inc.php	16 Feb 2005 12:36:30 -0000	1.91
+++ serendipity_lang_pt.inc.php	17 Feb 2005 17:05:41 -0000	1.92
@@ -652,6 +652,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_lang_it.inc.php	16 Feb 2005 12:36:28 -0000	1.55
+++ serendipity_lang_it.inc.php	17 Feb 2005 17:05:39 -0000	1.56
@@ -651,6 +651,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- serendipity_lang_da.inc.php	16 Feb 2005 12:36:28 -0000	1.136
+++ serendipity_lang_da.inc.php	17 Feb 2005 17:05:35 -0000	1.137
@@ -652,6 +652,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_lang_fr.inc.php	16 Feb 2005 12:36:28 -0000	1.116
+++ serendipity_lang_fr.inc.php	17 Feb 2005 17:05:38 -0000	1.117
@@ -655,6 +655,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_fi.inc.php	16 Feb 2005 12:36:28 -0000	1.24
+++ serendipity_lang_fi.inc.php	17 Feb 2005 17:05:38 -0000	1.25
@@ -649,6 +649,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_ko.inc.php	16 Feb 2005 12:36:29 -0000	1.24
+++ serendipity_lang_ko.inc.php	17 Feb 2005 17:05:41 -0000	1.25
@@ -654,6 +654,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- serendipity_lang_es.inc.php	16 Feb 2005 12:36:28 -0000	1.131
+++ serendipity_lang_es.inc.php	17 Feb 2005 17:05:36 -0000	1.132
@@ -654,6 +654,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_cn.inc.php	16 Feb 2005 12:36:27 -0000	1.36
+++ serendipity_lang_cn.inc.php	17 Feb 2005 17:05:34 -0000	1.37
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_lang_tn.inc.php	16 Feb 2005 12:36:30 -0000	1.37
+++ serendipity_lang_tn.inc.php	17 Feb 2005 17:05:41 -0000	1.38
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_ru.inc.php	16 Feb 2005 12:36:30 -0000	1.29
+++ serendipity_lang_ru.inc.php	17 Feb 2005 17:05:41 -0000	1.30
@@ -652,6 +652,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- serendipity_lang_de.inc.php	16 Feb 2005 12:36:28 -0000	1.157
+++ serendipity_lang_de.inc.php	17 Feb 2005 17:05:35 -0000	1.158
@@ -650,6 +650,8 @@
 @define('CHARSET', 'Zeichensatz');
 @define('AUTOLANG', 'Sprache des Browsers eines Besuchers verwenden');
 @define('AUTOLANG_DESC', 'Falls aktiviert wird die im Browser des Besuchers eingestellte Sprache als Standardsprache für Einträge und die Serendipity Oberfläche benutzt.');
+@define('INSTALL_AUTODETECT_URL', 'HTTP-Hostnamen automatisch erkennen');
+@define('INSTALL_AUTODETECT_URL_DESC', 'Falls aktiviert wird Serendipity sicherstellen, dass der vom Besucher gewählte HTTP-Hostname als BaseURL variable verwendet wird. Sofern diese Option aktiviert ist, ist es möglich, mehrere Domainnamen für das Weblog zu verwenden. Alle Links werden dann mit dem HTTP-Hostnamen umgeschrieben, der vom Besucher gewählt wurde.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- serendipity_lang_nl.inc.php	16 Feb 2005 12:36:29 -0000	1.92
+++ serendipity_lang_nl.inc.php	17 Feb 2005 17:05:41 -0000	1.93
@@ -653,6 +653,8 @@
 @define('CHARSET', 'Charset');
 @define('AUTOLANG', 'Use visitor\'s browser language as default');
 @define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
+@define('INSTALL_AUTODETECT_URL', 'Autodetect used HTTP-Host'); // Translate
+@define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.18,1.19

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
remove hardcoded variable, RFE #1121798


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- functions_comments.inc.php	16 Feb 2005 15:21:00 -0000	1.18
+++ functions_comments.inc.php	17 Feb 2005 11:46:18 -0000	1.19
@@ -469,7 +469,7 @@
               . "\n" . USER . ' ' . IP_ADDRESS . ': ' . $_SERVER['REMOTE_ADDR']
               . "\n" . USER . ' ' . NAME       . ': ' . $fromName
               . "\n" . USER . ' ' . EMAIL      . ': ' . $fromEmail
-              . "\n" . USER . ' website: '            . $fromUrl
+              . "\n" . USER . ' ' . HOMEPAGE   . ': ' . $fromUrl
               . "\n"
               . "\n" . COMMENTS                . ': '
               . "\n" . strip_tags($comment)

[php-blog-cvs] serendipity/include lang.inc.php,1.10,1.11

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

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

Modified Files:
	lang.inc.php 
Log Message:
patch #1121207 by Tadashi Jokagi to correctly use mb_Send_mail for japanese


Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lang.inc.php	16 Feb 2005 12:36:19 -0000	1.10
+++ lang.inc.php	17 Feb 2005 11:38:45 -0000	1.11
@@ -22,6 +22,14 @@
 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)
 
+    if (function_exists('mb_language')) {
+        @mb_language($serendipity['lang']);
+    }
+    
+    if (function_exists('mb_internal_encoding')) {
+        @mb_internal_encoding(LANG_CHARSET);
+    }
+
     // Multibyte string functions wrapper:
     // strlen(), strpos(), strrpos(), strtolower(), strtoupper(), substr(), ucfirst()
     function serendipity_mb() {
@@ -33,8 +41,6 @@
                 if (function_exists('mb_strtoupper')) {
                     $mbstring = 2;
                 }
-
-                @mb_internal_encoding(LANG_CHARSET);
             }
         }
 

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.9,1.10

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

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

Modified Files:
	wordpress.inc.php 
Log Message:
honor WPs comment_status.


Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wordpress.inc.php	14 Feb 2005 12:51:33 -0000	1.9
+++ wordpress.inc.php	17 Feb 2005 11:31:04 -0000	1.10
@@ -228,13 +228,15 @@
                                      'email'     => $a['comment_author_email'],
                                      'url'       => $a['comment_author_url'],
                                      'ip'        => $a['comment_author_IP'],
-                                     'status'    => 'approved',
+                                     'status'    => (empty($a['comment_approved']) || $a['comment_approved'] == '1') ? 'approved' : 'pending',
                                      'body'      => $a['comment_content'],
                                      'type'      => 'NORMAL');
 
                     serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
-                    $cid = serendipity_db_insert_id('comments', 'id');
-                    serendipity_approveComment($cid, $entry['entryid'], true);
+                    if ($comment['status'] == 'approved') {
+                        $cid = serendipity_db_insert_id('comments', 'id');
+                        serendipity_approveComment($cid, $entry['entryid'], true);
+                    }
                 }
             }
         }
@@ -249,4 +251,4 @@
 return 'Serendipity_Import_WordPress';
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/docs NEWS,1.63,1.64

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

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

Modified Files:
	NEWS 
Log Message:
honor WPs comment_status.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- NEWS	16 Feb 2005 15:21:00 -0000	1.63
+++ NEWS	17 Feb 2005 11:31:03 -0000	1.64
@@ -20,6 +20,7 @@
       - Textpattern 1.0rc1
       - pMachine Pro 2.4
       - Nucleus 3.15
+      - WordPress 1.5
       (garvinhicking)
 
     * Remember last state of media library (sort order, files per page,

[php-blog-cvs] serendipity/docs NEWS,1.62,1.63

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

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

Modified Files:
	NEWS 
Log Message:
Fixed another postgreSQL problem:

When an entry was posted to multiple categories, the comments to that entry
showed up as many times as the amount of multiple categories.

This is because we joined the categories/entrycat table without taking
possible multiple rows into account, which were not evaluated anywhere.
The 'category_name' was the only key we gained from the join, and it
was only used with the RSS 2.0 comments feed, where a category is not
really needed/evaluated by most RSS feeders.

We could only fix this "for real" by building a group statement with an
average function to all fields used, but the performance drops would
not benefit such a way.

Bottom line: Fixed SQL query, improved speed for fetching comments, removed
unused/obsolete RSS feature.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- NEWS	16 Feb 2005 12:36:20 -0000	1.62
+++ NEWS	16 Feb 2005 15:21:00 -0000	1.63
@@ -3,6 +3,11 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Fixed bug for postgreSQL: Comments for entries within multiple
+      categories showed up as many times as the entry was within multiple
+      categories. Thanks to rickmans from the forums for detecting this.
+      (garvinhicking)
+
     * Added configuration directive to allow visitor language negotiation
       via browser language. (garvinhicking)
 

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.17,1.18

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
Fixed another postgreSQL problem:

When an entry was posted to multiple categories, the comments to that entry
showed up as many times as the amount of multiple categories.

This is because we joined the categories/entrycat table without taking
possible multiple rows into account, which were not evaluated anywhere.
The 'category_name' was the only key we gained from the join, and it
was only used with the RSS 2.0 comments feed, where a category is not
really needed/evaluated by most RSS feeders.

We could only fix this "for real" by building a group statement with an
average function to all fields used, but the performance drops would
not benefit such a way.

Bottom line: Fixed SQL query, improved speed for fetching comments, removed
unused/obsolete RSS feature.


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- functions_comments.inc.php	10 Feb 2005 15:37:36 -0000	1.17
+++ functions_comments.inc.php	16 Feb 2005 15:21:00 -0000	1.18
@@ -100,18 +100,16 @@
                     e.id AS entryid,
                     e.authorid,
                     co.id AS commentid,
-                    co.parent_id AS parent_id,
-                    c.category_name
+                    co.parent_id AS parent_id
               FROM
                     {$serendipity['dbPrefix']}comments co
                     LEFT JOIN {$serendipity['dbPrefix']}entries e ON (co.entry_id = e.id)
-                    LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON (e.id = ec.entryid)
-                    LEFT JOIN {$serendipity['dbPrefix']}category c ON (ec.categoryid = c.categoryid)
-              WHERE co.type LIKE 'NORMAL' AND entry_id > 0 $and
+              WHERE co.type LIKE 'NORMAL' AND co.entry_id > 0 $and
               $group
               ORDER BY
                     co.id " . ($order != '' ? $order : '') . "
                     $limit";
+
     $comments = serendipity_db_query($query);
 
     if (!is_array($comments)) {

Re: [php-blog-cvs] serendipity/include/db postgres.inc.php,1.10,1.11

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

Garvin Hicking wrote:
> Update of /cvsroot/php-blog/serendipity/include/db
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15857
> 
> Modified Files:
> 	postgres.inc.php 
> Log Message:
> OIDS seem to be deprecated in latest postgresql versions, but there seems to be no way to get the last insert primary id from an INSERT statement with postgreSQL.
> So we enable OIDS for our serendipity create/insert statements here.

Is that primary ID defined as sequence? Then you can get it with

    SELECT CURRVAL('[sequence_name]');

This should even be ANSI-SQL compatible.

Sebastian

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

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

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

Modified Files:
	textpattern.inc.php 
Log Message:
typo


Index: textpattern.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/textpattern.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- textpattern.inc.php	16 Feb 2005 12:46:49 -0000	1.2
+++ textpattern.inc.php	16 Feb 2005 13:17:45 -0000	1.3
@@ -149,7 +149,7 @@
             $entries[$x] = mysql_fetch_assoc($res);
 
             $entry = array('title'          => $entries[$x]['Title'],
-                           'isdraft'        => ($entries[$x]['status'] == '4') ? 'false' : 'true',
+                           'isdraft'        => ($entries[$x]['Status'] == '4') ? 'false' : 'true',
                            'allow_comments' => ($entries[$x]['Annotate'] == '1' ) ? 'true' : 'false',
                            'timestamp'      => strtotime($entries[$x]['Posted']),
                            'extended'       => strtr($entries[$x]['Body_html'], $this->trans_table),

[php-blog-cvs] serendipity/include/db postgres.inc.php,1.10,1.11

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

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

Modified Files:
	postgres.inc.php 
Log Message:
OIDS seem to be deprecated in latest postgresql versions, but there seems to be no way to get the last insert primary id from an INSERT statement with postgreSQL.
So we enable OIDS for our serendipity create/insert statements here.


Index: postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- postgres.inc.php	26 Jan 2005 14:14:06 -0000	1.10
+++ postgres.inc.php	16 Feb 2005 12:56:42 -0000	1.11
@@ -98,6 +98,11 @@
                          'both'  => PGSQL_BOTH
     );
 
+    if (!isset($serendipity['dbPgsqlOIDS'])) {
+        $serendipity['dbPgsqlOIDS'] = true;
+        @serendipity_db_query('SET default_with_oids = true', true, 'both', false, false, false, true);
+    }
+
     if (!$expectError && ($reportErr || !$serendipity['production'])) {
         $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
     } else {

[php-blog-cvs] serendipity/include/admin/importers textpattern.inc.php,1.1,1.2

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

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

Modified Files:
	textpattern.inc.php 
Log Message:
I forgot I used 'txp_' as my prefix so that all tables were called 'txp_txp_users' and then 'txp_textpattern', which would need to be reduced to 'textpattern'.


Index: textpattern.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/textpattern.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- textpattern.inc.php	14 Feb 2005 13:46:40 -0000	1.1
+++ textpattern.inc.php	16 Feb 2005 12:46:49 -0000	1.2
@@ -102,16 +102,16 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT user_id    AS ID, 
-                                    name       AS user_login, 
+        $res = @mysql_query("SELECT user_id    AS ID,
+                                    name       AS user_login,
                                     `pass`     AS user_pass,
-                                    email      AS user_email, 
+                                    email      AS user_email,
                                     privs      AS user_level
                                FROM {$this->data['prefix']}txp_users", $txpdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($txpdb));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
             $users[$x] = mysql_fetch_assoc($res);
 
@@ -140,7 +140,7 @@
 
         /* Entries */
         // Notice: Textpattern doesn't honor the prefix for this table. Wicked system.
-        $res = @mysql_query("SELECT * FROM txp_textpattern ORDER BY Posted;", $txpdb);
+        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}textpattern ORDER BY Posted;", $txpdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($txpdb));
         }
@@ -241,7 +241,7 @@
             $this->categories[] = $row;
             $this->importCategories($row['name'], $row['categoryid']);
         }
-        
+
         return true;
     }
 }

[php-blog-cvs] serendipity serendipity_config.inc.php,1.144,1.145

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Fix serious plugin hook_event bug. Plugins were cached because of the introduction of a new hook too early in sequence, resulting in weird behaviour with plugin configuration (see mail by rasmus)

For the multilingual plugin to be able to function properly, a new autodetection routine has been put in place. I think this even acts nicely in the core serendipity, but for the future we may want to move it to a plugin somehow (I don't see a way currently)



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- serendipity_config.inc.php	10 Feb 2005 15:03:45 -0000	1.144
+++ serendipity_config.inc.php	16 Feb 2005 12:36:26 -0000	1.145
@@ -209,7 +209,7 @@
  * If a user is logged in, fetch his preferences. He possibly wants to have a different language
  */
 
-serendipity_plugin_api::hook_event('frontend_configure_start', $serendipity);
+$serendipity['lang'] = serendipity_getSessionLanguage(); // @see function declaration for todo
 
 if (isset($_SESSION['serendipityAuthorid'])) {
     serendipity_load_configuration($_SESSION['serendipityAuthorid']);

[php-blog-cvs] serendipity/docs NEWS,1.61,1.62

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

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

Modified Files:
	NEWS 
Log Message:
Fix serious plugin hook_event bug. Plugins were cached because of the introduction of a new hook too early in sequence, resulting in weird behaviour with plugin configuration (see mail by rasmus)

For the multilingual plugin to be able to function properly, a new autodetection routine has been put in place. I think this even acts nicely in the core serendipity, but for the future we may want to move it to a plugin somehow (I don't see a way currently)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- NEWS	14 Feb 2005 16:55:40 -0000	1.61
+++ NEWS	16 Feb 2005 12:36:20 -0000	1.62
@@ -3,22 +3,23 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added configuration directive to allow visitor language negotiation
+      via browser language. (garvinhicking)
+
     * Added native importers to migrate entries, comments,
-      categories and authors for: 
+      categories and authors for:
       - geeklog 1.3.11
       - sunlog 0.4.4
       - b2Evolution "Paris"
       - boastMachine 3.0
       - Textpattern 1.0rc1
       - pMachine Pro 2.4
+      - Nucleus 3.15
       (garvinhicking)
 
     * Remember last state of media library (sort order, files per page,
       directory, sortfield), via JavaScript+Cookies (garvinhicking)
 
-    * Added native import for Nucleus (3.15) entries, comments, categories
-      and authors (garvinhicking)
-
     * The config option 'extCSS' has been removed. It is now re-
       commended to set external stylesheets in the template's index.tpl
       file, or to @import it within the templates style.css file.

[php-blog-cvs] serendipity/include lang.inc.php,1.9,1.10 functions_config.inc.php,1.20,1.21 compat.inc.php,1.6,1.7

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

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

Modified Files:
	lang.inc.php functions_config.inc.php compat.inc.php 
Log Message:
Fix serious plugin hook_event bug. Plugins were cached because of the introduction of a new hook too early in sequence, resulting in weird behaviour with plugin configuration (see mail by rasmus)

For the multilingual plugin to be able to function properly, a new autodetection routine has been put in place. I think this even acts nicely in the core serendipity, but for the future we may want to move it to a plugin somehow (I don't see a way currently)



Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- functions_config.inc.php	9 Feb 2005 11:11:24 -0000	1.20
+++ functions_config.inc.php	16 Feb 2005 12:36:19 -0000	1.21
@@ -195,7 +195,7 @@
 
 function serendipity_restoreVar(&$source, &$target) {
     global $serendipity;
-    
+
     if (isset($source) && !isset($target)) {
         $target = $source;
         return true;
@@ -419,5 +419,46 @@
     return $res;
 }
 
+/* TODO:
+  This previously was handled inside a plugin with an event hook, but caching
+  the event plugins that early in sequence created trouble with plugins not
+  having loaded the right language.
+  Find a way to let plugins hook into that sequence :-) */
+function serendipity_getSessionLanguage() {
+    global $serendipity;
+
+    if ($_SESSION['serendipityAuthedUser']) {
+        header('X-Serendipity-InterfaceLangSource: Database');
+        return $serendipity['lang'];
+    }
+
+    if (isset($_REQUEST['user_language']) && (!empty($serendipity['languages'][$_REQUEST['user_language']]))) {
+        serendipity_setCookie('serendipityLanguage', $_REQUEST['user_language']);
+    }
+
+    if (isset($serendipity['COOKIE']['serendipityLanguage'])) {
+        header('X-Serendipity-InterfaceLangSource: Cookie');
+        $lang = $serendipity['COOKIE']['serendipityLanguage'];
+    } elseif (!empty($serendipity['languages'][$serendipity['GET']['lang_selected']])) {
+        header('X-Serendipity-InterfaceLangSource: GET');
+        $lang = $serendipity['GET']['lang_selected'];
+    } elseif (serendipity_db_bool($serendipity['lang_content_negotiation'])) {
+        header('X-Serendipity-InterfaceLangSource: Content-Negotiation');
+        $lang = serendipity_detectLang();
+    }
+
+    if (!isset($lang) || !isset($serendipity['languages'][$lang])) {
+        $lang = $serendipity['lang'];
+    }
+
+    header('X-Serendipity-InterfaceLang: ' . $lang);
+
+    if ($lang != $serendipity['lang']) {
+        $serendipity['content_lang'] = $lang;
+    }
+
+    return $lang;
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lang.inc.php	26 Jan 2005 14:14:03 -0000	1.9
+++ lang.inc.php	16 Feb 2005 12:36:19 -0000	1.10
@@ -10,18 +10,7 @@
     } elseif (IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-        $supported_languages = array_keys($serendipity['languages']);
-        $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
-        if (is_array($possible_languages)) {
-            foreach($possible_languages as $index => $lang) {
-                $preferred_language = strtolower(preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang));
-                if (in_array($preferred_language, $supported_languages)) {
-                    @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
-                    $serendipity['autolang'] = $preferred_language;
-                    break;
-                } // endif
-            } // endforeach
-        } // endif
+        serendipity_detectLang(true);
     }  //endif
 
     // Do fallback to english

Index: compat.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/compat.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- compat.inc.php	9 Feb 2005 19:55:20 -0000	1.6
+++ compat.inc.php	16 Feb 2005 12:36:19 -0000	1.7
@@ -121,6 +121,28 @@
     }
 }
 
+// Needs to be included here so that it's globally available also when installing
+function serendipity_detectLang($use_include = false) {
+    global $serendipity;
+
+    $supported_languages = array_keys($serendipity['languages']);
+    $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
+    if (is_array($possible_languages)) {
+        foreach($possible_languages as $index => $lang) {
+            $preferred_language = strtolower(preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang));
+            if (in_array($preferred_language, $supported_languages)) {
+                if ($use_include) {
+                    @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
+                    $serendipity['autolang'] = $preferred_language;
+                }
+                return $preferred_language;
+            } // endif
+        } // endforeach
+    } // endif
+
+    return $serendipity['lang'];
+}
+
 function serendipity_getCoreVersion($version) {
     return preg_replace('@^([0-9\.]+).*$@', '\1', $version);
 }