From geeklog-cvs at lists.geeklog.net  Sat Jul  4 11:32:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 04 Jul 2009 11:32:01 -0400
Subject: [geeklog-cvs] geeklog: Fixed warning in migration script when no
	backups are a...
Message-ID: <hg.8f27dc3512cf.1246721521.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8f27dc3512cf
changeset: 7162:8f27dc3512cf
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 16:26:35 2009 +0200
description:
Fixed warning in migration script when no backups are available (bug #0000918, patch provided by hiroron)

diffstat:

 public_html/admin/install/migrate.php |  12 +++++++-----
 public_html/docs/history              |   3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 1aa777aacd39 -r 8f27dc3512cf public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jul 04 14:04:28 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sat Jul 04 16:26:35 2009 +0200
@@ -326,11 +326,13 @@
             . '<p><label class="' . $form_label_dir . '">' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . '</label> <input type="text" name="site_admin_url" value="' . htmlspecialchars($site_admin_url) . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>' . LB;
 
         // Identify the backup files in backups/ and order them newest to oldest
-        $sql_files = glob($backup_dir . '*.sql');
-        $tar_files = glob($backup_dir . '*.tar.gz');
-        $tgz_files = glob($backup_dir . '*.tgz');
-        $zip_files = glob($backup_dir . '*.zip');
-        $backup_files = array_merge($sql_files, $tar_files, $tgz_files, $zip_files);
+        $backup_files = array();
+        foreach (array('*.sql', '*.tar.gz', '*.tgz', '*.zip') as $pattern) {
+            $files = glob($backup_dir . $pattern);
+            if (is_array($files)) {
+                $backup_files = array_merge($backup_files, $files);
+            }
+        }
         rsort($backup_files);
 
         $display .= '<p><label class="' . $form_label_dir . '">' . $LANG_MIGRATE[6] . ' ' . INST_helpLink('migrate_file') . '</label>' . LB
diff -r 1aa777aacd39 -r 8f27dc3512cf public_html/docs/history
--- a/public_html/docs/history	Sat Jul 04 14:04:28 2009 +0200
+++ b/public_html/docs/history	Sat Jul 04 16:26:35 2009 +0200
@@ -11,6 +11,9 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- Fixed warning in migration script when no backups are available (bug #0000918,
+  patch provided by hiroron)
+
 - Updated Estonian language files, provided by Artur R?pp
 - Updated Hebrew language files, provided by LWC
 - Updated Japanese language files and documentation, provided by the

From geeklog-cvs at lists.geeklog.net  Sat Jul  4 11:32:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 04 Jul 2009 11:32:02 -0400
Subject: [geeklog-cvs] geeklog: Fixed auto-detection of table prefix during
	migration w...
Message-ID: <hg.3013cca2bd66.1246721522.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3013cca2bd66
changeset: 7164:3013cca2bd66
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 17:27:14 2009 +0200
description:
Fixed auto-detection of table prefix during migration when the SQL dump contained CREATE TABLE IF NOT EXISTS requests (bug #0000922)

diffstat:

 public_html/admin/install/migrate.php |  1 +
 public_html/docs/history              |  2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 23c373e2f87b -r 3013cca2bd66 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jul 04 16:35:45 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sat Jul 04 17:27:14 2009 +0200
@@ -614,6 +614,7 @@
                         $num_create++;
                         $line = trim($line);
                         if (strpos($line, 'access') !== false) {
+                            $line = str_replace('IF NOT EXISTS ', '', $line);
                             $words = explode(' ', $line);
                             if (count($words) >= 3) {
                                 $table = str_replace('`', '', $words[2]);
diff -r 23c373e2f87b -r 3013cca2bd66 public_html/docs/history
--- a/public_html/docs/history	Sat Jul 04 16:35:45 2009 +0200
+++ b/public_html/docs/history	Sat Jul 04 17:27:14 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- Fixed auto-detection of table prefix during migration when the SQL dump
+  contained CREATE TABLE IF NOT EXISTS requests (bug #0000922) [Dirk]
 - When an error occurs in bigdump.php (during migration) send the user back to
   migrate.php (bug #0000919) [Dirk]
 - Fixed warning in migration script when no backups are available (bug #0000918,

From geeklog-cvs at lists.geeklog.net  Sat Jul  4 11:32:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 04 Jul 2009 11:32:01 -0400
Subject: [geeklog-cvs] geeklog: When an error occurs in bigdump.php (during
	migration) ...
Message-ID: <hg.23c373e2f87b.1246721521.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/23c373e2f87b
changeset: 7163:23c373e2f87b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 16:35:45 2009 +0200
description:
When an error occurs in bigdump.php (during migration) send the user back to migrate.php

diffstat:

 public_html/admin/install/bigdump.php |  2 +-
 public_html/docs/history              |  2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 8f27dc3512cf -r 23c373e2f87b public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sat Jul 04 16:26:35 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Sat Jul 04 16:35:45 2009 +0200
@@ -386,7 +386,7 @@
 }
 
 if ($error) {
-  echo '<p><a href="' . $_SERVER['PHP_SELF'] . '">' . $LANG_BIGDUMP[30] . '</a> ' . $LANG_BIGDUMP[31] . '</p>' . LB;
+  echo '<p><a href="migrate.php">' . $LANG_BIGDUMP[30] . '</a> ' . $LANG_BIGDUMP[31] . '</p>' . LB;
 }
 
 if ($dbconnection) mysql_close();
diff -r 8f27dc3512cf -r 23c373e2f87b public_html/docs/history
--- a/public_html/docs/history	Sat Jul 04 16:26:35 2009 +0200
+++ b/public_html/docs/history	Sat Jul 04 16:35:45 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- When an error occurs in bigdump.php (during migration) send the user back to
+  migrate.php (bug #0000919) [Dirk]
 - Fixed warning in migration script when no backups are available (bug #0000918,
   patch provided by hiroron)
 

From geeklog-cvs at lists.geeklog.net  Sat Jul  4 11:32:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 04 Jul 2009 11:32:02 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Fixed appearance of the "No"
	button when bei...
Message-ID: <hg.9248eaefde1c.1246721522.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9248eaefde1c
changeset: 7165:9248eaefde1c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 17:31:22 2009 +0200
description:
Cosmetics: Fixed appearance of the "No" button when being asked if it's okay to overwrite a file

diffstat:

 public_html/admin/install/migrate.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 3013cca2bd66 -r 9248eaefde1c public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jul 04 17:27:14 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sat Jul 04 17:31:22 2009 +0200
@@ -538,7 +538,7 @@
                             . '<input type="hidden" name="backup_file" value="' . $backup_file['name'] . '"' . XHTML . '>' . LB
                             . '<input type="hidden" name="language" value="' . $language . '"' . XHTML . '>' . LB
                             . '<input type="submit" class="button big-button" name="overwrite_file" value="' . $LANG_MIGRATE[23] . '"' . XHTML .'>' . LB
-                            . '<input type="button" name="no" value="' . $LANG_MIGRATE[24] . '" onclick="document.location=\'migrate.php\'"' . XHTML .'>' . LB
+                            . '<input type="submit" class="button big-button" name="no" value="' . $LANG_MIGRATE[24] . '" onclick="document.location=\'migrate.php\'"' . XHTML .'>' . LB
                             . '</p></form>' . LB;
 
                     }

From geeklog-cvs at lists.geeklog.net  Sat Jul  4 12:31:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 04 Jul 2009 12:31:37 -0400
Subject: [geeklog-cvs] geeklog: Fixed advanced search not using start and
	end dates (re...
Message-ID: <hg.46ded8077a9b.1246725097.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/46ded8077a9b
changeset: 7166:46ded8077a9b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 18:31:27 2009 +0200
description:
Fixed advanced search not using start and end dates (really this time; bug #0000924, patch provided by dengen)

diffstat:

 public_html/docs/history        |  2 ++
 system/classes/search.class.php |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 9248eaefde1c -r 46ded8077a9b public_html/docs/history
--- a/public_html/docs/history	Sat Jul 04 17:31:22 2009 +0200
+++ b/public_html/docs/history	Sat Jul 04 18:31:27 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- Fixed advanced search not using start and end dates (bug #0000924, patch
+  provided by dengen)
 - Fixed auto-detection of table prefix during migration when the SQL dump
   contained CREATE TABLE IF NOT EXISTS requests (bug #0000922) [Dirk]
 - When an error occurs in bigdump.php (during migration) send the user back to
diff -r 9248eaefde1c -r 46ded8077a9b system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Jul 04 17:31:22 2009 +0200
+++ b/system/classes/search.class.php	Sat Jul 04 18:31:27 2009 +0200
@@ -371,7 +371,7 @@
                 $DE = explode($delim, $this->_dateEnd);
                 $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
                 $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-                $sql .= "AND (UNIX_TIMESTAMP(date) BETWEEN '{$this->_dateStart}' AND '{$this->_dateEnd}') ";
+                $sql .= "AND (UNIX_TIMESTAMP(date) BETWEEN '$startdate' AND '$enddate') ";
             }
         }
         if (!empty($this->_topic)) {
@@ -432,7 +432,7 @@
                 $DE = explode($delim, $this->_dateEnd);
                 $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
                 $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-                $sql .= "AND (UNIX_TIMESTAMP(c.date) BETWEEN '{$this->_dateStart}' AND '{$this->_dateEnd}') ";
+                $sql .= "AND (UNIX_TIMESTAMP(c.date) BETWEEN '$startdate' AND '$enddate') ";
             }
         }
         if (!empty($this->_topic)) {

From geeklog-cvs at lists.geeklog.net  Sun Jul  5 03:58:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 05 Jul 2009 03:58:58 -0400
Subject: [geeklog-cvs] geeklog: Updated Japanese language file,
	provided by the Geeklog...
Message-ID: <hg.1133df23df4c.1246780738.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1133df23df4c
changeset: 7167:1133df23df4c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 05 09:58:48 2009 +0200
description:
Updated Japanese language file, provided by the Geeklog.jp group

diffstat:

 language/japanese_utf-8.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 46ded8077a9b -r 1133df23df4c language/japanese_utf-8.php
--- a/language/japanese_utf-8.php	Sat Jul 04 18:31:27 2009 +0200
+++ b/language/japanese_utf-8.php	Sun Jul 05 09:58:48 2009 +0200
@@ -1321,7 +1321,7 @@
     'last_ten_backups' => '????????????????????????????????????',
     'do_backup' => '???????????????????????????',
     'backup_successful' => '???????????????????????????????????????????????????????????????',
-    'db_explanation' => 'Geeklog???????????????????????????????????????????????????????????????????????????????????????',
+    'db_explanation' => 'Geeklog???????????????????????????????????????????????????????????????????????????',
     'not_found' => "??????????????????????????????????????????mysqldump??????????????????????????????????????????PHP???open_basedir????????????????????????????????????????????????????????????????????????????????????<br" . XHTML . "><strong>mysqldump_path</strong>?????????????????????????????????????????????????????????????????????????????????<br" . XHTML . ">?????????????????????\n<var>{$_DB_mysqldump_path}</var>?????????",
     'zero_size' => '?????????????????????????????????????????????????????????????????????0??????????????????',
     'path_not_found' => "{$_CONF['backup_path']} ??????????????????????????????????????????????????????????????????",

From geeklog-cvs at lists.geeklog.net  Sun Jul  5 14:47:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 05 Jul 2009 14:47:08 -0400
Subject: [geeklog-cvs] geeklog: Fixed formatting (no code changes)
Message-ID: <hg.0beb746bbef2.1246819628.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0beb746bbef2
changeset: 7168:0beb746bbef2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 05 11:17:48 2009 +0200
description:
Fixed formatting (no code changes)

diffstat:

 public_html/lib-common.php |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (16 lines):

diff -r 1133df23df4c -r 0beb746bbef2 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Jul 05 09:58:48 2009 +0200
+++ b/public_html/lib-common.php	Sun Jul 05 11:17:48 2009 +0200
@@ -3973,9 +3973,9 @@
         }
 
         if( $_CONF['show_servicename'] )
-    {
-        return "$remoteusername@$remoteservice";
-    }
+        {
+            return "$remoteusername@$remoteservice";
+        }
         else
         {
             return $remoteusername;

From geeklog-cvs at lists.geeklog.net  Tue Jul  7 14:36:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 07 Jul 2009 14:36:43 -0400
Subject: [geeklog-cvs] geeklog: Updated FCKeditor to version 2.6.4.1
Message-ID: <hg.38915c0e24ed.1246991803.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/38915c0e24ed
changeset: 7169:38915c0e24ed
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Jul 07 20:28:49 2009 +0200
description:
Updated FCKeditor to version 2.6.4.1

diffstat:

 public_html/docs/english/changes.html                                |   2 +-
 public_html/docs/history                                             |   1 +
 public_html/fckeditor/_whatsnew.html                                 |   7 +
 public_html/fckeditor/editor/_source/fckeditorapi.js                 |   4 +-
 public_html/fckeditor/editor/dialog/fck_about.html                   |   4 +-
 public_html/fckeditor/editor/filemanager/connectors/php/basexml.php  |  10 +-
 public_html/fckeditor/editor/filemanager/connectors/php/commands.php |  55 +++++----
 public_html/fckeditor/editor/filemanager/connectors/php/config.php   |   4 +-
 public_html/fckeditor/editor/filemanager/connectors/php/io.php       |  10 +-
 public_html/fckeditor/editor/filemanager/connectors/php/upload.php   |   4 +-
 public_html/fckeditor/editor/js/fckeditorcode_gecko.js               |   2 +-
 public_html/fckeditor/editor/js/fckeditorcode_ie.js                  |   2 +-
 public_html/fckeditor/fckeditor.js                                   |   4 +-
 13 files changed, 69 insertions(+), 40 deletions(-)

diffs (truncated from 310 to 300 lines):

diff -r 0beb746bbef2 -r 38915c0e24ed public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/docs/english/changes.html	Tue Jul 07 20:28:49 2009 +0200
@@ -34,7 +34,7 @@
 <ul>
 <li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP 4 in August 2008, you should be
 looking into upgrading to PHP 5 anyway.</li>
-<li>Includes <a href="http://www.fckeditor.net/">FCKeditor</a> 2.6.4</li>
+<li>Includes <a href="http://www.fckeditor.net/">FCKeditor</a> 2.6.4.1</li>
 <li>Includes a new plugin, <a href="http://wiki.geeklog.net/index.php/XMLSitemap_Plugin">XMLSitemap</a>, that automatically generates a <a
     href="http://www.sitemaps.org/">XML sitemap file</a>, as supported by all
     major search engines. Plugin written and provided by mystral-kk.</li>
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/docs/history
--- a/public_html/docs/history	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/docs/history	Tue Jul 07 20:28:49 2009 +0200
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- Updated FCKeditor to version 2.6.4.1 [Dirk]
 - Fixed advanced search not using start and end dates (bug #0000924, patch
   provided by dengen)
 - Fixed auto-detection of table prefix during migration when the SQL dump
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/_whatsnew.html
--- a/public_html/fckeditor/_whatsnew.html	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/_whatsnew.html	Tue Jul 07 20:28:49 2009 +0200
@@ -33,6 +33,13 @@
 	<h1>
 		FCKeditor ChangeLog - What's New?</h1>
 	<h3>
+		Version 2.6.4.1</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li><strong>Security release, upgrade is highly recommended.</strong></li>
+	</ul>
+	<h3>
 		Version 2.6.4</h3>
 	<p>
 		Fixed Bugs:</p>
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/_source/fckeditorapi.js
--- a/public_html/fckeditor/editor/_source/fckeditorapi.js	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/_source/fckeditorapi.js	Tue Jul 07 20:28:49 2009 +0200
@@ -40,8 +40,8 @@
 		// objects that aren't really FCKeditor instances.
 		var sScript =
 			'window.FCKeditorAPI = {' +
-				'Version : "2.6.4",' +
-				'VersionBuild : "21629",' +
+				'Version : "2.6.4.1",' +
+				'VersionBuild : "23187",' +
 				'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
 				'GetInstance : function( name )' +
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/dialog/fck_about.html
--- a/public_html/fckeditor/editor/dialog/fck_about.html	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/dialog/fck_about.html	Tue Jul 07 20:28:49 2009 +0200
@@ -78,8 +78,8 @@
 								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
-								<b>2.6.4</b><br />
-								Build 21629</td>
+								<b>2.6.4.1</b><br />
+								Build 23187</td>
 						</tr>
 					</table>
 				</td>
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/filemanager/connectors/php/basexml.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/basexml.php	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/basexml.php	Tue Jul 07 20:28:49 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -65,6 +65,9 @@
 
 function SendError( $number, $text )
 {
+	if ( $_GET['Command'] == 'FileUpload' )
+		SendUploadResults( $number, "", "", $text ) ;
+
 	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
 	{
 		SendErrorNode( $number, $text ) ;
@@ -88,6 +91,9 @@
 
 function SendErrorNode(  $number, $text )
 {
-	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
+	if ($text)
+		echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
+	else
+		echo '<Error number="' . $number . '" />' ;
 }
 ?>
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/filemanager/connectors/php/commands.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/commands.php	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/commands.php	Tue Jul 07 20:28:49 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -30,16 +30,18 @@
 	// Array that will hold the folders names.
 	$aFolders	= array() ;
 
-	$oCurrentFolder = opendir( $sServerDir ) ;
+	$oCurrentFolder = @opendir( $sServerDir ) ;
 
-	while ( $sFile = readdir( $oCurrentFolder ) )
+	if ($oCurrentFolder !== false)
 	{
-		if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
-			$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+		while ( $sFile = readdir( $oCurrentFolder ) )
+		{
+			if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
+				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+		}
+		closedir( $oCurrentFolder ) ;
 	}
 
-	closedir( $oCurrentFolder ) ;
-
 	// Open the "Folders" node.
 	echo "<Folders>" ;
 
@@ -60,29 +62,34 @@
 	$aFolders	= array() ;
 	$aFiles		= array() ;
 
-	$oCurrentFolder = opendir( $sServerDir ) ;
+	$oCurrentFolder = @opendir( $sServerDir ) ;
 
-	while ( $sFile = readdir( $oCurrentFolder ) )
+	if ($oCurrentFolder !== false)
 	{
-		if ( $sFile != '.' && $sFile != '..' )
+		while ( $sFile = readdir( $oCurrentFolder ) )
 		{
-			if ( is_dir( $sServerDir . $sFile ) )
-				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
-			else
+			if ( $sFile != '.' && $sFile != '..' )
 			{
-				$iFileSize = @filesize( $sServerDir . $sFile ) ;
-				if ( !$iFileSize ) {
-					$iFileSize = 0 ;
+				if ( is_dir( $sServerDir . $sFile ) )
+					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+				else
+				{
+					$iFileSize = @filesize( $sServerDir . $sFile ) ;
+					if ( !$iFileSize ) {
+						$iFileSize = 0 ;
+					}
+					if ( $iFileSize > 0 )
+					{
+						$iFileSize = round( $iFileSize / 1024 ) ;
+						if ( $iFileSize < 1 )
+							$iFileSize = 1 ;
+					}
+
+					$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 				}
-				if ( $iFileSize > 0 )
-				{
-					$iFileSize = round( $iFileSize / 1024 ) ;
-					if ( $iFileSize < 1 ) $iFileSize = 1 ;
-				}
-
-				$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
 			}
 		}
+		closedir( $oCurrentFolder ) ;
 	}
 
 	// Send the folders
@@ -152,7 +159,7 @@
 		$sErrorNumber = '102' ;
 
 	// Create the "Error" node.
-	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
+	echo '<Error number="' . $sErrorNumber . '" />' ;
 }
 
 function FileUpload( $resourceType, $currentFolder, $sCommand )
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/filemanager/connectors/php/config.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Tue Jul 07 20:28:49 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -153,4 +153,4 @@
 $Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'] ;
 $Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
 
-?>
\ No newline at end of file
+?>
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/filemanager/connectors/php/io.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/io.php	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/io.php	Tue Jul 07 20:28:49 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -245,6 +245,9 @@
 	if ( strpos( $sCurrentFolder, '..' ) || strpos( $sCurrentFolder, "\\" ))
 		SendError( 102, '' ) ;
 
+	if ( preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+		SendError( 102, '' ) ;
+
 	return $sCurrentFolder ;
 }
 
@@ -286,6 +289,11 @@
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
 EOF;
 
+	if ($errorNumber && $errorNumber != 201) {
+		$fileUrl = "";
+		$fileName = "";
+	}
+
 	$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
 	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
 	echo '</script>' ;
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/filemanager/connectors/php/upload.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/upload.php	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/upload.php	Tue Jul 07 20:28:49 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -47,7 +47,7 @@
 // The file type (from the QueryString, by default 'File').
 $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
 
-$sCurrentFolder	= GetCurrentFolder() ;
+$sCurrentFolder	= "/" ;
 
 // Is enabled the upload?
 if ( ! IsAllowedCommand( $sCommand ) )
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/js/fckeditorcode_gecko.js
--- a/public_html/fckeditor/editor/js/fckeditorcode_gecko.js	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/js/fckeditorcode_gecko.js	Tue Jul 07 20:28:49 2009 +0200
@@ -35,7 +35,7 @@
 var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B
 =A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().l
 ength>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) retu
 rn this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==
 B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attribut
 es[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.Se
 tEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B]
 ;},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNod
 es.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfi
 g.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||
 A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=
 A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=
 FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
 var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/c
 ss"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCK
 Tools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var 
 H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode
 (A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=
 0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.docu
 ment.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools
 .RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.
 NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
 FCKTools.CancelEvent=function(e){if (e) e.preventDefault();};FCKTools.DisableSelection=function(A){if (FCKBrowserInfo.IsGecko) A.style.MozUserSelect='none';else if (FCKBrowserInfo.IsSafari) A.style.KhtmlUserSelect='none';else A.style.userSelect='none';};FCKTools._AppendStyleSheet=function(A,B){var e=A.createElement('LINK');e.rel='stylesheet';e.type='text/css';e.href=B;A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var e=A.createElement("STYLE");e.appendChild(A.createTextNode(B));A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.ClearElementAttributes=function(A){for (var i=0;i<A.attributes.length;i++){A.removeAttribute(A.attributes[i].name,0);}};FCKTools.GetAllChildrenIds=function(A){var B=[];var C=function(parent){for (var i=0;i<parent.childNodes.length;i++){var D=parent.childNodes[i].id;if (D&&D.length>0) B[B.length]=D;C(parent.childNodes[i]);}};C(A);return B;};FCKTools.RemoveOuter
 Tags=function(e){var A=e.ownerDocument.createDocumentFragment();for (var i=0;i<e.childNodes.length;i++) A.appendChild(e.childNodes[i].cloneNode(true));e.parentNode.replaceChild(A,e);};FCKTools.CreateXmlObject=function(A){switch (A){case 'XmlHttp':return new XMLHttpRequest();case 'DOMDocument':var B=(new DOMParser()).parseFromString('<tmp></tmp>','text/xml');FCKDomTools.RemoveNode(B.firstChild);return B;};return null;};FCKTools.GetScrollPosition=function(A){return { X:A.pageXOffset,Y:A.pageYOffset };};FCKTools.AddEventListener=function(A,B,C){A.addEventListener(B,C,false);};FCKTools.RemoveEventListener=function(A,B,C){A.removeEventListener(B,C,false);};FCKTools.AddEventListenerEx=function(A,B,C,D){A.addEventListener(B,function(e){C.apply(A,[e].concat(D||[]));},false);};FCKTools.GetViewPaneSize=function(A){return { Width:A.innerWidth,Height:A.innerHeight };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.classNa
 me;A.className='';};var D=A.getAttribute('style');if (D&&D.length>0){C.Inline=D;A.setAttribute('style','',0);};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';if (B.Inline) A.setAttribute('style',B.Inline,0);else A.removeAttribute('style',0);FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=function(id){return A.document.getElementById(id);};};FCKTools.AppendElement=function(A,B){return A.appendChild(A.ownerDocument.createElement(B));};FCKTools.GetElementPosition=function(A,B){var c={ X:0,Y:0 };var C=B||window;var D=FCKTools.GetElementWindow(A);var E=null;while (A){var F=D.getComputedStyle(A,'').position;if (F&&F!='static'&&A.style.zIndex!=FCKConfig.FloatingPanelsZIndex) break;c.X+=A.offsetLeft-A.scrollLeft;c.Y+=A.offsetTop-A.scrollTop;if (!FCKBrowserInfo.IsOpera){var G=E;while (G&&G!=A){c.X-=G.scrollLeft;c.Y-=G.scrollTop;G=G.parentNode;}};E=A;if (A.off
 setParent) A=A.offsetParent;else{if (D!=C){A=D.frameElement;E=null;if (A) D=FCKTools.GetElementWindow(A);}else{c.X+=A.scrollLeft;c.Y+=A.scrollTop;break;}}};return c;};
-var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4",VersionBuild : "21629",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ])
  ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function F
 CKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4.1",VersionBuild : "23187",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i 
 ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function
  FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
 var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
 var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBod
 y:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
 var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1
 ,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/editor/js/fckeditorcode_ie.js
--- a/public_html/fckeditor/editor/js/fckeditorcode_ie.js	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/editor/js/fckeditorcode_ie.js	Tue Jul 07 20:28:49 2009 +0200
@@ -36,7 +36,7 @@
 var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B
 =A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().l
 ength>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) retu
 rn this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==
 B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attribut
 es[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.Se
 tEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B]
 ;},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNod
 es.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfi
 g.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||
 A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=
 A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=
 FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
 var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/c
 ss"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCK
 Tools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var 
 H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode
 (A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=
 0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.docu
 ment.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools
 .RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.
 NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
 FCKTools.CancelEvent=function(e){return false;};FCKTools._AppendStyleSheet=function(A,B){return A.createStyleSheet(B).owningElement;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var s=A.createStyleSheet("");s.cssText=B;return s;};FCKTools.ClearElementAttributes=function(A){A.clearAttributes();};FCKTools.GetAllChildrenIds=function(A){var B=[];for (var i=0;i<A.all.length;i++){var C=A.all[i].id;if (C&&C.length>0) B[B.length]=C;};return B;};FCKTools.RemoveOuterTags=function(e){e.insertAdjacentHTML('beforeBegin',e.innerHTML);e.parentNode.removeChild(e);};FCKTools.CreateXmlObject=function(A){var B;switch (A){case 'XmlHttp':if (document.location.protocol!='file:') try { return new XMLHttpRequest();} catch (e) {};B=['MSXML2.XmlHttp','Microsoft.XmlHttp'];break;case 'DOMDocument':B=['MSXML2.DOMDocument','Microsoft.XmlDom'];break;};for (var i=0;i<2;i++){try { return new ActiveXObject(B[i]);}catch (e){}};if (FCKLang.NoActiveX){alert(FCKLang.NoActiveX);FCKLang.NoActiveX=
 null;};return null;};FCKTools.DisableSelection=function(A){A.unselectable='on';var e,i=0;while ((e=A.all[i++])){switch (e.tagName){case 'IFRAME':case 'TEXTAREA':case 'INPUT':case 'SELECT':break;default:e.unselectable='on';}}};FCKTools.GetScrollPosition=function(A){var B=A.document;var C={ X:B.documentElement.scrollLeft,Y:B.documentElement.scrollTop };if (C.X>0||C.Y>0) return C;return { X:B.body.scrollLeft,Y:B.body.scrollTop };};FCKTools.AddEventListener=function(A,B,C){A.attachEvent('on'+B,C);};FCKTools.RemoveEventListener=function(A,B,C){A.detachEvent('on'+B,C);};FCKTools.AddEventListenerEx=function(A,B,C,D){var o={};o.Source=A;o.Params=D||[];o.Listener=function(ev){return C.apply(o.Source,[ev].concat(o.Params));};if (FCK.IECleanup) FCK.IECleanup.AddItem(null,function() { o.Source=null;o.Params=null;});A.attachEvent('on'+B,o.Listener);A=null;D=null;};FCKTools.GetViewPaneSize=function(A){var B;var C=A.document.documentElement;if (C&&C.clientWidth) B=C;else B=A.document.body;
 if (B) return { Width:B.clientWidth,Height:B.clientHeight };else return { Width:0,Height:0 };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.className;A.className='';};var D=A.style.cssText;if (D.length>0){C.Inline=D;A.style.cssText='';};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';A.style.cssText=B.Inline||'';FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=A.document.getElementById;};FCKTools.AppendElement=function(A,B){return A.appendChild(this.GetElementDocument(A).createElement(B));};FCKTools.ToLowerCase=function(A){return A.toLowerCase();};
-var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4",VersionBuild : "21629",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ])
  ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function F
 CKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.4.1",VersionBuild : "23187",Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i 
 ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function
  FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
 var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
 var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBod
 y:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
 var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1
 ,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
diff -r 0beb746bbef2 -r 38915c0e24ed public_html/fckeditor/fckeditor.js
--- a/public_html/fckeditor/fckeditor.js	Sun Jul 05 11:17:48 2009 +0200
+++ b/public_html/fckeditor/fckeditor.js	Tue Jul 07 20:28:49 2009 +0200
@@ -59,8 +59,8 @@

From geeklog-cvs at lists.geeklog.net  Wed Jul  8 06:57:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 08 Jul 2009 06:57:29 -0400
Subject: [geeklog-cvs] geeklog: Use uppercase directory names (to match
	those in images...
Message-ID: <hg.061a9d7fe824.1247050649.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/061a9d7fe824
changeset: 7170:061a9d7fe824
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 08 12:57:15 2009 +0200
description:
Use uppercase directory names (to match those in images/library)

diffstat:

 public_html/fckeditor/editor/filemanager/connectors/php/config.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 38915c0e24ed -r 061a9d7fe824 public_html/fckeditor/editor/filemanager/connectors/php/config.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Tue Jul 07 20:28:49 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Wed Jul 08 12:57:15 2009 +0200
@@ -127,28 +127,28 @@
 
 $Config['AllowedExtensions']['File']	= array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip') ;
 $Config['DeniedExtensions']['File']		= array() ;
-$Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'file/' ;
+$Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'File/' ;
 $Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
 $Config['QuickUploadPath']['File']		= $Config['UserFilesPath'] ;
 $Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
 
 $Config['AllowedExtensions']['Image']	= array('bmp','gif','jpeg','jpg','png') ;
 $Config['DeniedExtensions']['Image']	= array() ;
-$Config['FileTypesPath']['Image']		= $Config['UserFilesPath'] . 'image/' ;
+$Config['FileTypesPath']['Image']		= $Config['UserFilesPath'] . 'Image/' ;
 $Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
 $Config['QuickUploadPath']['Image']		= $Config['UserFilesPath'] ;
 $Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
 
 $Config['AllowedExtensions']['Flash']	= array('swf','flv') ;
 $Config['DeniedExtensions']['Flash']	= array() ;
-$Config['FileTypesPath']['Flash']		= $Config['UserFilesPath'] . 'flash/' ;
+$Config['FileTypesPath']['Flash']		= $Config['UserFilesPath'] . 'Flash/' ;
 $Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
 $Config['QuickUploadPath']['Flash']		= $Config['UserFilesPath'] ;
 $Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
 
 $Config['AllowedExtensions']['Media']	= array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv') ;
 $Config['DeniedExtensions']['Media']	= array() ;
-$Config['FileTypesPath']['Media']		= $Config['UserFilesPath'] . 'media/' ;
+$Config['FileTypesPath']['Media']		= $Config['UserFilesPath'] . 'Media/' ;
 $Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
 $Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'] ;
 $Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;

From geeklog-cvs at lists.geeklog.net  Sun Jul 12 05:01:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 12 Jul 2009 05:01:49 -0400
Subject: [geeklog-cvs] geeklog: Updated Japanese language files and
	documentation, prov...
Message-ID: <hg.83438096c30b.1247389309.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/83438096c30b
changeset: 7171:83438096c30b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 12 11:01:37 2009 +0200
description:
Updated Japanese language files and documentation, provided by the Geeklog.jp group

diffstat:

 language/japanese_utf-8.php                           |  518 +++++++++++-----------
 plugins/calendar/language/japanese_utf-8.php          |   10 +-
 plugins/links/language/japanese_utf-8.php             |   12 +-
 plugins/polls/language/japanese_utf-8.php             |    8 +-
 plugins/spamx/language/japanese_utf-8.php             |   28 +-
 plugins/staticpages/language/japanese_utf-8.php       |    4 +-
 public_html/admin/install/language/japanese_utf-8.php |   18 +-
 public_html/docs/japanese/changes.html                |    2 +-
 public_html/docs/japanese/history.html                |    2 +-
 9 files changed, 305 insertions(+), 297 deletions(-)

diffs (truncated from 1208 to 300 lines):

diff -r 061a9d7fe824 -r 83438096c30b language/japanese_utf-8.php
--- a/language/japanese_utf-8.php	Wed Jul 08 12:57:15 2009 +0200
+++ b/language/japanese_utf-8.php	Sun Jul 12 11:01:37 2009 +0200
@@ -31,7 +31,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-################################################################################
+###############################################################################
 
 $LANG_CHARSET = 'utf-8';
 
@@ -104,7 +104,7 @@
     52 => '??????',
     53 => '????????????',
     54 => '?????????????????????????????????',
-    55 => '??????????????????',
+    55 => '??????????????? ',
     56 => '??????',
     57 => '???????????????',
     58 => '????????????',
@@ -153,7 +153,7 @@
     101 => '',
     102 => '',
     103 => '??????????????????',
-    104 => '???',
+    104 => ':',
     105 => '?????????????????????',
     106 => '????????????',
     107 => 'GL????????????????????????',
@@ -167,7 +167,7 @@
     115 => '-',
     116 => '?????????????????????',
     117 => '????????????',
-    118 => '????????????????????????',
+    118 => '?????????????????????:',
     119 => "<a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">??????????????????????????????</a>",
     120 => '?????????????????????????????
?????????',
     121 => '???????????? (%d???)',
@@ -215,7 +215,7 @@
     27 => '????????????',
     28 => '?????????????????????',
     29 => '????????????',
-    30 => '?????????',
+    30 => '??????:',
     31 => 'by',
     32 => '??????????????????',
     33 => '????????????????????????',
@@ -263,7 +263,7 @@
     26 => '?????????????????????????????????????????????????????????????????????<strong>????????????????
????</strong>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????URL????????????????????????????????????????????????',
     27 => '????????????',
     28 => '??????',
-    29 => '??????????????????????????????',
+    29 => '???????????????????????????:',
     30 => '????????????????????????:',
     31 => '?????????????????
????????????',
     32 => '??????',
@@ -297,8 +297,8 @@
     60 => '???????????????????????????',
     61 => '??????',
     62 => '????????????100??????',
-    63 => "???????????????????????????????????????????????????????????????????
????????????????????????????????????????",
-    64 => '????????????????????????',
+    63 => "??????????????????????????????????????????????????????????????????????????????????????????????????
??????????????????{$_CONF['site_name']}????????????????????
?????????????????????",
+    64 => '?????????????????????:',
     65 => '??????????????????????????????',
     66 => '??????????????????????????????',
     67 => '????????????',
@@ -309,7 +309,7 @@
     72 => '?????????',
     73 => '??????',
     74 => '???????????????????????????????????????',
-    75 => '????????????????????????????????????????????????????
????',
+    75 => '????????????????????????????????????????????????????
?:',
     76 => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     77 => '??????',
     78 => '???????????????',
@@ -333,7 +333,7 @@
     96 => '?????????????????????',
     97 => '??????????????????????????????',
     98 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
-    99 => '????????????????????????????????????',
+    99 => '?????????????????????????????????:',
     100 => '????????
??????????????????',
     101 => '?????????????????
?????????????????????????????????',
     102 => '?????????????????????????????????',
@@ -452,16 +452,16 @@
     26 => '????????????????????????????????????????????????',
     27 => '???????????????',
     28 => '%s ??????????????????????????????: ',
-    29 => "?????????{$_CONF['site_name']} ???????????????????????????????????????????
????",
-    30 => ' ???????????????????????????????????????????
???? ',
+    29 => "?????????{$_CONF['site_name']} ???????????????????????????????????????????
?:",
+    30 => ' ???????????????????????????????????????????
?: ',
     31 => '????????????',
     32 => '??????',
     33 => '?????????????????????????
?????????????????????????????????????',
     34 => '??????????????????????????????',
     35 => '??????????????????????????????????????????????????????????????????????????????',
     36 => '?????????:',
-    37 => '?????????????????????',
-    38 => "????????????????????? ???????
????%s <{$_CONF['site_url']}>:"
+    37 => '??????????????????????????????',
+    38 => "?????????????????????<{$_CONF['site_url']}>?????? %s ??????????????????????????????????????????:"
 );
 
 ###############################################################################
@@ -480,7 +480,7 @@
     10 => '??????',
     11 => '????????????',
     12 => '????????????',
-    13 => '????????????????????????????????????',
+    13 => '?????????????????????: ????????????',
     14 => '?????????????????????????????????????????????',
     15 => '???????????????????????????????????????????????????',
     16 => '????????????',
@@ -492,11 +492,11 @@
     22 => '(????????? YYYY-MM-DD)',
     23 => '????????????',
     24 => '%d???????????????????????????',
-    25 => '??????????????????????????????????????????',
+    25 => '???????????????????????????????????????:',
     26 => '???',
     27 => '???',
     28 => '??????????????????????????????????????????????????????????????????',
-    29 => '???????????????????????????????????????',
+    29 => '????????????????????????????????????:',
     30 => '',
     31 => '???????????????????????????????????????????????????????????????????????????',
     32 => '',
@@ -660,9 +660,9 @@
 $LANG20 = array(
     1 => '?????????????????
?????????',
     2 => '???????????????????????????????????????????
??????????????????????',
-    3 => '????????????????????????????????????????????????',
-    4 => '???????????????',
-    5 => '??????????????????',
+    3 => '?????????????????????????????????????????????:',
+    4 => '????????????:',
+    5 => '???????????????:',
     6 => '?????????????????????????????????????????????????????????<br' . XHTML . '>??????????????????????????
???????????????????????????',
     7 => '????????????'
 );
@@ -781,8 +781,8 @@
     34 => '????????????',
     35 => '???',
     36 => '???',
-    37 => '??????????????
??????????????????',
-    38 => '???????????????',
+    37 => '??????????????
???????????????:',
+    38 => '????????????:',
     39 => '???????????????',
     40 => '',
     41 => "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????<a href=\"{$_CONF['site_admin_url']}/story.php\">?????????????????????</a>???????????????????????????",
@@ -795,7 +795,7 @@
     48 => '??????',
     49 => '???',
     50 => '???',
-    51 => '<p>??????????????????????????????????????????????????????????????????????????????[imageX]???[imageX_right]???[imageX_left]???X??????????????????????????????????????? [image1]????????????????????????????????????????????
??????????????????????????????????????????????????????????????????<br' . XHTML . '><p><strong>???????????????</strong>: ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</p>',
+    51 => '<p>??????????????????????????????????????????????????????????????????????????????[imageX]???[imageX_right]???[imageX_left]???X??????????????????????????????????????? [image1]????????????: ?????????????????????????????
??????????????????????????????????????????????????????????????????<br' . XHTML . '><p><strong>???????????????</strong>: ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</p>',
     52 => '',
     53 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     54 => '??????????????????????????????????????????????????????',
@@ -822,7 +822,7 @@
     75 => '?
???????',
     76 => '?
???????????????????',
     77 => '????????????????????????????????????????????????????????????JavaScript?????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
-    78 => '<a href="%s/story.php?mode=edit&sid=%s&editopt=default">???????????????????????????????????????</a>',
+    78 => '<a href="%s/story.php?mode=edit&amp;sid=%s&amp;editopt=default">???????????????????????????????????????</a>',
     79 => '???????????????',
     80 => '????????????',
     81 => '?
???????????????????',
@@ -854,7 +854,7 @@
     13 => "???????????????????????????????????????????????????????????????????????????????????????????????????<a href=\"{$_CONF['site_admin_url']}/topic.php\">?????????????????????</a>????????????????????????",
     14 => '??????????????????',
     15 => '????????????????????????',
-    16 => '???????????????',
+    16 => '?????????:',
     17 => '????????????',
     18 => '????????????',
     19 => '??????',
@@ -907,7 +907,7 @@
     31 => '???????????????',
     32 => '??????????????????????????????%d ?????????????????????????????????%d ????????????????????????????????????',
     33 => '??????',
-    34 => '??????????????????????????????????????????????????????????????????',
+    34 => '?????????: ??????????????????????????????????????????????????????',
     35 => '???????????????????????????',
     36 => '???',
     37 => '?????????ID',
@@ -957,8 +957,8 @@
     81 => '%s????????????????????????????????????????????????????????????',
     82 => "????????????{$_CONF['site_name']}?????????????????????%s?????????????????????????????????????????????30????????
?????????????????????????????????????????????????????????????????????????????????",
     83 => "????????????{$_CONF['site_name']}???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
-    84 => "??????????????????????????? : %s  ???????????? : {$_CONF['site_url']}",
-    85 => '???????????????????????????????????????????????????????????????????????????????????????????????? : %s',
+    84 => "???????????????????????????: %s  ????????????: {$_CONF['site_url']}",
+    85 => '????????????????????????????????????????????????????????????????????????????????????????????????: %s',
     86 => '??????',
     87 => '??????????????????'
 );
@@ -1001,7 +1001,7 @@
     3 => '???????
?',
     4 => '??????',
     5 => '??
???',
-    6 => '???????
????',
+    6 => '???????
?:',
     7 => '?????????????????????',
     8 => '????????
',
     9 => '???????????????',
@@ -1010,8 +1010,8 @@
     12 => '????????????????????????????????????',
     13 => '?
????????????????',
     14 => '???????????????????????????????????????????????????',
-    15 => '?????????????????????????????????????
???? ',
-    16 => '????????????????????????????????????????????????????
????',
+    15 => '?????????????????????????????????????
?: ',
+    16 => '????????????????????????????????????????????????????
?: ',
     17 => "<a href={$_CONF['site_admin_url']}/mail.php>??????????????????????????????</a>",
     18 => '???????
?',
     19 => '??????: ????????
?
???????????????????????????????????
???????Logged-in Users???????????????????????????',
@@ -1033,7 +1033,7 @@
     3 => '????????????????????????????????????????????????',
     4 => '??????????????????????????????',
     5 => '?????????????????????',
-    6 => '???????????????????????????????????????????????????????????????????????????',
+    6 => '??????: ??????????????????????????????????????????????????????????????????',
     7 => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     8 => '???????????????????????????????????????????????????????????????',
     9 => '???????????????????????????????????????????????????Geeklog?????
????????????<a href=http://www.geeklog.net>Geeklog</a>??????????????????????????????????????????????????????????????????????????????????
?????????????????????????',
@@ -1058,7 +1058,7 @@
     28 => '??????????????????????????????',
     29 => 'GL???????????????',
     30 => '???????????????????????????????????????????',
-    31 => '?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+    31 => '???????????????????????????????????????????????????? ??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     32 => '<p><strong>???????????????????????????????????????????????????????????????????????????</strong></p>',
     33 => '????????????????????????',
     34 => '??????',
@@ -1069,16 +1069,20 @@
     39 => '?????????????????????????????????',
     40 => '???????????????????????????????????? (.tar.gz, .tgz, .zip) ????????????????????????????????????????????????:',
     41 => '??????????????????',
-    99 => '??????????????????????????????????????????',
+
+    // to match the PHP error constants,
+    // http://www.php.net/manual/en/features.file-upload.errors.php
+    // TBD: move to a separate $LANG array
+     99 => '??????????????????????????????????????????',
     100 => 'Ok.',
-    101 => 'php.ini??????????????
??????????????????????????????????????????????????????????????????',
-    102 => '?????????????????????????????????HTML?????????????????? MAX_FILE_SIZE ???????????????????????????????????????????????????????????????',
-    103 => '???????????????????????????????????????????????????????????????',
+    101 => '????????????????????????????????????????????????php.ini ??
??? upload_max_filesize ???????????
??????????????????',
+    102 => '????????????????????????????????????????????????HTML?????????????????????????????? MAX_FILE_SIZE ???????????
??????????????????',
+    103 => '??????????????????????????????????????????????????????????????????',
     104 => '?????????????????????????????????????????????',
     105 => '(??????????????????)',
-    106 => '?????????????????????????????????',
-    107 => '?????????????????????????????????',
-    108 => '?????????????????????????????????????????????'
+    106 => '??????????????????????????????????????????????????????',
+    107 => '?????????????????????????????????????????????',
+    108 => '????????????????????????????????????????????????????????????????????????????????????'
 );
 
 ###############################################################################
@@ -1156,7 +1160,7 @@
     13 => '??????????????????????????????',
     14 => '???????????????????????????????????????????????????????????????????????????????????????',
     15 => '????????????????????????????????
?????????????????
??????????????????',
-    16 => '??????????????????????????????',
+    16 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     17 => '',
     18 => '',
     19 => '',
@@ -1169,7 +1173,7 @@
     26 => '',
     27 => '???????????????????????????????????????',
     28 => '????????????????????????????????????',
-    29 => '????????
?????????????????????????????????????????????',
+    29 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     30 => '????????????????????????????????????',
     31 => '',
     32 => '',
@@ -1188,7 +1192,7 @@
     45 => '???????????????????????????????????????',
     46 => '',
     47 => '??????????????????*nix???????????????????????????????????????*nix???????????????????????????????????????????????????????????????????????????????????????Windows????????????????????????????????????adodb_*.php???????????????????????????????????????????????????????????????????????????',
-    48 => "{$_CONF['site_name']}?????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
+    48 => "{$_CONF['site_name']}?????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????",
     49 => '?????????????????????????????????????????????',
     50 => '????????????????????????????????????',
     51 => '???????????????????????????????????????????????????????????????????????????????????????',
@@ -1201,7 +1205,7 @@
     58 => '?????????????????????????????????????????????',
     59 => '???????????????????????????????????????',
     60 => '??????????????????????????????????????????',
-    61 => '%s??????????????? : ????????????????????????????????????????????????????????????',
+    61 => '%s???????????????: ????????????????????????????????????????????????????????????',

From geeklog-cvs at lists.geeklog.net  Sun Jul 12 12:28:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 12 Jul 2009 12:28:47 -0400
Subject: [geeklog-cvs] geeklog: Geeklog 1.6.0rc2
Message-ID: <hg.f63c5d515e67.1247416127.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f63c5d515e67
changeset: 7172:f63c5d515e67
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 12 15:58:44 2009 +0200
description:
Geeklog 1.6.0rc2

diffstat:

 public_html/admin/install/lib-install.php |  2 +-
 public_html/docs/history                  |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 83438096c30b -r f63c5d515e67 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Jul 12 11:01:37 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Jul 12 15:58:44 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0rc1');
+    define('VERSION', '1.6.0rc2');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r 83438096c30b -r f63c5d515e67 public_html/docs/history
--- a/public_html/docs/history	Sun Jul 12 11:01:37 2009 +0200
+++ b/public_html/docs/history	Sun Jul 12 15:58:44 2009 +0200
@@ -1,6 +1,6 @@
 Geeklog History/Changes:
 
-Jul ??, 2009 (1.6.0rc2)
+Jul 12, 2009 (1.6.0rc2)
 ------------
 
 Geeklog 1.6.0 incorporates the following projects implemented during

From geeklog-cvs at lists.geeklog.net  Sun Jul 12 12:28:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 12 Jul 2009 12:28:48 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0rc2 for changeset
	f63c5d515e67
Message-ID: <hg.c95f641b271c.1247416128.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c95f641b271c
changeset: 7173:c95f641b271c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 12 18:28:31 2009 +0200
description:
Added tag geeklog_1_6_0rc2 for changeset f63c5d515e67

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r f63c5d515e67 -r c95f641b271c .hgtags
--- a/.hgtags	Sun Jul 12 15:58:44 2009 +0200
+++ b/.hgtags	Sun Jul 12 18:28:31 2009 +0200
@@ -4,3 +4,4 @@
 b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2
 c255cdae51b7fead30ea2b8e04350cc70561fcdd geeklog_1_6_0b3
 401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1
+f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2

From geeklog-cvs at lists.geeklog.net  Fri Jul 17 05:48:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 17 Jul 2009 05:48:59 -0400
Subject: [geeklog-cvs] geeklog: Removed unused image file (bug #0000932)
Message-ID: <hg.fd6c6c1f8d19.1247824139.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fd6c6c1f8d19
changeset: 7174:fd6c6c1f8d19
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Jul 17 11:48:47 2009 +0200
description:
Removed unused image file (bug #0000932)

diffstat:

 public_html/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif0000644 |    
 1 files changed, 0 insertions(+), 0 deletions(-)

diffs (2 lines):

diff -r c95f641b271c -r fd6c6c1f8d19 public_html/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif0000644
Binary file public_html/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif0000644 has changed

From geeklog-cvs at lists.geeklog.net  Sat Jul 18 08:58:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 18 Jul 2009 08:58:19 -0400
Subject: [geeklog-cvs] geeklog: Updated language file for formal German,
	provided by Ma...
Message-ID: <hg.e5079ba43c66.1247921899.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e5079ba43c66
changeset: 7175:e5079ba43c66
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 18 14:21:30 2009 +0200
description:
Updated language file for formal German, provided by Markus Wollschl?ger

diffstat:

 language/german_formal.php       |  192 +++++++++++++++++++-------------------
 language/german_formal_utf-8.php |  192 +++++++++++++++++++-------------------
 public_html/docs/history         |    6 +
 3 files changed, 198 insertions(+), 192 deletions(-)

diffs (truncated from 934 to 300 lines):

diff -r fd6c6c1f8d19 -r e5079ba43c66 language/german_formal.php
--- a/language/german_formal.php	Fri Jul 17 11:48:47 2009 +0200
+++ b/language/german_formal.php	Sat Jul 18 14:21:30 2009 +0200
@@ -527,14 +527,14 @@
     60 => 'pro Seite',
     61 => 'Suche korrigieren',
     62 => '#',
-    63 => 'Description',
-    64 => 'Showing %1$d - %2$d of %3$d results',
-    65 => 'Story',
-    66 => 'Comment',
-    67 => 'Show %d Results',
-    68 => 'Sort By',
-    69 => 'Titles Only',
-    70 => 'Not available ...'
+    63 => 'Beschreibung',
+    64 => 'Gezeigt werden %1$d - %2$d von %3$d Ergebnissen',
+    65 => 'Artikel',
+    66 => 'Kommentar',
+    67 => 'Zeige %d Suchergebnisse',
+    68 => 'Sortieren nach',
+    69 => 'Nur Titel durchsuchen',
+    70 => 'Nicht verf?gbar ...'
 );
 
 ###############################################################################
@@ -583,7 +583,7 @@
     3 => 'Druckf?hige Version',
     4 => 'Optionen',
     5 => '',
-    6 => 'Feed \'%s\' abonnieren'
+    6 => 'Newsfeed \'%s\' abonnieren'
 );
 
 ###############################################################################
@@ -643,8 +643,8 @@
     51 => 'Ort',
     52 => 'L?schen',
     53 => 'Account anlegen',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Einleitung Artikel',
+    55 => 'Hauptteil Artikel'
 );
 
 ###############################################################################
@@ -692,7 +692,7 @@
     22 => '',
     23 => 'Reihenfolge',
     24 => '',
-    25 => 'Um einen Block zu ?ndern oder zu l?schen, auf das ?ndern-Icon (s.u.) klicken. Um einen neuen Block anzulegen, auf Neu anlegen (s.o.) klicken.',
+    25 => 'Um einen Block zu ?ndern oder zu l?schen, auf das ?ndern-Symbol (s.u.) klicken. Um einen neuen Block anzulegen, auf Neu anlegen (s.o.) klicken.',
     26 => 'Layout-Block',
     27 => 'PHP-Block',
     28 => 'PHP-Block: Optionen',
@@ -719,7 +719,7 @@
     49 => ' (keine Leerzeichen, muss eindeutig sein)',
     50 => '',
     51 => '(mit http://)',
-    52 => 'Wenn das Feld leer ist, wird kein Hilfe-Icon zu diesem Block angezeigt.',
+    52 => 'Wenn das Feld leer ist, wird kein Hilfe-Symbol zu diesem Block angezeigt.',
     53 => 'Aktiv',
     54 => 'Speichern',
     55 => 'Abbruch',
@@ -735,7 +735,7 @@
     65 => 'Reihenfolge',
     66 => 'Autotags',
     67 => 'Ankreuzen, um Autotags zu interpretieren',
-    68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
+    68 => 'The Newsfeed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
 );
 
 ###############################################################################
@@ -764,7 +764,7 @@
     20 => 'Ping',
     21 => 'Senden',
     22 => 'Artikelliste',
-    23 => 'Auf das ?ndern-Icon klicken, um einen Artikel zu ?ndern oder zu l?schen. Um einen Artikel anzusehen, auf dessen Titel klicken. Auf Neu anlegen (s.o.) klicken, um einen neuen Artikel zu schreiben.',
+    23 => 'Auf das ?ndern-Symbol klicken, um einen Artikel zu ?ndern oder zu l?schen. Um einen Artikel anzusehen, auf dessen Titel klicken. Auf Neu anlegen (s.o.) klicken, um einen neuen Artikel zu schreiben.',
     24 => 'Diese ID wird bereits f?r einen anderen Artikel benutzt. Bitte w?hlen Sie eine andere ID.',
     25 => 'Fehler beim Speichern des Artikels',
     26 => 'Artikelvorschau',
@@ -797,29 +797,29 @@
     53 => 'wurde nicht verwendet. Sie m?ssen dieses Bild im Text des Artikels verwenden oder es l?schen bevor Sie Ihre ?nderungen sichern k?nnen.',
     54 => 'Nicht verwendete Bilder',
     55 => 'Folgende Fehler traten beim Versuch, den Artikel zu speichern, auf. Bitte diese Fehler beheben und den Artikel noch einmal speichern.',
-    56 => 'mit Icon',
+    56 => 'mit Symbol',
     57 => 'Bild in Originalgr??e',
     58 => 'Artikelverwaltung',
     59 => 'Option',
     60 => '',
     61 => 'automatisch archivieren',
     62 => 'automatisch l?schen',
-    63 => 'Disable Comments',
+    63 => 'Kommentarm?glichkeit zeitgesteuert ausschalten',
     64 => '',
     65 => '',
     66 => '',
     67 => 'Editierbereich vergr??ern',
     68 => 'Editierbereich verkleinern',
     69 => 'Ver?ffentlichungsdatum',
-    70 => 'Auswahl der Toolbar',
-    71 => 'Basic Toolbar',
-    72 => 'Common Toolbar',
-    73 => 'Advanced Toolbar',
-    74 => 'Advanced II Toolbar',
-    75 => 'Full Featured',
+    70 => 'Auswahl der Symbolleiste',
+    71 => 'Einfache Symbolleiste',
+    72 => 'Normale Symbolleiste',
+    73 => 'Extra Symbolleiste',
+    74 => 'Extra II Symbolleiste',
+    75 => 'Alle Symbole',
     76 => 'Ver?ffentlichung',
-    77 => 'JavaScript mu? f?r den Advanced Editor an sein. Der Advanced Editor kann im Configuration Admin Panel ausgeschaltet werden.',
-    78 => 'Klick <a href="%s/story.php?mode=edit&amp;sid=%s&amp;editopt=default">hier</a>, um den  Default-Editor zu verwenden',
+    77 => 'JavaScript mu? f?r den WYSIWYG-Editor an sein. Der WYSIWYG-Editor kann im Configuration Admin Panel ausgeschaltet werden.',
+    78 => 'Klicken Sie <a href="%s/story.php?mode=edit&amp;sid=%s&amp;editopt=default">hier</a>, um den  Default-Editor zu verwenden',
     79 => 'Vorschau',
     80 => 'Editor',
     81 => 'Ver?ffentlichung',
@@ -827,7 +827,7 @@
     83 => 'Archivierung',
     84 => 'Rechte',
     85 => 'Alles anzeigen',
-    86 => 'Advanced Editor',
+    86 => 'WYSIWYG-Editor',
     87 => 'Artikel-Statistik',
     88 => 'Format im Wiki-Stil '
 );
@@ -862,7 +862,7 @@
     24 => '(*)',
     25 => 'Archiv-Kategorie',
     26 => 'Zur Archiv-Kategorie machen (nur f?r eine Kategorie m?glich)',
-    27 => 'oder ein Icon hochladen',
+    27 => 'oder ein Symbol hochladen',
     28 => 'maximal',
     29 => 'Fehler beim Datei-Upload'
 );
@@ -882,7 +882,7 @@
     9 => '(keine Leerzeichen!)',
     10 => 'Bitte die Felder Username und E-Mail-Adresse ausf?llen.',
     11 => 'User-Manager',
-    12 => 'Auf das ?ndern-Icon klicken, um einen User zu ?ndern oder zu l?schen. Ein neuer User kann mit Neu anlegen (s.o.) angelegt werden.',
+    12 => 'Auf das ?ndern-Symbol klicken, um einen User zu ?ndern oder zu l?schen. Ein neuer User kann mit Neu anlegen (s.o.) angelegt werden.',
     13 => 'SecLev',
     14 => 'Reg. Datum',
     15 => '',
@@ -957,7 +957,7 @@
     84 => "Ihr Einlogname ist: %s  auf der Site: {$_CONF['site_url']}",
     85 => 'Wenn Sie Ihr Passwort vergessen haben, benutzen Sie folgenden Link: %s',
     86 => 'Enthalten',
-    87 => 'Reminders'
+    87 => 'Erinnerungen'
 );
 
 ###############################################################################
@@ -979,14 +979,14 @@
     18 => 'E-Mail',
     34 => 'Kommandozentrale',
     35 => 'Beitr?ge: Artikel',
-    36 => 'Parent or Comment',
+    36 => 'Parent or Kommentar',
     37 => '',
     38 => 'Abschicken',
     39 => 'Derzeit gibt es keine Beitr?ge zu moderieren.',
     40 => 'Neue User',
-    41 => 'Comment Submissions',
+    41 => 'Eingereichte Kommentare',
     42 => 'User Name',
-    43 => 'Auto-publish Comments?'
+    43 => 'Kommentare automatisch ver?ffentlichen?'
 );
 
 ###############################################################################
@@ -1035,7 +1035,7 @@
     8 => 'Plugin-Kompatibilit?tstest fehlgeschlagen',
     9 => 'Dieses Plugin ben?tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a> oder evtl. eine andere Version dieses Plugins.',
     10 => '<br' . XHTML . '><b>Es sind derzeit keine Plugins installiert.</b><br' . XHTML . '><br' . XHTML . '>',
-    11 => 'Um ein Plugin zu ?ndern oder zu l?schen, auf das ?ndern-Icon klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f?r ein Plugin angezeigt werden, bedeutet das, dass f?r das Plugin noch ein Update durchgef?hrt werden muss. Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
+    11 => 'Um ein Plugin zu ?ndern oder zu l?schen, auf das ?ndern-Symbol klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f?r ein Plugin angezeigt werden, bedeutet das, dass f?r das Plugin noch ein Update durchgef?hrt werden muss. Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
     12 => '(kein Name angegeben)',
     13 => 'Plugin-Editor',
     14 => 'Neues Plugin',
@@ -1089,7 +1089,7 @@
     10 => 'Newsfeed',
     11 => 'Neuer Newsfeed',
     12 => 'Kommandozentrale',
-    13 => 'Um einen Newsfeed zu ?ndern oder zu l?schen, auf das ?ndern-Icon (s.u.) klicken. Um einen neuen Newsfeed anzulegen, auf Neu anlegen (s.o.) klicken.',
+    13 => 'Um einen Newsfeed zu ?ndern oder zu l?schen, auf das ?ndern-Symbol (s.u.) klicken. Um einen neuen Newsfeed anzulegen, auf Neu anlegen (s.o.) klicken.',
     14 => 'Titel',
     15 => 'Art',
     16 => 'Dateiname',
@@ -1152,8 +1152,8 @@
     12 => 'Der Block wurde gel?scht.',
     13 => 'Ihre Kategorie wurde gespeichert.',
     14 => 'Die Kategorie und alle zugeh?rigen Artikel wurden gel?scht.',
-    15 => 'Your comment has been submitted for review and will be published when approved by a moderator.',
-    16 => 'You have been unsubscribed. You will no longer be notified of new replies.',
+    15 => 'Der Kommentar wurde zur Moderation eingereicht. Er wird ver?ffentlicht, wenn ein Moderator zustimmt.',
+    16 => 'Abonnement wurde gel?scht. Es gibt nicht l?nger Benachrichtigungen bei Antworten.',
     17 => '',
     18 => '',
     19 => '',
@@ -1230,14 +1230,14 @@
     90 => 'OpenID- Identifizierung abgebrochen.',
     91 => 'You specified an invalid identity URL.',
     92 => "Bitte <a href=\"{$_CONF['site_admin_url']}/sectest.php\">die Sicherheit Ihrer Site ?berpr?fen</a> bevor Sie sie benutzen!",
-    93 => 'Database back up war erfolgreich.',
-    94 => 'Backup Failed: Dateigr??e unter 1kb',
+    93 => 'Datenbank-Backup war erfolgreich.',
+    94 => 'Backup hat nicht geklappt: Dateigr??e unter 1kb',
     95 => 'Es gab einen Fehler.',
     96 => '',
     97 => '',
-    98 => 'The plugin was successfully uploaded.',
-    99 => 'The plugin already exists.',
-    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
+    98 => 'Das Plugin wurde erfolgreich hochgeladen.',
+    99 => 'Das Plugin existiert schon.',
+    100 => 'Die hochgeladene Plugindatei ist kein GZip oder Zip-Archiv.',
     101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.',
     400 => 'Not all required fields have been passed validation',
     401 => 'Please enter Fullname'
@@ -1264,7 +1264,7 @@
     'missingfields' => 'Fehlende Angaben',
     'missingfieldsmsg' => ' Sie m?ssen den Namen und eine Beschreibung f?r die Gruppe angeben.',
     'groupmanager' => 'Gruppen-Manager',
-    'newgroupmsg' => 'Um eine Gruppe zu ?ndern oder zu l?schen, auf das ?ndern-Icon klicken. Neu anlegen (s.o.) legt eine neue Gruppe an. Hinweis: Core-Gruppen k?nnen nicht gel?scht werden, da sie vom System ben?tigt werden.',
+    'newgroupmsg' => 'Um eine Gruppe zu ?ndern oder zu l?schen, auf das ?ndern-Symbol klicken. Neu anlegen (s.o.) legt eine neue Gruppe an. Hinweis: Core-Gruppen k?nnen nicht gel?scht werden, da sie vom System ben?tigt werden.',
     'groupname' => 'Gruppen-Name',
     'coregroup' => 'Core-Gruppe',
     'yes' => 'Ja',
@@ -1429,7 +1429,7 @@
     'error_ping_url' => 'Bitte geben Sie die Ping-URL der Site ein.',
     'no_services' => 'Es sind keine Weblog-Verzeichnisse konfiguriert.',
     'services_headline' => 'Weblog-Verzeichnisse',
-    'service_explain' => 'Um ein Weblog-Verzeichnis zu ?ndern oder zu l?schen, auf das ?ndern-Icon klicken. Um ein neues Weblog-Verzeichnis einzutragen, auf Neu anlegen (s.o.) klicken.',
+    'service_explain' => 'Um ein Weblog-Verzeichnis zu ?ndern oder zu l?schen, auf das ?ndern-Symbol klicken. Um ein neues Weblog-Verzeichnis einzutragen, auf Neu anlegen (s.o.) klicken.',
     'service' => 'Verzeichnis',
     'ping_method' => 'Ping-Methode',
     'service_website' => 'Website',
@@ -1559,7 +1559,7 @@
     'admin_home' => 'Kommandozentrale',
     'create_new' => 'Neu anlegen',
     'create_new_adv' => 'Neu anlegen (Erw.)',
-    'enabled' => 'Aktiv',
+    'enabled' => 'Funktion aktivieren',
     'title' => 'Titel',
     'type' => 'Typ',
     'topic' => 'Kategorie',
@@ -1665,7 +1665,7 @@
     'site_mail' => 'Site E-Mail',
     'noreply_mail' => 'No-Reply E-Mail',
     'site_name' => 'Name des Webauftritts',
-    'site_slogan' => 'Slogan',
+    'site_slogan' => 'Slogan im Kopf',
     'microsummary_short' => 'Microsummary',
     'path_log' => 'Pfad zum Log',
     'path_language' => 'Pfad zu Sprachdateien',
@@ -1673,12 +1673,12 @@
     'path_data' => 'Pfad zu Data',
     'path_images' => 'Pfad zu Images',
     'path_pear' => 'Pfad zu Pear',
-    'have_pear' => 'Pear vorhanden?',
+    'have_pear' => 'Pear auf dem Server vorhanden?',
     'mail_settings' => 'Einstellungen ',
-    'allow_mysqldump' => 'MySQL Dump erlauben',
+    'allow_mysqldump' => 'MySQL-Dump erlauben',
     'mysqldump_path' => 'Pfad zu Executable',
-    'mysqldump_options' => 'MySQL Dump Optionen',
-    'mysqldump_filename_mask' => 'Backup File Name Mask',
+    'mysqldump_options' => 'Optionen MySQL-Dump',
+    'mysqldump_filename_mask' => 'Backupdateibezeichnung',
     'theme' => 'Theme',
     'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men?s ',
@@ -1720,11 +1720,11 @@
     'cookie_language' => 'Language Cookie Name',
     'cookie_tzid' => 'Zeitzone Cookie Name',
     'cookie_anon_name' => 'Anon. Username Cookie Name',
-    'cookie_ip' => 'Cookies embed IP?',
-    'default_perm_cookie_timeout' => 'Permanent Timeout',
-    'session_cookie_timeout' => 'Session Timeout',
-    'cookie_path' => 'Cookie Path',
-    'cookiedomain' => 'Cookie Domain',
+    'cookie_ip' => 'IP in Cookies einbetten?',
+    'default_perm_cookie_timeout' => 'Permanenter Timeout',
+    'session_cookie_timeout' => 'Session-Timeout',
+    'cookie_path' => 'Cookie-Pfad',
+    'cookiedomain' => 'Cookie-Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Letzten Login aufzeichnen?',
     'num_search_results' => 'Anzahl Suchergebnisse',
@@ -1740,13 +1740,13 @@
     'storysubmission' => 'Artikel moderieren?',
     'usersubmission' => 'Neue User zur Moderation?',
     'listdraftstories' => 'Anzahl Artikel auf Entwurf anzeigen?',
-    'notification' => 'Benachrichtigung',

From geeklog-cvs at lists.geeklog.net  Sat Jul 18 08:58:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 18 Jul 2009 08:58:20 -0400
Subject: [geeklog-cvs] geeklog: Updated Japanese language file,
	provided by the Geeklog...
Message-ID: <hg.9273d06bdfb7.1247921900.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9273d06bdfb7
changeset: 7176:9273d06bdfb7
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 18 14:41:30 2009 +0200
description:
Updated Japanese language file, provided by the Geeklog.jp group

diffstat:

 language/japanese_utf-8.php |  24 ++++++++++++------------
 public_html/docs/history    |   3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (53 lines):

diff -r e5079ba43c66 -r 9273d06bdfb7 language/japanese_utf-8.php
--- a/language/japanese_utf-8.php	Sat Jul 18 14:21:30 2009 +0200
+++ b/language/japanese_utf-8.php	Sat Jul 18 14:41:30 2009 +0200
@@ -1524,18 +1524,18 @@
 );
 
 $LANG_MONTH = array(
-    1 => ' 1???',
-    2 => ' 2???',
-    3 => ' 3???',
-    4 => ' 4???',
-    5 => ' 5???',
-    6 => ' 6???',
-    7 => ' 7???',
-    8 => ' 8???',
-    9 => ' 9???',
-    10 => '10???',
-    11 => '11???',
-    12 => '12???'
+    1 => ' 1',
+    2 => ' 2',
+    3 => ' 3',
+    4 => ' 4',
+    5 => ' 5',
+    6 => ' 6',
+    7 => ' 7',
+    8 => ' 8',
+    9 => ' 9',
+    10 => '10',
+    11 => '11',
+    12 => '12'
 );
 
 $LANG_WEEK = array(
diff -r e5079ba43c66 -r 9273d06bdfb7 public_html/docs/history
--- a/public_html/docs/history	Sat Jul 18 14:21:30 2009 +0200
+++ b/public_html/docs/history	Sat Jul 18 14:41:30 2009 +0200
@@ -1,6 +1,6 @@
 Geeklog History/Changes:
 
-Jul 12, 2009 (1.6.0rc2)
+Jul 19, 2009 (1.6.0)
 ------------
 
 Geeklog 1.6.0 incorporates the following projects implemented during
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 - Updated language file for formal German, provided by Markus Wollschl?ger
+- Updated Japanese language file, provided by the Geeklog.jp group
 
 
 Jul 12, 2009 (1.6.0rc2)

From geeklog-cvs at lists.geeklog.net  Sat Jul 18 12:33:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 18 Jul 2009 12:33:34 -0400
Subject: [geeklog-cvs] geeklog: Partial German translation of the language
	file for the...
Message-ID: <hg.94cb740a4478.1247934814.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/94cb740a4478
changeset: 7177:94cb740a4478
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 18 18:01:12 2009 +0200
description:
Partial German translation of the language file for the install script

diffstat:

 public_html/admin/install/language/german.php |  58 ++++++++++++++--------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diffs (103 lines):

diff -r 9273d06bdfb7 -r 94cb740a4478 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sat Jul 18 14:41:30 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sat Jul 18 18:01:12 2009 +0200
@@ -122,13 +122,13 @@
     70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
     71 => 'Please make sure to select the correct Geeklog version you are coming from below. This script will do incremental upgrades after this version (i.e. you can upgrade directly from any old version to ',
     72 => ').',
-    73 => 'Please note this script will not upgrade any beta or release candidate versions of Geeklog.',
-    74 => 'Database already up to date!',
-    75 => 'It looks like your database is already up to date. You probably ran the upgrade before. If you need to run the upgrade again, please re-install your database backup and try again.',
-    76 => 'Select Your Current Geeklog Version',
-    77 => 'The installer was unable to determine your current version of Geeklog, please select it from the list below:',
-    78 => 'Upgrade Error',
-    79 => 'An error occured while upgrading your Geeklog installation.',
+    73 => 'Beachte bitte, dass dieses Skript keine Beta- oder Release Candidate-Versionen von Geeklog aktualisieren kann.',
+    74 => 'Datenbank schon aktuell',
+    75 => 'Die Datenbank ist offenbar schon aktuell. Du hast das Update wahrscheinlich schon einmal vorgenommen. Wenn Du es tats?chlich noch einmal durchf?hren willst, installiere bitte zuerst die Datenbank von einem Backup und probiere es dann noch einmal.',
+    76 => 'Geeklog-Version ausw?hlen',
+    77 => 'Das Installations-Skript konnte die bisher verwendete Geeklog-Version nicht ermitteln. Bitte w?hle die korrekte Version aus dieser Liste aus:',
+    78 => 'Update-Fehler',
+    79 => 'Beim Update Deiner Geeklog-Installation trat ein Fehler auf.',
     80 => '?ndern',
     81 => 'Stop!',
     82 => 'Es ist unbedingt n?tig, die Zugriffsrechte der unten aufgef?hrten Dateien zu ?ndern. Andernfalls wirst Du Geeklog nicht installieren k?nnen.',
@@ -137,10 +137,10 @@
     85 => '" scheint nicht korrekt zu sein. Bitte gib den Pfad noch einmal ein.',
     86 => 'Sprache',
     87 => 'http://geeklog.info/forum/index.php?forum=1',
-    88 => 'Change directory and containing files to',
+    88 => '?ndere das Verzeichnis und die Dateien darin zu',
     89 => 'Aktuelle Version:',
     90 => 'Leere Datenbank?',
-    91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
+    91 => 'Entweder ist die Datenbank leer oder die Zugangsdaten f?r die Datenbank sind nicht korrekt. Oder wolltest Du eigentlich eine Neuinstallation durchf?hren (statt eines Updates)? Bitte noch einmal probieren.',
     92 => 'Benutze UTF-8',
     93 => 'Fertig',
     94 => 'Hier sind einige Hinweise, um den richtigen Pfad zu ermitteln:',
@@ -153,8 +153,8 @@
     101 => 'Schritt',
     102 => 'Konfigurations-Informationen eingeben',
     103 => 'und zus?tzliche Plugins konfigurieren',
-    104 => 'Incorrect Admin Directory Path',
-    105 => 'Sorry, but the admin directory path you entered does not appear to be correct. Please go back and try again.'
+    104 => 'Der Pfad f?r das Admin-Verzeichnis ist nicht korrekt',
+    105 => 'Der Pfad, den Du f?r das Admin-Verzeichnis eingegeben hast, scheint nicht korrekt zu sein. Bitte ?berpr?fe Deine Eingabe und versuche es dann noch einmal.'
 );
 
 // +---------------------------------------------------------------------------+
@@ -190,12 +190,12 @@
 // migrate.php
 
 $LANG_MIGRATE = array(
-    0 => 'The migration process will overwrite any existing database information.',
-    1 => 'Before Proceding',
-    2 => 'Be sure any previously installed plugins have been copied to your new server.',
-    3 => 'Be sure any images from <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, and <code>public_html/images/userphotos/</code>, have been copied to your new server.',
-    4 => 'If you\'re upgrading from a Geeklog version older than <strong>1.5.0</strong>, then make sure to copy over all your old <tt>config.php</tt> files so that the migration can pick up your settings.',
-    5 => 'If you\'re upgrading to a new Geeklog version, then don\'t upload your theme just yet. Use the included default theme until you can be sure your migrated site works properly.',
+    0 => 'Bei der Migration werden ggfs. Datenbank-Eintr?ge ?berschrieben.',
+    1 => 'Vorbereitende Schritte',
+    2 => 'Stelle sicher, dass alle bereits installierten Plugins auf den neuen Server kopiert wurden.',
+    3 => 'Stelle sicher, dass alle Bilder aus <code>public_html/images/articles/</code>, <code>public_html/images/topics/</code>, und <code>public_html/images/userphotos/</code> auf den neuen Server kopiert wurden.',
+    4 => 'Wenn Du von einer Geeklog-Version ?lter als <strong>1.5.0</strong> aktualisierst solltest Du sicherstellen, dass alle alten <tt>config.php</tt>-Dateien (von Geeklog und von den Plugins) auf den neuen Server kopiert wurden, damit die alten Einstellungen ?bernommen werden k?nnen.',
+    5 => 'Wenn Du von einer ?lteren Geeklog-Version aktualisierst, dann solltest Du Dein Theme noch <em>nicht</em> hochladen. Benutze zuerst das mitgelieferte Theme bis sicher ist, dass die Migration erfolgreich war.',
     6 => 'Backup ausw?hlen',
     7 => 'Datei ausw?hlen...',
     8 => 'Vom backups-Verzeichnis des Webservers',
@@ -309,17 +309,17 @@
 // Error Messages
 
 $LANG_ERROR = array(
-    0 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini. Please upload your backup file using another method, such as FTP.',
-    1 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form. Please upload your backup file using another method, such as FTP.',
-    2 => 'The uploaded file was only partially uploaded.',
-    3 => 'No file was uploaded.',
-    4 => 'Missing a temporary folder.',
-    5 => 'Failed to write file to disk.',
-    6 => 'File upload stopped by extension.',
-    7 => 'The uploaded file exceeds the post_max_size directive in your php.ini. Please upload your database file using another method, such as FTP.',
-    8 => 'Error',
-    9 => 'Failed to connect to the database with the error: ',
-    10 => 'Check your database settings'
+    0 => 'Die hochgeladene Datei ist gr??er als der max. erlaubte Wert (siehe upload_max_filesize in der php.ini). Lade die Datei stattdessen auf einem anderen Weg hoch, z.B. per FTP.',
+    1 => 'Die hochgeladene Datei ist gr??er als der max. erlaubte Werte (siehe MAX_FILE_SIZE im HTML-Formular). Lade die Datei stattdessen auf einem anderen Weg hoch, z.B. per FTP.',
+    2 => 'Die hochgeladene Datei wurde nur teilweise ?bertragen.',
+    3 => 'Es wurde keine Datei hochgeladen.',
+    4 => 'Verzeichnis f?r tempor?re Dateien nicht gefunden.',
+    5 => 'Konnte die Datei nicht abspeichern.',
+    6 => 'Hochladen wegen nicht erlaubten Date-Extension abgebrochen.',
+    7 => 'Die hochgeladene Datei ist gr??er als der max. erlaubte Wert (siehe post_max_size in der php.ini). Lade die Datei stattdessen auf einem anderen Weg hoch, z.B. per FTP.',
+    8 => 'Fehler',
+    9 => 'Konnte keine Verbindung zur Datenbank herstellen. Fehler: ',
+    10 => '?berpr?fe die Datenbank-Einstellungen bzw. Zugangsdaten'
 );
 
 // +---------------------------------------------------------------------------+
@@ -363,4 +363,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>

From geeklog-cvs at lists.geeklog.net  Sat Jul 18 17:07:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 18 Jul 2009 17:07:40 -0400
Subject: [geeklog-cvs] geeklog: Update to the Japanese documentation,
	provided by the G...
Message-ID: <hg.de39583ffa2f.1247951260.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/de39583ffa2f
changeset: 7178:de39583ffa2f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 18 23:07:28 2009 +0200
description:
Update to the Japanese documentation, provided by the Geeklog.jp group

diffstat:

 public_html/docs/history               |    3 +-
 public_html/docs/japanese/history.html |  166 ++++++++++++++++++--------------
 2 files changed, 96 insertions(+), 73 deletions(-)

diffs (truncated from 490 to 300 lines):

diff -r 94cb740a4478 -r de39583ffa2f public_html/docs/history
--- a/public_html/docs/history	Sat Jul 18 18:01:12 2009 +0200
+++ b/public_html/docs/history	Sat Jul 18 23:07:28 2009 +0200
@@ -11,7 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 - Updated language file for formal German, provided by Markus Wollschl?ger
-- Updated Japanese language file, provided by the Geeklog.jp group
+- Updated Japanese language file and documentation, provided by the
+  Geeklog.jp group
 
 
 Jul 12, 2009 (1.6.0rc2)
diff -r 94cb740a4478 -r de39583ffa2f public_html/docs/japanese/history.html
--- a/public_html/docs/japanese/history.html	Sat Jul 18 18:01:12 2009 +0200
+++ b/public_html/docs/japanese/history.html	Sat Jul 18 23:07:28 2009 +0200
@@ -13,18 +13,41 @@
 <body>
 <h1>Geeklog History/Changes:</h1>
 
+<h2>July 19, 2009 (1.6.0)</h2>
 
-<h2>Jun 28, 2009 (1.6.0rc1)</h2>
-
-Geeklog 1.6.0??????????????????Google Summer of Code 2008???????????????????????????????????????????????????:
+<p>Geeklog 1.6.0??????????????????Google Summer of Code 2008???????????????????????????????????????????????????:</p>  
 
 <ul>
-  <li>????????????????????????????????????????????????????????????????????????????????????Matt
-    West?????????????????????</li>
-  <li>?????????????????????????????????????????????Sami Barakat?????????????????????</li>
-  <li>???????????????????????????????????????????????????Jared Wenerd?????????????????????</li>
+  <li>?????????????????????????????????????????????????????????????????????????????????(Matt  
+    West??????????????????)</li>
+  <li>???????????????????????????????????????(Sami Barakat??????????????????)</li>  
+  <li>?????????????????????????????????????????????(Jared Wenerd??????????????????)</li>  
 </ul>
 
+<ul>
+  <li>???????????????????????????????????????????????????????????????????????????((Markus Wollschl??ger??????)</li>
+  <li>?????????????????????????????????(Geeklog.jp group??????)</li>
+</ul>
+
+
+<h2>July 12, 2009 (1.6.0rc2)</h2>
+
+<h3>1.6.0rc1???????????????:</h3>
+
+<ul>
+  <li>FCKeditor???version 2.6.4.1??????????????????????????? [Dirk]  </li>
+  <li>???????????????????????????????????????????????????????????? (bug #0000924, patch provided by dengen)  </li>
+  <li>SQL????????????CREATE TABLE IF NOT EXISTS?????????????????????????????????????????????????????????????????????????????? (bug #0000922) [Dirk]  </li>
+  <li>bigdump.php????????????????????????????????? (?????????) migrate.php???????????????????????? (bug #0000919) [Dirk]  </li>
+  <li>???????????????????????????????????????????????????????????????????????? (bug #0000918, patch provided by hiroron)  </li>
+  <li>???????????????????????????????????????(Artur R??pp??????)  </li>
+  <li>???????????????????????????????????????(LWC??????)  </li>
+  <li>????????????????????????????????????????????????????????????(Geeklog.jp group??????)</li>
+</ul>
+
+
+<h2>Jun 28, 2009 (1.6.0rc1)</h2>  
+
 <h3>1.6.0b3???????????????:</h3>
 
 <ul>
@@ -46,9 +69,9 @@
     [Dirk]</li>
   <li>????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>
-  <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+  <li>?????????????????????????????????????????????(????????????????????????)??????????????????????????????????????????????????????????????????
     [Dirk]</li>
-  <li>????????????????????????????????????????????????????????????????????????????????????(Markus
+  <li>??????????????????(????????????????????????)????????????????????????????????????(Markus
     Wollschl??ger??????????????????) [Dirk]</li>
   <li>$_CONF['comment_close_rec_stories']?????????????????? (??????#0000899)
     [Dirk]
@@ -63,7 +86,7 @@
     (Nemesis ??? MaXe????????????????????????) [Dirk]</li>
   <li>??????????????????????????????????????????????????????????????????????????????????????????????????????plugin_commentsupport?????????
     [Dirk]</li>
-  <li>?????????????????????????????????????????????????????????????????????????????????Geeklog.jp??????????????????</li>
+  <li>?????????????????????????????????????????????????????????????????????????????????(Geeklog.jp group??????)</li>
 </ul>
 
 <h3>??????????????????????????????</h3>
@@ -99,10 +122,10 @@
 
 <h3>1.6.0b1???????????????:</h3>
 <ul>
-  <li>?????????????????????????????
?????????????????????????????????????????????????????????????????????[Sami]</li>
-  <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+  <li>?????????????????????(?????
??????????????????????????????????????????????????????????????????)[Sami]</li>
+  <li>??????????????????????????????????????????????????????(??????????????????????????????)???????????????????????????????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>
-  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
+  <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????(????????????????????????????????????????????????????????????)???[Dirk]</li>
   <li>SQL errors(&quot;Unfortunately, an error has occurred ...&quot;)???error.log???????????????????????????????????????????????????
     [Tony, Dirk]</li>
   <li>$_CONF['search_no_data']???config option???????????????????????????????????????????????????????????????[Dirk]</li>
@@ -111,8 +134,8 @@
   <li>?????????????????????????????????????????????????????????????????????????????????????????????(reported
     by Tom Homer) [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
-  <li>?????????SSL?????????????????????URL???????????????????????????????????????????????
???????????????Geeklog
-    Japanese??????????????????????????????????????????</li>
+  <li>?????????SSL?????????????????????URL???????????????????????????????????????(?????
???????????????Geeklog
+    Japanese???????????????????????????????????????)</li>
   <li>config class???????????????????????????????????????????????????(tgc???????????????????????????)
     [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????fix???????????????search/searchform.thtml????????????????????????????????????????????
????????????(??????#0000874?????????)</li>
@@ -123,7 +146,7 @@
     [Dirk]</li>
   <li>search class?????????????????????????????????????????????????????????????????????????????????off?????????[Dirk]</li>
   <li>lib-custom.php???1.6.0b1 tarball????????????????????????</li>
-  <li>???????????????????????????????????????Juan Pablo Novillo???????????????????????????</li>
+  <li>?????????????????????????????????????????????(Juan Pablo Novillo??????)</li>
 </ul>
 
 <h3>??????????????????????????????</h3>
@@ -158,10 +181,10 @@
 
 <p>1.6.0b1???????????????:</p>
 <ul>
-  <li>?????????????????????????????
?????????????????????????????????????????????????????????????????????[Sami]</li>
-  <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
+  <li>?????????????????????(?????
??????????????????????????????????????????????????????????????????)[Sami]</li>
+  <li>??????????????????????????????????????????????????????(??????????????????????????????)???????????????????????????????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>
-  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
+  <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????(????????????????????????????????????????????????????????????)???[Dirk]</li>
   <li>SQL errors(&quot;Unfortunately, an error has occurred ...&quot;)???error.log???????????????????????????????????????????????????
     [Tony, Dirk]</li>
   <li>$_CONF['search_no_data']???config option???????????????????????????????????????????????????????????????[Dirk]</li>
@@ -170,8 +193,8 @@
   <li>?????????????????????????????????????????????????????????????????????????????????????????????(reported
     by Tom Homer) [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
-  <li>?????????SSL?????????????????????URL???????????????????????????????????????????????
???????????????Geeklog
-    Japanese??????????????????????????????????????????</li>
+  <li>?????????SSL?????????????????????URL???????????????????????????????????????(?????
???????????????Geeklog
+    Japanese???????????????????????????????????????)</li>
   <li>config class???????????????????????????????????????????????????(tgc???????????????????????????)
     [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????fix???????????????search/searchform.thtml????????????????????????????????????????????
????????????(??????#0000874?????????)</li>
@@ -182,7 +205,7 @@
     [Dirk]</li>
   <li>search class?????????????????????????????????????????????????????????????????????????????????off?????????[Dirk]</li>
   <li>lib-custom.php???1.6.0b1 tarball????????????????????????</li>
-  <li>???????????????????????????????????????Juan Pablo Novillo???????????????????????????</li>
+  <li>??????????????????????????????????????????(Juan Pablo Novillo??????)</li>
 </ul>
 <h3>??????????????????????????????</h3>
 <ul>
@@ -212,11 +235,11 @@
   <li>??????????????????????????????????????????????????????????????????XML???????????????????????????????????????????????????????????????XMLSitemap???(mystral-kk??????)</li>
   <li>??????????????????????????????AllUsers??????????????????????????????User???????????????????????????????????????????????????????????????????????????????????????????????????????????????(??????#0000863
     &amp; #0000864) [Dirk]</li>
-  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????????????????????????????????????????????[Dirk]</li>
+  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????
???????(?????????????????????)??????????????????[Dirk]</li>
   <li>CUSTOM_templateSetVars?????????????????????????????????????????????????????????(??????#0000862)[Dirk]</li>
   <li>?????????????????????????????????????????????????????????(????????????#0000840)
     [Sami]</li>
-  <li>????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
+  <li>????????
???????????????????????????????????????????????????????????????????????????????????????????????????(????????????????????????????????????????????????????????????????????????)[Dirk]</li>
   <li>?????????????????????????????????????????????????????????URL????????????????????????????????????????????????URL?????????????????????[Dirk]</li>
   <li>????????????????????????????????????[Dirk]</li>
 </ul>
@@ -236,13 +259,13 @@
   </dd>
 </dl>
 <ul>
-  <li>????????????????????????????????????????????????HTML???????????????????????????????????????;???????????????????????????????????????????????????????????????????????
???????????????[Dirk]</li>
-  <li>????????????????????????????????????????????????[Dirk]????????
??????????
????<a href="http://www.sem-r.com/09/20090213153711.html??????" class="external free" title="http://www.sem-r.com/09/20090213153711.html???" rel="nofollow">http://www.sem-r.com/09/20090213153711.html???</a></li>
+  <li>????????????????????????????????????????????????HTML?????????(???????????????????????????;???????????????????????????????????????????????????????????????????????
????????????)[Dirk]</li>
+  <li>????????????????????????????????????????????????[Dirk](?????
??????????
????<a href="http://www.sem-r.com/09/20090213153711.html??????" class="external free" title="http://www.sem-r.com/09/20090213153711.html)" rel="nofollow">http://www.sem-r.com/09/20090213153711.html)</a></li>
   <li>admin/sectest.php???????????????????????????????????????????????????????????????(??????#0000716)
     [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????????????????(????????????#0000771,Roshan
     Singh??????????????????????????????)</li>
-  <li>COM_checkList???HTML??
???checkbox?
??????????????????????????????????????????????????????????!????????????????????????????????????????????????(Geeklog1.5.2sr4???usersettings.php??????????????????????????????Bookoo???????????????)</li>
+  <li>COM_checkList???HTML??
???checkbox?
??????????????????????????????????????????????????????????! ????????????????????????????????????????????????(Geeklog1.5.2sr4???usersettings.php??????????????????????????????Bookoo???????????????)</li>
   <li>?????????????????????COM_allowedHTML and COM_checkHTML???????????????????????????fix??????????????????????????????????????????????????????????????????????????????'story.edit'???????????????????????????
     ?????????????????????????????????????????????StoryAdmin?????????admin_html?????????????????????CalendarAdmin??????????????????????????????????????????
     ????????????(??????#0000785) [Dirk]</li>
@@ -252,7 +275,7 @@
     [Dirk]</li>
   <li>????????????API??????PLG_pluginStateChange???????
?[Dirk]</li>
   <li>?????????????????????????????????????????????????????????fix???????????????????????????????????????????????????2????????????????????????????????????????????????????????????????????????????????????????????????
-    ????????????????
????????????????????????????????????????????????????????????????(??????#0000692)
+    ?????????(????
?????????????????????????????????????)????????????????????????(??????#0000692)
     [Mike, Maciej Cupial]</li>
   <li>?????
??????????????????????????????????????????(????????????#0000760,
     dengen &amp; mystral-kk????????????????????????)</li>
@@ -270,7 +293,7 @@
   <li>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>
   <li>???????????????????????????????????????????????????????????????????????????????????????????????????????????????(??????#0000843)??????????????????</li>
-  <li>wiki?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????(??????#0000823)
+  <li>wiki????????????????????????????????????????????????(??????????????????????????????????????????)?????????????????????????????????????????????????????????(??????#0000823)
     [Dirk]</li>
   <li>???API??????PLG_migrate???????
? [Dirk]</li>
   <li>???????????????????????????????????????DOCTYPE?????????????????????????????????????????????????????????????????????DOCTYPE???????????????{doctype}?????
????????????(feature
@@ -278,7 +301,7 @@
   <li>????????????????????????????????????????????????????????????????????????????????????????????????????????
??????????????????????????????????????????[Dirk]</li>
   <li>XTML?????????????????????XHTML?????????????????????xmlns?????????????????????headr.thtml???article/printable.thtml?????????????????????????????????????
??????????</li>
   <li>?????????????????????????????????'&amp;'??????????????????????????????(??????#0000825)</li>
-  <li>????????????pdf??????????????????????????????????????????????????????????????????????????????????????????????????????
+  <li>????????????pdf?????????????????????????????????(???????????????????????????????????????????????????????????????)
     [Dirk]</li>
   <li>??????????????????????????????CR???????????????????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>
@@ -290,10 +313,10 @@
     (??????0000821) [Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
   <li>????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
-  <li>????????????????????????'group.assign'??????????????????????????????????????????????????????????????
????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????(feature
+  <li>????????????????????????'group.assign'??????????????????????????????????????????????????????????????
?????????????????????????????????(???????????????????????????)??????????????????????????????????????????????????????????????????????????????(feature
     request #0000190) [Dirk]</li>
   <li>php?????????php 4.3.0????????????php 4.1.0??????????????????????????????????????????????????????[Dirk]</li>
-  <li>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
+  <li>????????????????????????????????????????????????????????????????????????????????????(????????????????????????????????????)?????????[Dirk]</li>
   <li>$_CONF['pagetitle'] ?????????????????????????????????COM_siteHeader('menu',
     $pagetitle)?????????[Dirk]</li>
   <li>??????????????????????????????????????????[Dirk]</li>
@@ -328,7 +351,7 @@
   <li>JPEG???????????????????????????????????????????????????????????????????????????(????????????
     #0000720) [Dirk]</li>
   <li>??????????????????????????????????????????????????????????????????????????????????????????(LWC??????)</li>
-  <li>???????????????????????????????????????????????????????????????????????????(Aleksandar
+  <li>??????????????????(???????????????)????????????????????????????????????(Aleksandar
     Scepanovic??????)</li>
 </ul>
 <h3>??????????????????????????????</h3>
@@ -384,7 +407,7 @@
 
 <p>????????????????????????????????????????????????????????????????????????????????????</p>
 <p>Nine Situations Group???Bookoo???usersettings.php???????????????????????????????????????SQL
-injection???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????
+injection??????(????????????)???????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????????????????????????</p>
 
 
@@ -393,7 +416,7 @@
 
 <p>????????????????????????????????????????????????????????????????????????????????????</p>
 <p>Nine Situation Group???Bookoo????????????webservices API?????????????????????SQL
-injection???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????
+injection??????(????????????)???????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????????????????????????</p>
 <p>??????????????????????????????????????????</p>
 <p>??????????
??????????????????????????????????????????????????????????????????????get_SPX_Ver????????????Geeklog????????????????????????????????????????????????????????????????????????????????
????????????(Sheila??????????????????)
@@ -404,14 +427,14 @@
 
 <p>????????????????????????????????????????????????????????????????????????????????????</p>
 <p>Nine Situation Group???Bookoo???Geeklog??????????????????glFusion??????SQL
-injection?????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????
+injection??????(????????????)?????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????
 ????????????????????????????????????</p>
 
 
 <h2>Mar 30, 2009 (1.5.2sr1)</h2>
 
 <p>????????????????????????????????????????????????????????????????????????????????????</p>
-<p>???????????????????????
????????????query??????????????????XSS????????????????????????????????????????????????????????????????????????Fernando
+<p>???????????????????????
????????????query??????????????????XSS(??????????????????????????????????????????)????????????????????????Fernando
 Munoz?????????????????????????????????????????????(??????#0000841)???</p>
 
 <h2>Feb 8, 2009 (1.5.2)</h2>
@@ -425,14 +448,14 @@
   <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????[Dirk]</li>
   <li>???????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????[Dirk]</li>
   <li>?????????????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????[Dirk]</li>
-  <li>?????????????????????????????????????????????????????????????????????????????????????????????Artur
-    R??pp??????</li>
-  <li>???????????????????????????????????????????????????geeklog.jp?????????????????????</li>
+  <li>?????????????????????????????????????????????????????????????????????????????????????????????(Artur
+    R??pp??????)</li>
+  <li>???????????????????????????????????????????????????(Geeklog.jp group??????)</li>
 </ul>
 
 <h3>??????????????????????????????</h3>
 <ul>
-  <li>????????????????????????????????????????????????????????????fix???greenteagod????????????????????????1.5.2rc1?????????????????????
+  <li>????????????????????????????????????????????????????????????fix(greenteagod??????????????????)???1.5.2rc1?????????????????????
     [Dirk]</li>
 </ul>
 
@@ -474,7 +497,7 @@
     (?????? #0000759) [Dirk]</li>
   <li>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????$LANG_DIRECTION???'ltr'??????????????????
     (??????#0000762) [Dirk]</li>
-  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????
+  <li>??????????????????????????????????????????????????????????????????????????????????????????????????????????????????(?????
????????????)??????????????????
     (?????? #0000763) [Dirk]</li>
   <li>????????????????????????????????????????????????????????????geeklog???????????????????????????????????????????????????????????????(Tom
     Homer??????????????????)</li>
@@ -502,11 +525,10 @@
   <li>???????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????????????????????????????
     [Dirk]</li>

From geeklog-cvs at lists.geeklog.net  Sun Jul 19 07:45:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 19 Jul 2009 07:45:57 -0400
Subject: [geeklog-cvs] geeklog: Set version number to 1.6.0
Message-ID: <hg.53f8e4d15b5c.1248003957.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/53f8e4d15b5c
changeset: 7179:53f8e4d15b5c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 19 09:03:54 2009 +0200
description:
Set version number to 1.6.0

diffstat:

 public_html/admin/install/lib-install.php |  2 +-
 public_html/docs/history                  |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r de39583ffa2f -r 53f8e4d15b5c public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Jul 18 23:07:28 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Jul 19 09:03:54 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0rc2');
+    define('VERSION', '1.6.0');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r de39583ffa2f -r 53f8e4d15b5c public_html/docs/history
--- a/public_html/docs/history	Sat Jul 18 23:07:28 2009 +0200
+++ b/public_html/docs/history	Sun Jul 19 09:03:54 2009 +0200
@@ -10,6 +10,7 @@
 + Improved search, by Sami Barakat
 + Comment moderation and editable comments, by Jared Wenerd
 
+Changes since 1.6.0rc2:
 - Updated language file for formal German, provided by Markus Wollschl?ger
 - Updated Japanese language file and documentation, provided by the
   Geeklog.jp group

From geeklog-cvs at lists.geeklog.net  Sun Jul 19 07:45:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 19 Jul 2009 07:45:57 -0400
Subject: [geeklog-cvs] geeklog: Synced some more translations between the
	various Germa...
Message-ID: <hg.f461a0655b76.1248003957.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f461a0655b76
changeset: 7180:f461a0655b76
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 19 13:40:07 2009 +0200
description:
Synced some more translations between the various German language files

diffstat:

 language/german.php              |  72 ++++++++++++++++++------------------
 language/german_formal.php       |  10 ++--
 language/german_formal_utf-8.php |  10 ++--
 language/german_utf-8.php        |  56 ++++++++++++++--------------
 4 files changed, 74 insertions(+), 74 deletions(-)

diffs (truncated from 431 to 300 lines):

diff -r 53f8e4d15b5c -r f461a0655b76 language/german.php
--- a/language/german.php	Sun Jul 19 09:03:54 2009 +0200
+++ b/language/german.php	Sun Jul 19 13:40:07 2009 +0200
@@ -582,7 +582,7 @@
     3 => 'Druckf?hige Version',
     4 => 'Optionen',
     5 => '',
-    6 => 'Feed \'%s\' abonnieren'
+    6 => 'Newsfeed \'%s\' abonnieren'
 );
 
 ###############################################################################
@@ -670,7 +670,7 @@
     1 => 'Ungen?gende Rechte',
     2 => 'Du hast nicht die n?tigen Rechte, um diesen Block ?ndern zu k?nnen.',
     3 => 'Block-Editor',
-    4 => 'Beim Lesen dieses Feeds trat ein Fehler auf (die Datei error.log enth?lt n?here Informationen).',
+    4 => 'Beim Lesen dieses Newsfeeds trat ein Fehler auf (die Datei error.log enth?lt n?here Informationen).',
     5 => '',
     6 => '',
     7 => 'Alle',
@@ -1664,7 +1664,7 @@
     'site_mail' => 'Site E-Mail',
     'noreply_mail' => 'No-Reply E-Mail',
     'site_name' => 'Name des Webauftritts',
-    'site_slogan' => 'Slogan',
+    'site_slogan' => 'Slogan im Kopf',
     'microsummary_short' => 'Microsummary',
     'path_log' => 'Pfad zum Log',
     'path_language' => 'Pfad zu Sprachdateien',
@@ -1672,12 +1672,12 @@
     'path_data' => 'Pfad zu Data',
     'path_images' => 'Pfad zu Images',
     'path_pear' => 'Pfad zu Pear',
-    'have_pear' => 'Pear vorhanden?',
+    'have_pear' => 'Pear auf dem Server vorhanden?',
     'mail_settings' => 'Einstellungen ',
-    'allow_mysqldump' => 'MySQL Dump erlauben',
+    'allow_mysqldump' => 'MySQL-Dump erlauben',
     'mysqldump_path' => 'Pfad zu Executable',
-    'mysqldump_options' => 'MySQL Dump Optionen',
-    'mysqldump_filename_mask' => 'Backup File Name Mask',
+    'mysqldump_options' => 'Optionen MySQL-Dump',
+    'mysqldump_filename_mask' => 'Backupdateibezeichnung',
     'theme' => 'Theme',
     'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men?s ',
@@ -1719,10 +1719,10 @@
     'cookie_language' => 'Language Cookie Name',
     'cookie_tzid' => 'Zeitzone Cookie Name',
     'cookie_anon_name' => 'Anon. Username Cookie Name',
-    'cookie_ip' => 'Cookies embed IP?',
-    'default_perm_cookie_timeout' => 'Permanent Timeout',
-    'session_cookie_timeout' => 'Session Timeout',
-    'cookie_path' => 'Cookie Path',
+    'cookie_ip' => 'IP in Cookies einbetten?',
+    'default_perm_cookie_timeout' => 'Permanenter Timeout',
+    'session_cookie_timeout' => 'Session-Timeout',
+    'cookie_path' => 'Cookie-Pfad',
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Letzten Login aufzeichnen?',
@@ -1739,13 +1739,13 @@
     'storysubmission' => 'Artikel moderieren?',
     'usersubmission' => 'Neue User zur Moderation?',
     'listdraftstories' => 'Anzahl Artikel auf Entwurf anzeigen?',
-    'notification' => 'Benachrichtigung',
+    'notification' => 'Admin-Benachrichtigung',
     'postmode' => 'Default Post Mode',
     'speedlimit' => 'Post Speedlimit',
     'skip_preview' => 'Vorschau ?berspringen in Posts',
-    'advanced_editor' => 'Erweiterter Editor?',
+    'advanced_editor' => 'WYSIWYG Editor?',
     'wikitext_editor' => 'Wikitext Editor?',
-    'cron_schedule_interval' => 'Cron Zeitabstand',
+    'cron_schedule_interval' => 'Zeitabstand f?r Cronjobs',
     'sortmethod' => 'Kategorien sortieren',
     'showstorycount' => 'Anzahl Artikel anzeigen?',
     'showsubmissioncount' => 'Anzahl Artikel zur Moderation anzeigen?',
@@ -1781,14 +1781,14 @@
     'minnews' => 'Min. Artikel pro Seite',
     'contributedbyline' => 'Autor anzeigen?',
     'hideviewscount' => 'Anzeigez?hler ausblenden?',
-    'hideemailicon' => 'E-Mail-Icon ausblenden?',
-    'hideprintericon' => 'Druck-Icon ausblenden?',
+    'hideemailicon' => 'E-Mail-Symbol ausblenden?',
+    'hideprintericon' => 'Druck-Symbol ausblenden?',
     'allow_page_breaks' => 'Seitenumbr?che erlauben?',
     'page_break_comments' => 'Kommentare auf Mehrseiten-Artikeln',
-    'article_image_align' => 'Ausrichtung Kategorie Icon',
-    'show_topic_icon' => 'Kategorie Icon anzeigen?',
-    'draft_flag' => 'Als Defaulteinstellung auf Entwurf',
-    'frontpage' => 'Als Defaulteinstellung auf der Titelseite',
+    'article_image_align' => 'Ausrichtung Kategorie-Symbol',
+    'show_topic_icon' => 'Kategorie-Symbol anzeigen?',
+    'draft_flag' => 'Als Grundeinstellung auf Entwurf',
+    'frontpage' => 'Als Grundeinstellung auf der Titelseite',
     'hide_no_news_msg' => '"No News"-Message ausblenden?',
     'hide_main_page_navigation' => 'Main Page Navigation ausblenden?',
     'onlyrootfeatures' => 'Nur Root kann Hauptartikel schreiben?',
@@ -1796,13 +1796,13 @@
     'aftersave_user' => 'Nachdem der User gespeichert wurde',
     'show_right_blocks' => 'Immer rechte Bl?cke anzeigen?',
     'showfirstasfeatured' => 'Ersten Artikel als Hauptartikel anzeigen?',
-    'backend' => 'Feed einschalten?',
+    'backend' => 'Newsfeed einschalten?',
     'rdf_file' => 'Ausgabe-Unterverzeichnis',
-    'rdf_limit' => 'Feed Limit',
+    'rdf_limit' => 'Newsfeed Limit',
     'rdf_storytext' => 'Artikell?nge',
     'rdf_language' => 'Sprache',
     'syndication_max_headlines' => 'Max. Anzahl von ?berschriften (portal blocks)',
-    'copyrightyear' => 'Copyright Year',
+    'copyrightyear' => 'Copyright-Jahr',
     'image_lib' => 'Image Library',
     'path_to_mogrify' => 'Pfad zu Mogrify',
     'path_to_netpbm' => 'Pfad zu Netpbm',
@@ -1840,8 +1840,8 @@
     'allowed_protocols' => 'Erlaubte Protokolle',
     'disable_autolinks' => 'Autolinks ausschalten?',
     'clickable_links' => 'Make URLs clickable?',
-    'compressed_output' => 'Send compressed output?',
-    'frame_options' => 'Protection against "clickjacking"',
+    'compressed_output' => 'Komprimierten Output senden?',
+    'frame_options' => 'Schutz gegen "Clickjacking"',
     'censormode' => 'Zensur-Modus?',
     'censorreplace' => 'Zensurwort wird ersetzt mit',
     'censorlist' => 'Liste zensierter W?rter',
@@ -1856,7 +1856,7 @@
     'article_comment_close_days' => 'Days to close comments (default)',
     'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
     'allow_reply_notifications' => 'Allow comment reply notifications?',
-    'search_style' => 'Results List Style',
+    'search_style' => 'Darstellung der Ergebnisse',
     'search_limits' => 'Page Limits',
     'search_show_num' => 'Show Result Number?',
     'search_show_type' => 'Show Result Type?',
@@ -1897,22 +1897,22 @@
     'fs_user_submission' => 'Registrierung User',
     'fs_submission' => 'Registrierungseinstellungen',
     'fs_topics_block' => 'Kategorien-Block',
-    'fs_whosonline_block' => 'Wer ist online Block',
-    'fs_daily_digest' => 'T?gliche Zusammenfassung',
-    'fs_whatsnew_block' => 'Was ist neu Block',
+    'fs_whosonline_block' => 'Wer-ist-online-Block',
+    'fs_daily_digest' => 'T?gliche Zusammenfassung der Artikel',
+    'fs_whatsnew_block' => 'Was-ist-neu-Block',
     'fs_trackback' => 'Trackback',
     'fs_pingback' => 'Pingback',
     'fs_story' => 'Artikel',
     'fs_theme_advanced' => 'Erweiterte Einstellungen',
-    'fs_syndication' => 'Feed',
+    'fs_syndication' => 'Newsfeed',
     'fs_imagelib' => 'Image Library',
     'fs_upload' => 'Upload',
     'fs_articleimg' => 'Bilder in Artikeln',
-    'fs_topicicon' => 'Kategorie-Icon',
+    'fs_topicicon' => 'Kategorie-Symbol',
     'fs_userphoto' => 'Fotos',
-    'fs_gravatar' => 'Gravatar',
+    'fs_gravatar' => 'Gravatar.com',
     'fs_comments' => 'Kommentare',
-    'fs_htmlfilter' => 'HTML Filterung',
+    'fs_htmlfilter' => 'HTML-Filterung',
     'fs_censoring' => 'Zensieren',
     'fs_iplookup' => 'IP Lookup',
     'fs_perm_story' => 'Grundeinstellung Artikelrechte',
@@ -1941,10 +1941,10 @@
     16 => array('Kein Login ben?tigt' => 0, 'Nur erweiterte Suche' => 1, 'Einfache und erweiterte Suche' => 2),
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
     18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
-    19 => array('Google' => 'google', 'Table' => 'table'),
-    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    19 => array('Google' => 'google', 'Tabelle' => 'table'),
+    20 => array('Exakter Ausdruck' => 'phrase', 'Alle Worte' => 'all', 'Eines der Worte' => 'any'),
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
     22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
 );
 
-?>
\ No newline at end of file
+?>
diff -r 53f8e4d15b5c -r f461a0655b76 language/german_formal.php
--- a/language/german_formal.php	Sun Jul 19 09:03:54 2009 +0200
+++ b/language/german_formal.php	Sun Jul 19 13:40:07 2009 +0200
@@ -671,7 +671,7 @@
     1 => 'Ungen?gende Rechte',
     2 => 'Sie haben nicht die n?tigen Rechte, um diesen Block ?ndern zu k?nnen.',
     3 => 'Block-Editor',
-    4 => 'Beim Lesen dieses Feeds trat ein Fehler auf (die Datei error.log enth?lt n?here Informationen).',
+    4 => 'Beim Lesen dieses Newsfeeds trat ein Fehler auf (die Datei error.log enth?lt n?here Informationen).',
     5 => '',
     6 => '',
     7 => 'Alle',
@@ -1746,7 +1746,7 @@
     'skip_preview' => 'Vorschau ?berspringen in Posts',
     'advanced_editor' => 'WYSIWYG Editor?',
     'wikitext_editor' => 'Wikitext Editor?',
-    'cron_schedule_interval' => 'Zeitabstand f?r Crobjobs',
+    'cron_schedule_interval' => 'Zeitabstand f?r Cronjobs',
     'sortmethod' => 'Kategorien sortieren',
     'showstorycount' => 'Anzahl Artikel anzeigen?',
     'showsubmissioncount' => 'Anzahl Artikel zur Moderation anzeigen?',
@@ -1803,7 +1803,7 @@
     'rdf_storytext' => 'Artikell?nge',
     'rdf_language' => 'Sprache',
     'syndication_max_headlines' => 'Max. Anzahl von ?berschriften (portal blocks)',
-    'copyrightyear' => 'Copyright Year',
+    'copyrightyear' => 'Copyright-Jahr',
     'image_lib' => 'Image Library',
     'path_to_mogrify' => 'Pfad zu Mogrify',
     'path_to_netpbm' => 'Pfad zu Netpbm',
@@ -1842,7 +1842,7 @@
     'disable_autolinks' => 'Autolinks ausschalten?',
     'clickable_links' => 'URLs anklickbar machen?',
     'compressed_output' => 'Komprimierten Output senden?',
-    'frame_options' => 'Schutz gegen "clickjacking"',
+    'frame_options' => 'Schutz gegen "Clickjacking"',
     'censormode' => 'Zensur-Modus?',
     'censorreplace' => 'Zensurwort wird ersetzt mit',
     'censorlist' => 'Liste zensierter W?rter',
@@ -1857,7 +1857,7 @@
     'article_comment_close_days' => 'Tage nach denen Kommentare uneditierbar werden (hier nur Grundeinstellung)',
     'comment_close_rec_stories' => 'Anzahl letzter Artikel, die kommentierbar sein sollen',
     'allow_reply_notifications' => 'Benachrichtigung auf Kommentare erlauben?',
-    'search_style' => 'Ergebnisse als Liste',
+    'search_style' => 'Darstellung der Ergebnisse',
     'search_limits' => 'Seiteneinstellung',
     'search_show_num' => 'Ergebnisnummer zeigen?',
     'search_show_type' => 'Ergebnisart zeigen?',
diff -r 53f8e4d15b5c -r f461a0655b76 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun Jul 19 09:03:54 2009 +0200
+++ b/language/german_formal_utf-8.php	Sun Jul 19 13:40:07 2009 +0200
@@ -671,7 +671,7 @@
     1 => 'Ungen??gende Rechte',
     2 => 'Sie haben nicht die n??tigen Rechte, um diesen Block ??ndern zu k??nnen.',
     3 => 'Block-Editor',
-    4 => 'Beim Lesen dieses Feeds trat ein Fehler auf (die Datei error.log enth??lt n??here Informationen).',
+    4 => 'Beim Lesen dieses Newsfeeds trat ein Fehler auf (die Datei error.log enth??lt n??here Informationen).',
     5 => '',
     6 => '',
     7 => 'Alle',
@@ -1746,7 +1746,7 @@
     'skip_preview' => 'Vorschau ??berspringen in Posts',
     'advanced_editor' => 'WYSIWYG Editor?',
     'wikitext_editor' => 'Wikitext Editor?',
-    'cron_schedule_interval' => 'Zeitabstand f??r Crobjobs',
+    'cron_schedule_interval' => 'Zeitabstand f??r Cronjobs',
     'sortmethod' => 'Kategorien sortieren',
     'showstorycount' => 'Anzahl Artikel anzeigen?',
     'showsubmissioncount' => 'Anzahl Artikel zur Moderation anzeigen?',
@@ -1803,7 +1803,7 @@
     'rdf_storytext' => 'Artikell??nge',
     'rdf_language' => 'Sprache',
     'syndication_max_headlines' => 'Max. Anzahl von ??berschriften (portal blocks)',
-    'copyrightyear' => 'Copyright Year',
+    'copyrightyear' => 'Copyright-Jahr',
     'image_lib' => 'Image Library',
     'path_to_mogrify' => 'Pfad zu Mogrify',
     'path_to_netpbm' => 'Pfad zu Netpbm',
@@ -1842,7 +1842,7 @@
     'disable_autolinks' => 'Autolinks ausschalten?',
     'clickable_links' => 'URLs anklickbar machen?',
     'compressed_output' => 'Komprimierten Output senden?',
-    'frame_options' => 'Schutz gegen "clickjacking"',
+    'frame_options' => 'Schutz gegen "Clickjacking"',
     'censormode' => 'Zensur-Modus?',
     'censorreplace' => 'Zensurwort wird ersetzt mit',
     'censorlist' => 'Liste zensierter W??rter',
@@ -1857,7 +1857,7 @@
     'article_comment_close_days' => 'Tage nach denen Kommentare uneditierbar werden (hier nur Grundeinstellung)',
     'comment_close_rec_stories' => 'Anzahl letzter Artikel, die kommentierbar sein sollen',
     'allow_reply_notifications' => 'Benachrichtigung auf Kommentare erlauben?',
-    'search_style' => 'Ergebnisse als Liste',
+    'search_style' => 'Darstellung der Ergebnisse',
     'search_limits' => 'Seiteneinstellung',
     'search_show_num' => 'Ergebnisnummer zeigen?',
     'search_show_type' => 'Ergebnisart zeigen?',
diff -r 53f8e4d15b5c -r f461a0655b76 language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Jul 19 09:03:54 2009 +0200
+++ b/language/german_utf-8.php	Sun Jul 19 13:40:07 2009 +0200
@@ -582,7 +582,7 @@
     3 => 'Druckf??hige Version',
     4 => 'Optionen',
     5 => '',
-    6 => 'Feed \'%s\' abonnieren'
+    6 => 'Newsfeed \'%s\' abonnieren'
 );
 
 ###############################################################################
@@ -670,7 +670,7 @@
     1 => 'Ungen??gende Rechte',
     2 => 'Du hast nicht die n??tigen Rechte, um diesen Block ??ndern zu k??nnen.',
     3 => 'Block-Editor',
-    4 => 'Beim Lesen dieses Feeds trat ein Fehler auf (die Datei error.log enth??lt n??here Informationen).',
+    4 => 'Beim Lesen dieses Newsfeeds trat ein Fehler auf (die Datei error.log enth??lt n??here Informationen).',
     5 => '',
     6 => '',
     7 => 'Alle',
@@ -1664,7 +1664,7 @@

From geeklog-cvs at lists.geeklog.net  Sun Jul 19 11:52:13 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 19 Jul 2009 11:52:13 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0_stable for changeset
	f461a0655b76
Message-ID: <hg.ae9b6d05e490.1248018733.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ae9b6d05e490
changeset: 7181:ae9b6d05e490
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 19 17:51:56 2009 +0200
description:
Added tag geeklog_1_6_0_stable for changeset f461a0655b76

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r f461a0655b76 -r ae9b6d05e490 .hgtags
--- a/.hgtags	Sun Jul 19 13:40:07 2009 +0200
+++ b/.hgtags	Sun Jul 19 17:51:56 2009 +0200
@@ -5,3 +5,4 @@
 c255cdae51b7fead30ea2b8e04350cc70561fcdd geeklog_1_6_0b3
 401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1
 f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
+f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable

From geeklog-cvs at lists.geeklog.net  Sun Jul 19 12:56:56 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 19 Jul 2009 12:56:56 -0400
Subject: [geeklog-cvs] tools: Geeklog 1.6.0 is the current version now
Message-ID: <hg.cc24438ad9ad.1248022616.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cc24438ad9ad
changeset: 40:cc24438ad9ad
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 19 18:56:47 2009 +0200
description:
Geeklog 1.6.0 is the current version now

diffstat:

 versionchecker/versionchecker.php |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (43 lines):

diff -r b66c0b4e8555 -r cc24438ad9ad versionchecker/versionchecker.php
--- a/versionchecker/versionchecker.php	Sat Jun 06 22:52:05 2009 +0200
+++ b/versionchecker/versionchecker.php	Sun Jul 19 18:56:47 2009 +0200
@@ -9,7 +9,7 @@
 <p align="left"><a href="http://www.geeklog.net/" title="go to the Geeklog homepage"><img src="http://www.geeklog.net/docs/images/newlogo.gif" alt="" width="243" height="90" border="0"></a></p>
 <?php
 
-$current = '1.5.2sr4';
+$current = '1.6.0';
 $version = '';
 if (isset ($_GET['version'])) {
     $version = strip_tags ($_GET['version']);
@@ -30,7 +30,6 @@
     '1.3.11sr5' => '1.3.11sr7-1',
     '1.3.11sr6' => '1.3.11sr7-1',
     '1.3.11sr7' => '1.3.11sr7-1',
-*/
     '1.4.0'     => '1.5.2sr4',
     '1.4.0sr1'  => '1.5.2sr4',
     '1.4.0sr2'  => '1.5.2sr4',
@@ -39,14 +38,14 @@
     '1.4.0sr5'  => '1.5.2sr4',
     '1.4.0sr5-1' => '1.5.2sr4',
     '1.4.0sr6'  => '1.5.2sr4',
-    '1.4.1'     => '1.5.2sr4',
-
-    '1.5.0'     => '1.5.2sr4',
-    '1.5.1'     => '1.5.2sr4',
-    '1.5.2'     => '1.5.2sr4',
-    '1.5.2sr1'  => '1.5.2sr4',
-    '1.5.2sr2'  => '1.5.2sr4',
-    '1.5.2sr3'  => '1.5.2sr4'
+*/
+    '1.4.1'     => '1.6.0',
+    '1.5.0'     => '1.6.0',
+    '1.5.1'     => '1.6.0',
+    '1.5.2'     => '1.6.0',
+    '1.5.2sr1'  => '1.6.0',
+    '1.5.2sr2'  => '1.6.0',
+    '1.5.2sr3'  => '1.6.0'
 );
 
 $v = explode ('.', $version);

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 03:56:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 03:56:27 -0400
Subject: [geeklog-cvs] geeklog: Use COM_numberFormat to format the number of
	registered...
Message-ID: <hg.7e8585cb1ac5.1248508587.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7e8585cb1ac5
changeset: 7182:7e8585cb1ac5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 05 11:08:29 2009 +0200
description:
Use COM_numberFormat to format the number of registered and anonymous users displayed in the Who's Online block

diffstat:

 public_html/lib-common.php |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r ae9b6d05e490 -r 7e8585cb1ac5 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/lib-common.php	Sun Jul 05 11:08:29 2009 +0200
@@ -4829,7 +4829,8 @@
         // note that we're overwriting the contents of $retval here
         if( $num_reg > 0 )
         {
-            $retval = $LANG01[112] . ': ' . $num_reg . '<br' . XHTML . '>';
+            $retval = $LANG01[112] . ': ' . COM_numberFormat($num_reg)
+                    . '<br' . XHTML . '>';
         }
         else
         {
@@ -4839,7 +4840,8 @@
 
     if( $num_anon > 0 )
     {
-        $retval .= $LANG01[41] . ': ' . $num_anon . '<br' . XHTML . '>';
+        $retval .= $LANG01[41] . ': ' . COM_numberFormat($num_anon)
+                . '<br' . XHTML . '>';
     }
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 03:56:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 03:56:27 -0400
Subject: [geeklog-cvs] geeklog: For Remote Users,
	display their service name in the Use...
Message-ID: <hg.e1c6092e5615.1248508587.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e1c6092e5615
changeset: 7184:e1c6092e5615
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 05 13:11:58 2009 +0200
description:
For Remote Users, display their service name in the User Editor

diffstat:

 public_html/admin/user.php                                |  9 +++++++++
 public_html/layout/professional/admin/user/edituser.thtml |  2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 81732ea9ee69 -r e1c6092e5615 public_html/admin/user.php
--- a/public_html/admin/user.php	Sun Jul 05 13:07:53 2009 +0200
+++ b/public_html/admin/user.php	Sun Jul 05 13:11:58 2009 +0200
@@ -175,6 +175,15 @@
         $user_templates->set_var('username', '');
     }
 
+    $remoteservice = '';
+    if ($_CONF['show_servicename'] && ($_CONF['user_login_method']['3rdparty']
+            || $_CONF['user_login_method']['openid'])) {
+        if (! empty($A['remoteservice'])) {
+            $remoteservice = '@' . $A['remoteservice'];
+        }
+    }
+    $user_templates->set_var('remoteservice', $remoteservice);
+
     if ($_CONF['allow_user_photo'] && ($A['uid'] > 0)) {
         $photo = USER_getPhoto ($A['uid'], $A['photo'], $A['email'], -1);
         $user_templates->set_var ('user_photo', $photo);
diff -r 81732ea9ee69 -r e1c6092e5615 public_html/layout/professional/admin/user/edituser.thtml
--- a/public_html/layout/professional/admin/user/edituser.thtml	Sun Jul 05 13:07:53 2009 +0200
+++ b/public_html/layout/professional/admin/user/edituser.thtml	Sun Jul 05 13:11:58 2009 +0200
@@ -16,7 +16,7 @@
                                     <tr>
                                         <td class="alignright" style="vertical-align:top;">{lang_username}:</td>
                                         <td>
-                                            <input type="text" size="16" maxlength="16" name="username" value="{username}"{xhtml}><br{xhtml}>
+                                            <input type="text" size="16" maxlength="16" name="username" value="{username}"{xhtml}> {remoteservice}<br{xhtml}>
                                             {user_photo}<br{xhtml}>
                                             {lang_delete_photo} {delete_photo_option}
                                         </td>

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 03:56:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 03:56:27 -0400
Subject: [geeklog-cvs] geeklog: Replaced hard-coded 'N/A' with
	$LANG_ADMIN['na']
Message-ID: <hg.81732ea9ee69.1248508587.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/81732ea9ee69
changeset: 7183:81732ea9ee69
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 05 13:07:53 2009 +0200
description:
Replaced hard-coded 'N/A' with $LANG_ADMIN['na']

diffstat:

 public_html/admin/plugins.php |   2 +-
 public_html/admin/user.php    |   2 +-
 public_html/lib-common.php    |  12 ++++++------
 system/lib-admin.php          |   4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (102 lines):

diff -r 7e8585cb1ac5 -r 81732ea9ee69 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sun Jul 05 11:08:29 2009 +0200
+++ b/public_html/admin/plugins.php	Sun Jul 05 13:07:53 2009 +0200
@@ -125,7 +125,7 @@
     }
     $plugin_code_version = PLG_chkVersion($pi_name);
     if (empty($plugin_code_version)) {
-        $code_version = 'N/A';
+        $code_version = $LANG_ADMIN['na'];
     } else {
         $code_version = $plugin_code_version;
     }
diff -r 7e8585cb1ac5 -r 81732ea9ee69 public_html/admin/user.php
--- a/public_html/admin/user.php	Sun Jul 05 11:08:29 2009 +0200
+++ b/public_html/admin/user.php	Sun Jul 05 13:07:53 2009 +0200
@@ -155,7 +155,7 @@
 
     $user_templates->set_var('lang_userid', $LANG28[2]);
     if (empty ($A['uid'])) {
-        $user_templates->set_var ('user_id', 'n/a');
+        $user_templates->set_var ('user_id', $LANG_ADMIN['na']);
     } else {
         $user_templates->set_var ('user_id', $A['uid']);
     }
diff -r 7e8585cb1ac5 -r 81732ea9ee69 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Jul 05 11:08:29 2009 +0200
+++ b/public_html/lib-common.php	Sun Jul 05 13:07:53 2009 +0200
@@ -2418,7 +2418,7 @@
 */
 function COM_adminMenu( $help = '', $title = '', $position = '' )
 {
-    global $_TABLES, $_USER, $_CONF, $LANG01, $_BLOCK_TEMPLATE,
+    global $_TABLES, $_USER, $_CONF, $LANG01, $LANG_ADMIN, $_BLOCK_TEMPLATE,
            $_DB_dbms, $config;
 
     $retval = '';
@@ -2629,7 +2629,7 @@
             $url = $_CONF['site_admin_url'] . '/mail.php';
             $adminmenu->set_var( 'option_url', $url );
             $adminmenu->set_var( 'option_label', $LANG01[105] );
-            $adminmenu->set_var( 'option_count', 'N/A' );
+            $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
 
             $menu_item = $adminmenu->parse( 'item',
                     ( $thisUrl == $url ) ? 'current' : 'option' );
@@ -2662,7 +2662,7 @@
             }
             else
             {
-                $adminmenu->set_var( 'option_count', 'N/A' );
+                $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
             }
 
             $menu_item = $adminmenu->parse( 'item',
@@ -2694,7 +2694,7 @@
 
             if( empty( $plg->numsubmissions ))
             {
-                $adminmenu->set_var( 'option_count', 'N/A' );
+                $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
             }
             else
             {
@@ -2715,7 +2715,7 @@
             $url = $_CONF['site_admin_url'] . '/database.php';
             $adminmenu->set_var( 'option_url', $url );
             $adminmenu->set_var( 'option_label', $LANG01[103] );
-            $adminmenu->set_var( 'option_count', 'N/A' );
+            $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
 
             $menu_item = $adminmenu->parse( 'item',
                     ( $thisUrl == $url ) ? 'current' : 'option' );
@@ -2733,7 +2733,7 @@
                                     . '/docs/english/index.html');
             }
             $adminmenu->set_var('option_label', $LANG01[113]);
-            $adminmenu->set_var('option_count', 'N/A');
+            $adminmenu->set_var('option_count', $LANG_ADMIN['na']);
             $menu_item = $adminmenu->parse('item', 'option');
             $link_array[$LANG01[113]] = $menu_item;
         }
diff -r 7e8585cb1ac5 -r 81732ea9ee69 system/lib-admin.php
--- a/system/lib-admin.php	Sun Jul 05 11:08:29 2009 +0200
+++ b/system/lib-admin.php	Sun Jul 05 13:07:53 2009 +0200
@@ -819,7 +819,7 @@
         case 'online_days':
             if ($fieldvalue < 0){
                 // users that never logged in, would have a negative online days
-                $retval = "N/A";
+                $retval = $LANG_ADMIN['na'];
             } else {
                 $retval = $fieldvalue;
             }
@@ -1046,7 +1046,7 @@
         case 'pi_version':
             $plugin_code_version = PLG_chkVersion ($A['pi_name']);
             if (empty ($plugin_code_version)) {
-                $code_version = 'N/A';
+                $code_version = $LANG_ADMIN['na'];
             } else {
                 $code_version = $plugin_code_version;
             }

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 04:04:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 04:04:34 -0400
Subject: [geeklog-cvs] geeklog: Start of 1.6.1 development: Updated version
	number and ...
Message-ID: <hg.85ab60faa47f.1248509074.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/85ab60faa47f
changeset: 7185:85ab60faa47f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 25 10:04:23 2009 +0200
description:
Start of 1.6.1 development: Updated version number and documentation

diffstat:

 public_html/admin/install/lib-install.php |   2 +-
 public_html/docs/english/theme.html       |  11 ++++++++++-
 public_html/docs/history                  |   9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r e1c6092e5615 -r 85ab60faa47f public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Jul 05 13:11:58 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sat Jul 25 10:04:23 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0');
+    define('VERSION', '1.6.1hg');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r e1c6092e5615 -r 85ab60faa47f public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Jul 05 13:11:58 2009 +0200
+++ b/public_html/docs/english/theme.html	Sat Jul 25 10:04:23 2009 +0200
@@ -195,7 +195,16 @@
 </ol>
 
 
-<h2><a name="changes">Theme changes in Geeklog 1.6.0</a></h2>
+<h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
+
+<ul>
+<li>Added a <code>{remoteservice}</code> variable in
+    <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
+    service a Remote User was using to log in.</li>
+</ul>
+
+
+<h2><a name="changes160">Theme changes in Geeklog 1.6.0</a></h2>
 
 <ul>
 <li>Themes can now opt to use a <tt>{doctype}</tt> variable in their
diff -r e1c6092e5615 -r 85ab60faa47f public_html/docs/history
--- a/public_html/docs/history	Sun Jul 05 13:11:58 2009 +0200
+++ b/public_html/docs/history	Sat Jul 25 10:04:23 2009 +0200
@@ -1,5 +1,14 @@
 Geeklog History/Changes:
 
+??? ??, 2009 (1.6.1)
+------------
+
+- Use COM_numberFormat to format the number of registered and anonymous users
+  displayed in the Who's Online block [Dirk]
+- Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]
+- For Remote Users, display their service name in the User Editor [Dirk]
+
+
 Jul 19, 2009 (1.6.0)
 ------------
 

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 15:49:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 15:49:06 -0400
Subject: [geeklog-cvs] geeklog: New function COM_getTextContent turns HTML
	into continu...
Message-ID: <hg.dd235920fb85.1248551346.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/dd235920fb85
changeset: 7186:dd235920fb85
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 25 19:38:57 2009 +0200
description:
New function COM_getTextContent turns HTML into continuous text, e.g. for word counts and text excerpts

diffstat:

 public_html/lib-common.php      |  34 ++++++++++++++++++++++++++++++++++
 system/classes/search.class.php |   5 +----
 system/lib-story.php            |   2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r 85ab60faa47f -r dd235920fb85 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Jul 25 10:04:23 2009 +0200
+++ b/public_html/lib-common.php	Sat Jul 25 19:38:57 2009 +0200
@@ -6933,6 +6933,40 @@
 }
 
 /**
+* Turn a piece of HTML into continuous(!) plain text
+*
+* This function removes HTML tags, line breaks, etc. and returns one long
+* line of text. This is useful for word counts (do an explode() on the result)
+* and for text excerpts.
+*
+* @param    string  $text   original text, including HTML and line breaks
+* @return   string          continuous plain text
+* 
+*/
+function COM_getTextContent($text)
+{
+    // replace <br> with spaces so that Text<br>Text becomes two words
+    $text = preg_replace('/\<br(\s*)?\/?\>/i', ' ', $text);
+
+    // add extra space between tags, e.g. <p>Text</p><p>Text</p>
+    $text = str_replace('><', '> <', $text);
+
+    // only now remove all HTML tags
+    $text = strip_tags($text);
+
+    // replace all tabs, newlines,  and carrriage returns with spaces
+    $text = str_replace(array("\011", "\012", "\015"), ' ', $text);
+
+    // replace entities with plain spaces
+    $text = str_replace(array('&#20;', '&#160', '&nbsp;'), ' ', $text);
+
+    // collapse whitespace
+    $text = preg_replace('/\s\s+/', ' ', $text);
+
+    return trim($text);
+}
+
+/**
 * Now include all plugin functions
 */
 foreach ($_PLUGINS as $pi_name) {
diff -r 85ab60faa47f -r dd235920fb85 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Jul 25 10:04:23 2009 +0200
+++ b/system/classes/search.class.php	Sat Jul 25 19:38:57 2009 +0200
@@ -795,10 +795,7 @@
     */
     function _shortenText($keyword, $text, $num_words = 7)
     {
-        $text = strip_tags($text);
-        $text = str_replace(array("\011", "\012", "\015"), ' ', trim($text));
-        $text = str_replace('&nbsp;', ' ', $text);
-        $text = preg_replace('/\s\s+/', ' ', $text);
+        $text = COM_getTextContent($text);
         $words = explode(' ', $text);
         $word_count = count($words);
         if ($word_count <= $num_words) {
diff -r 85ab60faa47f -r dd235920fb85 system/lib-story.php
--- a/system/lib-story.php	Sat Jul 25 10:04:23 2009 +0200
+++ b/system/lib-story.php	Sat Jul 25 19:38:57 2009 +0200
@@ -325,7 +325,7 @@
         {
             $article->set_var( 'lang_readmore', $LANG01[2] );
             $article->set_var( 'lang_readmore_words', $LANG01[62] );
-            $numwords = COM_numberFormat (sizeof( explode( ' ', strip_tags( $bodytext ))));
+            $numwords = COM_numberFormat(count(explode(' ', COM_getTextContent($bodytext))));
             $article->set_var( 'readmore_words', $numwords );
 
             $article->set_var( 'readmore_link',

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 15:49:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 15:49:06 -0400
Subject: [geeklog-cvs] geeklog: Mark "expanded search" as deprecated (as in
	lib-plugins...
Message-ID: <hg.f13664e1db74.1248551346.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f13664e1db74
changeset: 7187:f13664e1db74
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 25 19:51:49 2009 +0200
description:
Mark "expanded search" as deprecated (as in lib-plugins.php)

diffstat:

 system/classes/plugin.class.php |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (27 lines):

diff -r dd235920fb85 -r f13664e1db74 system/classes/plugin.class.php
--- a/system/classes/plugin.class.php	Sat Jul 25 19:38:57 2009 +0200
+++ b/system/classes/plugin.class.php	Sat Jul 25 19:51:49 2009 +0200
@@ -56,6 +56,7 @@
     /**
     * @access private
     * @var boolean
+    * @deprecated no longer used
     */
     var $_expandedSearchSupport = false;
 
@@ -147,6 +148,7 @@
     * @author Tony Bibbs, tony AT geeklog DOT net
     * @access public
     * @param boolean $switch True if expanded search is supported otherwise false
+    * @deprecated no longer used
     *
     */
     function setExpandedSearchSupport($switch)
@@ -164,6 +166,7 @@
     * @author Tony Bibbs, tony AT geeklog DOT net
     * @access public
     * @return boolean True if expanded search is supported otherwise false
+    * @deprecated no longer used
     *
     */
     function supportsExpandedSearch()

From geeklog-cvs at lists.geeklog.net  Sat Jul 25 18:25:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 25 Jul 2009 18:25:29 -0400
Subject: [geeklog-cvs] geeklog: Missing semicolon after &#160;
Message-ID: <hg.caabae3fddb6.1248560729.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/caabae3fddb6
changeset: 7188:caabae3fddb6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 25 22:55:01 2009 +0200
description:
Missing semicolon after &#160;

diffstat:

 public_html/lib-common.php |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r f13664e1db74 -r caabae3fddb6 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Jul 25 19:51:49 2009 +0200
+++ b/public_html/lib-common.php	Sat Jul 25 22:55:01 2009 +0200
@@ -6954,11 +6954,11 @@
     // only now remove all HTML tags
     $text = strip_tags($text);
 
-    // replace all tabs, newlines,  and carrriage returns with spaces
+    // replace all tabs, newlines, and carrriage returns with spaces
     $text = str_replace(array("\011", "\012", "\015"), ' ', $text);
 
     // replace entities with plain spaces
-    $text = str_replace(array('&#20;', '&#160', '&nbsp;'), ' ', $text);
+    $text = str_replace(array('&#20;', '&#160;', '&nbsp;'), ' ', $text);
 
     // collapse whitespace
     $text = preg_replace('/\s\s+/', ' ', $text);

From geeklog-cvs at lists.geeklog.net  Sun Jul 26 04:57:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 26 Jul 2009 04:57:51 -0400
Subject: [geeklog-cvs] geeklog: Fixed missing whitespace around the link
	text in the Pi...
Message-ID: <hg.c607c286b39b.1248598671.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c607c286b39b
changeset: 7189:c607c286b39b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 26 09:46:15 2009 +0200
description:
Fixed missing whitespace around the link text in the Pingback text excerpt

diffstat:

 system/lib-pingback.php |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r caabae3fddb6 -r c607c286b39b system/lib-pingback.php
--- a/system/lib-pingback.php	Sat Jul 25 22:55:01 2009 +0200
+++ b/system/lib-pingback.php	Sun Jul 26 09:46:15 2009 +0200
@@ -270,9 +270,6 @@
         }
     }
 
-    $bspace = (MBYTE_substr($before, -1) == ' ' ? true : false);
-    $aspace = (MBYTE_substr($after, 0, 1) == ' ' ? true : false);
-
     $before = trim($before);
     $after = trim($after);
 
@@ -335,11 +332,11 @@
         }
 
         // actual link text
-        if (!empty($before) && $bspace) {
+        if (!empty($before)) {
             $retval .= ' ';
         }
         $retval .= $linktext;
-        if (!empty($after) && $aspace) {
+        if (!empty($after)) {
             $retval .= ' ';
         }
 

From geeklog-cvs at lists.geeklog.net  Sun Jul 26 04:57:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 26 Jul 2009 04:57:51 -0400
Subject: [geeklog-cvs] geeklog: When creating a Pingback excerpt,
	we may need to conver...
Message-ID: <hg.53a369a4935f.1248598671.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/53a369a4935f
changeset: 7191:53a369a4935f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 26 10:46:30 2009 +0200
description:
When creating a Pingback excerpt, we may need to convert the other site's content to our character set

diffstat:

 public_html/pingback.php |  39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 6efd092fe26b -r 53a369a4935f public_html/pingback.php
--- a/public_html/pingback.php	Sun Jul 26 09:51:34 2009 +0200
+++ b/public_html/pingback.php	Sun Jul 26 10:46:30 2009 +0200
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.4                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | pingback.php                                                              |
 // |                                                                           |
 // | Handle pingbacks for stories and plugins.                                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2005-2007 by the following authors:                         |
+// | Copyright (C) 2005-2009 by the following authors:                         |
 // |                                                                           |
 // | Author: Dirk Haun - dirk AT haun-online DOT de                            |
 // +---------------------------------------------------------------------------+
@@ -28,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-// 
-// $Id: pingback.php,v 1.19 2007/09/02 07:50:56 dhaun Exp $
 
 require_once 'lib-common.php';
 
@@ -157,7 +155,38 @@
                 $title = trim (COM_undoSpecialChars ($content[1]));
             }
 
-            if (isset($_CONF['pingback_excerpt']) && $_CONF['pingback_excerpt']) {
+            if ($_CONF['pingback_excerpt']) {
+
+                // Check which character set the site that sent the Pingback
+                // is using
+                $charset = 'ISO-8859-1'; // default, see RFC 2616, 3.7.1
+                $ctype = $req->getResponseHeader('Content-Type');
+                if (!empty($ctype)) {
+                    // e.g. text/html; charset=utf-8
+                    $c = explode(';', $ctype);
+                    foreach ($c as $ct) {
+                        $ch = explode('=', trim($ct));
+                        if (count($ch) == 2) {
+                            if(trim($ch[0]) == 'charset') {
+                                $charset = trim($ch[1]);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (!empty($charset) &&
+                        (strcasecmp($charset, COM_getCharset()) != 0)) {
+
+                    if (function_exists('mb_convert_encoding')) {
+                        $body = @mb_convert_encoding($body, COM_getCharset(),
+                                                     $charset);
+                    } elseif (function_exists('iconv')) {
+                        $body = @iconv($charset, COM_getCharset(), $body);
+                    }
+                    // else: tough luck ...
+                }
+
                 $excerpt = PNB_makeExcerpt($body, $oururl);
             }
 

From geeklog-cvs at lists.geeklog.net  Sun Jul 26 04:57:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 26 Jul 2009 04:57:52 -0400
Subject: [geeklog-cvs] geeklog: Updated list of changes
Message-ID: <hg.6ccc5481bbf6.1248598672.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6ccc5481bbf6
changeset: 7192:6ccc5481bbf6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 26 10:51:06 2009 +0200
description:
Updated list of changes

diffstat:

 public_html/docs/history |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r 53a369a4935f -r 6ccc5481bbf6 public_html/docs/history
--- a/public_html/docs/history	Sun Jul 26 10:46:30 2009 +0200
+++ b/public_html/docs/history	Sun Jul 26 10:51:06 2009 +0200
@@ -3,6 +3,11 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- When creating Pingback excerpts, convert the other site's content to our
+  site's character set, when necessary [Dirk]
+- New function COM_getTextContent converts HTML into continuous text. Used for
+  a more accurate "read more" count for articles and to improve the text
+  excerpts for search results and pingbacks [Dirk]
 - Use COM_numberFormat to format the number of registered and anonymous users
   displayed in the Who's Online block [Dirk]
 - Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Jul 26 04:57:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 26 Jul 2009 04:57:51 -0400
Subject: [geeklog-cvs] geeklog: Use COM_getTextContent
Message-ID: <hg.6efd092fe26b.1248598671.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6efd092fe26b
changeset: 7190:6efd092fe26b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jul 26 09:51:34 2009 +0200
description:
Use COM_getTextContent

diffstat:

 system/lib-pingback.php |  16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diffs (33 lines):

diff -r c607c286b39b -r 6efd092fe26b system/lib-pingback.php
--- a/system/lib-pingback.php	Sun Jul 26 09:46:15 2009 +0200
+++ b/system/lib-pingback.php	Sun Jul 26 09:51:34 2009 +0200
@@ -260,26 +260,16 @@
     for ($i = 0; $i < $num_matches; $i++) {
         if ($matches[1][$i] == $url) {
             $pos = MBYTE_strpos($html, $matches[0][$i]);
-            $before = strip_tags(MBYTE_substr($html, 0, $pos));
+            $before = COM_getTextContent(MBYTE_substr($html, 0, $pos));
 
             $pos += MBYTE_strlen($matches[0][$i]);
-            $after = strip_tags(MBYTE_substr($html, $pos));
+            $after = COM_getTextContent(MBYTE_substr($html, $pos));
 
-            $linktext = trim(strip_tags($matches[2][$i]));
+            $linktext = COM_getTextContent($matches[2][$i]);
             break;
         }
     }
 
-    $before = trim($before);
-    $after = trim($after);
-
-    // get rid of multiple whitespace
-    $pat = array('/^\s+/', '/\s{2,}/', '/\s+\$/');
-    $rep = array('',       ' ',        '');
-    $before   = preg_replace($pat, $rep, $before);
-    $linktext = preg_replace($pat, $rep, $linktext);
-    $after    = preg_replace($pat, $rep, $after);
-
     $tlen = MBYTE_strlen($linktext);
     if ($tlen >= $xlen) {
         // Special case: The actual link text is already longer (or as long) as

From geeklog-cvs at lists.geeklog.net  Mon Jul 27 15:39:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 27 Jul 2009 15:39:49 -0400
Subject: [geeklog-cvs] geeklog: Bah,
	wrong function name: COM_outputMessageAndAbort -> ...
Message-ID: <hg.9100c5b15c9d.1248723589.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9100c5b15c9d
changeset: 7193:9100c5b15c9d
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Jul 27 21:39:26 2009 +0200
description:
Bah, wrong function name: COM_outputMessageAndAbort -> COM_displayMessageAndAbort

diffstat:

 public_html/admin/auth.inc.php |  2 +-
 public_html/profiles.php       |  4 ++--
 public_html/submit.php         |  4 ++--
 public_html/users.php          |  2 +-
 public_html/usersettings.php   |  2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/admin/auth.inc.php
--- a/public_html/admin/auth.inc.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/admin/auth.inc.php	Mon Jul 27 21:39:26 2009 +0200
@@ -39,7 +39,7 @@
 // MAIN
 COM_clearSpeedlimit($_CONF['login_speedlimit'], 'login');
 if (COM_checkSpeedlimit('login', $_CONF['login_attempts']) > 0) {
-    COM_outputMessageAndAbort($LANG04[112], '', 403, 'Access denied');
+    COM_displayMessageAndAbort($LANG04[112], '', 403, 'Access denied');
 }
 
 $uid = '';
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/profiles.php
--- a/public_html/profiles.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/profiles.php	Mon Jul 27 21:39:26 2009 +0200
@@ -104,7 +104,7 @@
             $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
             if ($result > 0) {
                 COM_updateSpeedlimit ('mail');
-                COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+                COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
             }
 
             $msg = PLG_itemPreSave ('contact', $message);
@@ -327,7 +327,7 @@
     $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
     if ($result > 0) {
         COM_updateSpeedlimit ('mail');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $mailtext .= '------------------------------------------------------------'
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/submit.php
--- a/public_html/submit.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/submit.php	Mon Jul 27 21:39:26 2009 +0200
@@ -97,7 +97,7 @@
                 $formresult = PLG_showSubmitForm($type);
                 if ($formresult == false) {
                     COM_errorLog("Someone tried to submit an item to the $type-plugin, which cannot be found.", 1);
-                    COM_outputMessageAndAbort (79, '', 410, 'Gone');
+                    COM_displayMessageAndAbort (79, '', 410, 'Gone');
                 } else {
                     $retval .= $formresult;
                 }
@@ -292,7 +292,7 @@
     if ($result > 0)
     {
         COM_updateSpeedlimit ('submit');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     COM_updateSpeedlimit ('submit');
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/users.php
--- a/public_html/users.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/users.php	Mon Jul 27 21:39:26 2009 +0200
@@ -100,7 +100,7 @@
     $A = DB_fetchArray ($result);
 
     if ($A['status'] == USER_ACCOUNT_DISABLED && !SEC_hasRights ('user.edit')) {
-        COM_outputMessageAndAbort (30, '', 403, 'Forbidden');
+        COM_displayMessageAndAbort (30, '', 403, 'Forbidden');
     }
 
     $display_name = htmlspecialchars(COM_getDisplayName($user, $A['username'],
diff -r 6ccc5481bbf6 -r 9100c5b15c9d public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Jul 26 10:51:06 2009 +0200
+++ b/public_html/usersettings.php	Mon Jul 27 21:39:26 2009 +0200
@@ -969,7 +969,7 @@
              . $A['about'] . '<br' . XHTML . '>' . $A['pgpkey'] . '</p>';
     $result = PLG_checkforSpam ($profile, $_CONF['spamx']);
     if ($result > 0) {
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $A['email'] = COM_applyFilter ($A['email']);

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 03:53:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 03:53:02 -0400
Subject: [geeklog-cvs] geeklog: Bah,
	wrong function name: COM_outputMessageAndAbort -> ...
Message-ID: <hg.c2b3f7805eff.1248853982.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c2b3f7805eff
changeset: 7194:c2b3f7805eff
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Jul 27 21:39:26 2009 +0200
description:
Bah, wrong function name: COM_outputMessageAndAbort -> COM_displayMessageAndAbort

diffstat:

 public_html/admin/auth.inc.php |  2 +-
 public_html/profiles.php       |  4 ++--
 public_html/submit.php         |  4 ++--
 public_html/users.php          |  2 +-
 public_html/usersettings.php   |  2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r ae9b6d05e490 -r c2b3f7805eff public_html/admin/auth.inc.php
--- a/public_html/admin/auth.inc.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/admin/auth.inc.php	Mon Jul 27 21:39:26 2009 +0200
@@ -39,7 +39,7 @@
 // MAIN
 COM_clearSpeedlimit($_CONF['login_speedlimit'], 'login');
 if (COM_checkSpeedlimit('login', $_CONF['login_attempts']) > 0) {
-    COM_outputMessageAndAbort($LANG04[112], '', 403, 'Access denied');
+    COM_displayMessageAndAbort($LANG04[112], '', 403, 'Access denied');
 }
 
 $uid = '';
diff -r ae9b6d05e490 -r c2b3f7805eff public_html/profiles.php
--- a/public_html/profiles.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/profiles.php	Mon Jul 27 21:39:26 2009 +0200
@@ -104,7 +104,7 @@
             $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
             if ($result > 0) {
                 COM_updateSpeedlimit ('mail');
-                COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+                COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
             }
 
             $msg = PLG_itemPreSave ('contact', $message);
@@ -327,7 +327,7 @@
     $result = PLG_checkforSpam ($mailtext, $_CONF['spamx']);
     if ($result > 0) {
         COM_updateSpeedlimit ('mail');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $mailtext .= '------------------------------------------------------------'
diff -r ae9b6d05e490 -r c2b3f7805eff public_html/submit.php
--- a/public_html/submit.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/submit.php	Mon Jul 27 21:39:26 2009 +0200
@@ -97,7 +97,7 @@
                 $formresult = PLG_showSubmitForm($type);
                 if ($formresult == false) {
                     COM_errorLog("Someone tried to submit an item to the $type-plugin, which cannot be found.", 1);
-                    COM_outputMessageAndAbort (79, '', 410, 'Gone');
+                    COM_displayMessageAndAbort (79, '', 410, 'Gone');
                 } else {
                     $retval .= $formresult;
                 }
@@ -292,7 +292,7 @@
     if ($result > 0)
     {
         COM_updateSpeedlimit ('submit');
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     COM_updateSpeedlimit ('submit');
diff -r ae9b6d05e490 -r c2b3f7805eff public_html/users.php
--- a/public_html/users.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/users.php	Mon Jul 27 21:39:26 2009 +0200
@@ -100,7 +100,7 @@
     $A = DB_fetchArray ($result);
 
     if ($A['status'] == USER_ACCOUNT_DISABLED && !SEC_hasRights ('user.edit')) {
-        COM_outputMessageAndAbort (30, '', 403, 'Forbidden');
+        COM_displayMessageAndAbort (30, '', 403, 'Forbidden');
     }
 
     $display_name = htmlspecialchars(COM_getDisplayName($user, $A['username'],
diff -r ae9b6d05e490 -r c2b3f7805eff public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Jul 19 17:51:56 2009 +0200
+++ b/public_html/usersettings.php	Mon Jul 27 21:39:26 2009 +0200
@@ -969,7 +969,7 @@
              . $A['about'] . '<br' . XHTML . '>' . $A['pgpkey'] . '</p>';
     $result = PLG_checkforSpam ($profile, $_CONF['spamx']);
     if ($result > 0) {
-        COM_outputMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
     }
 
     $A['email'] = COM_applyFilter ($A['email']);

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 04:58:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 04:58:31 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fixes
Message-ID: <hg.80dd75e48446.1248857911.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/80dd75e48446
changeset: 7195:80dd75e48446
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 10:58:19 2009 +0200
description:
E_ALL fixes

diffstat:

 public_html/submit.php         |  9 +++++----
 system/classes/story.class.php |  6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 9100c5b15c9d -r 80dd75e48446 public_html/submit.php
--- a/public_html/submit.php	Mon Jul 27 21:39:26 2009 +0200
+++ b/public_html/submit.php	Wed Jul 29 10:58:19 2009 +0200
@@ -390,10 +390,11 @@
 
 // note that 'type' _may_ come in through $_GET even when the
 // other parameters are in $_POST
-if (isset ($_POST['type'])) {
-    $type = COM_applyFilter ($_POST['type']);
-} else {
-    $type = COM_applyFilter ($_GET['type']);
+$type = '';
+if (isset($_POST['type'])) {
+    $type = COM_applyFilter($_POST['type']);
+} elseif (isset($_GET['type'])) {
+    $type = COM_applyFilter($_GET['type']);
 }
 
 $mode = '';
diff -r 9100c5b15c9d -r 80dd75e48446 system/classes/story.class.php
--- a/system/classes/story.class.php	Mon Jul 27 21:39:26 2009 +0200
+++ b/system/classes/story.class.php	Wed Jul 29 10:58:19 2009 +0200
@@ -949,7 +949,11 @@
             $this->_trackbackcode = $_CONF['trackback_code'];
             $this->_statuscode = 0;
             $this->_show_topic_icon = $_CONF['show_topic_icon'];
-            $this->_owner_id = $_USER['uid'];
+            if (isset($_USER['uid'])) {
+                $this->_owner_id = $_USER['uid'];
+            } else {
+                $this->_owner_id = 1;
+            }
             $this->_group_id = $T['group_id'];
             $this->_perm_owner = $T['perm_owner'];
             $this->_perm_group = $T['perm_group'];

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 05:51:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 05:51:45 -0400
Subject: [geeklog-cvs] geeklog: Clean up $_USER['uid'] handling
Message-ID: <hg.a88b92761fb9.1248861105.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a88b92761fb9
changeset: 7196:a88b92761fb9
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 11:13:39 2009 +0200
description:
Clean up $_USER['uid'] handling

diffstat:

 system/classes/story.class.php |  33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r 80dd75e48446 -r a88b92761fb9 system/classes/story.class.php
--- a/system/classes/story.class.php	Wed Jul 29 10:58:19 2009 +0200
+++ b/system/classes/story.class.php	Wed Jul 29 11:13:39 2009 +0200
@@ -449,7 +449,11 @@
                 $this->_show_topic_icon = 1;
             }
 
-            $this->_uid = $_USER['uid'];
+            if (COM_isAnonUser()) {
+                $this->_uid = 1;
+            } else {
+                $this->_uid = $_USER['uid'];
+            }
             $this->_date = time();
             $this->_expire = time();
             $this->_commentcode = $_CONF['comment_code'];
@@ -479,7 +483,11 @@
 
             $this->_statuscode = 0;
             $this->_featured = 0;
-            $this->_owner_id = $_USER['uid'];
+            if (COM_isAnonUser()) {
+                $this->_owner_id = 1;
+            } else {
+                $this->_owner_id = $_USER['uid'];
+            }
 
             if (isset($_GROUPS['Story Admin'])) {
                 $this->_group_id = $_GROUPS['Story Admin'];
@@ -792,10 +800,10 @@
     {
         global $_USER, $_CONF, $_TABLES;
 
-        if (isset($_USER['uid']) && ($_USER['uid'] > 1)) {
+        if (COM_isAnonUser()) {
+            $this->_uid = 1;
+        } else {
             $this->_uid = $_USER['uid'];
-        } else {
-            $this->_uid = 1;
         }
 
         $this->_postmode = $_CONF['postmode'];
@@ -845,6 +853,9 @@
         $this->_postmode = COM_applyFilter($array['postmode']);
         $this->_sid = COM_applyFilter($array['sid']);
         $this->_uid = COM_applyFilter($array['uid'], true);
+        if ($this->_uid < 1) {
+            $this->_uid = 1;
+        }
         $this->_unixdate = COM_applyFilter($array['date'], true);
 
         if (!isset($array['bodytext'])) {
@@ -895,10 +906,10 @@
         global $_USER, $_CONF, $_TABLES;
         $this->_sid = COM_makeSid();
 
-        if (isset($_USER['uid']) && ($_USER['uid'] > 1)) {
+        if (COM_isAnonUser()) {
+            $this->_uid = 1;
+        } else {
             $this->_uid = $_USER['uid'];
-        } else {
-            $this->_uid = 1;
         }
 
         $tmptid = addslashes(COM_sanitizeID($this->_tid));
@@ -949,10 +960,10 @@
             $this->_trackbackcode = $_CONF['trackback_code'];
             $this->_statuscode = 0;
             $this->_show_topic_icon = $_CONF['show_topic_icon'];
-            if (isset($_USER['uid'])) {
+            if (COM_isAnonUser()) {
+                $this->_owner_id = 1;
+            } else {
                 $this->_owner_id = $_USER['uid'];
-            } else {
-                $this->_owner_id = 1;
             }
             $this->_group_id = $T['group_id'];
             $this->_perm_owner = $T['perm_owner'];

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 05:51:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 05:51:45 -0400
Subject: [geeklog-cvs] geeklog: Initialize comment expiry time to avoid an
	SQL error wh...
Message-ID: <hg.d9e3fbb9e583.1248861105.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d9e3fbb9e583
changeset: 7197:d9e3fbb9e583
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 11:51:34 2009 +0200
description:
Initialize comment expiry time to avoid an SQL error when story submission queue is disabled (reported by Dieter Thomas)

diffstat:

 system/classes/story.class.php |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (24 lines):

diff -r a88b92761fb9 -r d9e3fbb9e583 system/classes/story.class.php
--- a/system/classes/story.class.php	Wed Jul 29 11:13:39 2009 +0200
+++ b/system/classes/story.class.php	Wed Jul 29 11:51:34 2009 +0200
@@ -1957,6 +1957,8 @@
      */
     function _sanitizeData()
     {
+        global $_CONF;
+
         if (empty($this->_hits)) {
             $this->_hits = 0;
         }
@@ -1984,6 +1986,11 @@
         } elseif ($this->_show_topic_icon != 1) {
             $this->_show_topic_icon = 0;
         }
+
+        if (empty($this->_comment_expire)) {
+            $this->_comment_expire = $this->_date
+                            + ($_CONF['article_comment_close_days'] * 86400);
+        }
     }
 // End Private Methods.
 

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 14:53:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 14:53:22 -0400
Subject: [geeklog-cvs] geeklog: Updated lib-mbyte.php for use with test
	framework
Message-ID: <hg.bd3a784653f8.1248893602.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bd3a784653f8
changeset: 7198:bd3a784653f8
user:      Sean Clark <sc1245 at messiah.edu>
date:      Wed Jul 29 14:49:13 2009 -0400
description:
Updated lib-mbyte.php for use with test framework

diffstat:

 system/lib-mbyte.php |  33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diffs (68 lines):

diff -r d9e3fbb9e583 -r bd3a784653f8 system/lib-mbyte.php
--- a/system/lib-mbyte.php	Wed Jul 29 11:51:34 2009 +0200
+++ b/system/lib-mbyte.php	Wed Jul 29 14:49:13 2009 -0400
@@ -45,7 +45,7 @@
 
     $language = array ();
     $fd = opendir ($_CONF['path_language']);
-
+	
     while (($file = @readdir ($fd)) !== false) {
         if ((substr ($file, 0, 1) != '.') && preg_match ('/\.php$/i', $file)
                 && is_file ($_CONF['path_language'] . $file)
@@ -77,12 +77,14 @@
         }
     }
     asort ($language);
-
-    return $language;
+	
+    return $language;	
 }
 
+
 // replacement functions for UTF-8 functions
-function MBYTE_checkEnabled()
+// $test, $enabled parameters only relevant for the PHPUnit test suite
+function MBYTE_checkEnabled($test = '', $enabled = true)
 {
     global $LANG_CHARSET;
 
@@ -90,21 +92,30 @@
 
     if (!isset($mb_enabled)) {
         $mb_enabled = false;
-        if (strcasecmp($LANG_CHARSET, 'utf-8') == 0) {
-            if (function_exists('mb_eregi_replace')) {
-                $mb_enabled = mb_internal_encoding('UTF-8');
-            }
+        if (strcasecmp($LANG_CHARSET, 'utf-8') == 0) {			
+			if($test == '') {
+			// Normal situation in live environment
+            	if (function_exists('mb_eregi_replace')) {
+                	$mb_enabled = mb_internal_encoding('UTF-8');
+				}
+				
+            } elseif($test == 'test') {
+				// Just for tests, true if we want function to exist
+				if($enabled) {
+					$mb_enabled = mb_internal_encoding('UTF-8');
+				}
+			}
         }
     }
-
+	
     return $mb_enabled;
-}
+}	
 
 
 function MBYTE_strlen($str)
 {
     static $mb_enabled;
-
+	
     if (!isset($mb_enabled)) {
         $mb_enabled = MBYTE_checkEnabled();
     }

From geeklog-cvs at lists.geeklog.net  Wed Jul 29 15:01:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 29 Jul 2009 15:01:49 -0400
Subject: [geeklog-cvs] geeklog: Initialize comment expiry time to avoid an
	SQL error wh...
Message-ID: <hg.0308e8b20873.1248894109.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0308e8b20873
changeset: 7199:0308e8b20873
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 20:36:02 2009 +0200
description:
Initialize comment expiry time to avoid an SQL error when story submission queue is disabled (reported by Dieter Thomas)

diffstat:

 system/classes/story.class.php |  40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diffs (101 lines):

diff -r c2b3f7805eff -r 0308e8b20873 system/classes/story.class.php
--- a/system/classes/story.class.php	Mon Jul 27 21:39:26 2009 +0200
+++ b/system/classes/story.class.php	Wed Jul 29 20:36:02 2009 +0200
@@ -449,7 +449,11 @@
                 $this->_show_topic_icon = 1;
             }
 
-            $this->_uid = $_USER['uid'];
+            if (COM_isAnonUser()) {
+                $this->_uid = 1;
+            } else {
+                $this->_uid = $_USER['uid'];
+            }
             $this->_date = time();
             $this->_expire = time();
             $this->_commentcode = $_CONF['comment_code'];
@@ -479,7 +483,11 @@
 
             $this->_statuscode = 0;
             $this->_featured = 0;
-            $this->_owner_id = $_USER['uid'];
+            if (COM_isAnonUser()) {
+                $this->_owner_id = 1;
+            } else {
+                $this->_owner_id = $_USER['uid'];
+            }
 
             if (isset($_GROUPS['Story Admin'])) {
                 $this->_group_id = $_GROUPS['Story Admin'];
@@ -792,10 +800,10 @@
     {
         global $_USER, $_CONF, $_TABLES;
 
-        if (isset($_USER['uid']) && ($_USER['uid'] > 1)) {
+        if (COM_isAnonUser()) {
+            $this->_uid = 1;
+        } else {
             $this->_uid = $_USER['uid'];
-        } else {
-            $this->_uid = 1;
         }
 
         $this->_postmode = $_CONF['postmode'];
@@ -845,6 +853,9 @@
         $this->_postmode = COM_applyFilter($array['postmode']);
         $this->_sid = COM_applyFilter($array['sid']);
         $this->_uid = COM_applyFilter($array['uid'], true);
+        if ($this->_uid < 1) {
+            $this->_uid = 1;
+        }
         $this->_unixdate = COM_applyFilter($array['date'], true);
 
         if (!isset($array['bodytext'])) {
@@ -895,10 +906,10 @@
         global $_USER, $_CONF, $_TABLES;
         $this->_sid = COM_makeSid();
 
-        if (isset($_USER['uid']) && ($_USER['uid'] > 1)) {
+        if (COM_isAnonUser()) {
+            $this->_uid = 1;
+        } else {
             $this->_uid = $_USER['uid'];
-        } else {
-            $this->_uid = 1;
         }
 
         $tmptid = addslashes(COM_sanitizeID($this->_tid));
@@ -949,7 +960,11 @@
             $this->_trackbackcode = $_CONF['trackback_code'];
             $this->_statuscode = 0;
             $this->_show_topic_icon = $_CONF['show_topic_icon'];
-            $this->_owner_id = $_USER['uid'];
+            if (COM_isAnonUser()) {
+                $this->_owner_id = 1;
+            } else {
+                $this->_owner_id = $_USER['uid'];
+            }
             $this->_group_id = $T['group_id'];
             $this->_perm_owner = $T['perm_owner'];
             $this->_perm_group = $T['perm_group'];
@@ -1942,6 +1957,8 @@
      */
     function _sanitizeData()
     {
+        global $_CONF;
+
         if (empty($this->_hits)) {
             $this->_hits = 0;
         }
@@ -1969,6 +1986,11 @@
         } elseif ($this->_show_topic_icon != 1) {
             $this->_show_topic_icon = 0;
         }
+
+        if (empty($this->_comment_expire)) {
+            $this->_comment_expire = $this->_date
+                            + ($_CONF['article_comment_close_days'] * 86400);
+        }
     }
 // End Private Methods.
 

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:44:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:44:44 -0400
Subject: [geeklog-cvs] geeklog: Check story permissions when emailing a story
Message-ID: <hg.afae3e80949c.1248975884.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/afae3e80949c
changeset: 7201:afae3e80949c
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 19:56:01 2009 +0200
description:
Check story permissions when emailing a story

diffstat:

 public_html/profiles.php |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 1f2c0ab2b681 -r afae3e80949c public_html/profiles.php
--- a/public_html/profiles.php	Wed Jul 29 19:49:55 2009 +0200
+++ b/public_html/profiles.php	Wed Jul 29 19:56:01 2009 +0200
@@ -300,9 +300,13 @@
         return $retval;
     }
 
-    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'";
-    $result = DB_query ($sql);
-    $A = DB_fetchArray ($result);
+    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND');
+    $result = DB_query($sql);
+    if (DB_numRows($result) == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+    $A = DB_fetchArray($result);
+
     $shortmsg = COM_stripslashes ($shortmsg);
     $mailtext = sprintf ($LANG08[23], $from, $fromemail) . LB;
     if (strlen ($shortmsg) > 0) {
@@ -392,6 +396,12 @@
         return $retval;
     }
 
+    $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND'));
+    $A = DB_fetchArray($result);
+    if ($A['count'] == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+
     if ($msg > 0) {
         $retval .= COM_showMessage ($msg);
     }

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:44:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:44:45 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_5_2sr5 for changeset
	052245bd696a
Message-ID: <hg.b08273d2cdfc.1248975885.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b08273d2cdfc
changeset: 7203:b08273d2cdfc
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Jul 30 19:43:48 2009 +0200
description:
Added tag geeklog_1_5_2sr5 for changeset 052245bd696a

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 052245bd696a -r b08273d2cdfc .hgtags
--- a/.hgtags	Wed Jul 29 20:33:20 2009 +0200
+++ b/.hgtags	Thu Jul 30 19:43:48 2009 +0200
@@ -6,3 +6,4 @@
 0e10ca8cf00c66e1fe3a91eae50b4a1c41f9f133 geeklog_1_5_2sr2
 bd0dc021770325e55175a9caf131c4db336c7924 geeklog_1_5_2sr3
 c8ee796a9cb98bf61c9714c7b49733a003ea6ef7 geeklog_1_5_2sr4
+052245bd696ae09499a53530652b631ef15021f0 geeklog_1_5_2sr5

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:44:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:44:44 -0400
Subject: [geeklog-cvs] geeklog: Fixed XSS (reported by Gerendi Sandor Attila)
Message-ID: <hg.1f2c0ab2b681.1248975884.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1f2c0ab2b681
changeset: 7200:1f2c0ab2b681
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 19:49:55 2009 +0200
description:
Fixed XSS (reported by Gerendi Sandor Attila)

diffstat:

 public_html/profiles.php |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 3e15c8a33aa2 -r 1f2c0ab2b681 public_html/profiles.php
--- a/public_html/profiles.php	Sun Jun 21 20:56:20 2009 +0200
+++ b/public_html/profiles.php	Wed Jul 29 19:49:55 2009 +0200
@@ -231,7 +231,7 @@
             $mail_template->set_var ('lang_subject', $LANG08[13]);
             $mail_template->set_var ('subject', $subject);
             $mail_template->set_var ('lang_message', $LANG08[14]);
-            $mail_template->set_var ('message', $message);
+            $mail_template->set_var ('message', htmlspecialchars($message));
             $mail_template->set_var ('lang_nohtml', $LANG08[15]);
             $mail_template->set_var ('lang_submit', $LANG08[16]);
             $mail_template->set_var ('uid', $uid);
@@ -421,7 +421,7 @@
     $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
     $mail_template->set_var('toemail', $toemail);
     $mail_template->set_var('lang_shortmessage', $LANG08[27]);
-    $mail_template->set_var('shortmsg', $shortmsg);
+    $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
     $mail_template->set_var('lang_warning', $LANG08[22]);
     $mail_template->set_var('lang_sendmessage', $LANG08[16]);
     $mail_template->set_var('story_id',$sid);

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:44:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:44:45 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation and version number
Message-ID: <hg.052245bd696a.1248975885.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/052245bd696a
changeset: 7202:052245bd696a
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 20:33:20 2009 +0200
description:
Updated documentation and version number

diffstat:

 public_html/admin/install/index.php |   2 +-
 public_html/docs/changes.html       |  12 ++++++++++++
 public_html/docs/history            |  11 +++++++++++
 public_html/siteconfig.php.dist     |   2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r afae3e80949c -r 052245bd696a public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Wed Jul 29 19:56:01 2009 +0200
+++ b/public_html/admin/install/index.php	Wed Jul 29 20:33:20 2009 +0200
@@ -48,7 +48,7 @@
     define("LB", "\n");
 }
 if (!defined('VERSION')) {
-    define('VERSION', '1.5.2sr4');
+    define('VERSION', '1.5.2sr5');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r afae3e80949c -r 052245bd696a public_html/docs/changes.html
--- a/public_html/docs/changes.html	Wed Jul 29 19:56:01 2009 +0200
+++ b/public_html/docs/changes.html	Wed Jul 29 20:33:20 2009 +0200
@@ -16,6 +16,18 @@
 <a href="history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a list
 of files that have been changed since the last release.</p>
 
+<h2><a name="changes152sr5">Geeklog 1.5.2sr5</a></h2>
+
+<p>This release addresses the following security issues:</p>
+<ol>
+<li>Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+    email a story to a friend.</li>
+<li>The "Mail Story to a Friend" function didn't check story permissions, so
+    that it was possible to email a story even if you didn't have the
+    permissions to view it on the site.</li>
+</ol>
+
+
 <h2><a name="changes152sr4">Geeklog 1.5.2sr4</a></h2>
 
 <p>Bookoo of the Nine Situations Group posted another SQL injection exploit, targetting an old bug in usersettings.php. As with the previous issues, this allowed an attacker to extract the password hash for any account and is fixed with this release.</p>
diff -r afae3e80949c -r 052245bd696a public_html/docs/history
--- a/public_html/docs/history	Wed Jul 29 19:56:01 2009 +0200
+++ b/public_html/docs/history	Wed Jul 29 20:33:20 2009 +0200
@@ -1,5 +1,16 @@
 Geeklog History/Changes:
 
+Jul 30, 2009 (1.5.2sr5)
+------------
+
+This release addresses the following security issues:
+- Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+  email a story to a friend.
+- The "Mail Story to a Friend" function didn't check story permissions, so that
+  it was possible to email a story even if you didn't have the permissions to
+  view it on the site.
+
+
 Apr 18, 2009 (1.5.2sr4)
 ------------
 
diff -r afae3e80949c -r 052245bd696a public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist	Wed Jul 29 19:56:01 2009 +0200
+++ b/public_html/siteconfig.php.dist	Wed Jul 29 20:33:20 2009 +0200
@@ -38,7 +38,7 @@
   define('LB',"\n");
 }
 if (!defined('VERSION')) {
-  define('VERSION', '1.5.2sr4');
+  define('VERSION', '1.5.2sr5');
 }
 
 ?>

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:45:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:45:42 -0400
Subject: [geeklog-cvs] geeklog: Fixed XSS (reported by Gerendi Sandor Attila)
Message-ID: <hg.463a2608020a.1248975942.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/463a2608020a
changeset: 7204:463a2608020a
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 13:36:24 2009 +0200
description:
Fixed XSS (reported by Gerendi Sandor Attila)

diffstat:

 public_html/profiles.php |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 0308e8b20873 -r 463a2608020a public_html/profiles.php
--- a/public_html/profiles.php	Wed Jul 29 20:36:02 2009 +0200
+++ b/public_html/profiles.php	Wed Jul 29 13:36:24 2009 +0200
@@ -245,7 +245,7 @@
             $mail_template->set_var('lang_subject', $LANG08[13]);
             $mail_template->set_var('subject', $subject);
             $mail_template->set_var('lang_message', $LANG08[14]);
-            $mail_template->set_var('message', $message);
+            $mail_template->set_var('message', htmlspecialchars($message));
             $mail_template->set_var('lang_nohtml', $LANG08[15]);
             $mail_template->set_var('lang_submit', $LANG08[16]);
             $mail_template->set_var('uid', $uid);
@@ -442,7 +442,7 @@
     $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
     $mail_template->set_var('toemail', $toemail);
     $mail_template->set_var('lang_shortmessage', $LANG08[27]);
-    $mail_template->set_var('shortmsg', $shortmsg);
+    $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
     $mail_template->set_var('lang_warning', $LANG08[22]);
     $mail_template->set_var('lang_sendmessage', $LANG08[16]);
     $mail_template->set_var('story_id',$sid);

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:45:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:45:43 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0sr1 for changeset
	01ee44e87dd8
Message-ID: <hg.4d63f15781aa.1248975943.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4d63f15781aa
changeset: 7207:4d63f15781aa
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Jul 30 19:44:19 2009 +0200
description:
Added tag geeklog_1_6_0sr1 for changeset 01ee44e87dd8

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 01ee44e87dd8 -r 4d63f15781aa .hgtags
--- a/.hgtags	Wed Jul 29 21:08:47 2009 +0200
+++ b/.hgtags	Thu Jul 30 19:44:19 2009 +0200
@@ -6,3 +6,4 @@
 401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1
 f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
 f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
+01ee44e87dd8fa20013e8935bb714d8447180f35 geeklog_1_6_0sr1

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:45:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:45:42 -0400
Subject: [geeklog-cvs] geeklog: Check story permissions when emailing a story
Message-ID: <hg.5c4b872f98ef.1248975942.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5c4b872f98ef
changeset: 7205:5c4b872f98ef
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 13:30:25 2009 +0200
description:
Check story permissions when emailing a story

diffstat:

 public_html/profiles.php |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 463a2608020a -r 5c4b872f98ef public_html/profiles.php
--- a/public_html/profiles.php	Wed Jul 29 13:36:24 2009 +0200
+++ b/public_html/profiles.php	Wed Jul 29 13:30:25 2009 +0200
@@ -314,9 +314,13 @@
         return $retval;
     }
 
-    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day,postmode FROM {$_TABLES['stories']} WHERE sid = '$sid'";
-    $result = DB_query ($sql);
-    $A = DB_fetchArray ($result);
+    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day,postmode FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND');
+    $result = DB_query($sql);
+    if (DB_numRows($result) == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+    $A = DB_fetchArray($result);
+
     $shortmsg = COM_stripslashes ($shortmsg);
     $mailtext = sprintf ($LANG08[23], $from, $fromemail) . LB;
     if (strlen ($shortmsg) > 0) {
@@ -339,7 +343,7 @@
         $author = COM_getDisplayName ($A['uid']);
         $mailtext .= $LANG01[1] . ' ' . $author . LB;
     }
-    if($A['postmode']==='wikitext'){
+    if ($A['postmode'] === 'wikitext') {
         $mailtext .= LB
             . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['introtext'])))).LB.LB
             . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['bodytext'])))).LB.LB
@@ -413,6 +417,12 @@
         return $retval;
     }
 
+    $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND'));
+    $A = DB_fetchArray($result);
+    if ($A['count'] == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+
     if ($msg > 0) {
         $retval .= COM_showMessage ($msg);
     }

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 13:45:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 13:45:43 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation and version number
Message-ID: <hg.01ee44e87dd8.1248975943.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/01ee44e87dd8
changeset: 7206:01ee44e87dd8
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 21:08:47 2009 +0200
description:
Updated documentation and version number

diffstat:

 public_html/admin/install/lib-install.php |   2 +-
 public_html/docs/english/changes.html     |  32 ++++++++++++++++++++++++++++++++
 public_html/docs/history                  |  28 ++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletions(-)

diffs (105 lines):

diff -r 5c4b872f98ef -r 01ee44e87dd8 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Wed Jul 29 13:30:25 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Wed Jul 29 21:08:47 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0');
+    define('VERSION', '1.6.0sr1');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r 5c4b872f98ef -r 01ee44e87dd8 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Wed Jul 29 13:30:25 2009 +0200
+++ b/public_html/docs/english/changes.html	Wed Jul 29 21:08:47 2009 +0200
@@ -16,6 +16,26 @@
 <a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
 list of files that have been changed since the last release.</p>
 
+
+<h2><a name="changes160sr1">Geeklog 1.6.0sr1</a></h2>
+
+<p>This release addresses the following security issues:</p>
+<ol>
+<li>Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+    email a story to a friend.</li>
+<li>The "Mail Story to a Friend" function didn't check story permissions, so
+    that it was possible to email a story even if you didn't have the
+    permissions to view it on the site.</li>
+</ol>
+
+<p>Other fixes:</p>
+<ul>
+<li>Fixed an SQL error when submitting a story and the story submission queue
+    was off.</li>
+<li>Fixed calls to a nonexistent function <code>COM_outputMessageAndAbort</code>.</li>
+</ul>
+
+
 <h2><a name="changes160">Geeklog 1.6.0</a></h2>
 
 <h3>Results from the Summer of Code</h3>
@@ -53,6 +73,18 @@
 you!</p>
 
 
+<h2><a name="changes152sr5">Geeklog 1.5.2sr5</a></h2>
+
+<p>This release addresses the following security issues:</p>
+<ol>
+<li>Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+    email a story to a friend.</li>
+<li>The "Mail Story to a Friend" function didn't check story permissions, so
+    that it was possible to email a story even if you didn't have the
+    permissions to view it on the site.</li>
+</ol>
+
+
 <h2><a name="changes152sr4">Geeklog 1.5.2sr4</a></h2>
 
 <p>Bookoo of the Nine Situations Group posted another SQL injection exploit, targetting an old bug in usersettings.php. As with the previous issues, this allowed an attacker to extract the password hash for any account and is fixed with this release.</p>
diff -r 5c4b872f98ef -r 01ee44e87dd8 public_html/docs/history
--- a/public_html/docs/history	Wed Jul 29 13:30:25 2009 +0200
+++ b/public_html/docs/history	Wed Jul 29 21:08:47 2009 +0200
@@ -1,5 +1,22 @@
 Geeklog History/Changes:
 
+Jul 30, 2009 (1.6.0sr1)
+------------
+
+This release addresses the following security issues:
+- Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+  email a story to a friend.
+- The "Mail Story to a Friend" function didn't check story permissions, so that
+  it was possible to email a story even if you didn't have the permissions to
+  view it on the site.
+
+Not security-related:
+- Fixed an SQL error (due to a non-initialized variable; not exploitable) when
+  the story submission queue was off (reported by Dieter Thomas) [Dirk]
+- Fixed calls to a nonexistent function COM_outputMessageAndAbort (should have
+  been COM_displayMessageAndAbort) [Dirk]
+
+
 Jul 19, 2009 (1.6.0)
 ------------
 
@@ -335,6 +352,17 @@
   every other plugin and built-in function does (bug #0000644) [Dirk]
 
 
+Jul 30, 2009 (1.5.2sr5)
+------------
+
+This release addresses the following security issues:
+- Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+  email a story to a friend.
+- The "Mail Story to a Friend" function didn't check story permissions, so that
+  it was possible to email a story even if you didn't have the permissions to
+  view it on the site.
+
+
 Apr 18, 2009 (1.5.2sr4)
 ------------
 

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 14:54:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 14:54:24 -0400
Subject: [geeklog-cvs] tools: Update for Geeklog 1.5.2sr5 / 1.6.0sr1
Message-ID: <hg.4e0fba88a94e.1248980064.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4e0fba88a94e
changeset: 41:4e0fba88a94e
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Jul 30 20:54:15 2009 +0200
description:
Update for Geeklog 1.5.2sr5 / 1.6.0sr1

diffstat:

 versionchecker/versionchecker.php |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (36 lines):

diff -r cc24438ad9ad -r 4e0fba88a94e versionchecker/versionchecker.php
--- a/versionchecker/versionchecker.php	Sun Jul 19 18:56:47 2009 +0200
+++ b/versionchecker/versionchecker.php	Thu Jul 30 20:54:15 2009 +0200
@@ -9,7 +9,7 @@
 <p align="left"><a href="http://www.geeklog.net/" title="go to the Geeklog homepage"><img src="http://www.geeklog.net/docs/images/newlogo.gif" alt="" width="243" height="90" border="0"></a></p>
 <?php
 
-$current = '1.6.0';
+$current = '1.6.0sr1';
 $version = '';
 if (isset ($_GET['version'])) {
     $version = strip_tags ($_GET['version']);
@@ -39,13 +39,16 @@
     '1.4.0sr5-1' => '1.5.2sr4',
     '1.4.0sr6'  => '1.5.2sr4',
 */
-    '1.4.1'     => '1.6.0',
-    '1.5.0'     => '1.6.0',
-    '1.5.1'     => '1.6.0',
-    '1.5.2'     => '1.6.0',
-    '1.5.2sr1'  => '1.6.0',
-    '1.5.2sr2'  => '1.6.0',
-    '1.5.2sr3'  => '1.6.0'
+    '1.4.1'     => '1.6.0sr1',
+    '1.5.0'     => '1.6.0sr1',
+    '1.5.1'     => '1.6.0sr1',
+    '1.5.2'     => '1.5.2sr5',
+    '1.5.2sr1'  => '1.5.2sr5',
+    '1.5.2sr2'  => '1.5.2sr5',
+    '1.5.2sr3'  => '1.5.2sr5',
+    '1.5.2sr4'  => '1.5.2sr5',
+    '1.5.2sr5'  => '1.6.0sr1',
+    '1.6.0'     => '1.6.0sr1'
 );
 
 $v = explode ('.', $version);

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 15:00:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 15:00:45 -0400
Subject: [geeklog-cvs] geeklog: Check story permissions when emailing a story
Message-ID: <hg.c9f2a827ba80.1248980445.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c9f2a827ba80
changeset: 7209:c9f2a827ba80
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 13:30:25 2009 +0200
description:
Check story permissions when emailing a story

diffstat:

 public_html/profiles.php |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r dcbfd5270aa9 -r c9f2a827ba80 public_html/profiles.php
--- a/public_html/profiles.php	Wed Jul 29 13:36:24 2009 +0200
+++ b/public_html/profiles.php	Wed Jul 29 13:30:25 2009 +0200
@@ -314,9 +314,13 @@
         return $retval;
     }
 
-    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day,postmode FROM {$_TABLES['stories']} WHERE sid = '$sid'";
-    $result = DB_query ($sql);
-    $A = DB_fetchArray ($result);
+    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day,postmode FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND');
+    $result = DB_query($sql);
+    if (DB_numRows($result) == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+    $A = DB_fetchArray($result);
+
     $shortmsg = COM_stripslashes ($shortmsg);
     $mailtext = sprintf ($LANG08[23], $from, $fromemail) . LB;
     if (strlen ($shortmsg) > 0) {
@@ -339,7 +343,7 @@
         $author = COM_getDisplayName ($A['uid']);
         $mailtext .= $LANG01[1] . ' ' . $author . LB;
     }
-    if($A['postmode']==='wikitext'){
+    if ($A['postmode'] === 'wikitext') {
         $mailtext .= LB
             . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['introtext'])))).LB.LB
             . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['bodytext'])))).LB.LB
@@ -413,6 +417,12 @@
         return $retval;
     }
 
+    $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND'));
+    $A = DB_fetchArray($result);
+    if ($A['count'] == 0) {
+        return COM_refresh($_CONF['site_url'] . '/index.php');
+    }
+
     if ($msg > 0) {
         $retval .= COM_showMessage ($msg);
     }

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 15:00:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 15:00:45 -0400
Subject: [geeklog-cvs] geeklog: Fixed XSS (reported by Gerendi Sandor Attila)
Message-ID: <hg.dcbfd5270aa9.1248980445.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/dcbfd5270aa9
changeset: 7208:dcbfd5270aa9
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Jul 29 13:36:24 2009 +0200
description:
Fixed XSS (reported by Gerendi Sandor Attila)

diffstat:

 public_html/profiles.php |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r bd3a784653f8 -r dcbfd5270aa9 public_html/profiles.php
--- a/public_html/profiles.php	Wed Jul 29 14:49:13 2009 -0400
+++ b/public_html/profiles.php	Wed Jul 29 13:36:24 2009 +0200
@@ -245,7 +245,7 @@
             $mail_template->set_var('lang_subject', $LANG08[13]);
             $mail_template->set_var('subject', $subject);
             $mail_template->set_var('lang_message', $LANG08[14]);
-            $mail_template->set_var('message', $message);
+            $mail_template->set_var('message', htmlspecialchars($message));
             $mail_template->set_var('lang_nohtml', $LANG08[15]);
             $mail_template->set_var('lang_submit', $LANG08[16]);
             $mail_template->set_var('uid', $uid);
@@ -442,7 +442,7 @@
     $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
     $mail_template->set_var('toemail', $toemail);
     $mail_template->set_var('lang_shortmessage', $LANG08[27]);
-    $mail_template->set_var('shortmsg', $shortmsg);
+    $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
     $mail_template->set_var('lang_warning', $LANG08[22]);
     $mail_template->set_var('lang_sendmessage', $LANG08[16]);
     $mail_template->set_var('story_id',$sid);

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 15:00:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 15:00:45 -0400
Subject: [geeklog-cvs] geeklog: Sync list of changes with 1.5.2sr5 and
	1.6.0sr1
Message-ID: <hg.45b48a8521db.1248980445.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/45b48a8521db
changeset: 7210:45b48a8521db
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Jul 30 21:00:35 2009 +0200
description:
Sync list of changes with 1.5.2sr5 and 1.6.0sr1

diffstat:

 public_html/docs/english/changes.html |  31 +++++++++++++++++++++++++++++++
 public_html/docs/history              |  28 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)

diffs (93 lines):

diff -r c9f2a827ba80 -r 45b48a8521db public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Wed Jul 29 13:30:25 2009 +0200
+++ b/public_html/docs/english/changes.html	Thu Jul 30 21:00:35 2009 +0200
@@ -16,6 +16,25 @@
 <a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
 list of files that have been changed since the last release.</p>
 
+<h2><a name="changes160sr1">Geeklog 1.6.0sr1</a></h2>
+
+<p>This release addresses the following security issues:</p>
+<ol>
+<li>Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+    email a story to a friend.</li>
+<li>The "Mail Story to a Friend" function didn't check story permissions, so
+    that it was possible to email a story even if you didn't have the
+    permissions to view it on the site.</li>
+</ol>
+
+<p>Other fixes:</p>
+<ul>
+<li>Fixed an SQL error when submitting a story and the story submission queue
+    was off.</li>
+<li>Fixed calls to a nonexistent function <code>COM_outputMessageAndAbort</code>.</li>
+</ul>
+
+
 <h2><a name="changes160">Geeklog 1.6.0</a></h2>
 
 <h3>Results from the Summer of Code</h3>
@@ -53,6 +72,18 @@
 you!</p>
 
 
+<h2><a name="changes152sr5">Geeklog 1.5.2sr5</a></h2>
+
+<p>This release addresses the following security issues:</p>
+<ol>
+<li>Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+    email a story to a friend.</li>
+<li>The "Mail Story to a Friend" function didn't check story permissions, so
+    that it was possible to email a story even if you didn't have the
+    permissions to view it on the site.</li>
+</ol>
+
+
 <h2><a name="changes152sr4">Geeklog 1.5.2sr4</a></h2>
 
 <p>Bookoo of the Nine Situations Group posted another SQL injection exploit, targetting an old bug in usersettings.php. As with the previous issues, this allowed an attacker to extract the password hash for any account and is fixed with this release.</p>
diff -r c9f2a827ba80 -r 45b48a8521db public_html/docs/history
--- a/public_html/docs/history	Wed Jul 29 13:30:25 2009 +0200
+++ b/public_html/docs/history	Thu Jul 30 21:00:35 2009 +0200
@@ -14,6 +14,23 @@
 - For Remote Users, display their service name in the User Editor [Dirk]
 
 
+Jul 30, 2009 (1.6.0sr1)
+------------
+
+This release addresses the following security issues:
+- Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+  email a story to a friend.
+- The "Mail Story to a Friend" function didn't check story permissions, so that
+  it was possible to email a story even if you didn't have the permissions to
+  view it on the site.
+
+Not security-related:
+- Fixed an SQL error (due to a non-initialized variable; not exploitable) when
+  the story submission queue was off (reported by Dieter Thomas) [Dirk]
+- Fixed calls to a nonexistent function COM_outputMessageAndAbort (should have
+  been COM_displayMessageAndAbort) [Dirk]
+
+
 Jul 19, 2009 (1.6.0)
 ------------
 
@@ -349,6 +366,17 @@
   every other plugin and built-in function does (bug #0000644) [Dirk]
 
 
+Jul 30, 2009 (1.5.2sr5)
+------------
+
+This release addresses the following security issues:
+- Gerendi Sandor Attila reported an XSS in the forms to email a user and to
+  email a story to a friend.
+- The "Mail Story to a Friend" function didn't check story permissions, so that
+  it was possible to email a story even if you didn't have the permissions to
+  view it on the site.
+
+
 Apr 18, 2009 (1.5.2sr4)
 ------------
 

From geeklog-cvs at lists.geeklog.net  Thu Jul 30 15:17:03 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 30 Jul 2009 15:17:03 -0400
Subject: [geeklog-cvs] geeklog: Updated lib-common to work with test suite
	(require ord...
Message-ID: <hg.d39f57b6372d.1248981423.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d39f57b6372d
changeset: 7211:d39f57b6372d
user:      Sean Clark <sc1245 at messiah.edu>
date:      Thu Jul 30 15:17:04 2009 -0400
description:
Updated lib-common to work with test suite (require order altered) and COM_debug fixed

diffstat:

 public_html/lib-common.php |  62 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 38 deletions(-)

diffs (100 lines):

diff -r 45b48a8521db -r d39f57b6372d public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/public_html/lib-common.php	Thu Jul 30 15:17:04 2009 -0400
@@ -70,7 +70,7 @@
 *
 * Must make sure that the function hasn't been disabled before calling it.
 *
-*/
+*/ 
 if (function_exists('set_error_handler')) {
     if (PHP_VERSION >= 5) {
         /* Tell the error handler to use the default error reporting options.
@@ -159,6 +159,14 @@
     }
 }
 
+/**
+* Include plugin class.
+* This is a poorly implemented class that was not very well thought out.
+* Still very necessary
+*
+*/
+
+require_once( $_CONF['path_system'] . 'lib-plugins.php' );
 
 /**
 * Include page time -- used to time how fast each page was created
@@ -187,15 +195,6 @@
 require_once( $_CONF['path_system'] . 'classes/template.class.php' );
 
 /**
-* This is the database library.
-*
-* Including this gives you a working connection to the database
-*
-*/
-
-require_once( $_CONF['path_system'] . 'lib-database.php' );
-
-/**
 * This is the security library used for application security
 *
 */
@@ -231,15 +230,6 @@
 require_once( $_CONF['path_system'] . 'lib-custom.php' );
 
 /**
-* Include plugin class.
-* This is a poorly implemented class that was not very well thought out.
-* Still very necessary
-*
-*/
-
-require_once( $_CONF['path_system'] . 'lib-plugins.php' );
-
-/**
 * Session management library
 *
 */
@@ -1801,25 +1791,21 @@
 * under the GPL.  This is not used very much in the code but you can use it
 * if you see fit
 *
-* @param        array       $A      Array to loop through and print values for
-* @return   string  Formated HTML List
-*
-*/
-
-function COM_debug( $A )
-{
-    if( !empty( $A ))
-    {
-        $retval .= LB . '<pre><p>---- DEBUG ----</p>';
-
-        for( reset( $A ); $k = key( $A ); next( $A ))
-        {
-            $retval .= sprintf( "<li>%13s [%s]</li>\n", $k, $A[$k] );
-        }
-
-        $retval .= '<p>---------------</p></pre>' . LB;
-    }
-
+* @param    array   $array    Array to loop through and print values for
+* @return   string  $retval    Formatted HTML List
+*
+*/
+
+function COM_debug($array)
+{
+    $retval = '';    
+    if(!empty($array)) {
+        $retval = '<ul><pre><p>---- DEBUG ----</p>';
+        foreach($array as $k => $v) { 
+            $retval .= sprintf("<li>%13s [%s]</li>\n", $k, $v);
+        }
+        $retval .= '<p>---------------</p></pre></ul>';
+    }    
     return $retval;
 }