From geeklog-cvs at lists.geeklog.net  Sun Nov  1 03:32:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 03:32:34 -0500
Subject: [geeklog-cvs] geeklog: Minor German translation update
Message-ID: <hg.1a195ed188fe.1257064354.1485632861@qs1489.pair.com>

changeset 7426:1a195ed188fe
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1a195ed188fe
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 01 09:04:51 2009 +0100
description:
Minor German translation update

diffstat:

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

diffs (84 lines):

diff -r 7fcb2cf3765b -r 1a195ed188fe language/german.php
--- a/language/german.php	Sat Oct 31 23:30:59 2009 +0100
+++ b/language/german.php	Sun Nov 01 09:04:51 2009 +0100
@@ -1601,7 +1601,7 @@
     'list_all' => 'Alle auflisten',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A',
+    'na' => 'n/v',
     'token_expiry' => 'Du solltest Deine ?nderungen bis sp?testens %s durchf?hren. Danach wird das Security-Token, das in diese Seite eingebettet ist, ung?ltig und Du w?rdest Deine ?nderungen verlieren.'
 );
 
@@ -1976,7 +1976,7 @@
     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)' => ''),
-    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 7fcb2cf3765b -r 1a195ed188fe language/german_formal.php
--- a/language/german_formal.php	Sat Oct 31 23:30:59 2009 +0100
+++ b/language/german_formal.php	Sun Nov 01 09:04:51 2009 +0100
@@ -1602,7 +1602,7 @@
     'list_all' => 'Alle auflisten',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A',
+    'na' => 'n/v',
     'token_expiry' => 'Sie sollten Ihre ?nderungen bis sp?testens %s durchf?hren. Danach wird das Security-Token, das in diese Seite eingebettet ist, ung?ltig und Sie w?rden Ihre ?nderungen verlieren.'
 );
 
@@ -1977,7 +1977,7 @@
     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)' => ''),
-    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 7fcb2cf3765b -r 1a195ed188fe language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Oct 31 23:30:59 2009 +0100
+++ b/language/german_formal_utf-8.php	Sun Nov 01 09:04:51 2009 +0100
@@ -1602,7 +1602,7 @@
     'list_all' => 'Alle auflisten',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A',
+    'na' => 'n/v',
     'token_expiry' => 'Sie sollten Ihre ??nderungen bis sp??testens %s durchf??hren. Danach wird das Security-Token, das in diese Seite eingebettet ist, ung??ltig und Sie w??rden Ihre ??nderungen verlieren.'
 );
 
@@ -1977,7 +1977,7 @@
     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)' => ''),
-    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 7fcb2cf3765b -r 1a195ed188fe language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Oct 31 23:30:59 2009 +0100
+++ b/language/german_utf-8.php	Sun Nov 01 09:04:51 2009 +0100
@@ -1601,7 +1601,7 @@
     'list_all' => 'Alle auflisten',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A',
+    'na' => 'n/v',
     'token_expiry' => 'Du solltest Deine ??nderungen bis sp??testens %s durchf??hren. Danach wird das Security-Token, das in diese Seite eingebettet ist, ung??ltig und Du w??rdest Deine ??nderungen verlieren.'
 );
 
@@ -1976,7 +1976,7 @@
     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)' => ''),
-    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 03:32:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 03:32:35 -0500
Subject: [geeklog-cvs] geeklog: Update documentation + version number
Message-ID: <hg.7915c1f5f403.1257064355.1485632861@qs1489.pair.com>

changeset 7427:7915c1f5f403
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7915c1f5f403
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 01 09:20:01 2009 +0100
description:
Update documentation + version number

diffstat:

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

diffs (41 lines):

diff -r 1a195ed188fe -r 7915c1f5f403 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Nov 01 09:04:51 2009 +0100
+++ b/public_html/admin/install/lib-install.php	Sun Nov 01 09:20:01 2009 +0100
@@ -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.1hg');
+    define('VERSION', '1.6.1b1');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r 1a195ed188fe -r 7915c1f5f403 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Nov 01 09:04:51 2009 +0100
+++ b/public_html/docs/english/changes.html	Sun Nov 01 09:20:01 2009 +0100
@@ -34,6 +34,8 @@
 <li>The Migrate option in the install script can now also be applied to an
     existing database (i.e. you don't need to import a database dump to update
     your URLs and paths).</li>
+<li>The Database Backup admin panel now includes options to optimize the
+    database and convert tables to InnoDB (MySQL only).</li>
 </ul>
 
 <h3>Bugfixes</h3>
diff -r 1a195ed188fe -r 7915c1f5f403 public_html/docs/history
--- a/public_html/docs/history	Sun Nov 01 09:04:51 2009 +0100
+++ b/public_html/docs/history	Sun Nov 01 09:20:01 2009 +0100
@@ -1,8 +1,10 @@
 Geeklog History/Changes:
 
-Nov 1, 2009 (1.6.1)
------------
-
+Nov 1, 2009 (1.6.1b1)
+-----------
+
+- Fixed an old bug that could cause SQL errors when a user changed their "Show
+  & hide boxes" settings [Dirk]
 - Searching by author threw an error on PHP 4 (bug #0001008) [Dirk]
 - Moved the functionality of the toinnodb.php script into the Database Backups
   admin panel [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:49 -0500
Subject: [geeklog-cvs] geeklog: Modernized the "timezone hack",
	made the config option ...
Message-ID: <hg.df55886043f2.1257066349.1485632861@qs1489.pair.com>

changeset 7428:df55886043f2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/df55886043f2
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 11:00:03 2009 +0200
description:
Modernized the "timezone hack", made the config option a dropdown, and moved all timezone-related code into a new TimeZoneConfig class

diffstat:

 public_html/admin/configuration.php          |   17 ++-
 public_html/admin/install/config-install.php |    2 +-
 public_html/docs/history                     |    2 +
 public_html/lib-common.php                   |   13 +-
 public_html/usersettings.php                 |   33 +---
 sql/updates/mssql_1.6.0_to_1.6.1.php         |    4 +
 sql/updates/mysql_1.6.0_to_1.6.1.php         |    4 +
 system/classes/timezoneconfig.class.php      |  260 ++++++++++++++++++++++++++++++++
 8 files changed, 300 insertions(+), 35 deletions(-)

diffs (truncated from 426 to 300 lines):

diff -r 30e040149cbe -r df55886043f2 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/public_html/admin/configuration.php	Sun Sep 20 11:00:03 2009 +0200
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Loads the administration UI and sends input to config.class               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2008 by the following authors:                         |
+// | Copyright (C) 2007-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Aaron Blankstein  - kantai AT gmail DOT com                      |
 // +---------------------------------------------------------------------------+
@@ -84,6 +84,21 @@
     return $themes;
 }
 
+/**
+* Helper function: Provide timezone dropdown
+*
+* @return   array   Array of (timezone-long-name, timezone-short-name) pairs
+*
+*/
+function configmanager_select_timezone_helper()
+{
+    global $_CONF;
+
+    require_once $_CONF['path_system'] . 'classes/timezoneconfig.class.php';
+
+    return array_flip(TimeZoneConfig::listAvailableTimeZones());
+}
+
 
 // MAIN
 $display = '';
diff -r 30e040149cbe -r df55886043f2 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/public_html/admin/install/config-install.php	Sun Sep 20 11:00:03 2009 +0200
@@ -291,7 +291,7 @@
     $c->add('thousand_separator',",",'text',6,29,NULL,440,TRUE);
     $c->add('decimal_separator',".",'text',6,29,NULL,450,TRUE);
     $c->add('decimal_count',"2",'text',6,29,NULL,460,TRUE);
-    $c->add('timezone','Etc/GMT-6','text',6,29,NULL,490,FALSE);
+    $c->add('timezone','UTC','select',6,29,NULL,490,FALSE);
 
     // Subgroup: Miscellaneous
     $c->add('sg_misc', NULL, 'subgroup', 7, 0, NULL, 0, TRUE);
diff -r 30e040149cbe -r df55886043f2 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 20 10:41:17 2009 +0200
+++ b/public_html/docs/history	Sun Sep 20 11:00:03 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Modernized the "timezone hack", made the config option a dropdown, and moved
+  all timezone-related code into a new TimeZoneConfig class [Dirk]
 - Changing the Post Mode in Advanced Editor mode selected the wrong tab
   (bug #0000980, patch provided by dengen)
 - Made the former $cc parameter for COM_mail an optional array of additional
diff -r 30e040149cbe -r df55886043f2 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/public_html/lib-common.php	Sun Sep 20 11:00:03 2009 +0200
@@ -130,12 +130,6 @@
     exit;
 }
 
-// timezone hack - set the webserver's timezone
-if( !empty( $_CONF['timezone'] ) && !ini_get( 'safe_mode' ) &&
-        function_exists( 'putenv' )) {
-    putenv( 'TZ=' . $_CONF['timezone'] );
-}
-
 
 // +---------------------------------------------------------------------------+
 // | Library Includes: You shouldn't have to touch anything below here         |
@@ -160,6 +154,13 @@
 }
 
 /**
+* Set the webserver's timezone
+*/
+
+require_once $_CONF['path_system'] . 'classes/timezoneconfig.class.php';
+TimeZoneConfig::setSystemTimeZone();
+
+/**
 * Include plugin class.
 * This is a poorly implemented class that was not very well thought out.
 * Still very necessary
diff -r 30e040149cbe -r df55886043f2 public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/public_html/usersettings.php	Sun Sep 20 11:00:03 2009 +0200
@@ -518,36 +518,15 @@
         $preferences->set_var ('theme_selection', '');
     }
 
-    require_once ('Date/TimeZone.php');
     // Timezone
-    if (empty($_USER['tzid']) && isset($_CONF['timezone'])) {
-        $timezone = $_CONF['timezone'];
-    } else if (!empty($_USER['tzid'])) {
-        $timezone = $_USER['tzid'];
-    } else {
-        $tz_obj = Date_TimeZone::getDefault();
-        $timezone = $tz_obj->id;
-    }
-    $selection = '<select id="tzid" name="tzid">' . LB;
+    require_once $_CONF['path_system'] . 'classes/timezoneconfig.class.php';
 
-    $T = $GLOBALS['_DATE_TIMEZONE_DATA'];
+    $timezone = TimeZoneConfig::getUserTimeZone();
+    $selection = TimeZoneConfig::getTimeZoneDropDown($timezone,
+            array('id' => 'tzid', 'name' => 'tzid'));
 
-    foreach ($T as $tzid => $tDetails) {
-        $tzcode = str_replace('_', ' ', $tzid);
-        $tzcode = htmlspecialchars($tzcode);
-        $selection .= '<option value="' . $tzcode . '"';
-        if ($timezone == $tzcode) {
-            $selection .= ' selected="selected"';
-        }
-        $hours = $tDetails['offset'] / (3600 * 1000);
-        if ($hours > 0) {
-            $hours = "+$hours";
-        }
-        $selection .= ">$hours, {$tDetails['shortname']} ($tzcode)</option>" . LB;
-    }
-    $selection .= '</select>';
-    $preferences->set_var ('timezone_selector', $selection);
-    $preferences->set_var ('lang_timezone', $LANG04[158]);
+    $preferences->set_var('timezone_selector', $selection);
+    $preferences->set_var('lang_timezone', $LANG04[158]);
 
     if ($A['noicons'] == '1') {
         $preferences->set_var ('noicons_checked', 'checked="checked"');
diff -r 30e040149cbe -r df55886043f2 sql/updates/mssql_1.6.0_to_1.6.1.php
--- a/sql/updates/mssql_1.6.0_to_1.6.1.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/sql/updates/mssql_1.6.0_to_1.6.1.php	Sun Sep 20 11:00:03 2009 +0200
@@ -23,6 +23,10 @@
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);
     $c->add('meta_keywords','Geeklog, Blog, Content Management System, CMS, Open Source, Security','text',0,0,NULL,2020,TRUE);
 
+    // the timezone config option is a dropdown now
+    $utc = addslashes(serialize('UTC')); // change default timezone to UTC
+    DB_query("UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = -1, default_value = '$utc' WHERE name = 'timezone' AND group_name = 'Core'");
+
     return true;
 }
 
diff -r 30e040149cbe -r df55886043f2 sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Sun Sep 20 11:00:03 2009 +0200
@@ -24,6 +24,10 @@
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);
     $c->add('meta_keywords','Geeklog, Blog, Content Management System, CMS, Open Source, Security','text',0,0,NULL,2020,TRUE);
 
+    // the timezone config option is a dropdown now
+    $utc = addslashes(serialize('UTC')); // change default timezone to UTC
+    DB_query("UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = -1, default_value = '$utc' WHERE name = 'timezone' AND group_name = 'Core'");
+
     return true;
 }
 
diff -r 30e040149cbe -r df55886043f2 system/classes/timezoneconfig.class.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/classes/timezoneconfig.class.php	Sun Sep 20 11:00:03 2009 +0200
@@ -0,0 +1,260 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | timezoneconfig.class.php                                                  |
+// |                                                                           |
+// | Helper class for time zone handling                                       |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Authors: Dirk Haun             - dirk AT haun-online DOT de               |
+// | based on earlier work by Oliver Spiesshofer, Yew Loong, and others        |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is free software; you can redistribute it and/or             |
+// | modify it under the terms of the GNU General Public License               |
+// | as published by the Free Software Foundation; either version 2            |
+// | of the License, or (at your option) any later version.                    |
+// |                                                                           |
+// | This program is distributed in the hope that it will be useful,           |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
+// | GNU General Public License for more details.                              |
+// |                                                                           |
+// | You should have received a copy of the GNU General Public License         |
+// | along with this program; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* Geeklog Time Zone Config class
+*
+* A collection of static (for now) methods dealing with time zone handling.
+*
+* For the original "Timezone Hack" discussion, see
+* @link http://www.geeklog.net/forum/viewtopic.php?showtopic=21232
+* 
+* @author Dirk Haun, dirk AT haun-online DOT de
+* 
+*/
+class TimeZoneConfig {
+
+    /**
+    * Set the system's timezone
+    *
+    * @param    string  $tz     timezone to set; use $_CONF['timezone'] if empty
+    * @return   void
+    * @static
+    *
+    */
+    function setSystemTimeZone($tz = '')
+    {
+        global $_CONF;
+
+        if (empty($tz) && !empty($_CONF['timezone'])) {
+            $tz = $_CONF['timezone'];
+        }
+
+        if (! empty($tz)) {
+            if (function_exists('date_default_timezone_set')) {
+                if (! @date_default_timezone_set($tz)) {
+                    date_default_timezone_set('UTC');
+                    COM_errorLog("Timezone '$tz' not valid - using 'UTC' instead", 1);
+                }
+            } elseif (!ini_get('safe_mode') && function_exists('putenv')) {
+                // aka "Timezone Hack"
+                putenv('TZ=' . $tz);
+            }
+        } elseif (function_exists('date_default_timezone_get')) {
+            // this is not ideal but will stop PHP 5.3.0ff from complaining ...
+            date_default_timezone_set(@date_default_timezone_get());
+        }
+    }
+
+    /**
+    * Get the user's preferred timezone
+    *
+    * @return   string  name of the timezone
+    * @static
+    *
+    */
+    function getUserTimeZone()
+    {
+        global $_CONF, $_USER;
+
+        if (! empty($_USER['tzid'])) {
+            $timezone = $_USER['tzid'];
+        } elseif (! empty($_CONF['timezone'])) {
+            $timezone = $_CONF['timezone'];
+        } else {
+            require_once 'Date/TimeZone.php';
+
+            $tz_obj = Date_TimeZone::getDefault();
+            $timezone = $tz_obj->id;
+        }
+
+        return $timezone;
+    }
+
+    /**
+    * Provide a dropdown menu of the available timezones
+    *
+    * @return   string  HTML for the dropdown
+    * @static
+    *
+    */
+    function getTimeZoneDropDown($selected = '', $attributes = array())
+    {
+        $timezones = TimeZoneConfig::listAvailableTimeZones();
+
+        $selection = '<select';
+        foreach ($attributes as $name => $value) {
+            $selection .= sprintf(' %s="%s"', $name, $value);
+        }
+        $selection .= '>' . LB;
+
+        foreach ($timezones as $tzid => $tzdisplay) {
+            $selection .= '<option value="' . $tzid . '"';
+            if (!empty($selected) && ($selected == $tzid)) {
+                $selection .= ' selected="selected"';
+            }
+            $selection .= ">$tzdisplay</option>" . LB;
+        }
+        $selection .= '</select>';
+
+        return $selection;
+    }
+
+    /**
+    * Provide a list of available timezones
+    *

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:49 -0500
Subject: [geeklog-cvs] geeklog: Use PHP 4-compatible callback
Message-ID: <hg.01f95a3e4545.1257066349.1485632861@qs1489.pair.com>

changeset 7429:01f95a3e4545
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/01f95a3e4545
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 11:14:25 2009 +0200
description:
Use PHP 4-compatible callback

diffstat:

 system/classes/timezoneconfig.class.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r df55886043f2 -r 01f95a3e4545 system/classes/timezoneconfig.class.php
--- a/system/classes/timezoneconfig.class.php	Sun Sep 20 11:00:03 2009 +0200
+++ b/system/classes/timezoneconfig.class.php	Sun Sep 20 11:14:25 2009 +0200
@@ -210,7 +210,7 @@
 
         }
 
-        uasort($timezones, 'TimeZoneConfig::_sort_by_timezone');
+        uasort($timezones, array('TimeZoneConfig', '_sort_by_timezone'));
 
         return $timezones;
     }

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:50 -0500
Subject: [geeklog-cvs] geeklog: Check timezone cookie and
	date_default_timezone_get for...
Message-ID: <hg.a053d9023368.1257066350.1485632861@qs1489.pair.com>

changeset 7430:a053d9023368
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a053d9023368
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 13:37:16 2009 +0200
description:
Check timezone cookie and date_default_timezone_get for the user's preferred time zone

diffstat:

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

diffs (21 lines):

diff -r 01f95a3e4545 -r a053d9023368 system/classes/timezoneconfig.class.php
--- a/system/classes/timezoneconfig.class.php	Sun Sep 20 11:14:25 2009 +0200
+++ b/system/classes/timezoneconfig.class.php	Sun Sep 20 13:37:16 2009 +0200
@@ -86,10 +86,17 @@
     {
         global $_CONF, $_USER;
 
+        // handle like the theme cookie, i.e. use if user is not logged in
+        if (isset($_COOKIE[$_CONF['cookie_tzid']]) && empty($_USER['tzid'])) {
+            $_USER['tzid'] = $_COOKIE[$_CONF['cookie_tzid']];
+        }
+
         if (! empty($_USER['tzid'])) {
             $timezone = $_USER['tzid'];
         } elseif (! empty($_CONF['timezone'])) {
             $timezone = $_CONF['timezone'];
+        } elseif (function_exists('date_default_timezone_get')) {
+            $timezone = @date_default_timezone_get();
         } else {
             require_once 'Date/TimeZone.php';
 

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:51 -0500
Subject: [geeklog-cvs] geeklog: Keep track of the system time zone we set
Message-ID: <hg.ecdf072e268e.1257066351.1485632861@qs1489.pair.com>

changeset 7431:ecdf072e268e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ecdf072e268e
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 17:06:57 2009 +0200
description:
Keep track of the system time zone we set

diffstat:

 system/classes/timezoneconfig.class.php |  25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r a053d9023368 -r ecdf072e268e system/classes/timezoneconfig.class.php
--- a/system/classes/timezoneconfig.class.php	Sun Sep 20 13:37:16 2009 +0200
+++ b/system/classes/timezoneconfig.class.php	Sun Sep 20 17:06:57 2009 +0200
@@ -55,23 +55,32 @@
     {
         global $_CONF;
 
+        static $system_timezone = '';
+
         if (empty($tz) && !empty($_CONF['timezone'])) {
             $tz = $_CONF['timezone'];
         }
 
         if (! empty($tz)) {
-            if (function_exists('date_default_timezone_set')) {
-                if (! @date_default_timezone_set($tz)) {
-                    date_default_timezone_set('UTC');
-                    COM_errorLog("Timezone '$tz' not valid - using 'UTC' instead", 1);
+            if ($tz != $system_timezone) {
+                if (function_exists('date_default_timezone_set')) {
+                    if (! @date_default_timezone_set($tz)) {
+                        date_default_timezone_set('UTC');
+                        COM_errorLog("Timezone '$tz' not valid - using 'UTC' instead", 1);
+                        $system_timezone = 'UTC';
+                    } else {
+                        $system_timezone = $tz;
+                    }
+                } elseif (!ini_get('safe_mode') && function_exists('putenv')) {
+                    // aka "Timezone Hack"
+                    putenv('TZ=' . $tz);
+                    $system_timezone = $tz;
                 }
-            } elseif (!ini_get('safe_mode') && function_exists('putenv')) {
-                // aka "Timezone Hack"
-                putenv('TZ=' . $tz);
             }
         } elseif (function_exists('date_default_timezone_get')) {
             // this is not ideal but will stop PHP 5.3.0ff from complaining ...
-            date_default_timezone_set(@date_default_timezone_get());
+            $system_timezone = @date_default_timezone_get();
+            date_default_timezone_set($system_timezone);
         }
     }
 

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:51 -0500
Subject: [geeklog-cvs] geeklog: Added setUserTimeZone method
Message-ID: <hg.3125f1336c8c.1257066351.1485632861@qs1489.pair.com>

changeset 7432:3125f1336c8c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3125f1336c8c
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 19:07:20 2009 +0200
description:
Added setUserTimeZone method

diffstat:

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

diffs (32 lines):

diff -r ecdf072e268e -r 3125f1336c8c system/classes/timezoneconfig.class.php
--- a/system/classes/timezoneconfig.class.php	Sun Sep 20 17:06:57 2009 +0200
+++ b/system/classes/timezoneconfig.class.php	Sun Sep 20 19:07:20 2009 +0200
@@ -85,6 +85,28 @@
     }
 
     /**
+    * Set the user's preferred timezone
+    *
+    * Note that does nothing if $_CONF['timezone'] is empty, i.e. if no
+    * system timezone is defined, we don't set a user timezone either.
+    *
+    * @return void
+    * @static
+    *
+    */
+    function setUserTimeZone()
+    {
+        global $_CONF;
+
+        if (! empty($_CONF['timezone'])) {
+            $tz = TimeZoneConfig::getUserTimeZone();
+            if (! empty($tz)) {
+                TimeZoneConfig::setSystemTimeZone($tz);
+            }
+        }
+    }
+
+    /**
     * Get the user's preferred timezone
     *
     * @return   string  name of the timezone

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:52 -0500
Subject: [geeklog-cvs] geeklog: The user's time zone selection (from My
	Account) is act...
Message-ID: <hg.a8de0db60197.1257066352.1485632861@qs1489.pair.com>

changeset 7433:a8de0db60197
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a8de0db60197
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 20 19:11:47 2009 +0200
description:
The user's time zone selection (from My Account) is actually used now

diffstat:

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

diffs (22 lines):

diff -r 3125f1336c8c -r a8de0db60197 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 20 19:07:20 2009 +0200
+++ b/public_html/docs/history	Sun Sep 20 19:11:47 2009 +0200
@@ -3,6 +3,7 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The user's time zone selection (from My Account) is actually used now [Dirk]
 - Modernized the "timezone hack", made the config option a dropdown, and moved
   all timezone-related code into a new TimeZoneConfig class [Dirk]
 - Changing the Post Mode in Advanced Editor mode selected the wrong tab
diff -r 3125f1336c8c -r a8de0db60197 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Sep 20 19:07:20 2009 +0200
+++ b/public_html/lib-common.php	Sun Sep 20 19:11:47 2009 +0200
@@ -236,6 +236,7 @@
 */
 
 require_once( $_CONF['path_system'] . 'lib-sessions.php' );
+TimeZoneConfig::setUserTimeZone();
 
 /**
 * Ulf Harnhammar's kses class

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 04:05:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 04:05:58 -0500
Subject: [geeklog-cvs] geeklog: Merged with "timezone" feature branch
Message-ID: <hg.aa322b3c4d3d.1257066358.1485632861@qs1489.pair.com>

changeset 7434:aa322b3c4d3d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/aa322b3c4d3d
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 01 09:43:28 2009 +0100
description:
Merged with "timezone" feature branch

diffstat:

 language/afrikaans.php                                                 |   46 +-
 language/afrikaans_utf-8.php                                           |   46 +-
 language/bosnian.php                                                   |   46 +-
 language/bosnian_utf-8.php                                             |   46 +-
 language/bulgarian.php                                                 |   46 +-
 language/bulgarian_utf-8.php                                           |   46 +-
 language/catalan.php                                                   |   46 +-
 language/catalan_utf-8.php                                             |   46 +-
 language/chinese_simplified_utf-8.php                                  |   46 +-
 language/chinese_traditional_utf-8.php                                 |   46 +-
 language/croatian.php                                                  |   46 +-
 language/croatian_utf-8.php                                            |   46 +-
 language/czech.php                                                     |   46 +-
 language/czech_utf-8.php                                               |   46 +-
 language/danish.php                                                    |   46 +-
 language/danish_utf-8.php                                              |   46 +-
 language/dutch.php                                                     |   46 +-
 language/dutch_utf-8.php                                               |   46 +-
 language/english.php                                                   |   45 +-
 language/english_utf-8.php                                             |   49 +-
 language/estonian.php                                                  |   50 +-
 language/estonian_utf-8.php                                            |   50 +-
 language/farsi_utf-8.php                                               |   46 +-
 language/finnish.php                                                   |   46 +-
 language/finnish_utf-8.php                                             |   46 +-
 language/french_canada.php                                             |   46 +-
 language/french_canada_utf-8.php                                       |   46 +-
 language/french_france.php                                             |   46 +-
 language/french_france_utf-8.php                                       |   46 +-
 language/german.php                                                    |   60 +-
 language/german_formal.php                                             |   58 +-
 language/german_formal_utf-8.php                                       |   58 +-
 language/german_utf-8.php                                              |   60 +-
 language/hebrew_utf-8.php                                              |   44 +-
 language/hellenic.php                                                  |   46 +-
 language/hellenic_utf-8.php                                            |   46 +-
 language/indonesian.php                                                |   46 +-
 language/indonesian_utf-8.php                                          |   46 +-
 language/italian.php                                                   |   46 +-
 language/italian_utf-8.php                                             |   46 +-
 language/japanese_utf-8.php                                            |  429 ++++---
 language/korean.php                                                    |   46 +-
 language/korean_utf-8.php                                              |   46 +-
 language/norwegian.php                                                 |   46 +-
 language/norwegian_utf-8.php                                           |   46 +-
 language/polish.php                                                    |   46 +-
 language/polish_utf-8.php                                              |   46 +-
 language/portuguese.php                                                |   46 +-
 language/portuguese_brazil.php                                         |   46 +-
 language/portuguese_brazil_utf-8.php                                   |   46 +-
 language/portuguese_utf-8.php                                          |   46 +-
 language/romanian.php                                                  |   46 +-
 language/romanian_utf-8.php                                            |   46 +-
 language/russian.php                                                   |   46 +-
 language/russian_utf-8.php                                             |   46 +-
 language/serbian.php                                                   |   46 +-
 language/serbian_utf-8.php                                             |   46 +-
 language/slovak.php                                                    |   46 +-
 language/slovak_utf-8.php                                              |   46 +-
 language/slovenian.php                                                 |   46 +-
 language/slovenian_utf-8.php                                           |   46 +-
 language/spanish.php                                                   |   46 +-
 language/spanish_argentina.php                                         |   46 +-
 language/spanish_argentina_utf-8.php                                   |   46 +-
 language/spanish_utf-8.php                                             |   46 +-
 language/swedish.php                                                   |   46 +-
 language/swedish_utf-8.php                                             |   46 +-
 language/turkish.php                                                   |   46 +-
 language/turkish_utf-8.php                                             |   46 +-
 language/ukrainian.php                                                 |   46 +-
 language/ukrainian_koi8-u.php                                          |   46 +-
 language/ukrainian_utf-8.php                                           |   46 +-
 plugins/calendar/autoinstall.php                                       |   16 +-
 plugins/calendar/functions.inc                                         |   91 +-
 plugins/calendar/language/czech.php                                    |    2 +-
 plugins/calendar/language/czech_utf-8.php                              |    2 +-
 plugins/calendar/language/danish.php                                   |    2 +-
 plugins/calendar/language/danish_utf-8.php                             |    2 +-
 plugins/calendar/language/dutch.php                                    |    2 +-
 plugins/calendar/language/dutch_utf-8.php                              |    2 +-
 plugins/calendar/language/estonian.php                                 |    2 +-
 plugins/calendar/language/french_canada.php                            |    2 +-
 plugins/calendar/language/french_canada_utf-8.php                      |    2 +-
 plugins/calendar/language/german.php                                   |    2 +-
 plugins/calendar/language/german_formal.php                            |    2 +-
 plugins/calendar/language/german_formal_utf-8.php                      |    2 +-
 plugins/calendar/language/german_utf-8.php                             |    2 +-
 plugins/calendar/language/japanese_utf-8.php                           |   16 +-
 plugins/calendar/language/korean.php                                   |    2 +-
 plugins/calendar/language/korean_utf-8.php                             |    2 +-
 plugins/calendar/language/russian.php                                  |    2 +-
 plugins/calendar/language/russian_utf-8.php                            |    2 +-
 plugins/calendar/language/slovenian.php                                |    2 +-
 plugins/calendar/language/slovenian_utf-8.php                          |    2 +-
 plugins/calendar/language/spanish.php                                  |    2 +-
 plugins/calendar/language/spanish_utf-8.php                            |    2 +-
 plugins/calendar/language/ukrainian.php                                |    2 +-
 plugins/calendar/language/ukrainian_koi8-u.php                         |    2 +-
 plugins/calendar/language/ukrainian_utf-8.php                          |    2 +-
 plugins/calendar/sql/mssql_install.php                                 |    5 +-
 plugins/calendar/sql/mssql_updates.php                                 |   43 +
 plugins/calendar/sql/mysql_install.php                                 |    3 +-
 plugins/calendar/sql/mysql_updates.php                                 |   43 +
 plugins/links/autoinstall.php                                          |    6 +-
 plugins/links/functions.inc                                            |   16 +-
 plugins/links/language/chinese_simplified_utf-8.php                    |    5 +-
 plugins/links/language/chinese_traditional_utf-8.php                   |    5 +-
 plugins/links/language/czech.php                                       |    5 +-
 plugins/links/language/czech_utf-8.php                                 |    5 +-
 plugins/links/language/dutch.php                                       |    5 +-
 plugins/links/language/dutch_utf-8.php                                 |    5 +-
 plugins/links/language/english.php                                     |    3 +-
 plugins/links/language/english_utf-8.php                               |    3 +-
 plugins/links/language/estonian.php                                    |    5 +-
 plugins/links/language/estonian_utf-8.php                              |    5 +-
 plugins/links/language/french_canada.php                               |    5 +-
 plugins/links/language/french_canada_utf-8.php                         |    5 +-
 plugins/links/language/german.php                                      |    5 +-
 plugins/links/language/german_formal.php                               |    5 +-
 plugins/links/language/german_formal_utf-8.php                         |    5 +-
 plugins/links/language/german_utf-8.php                                |    5 +-
 plugins/links/language/hebrew_utf-8.php                                |    3 +-
 plugins/links/language/japanese_utf-8.php                              |   23 +-
 plugins/links/language/korean.php                                      |    5 +-
 plugins/links/language/korean_utf-8.php                                |    5 +-
 plugins/links/language/polish.php                                      |    5 +-
 plugins/links/language/polish_utf-8.php                                |    5 +-
 plugins/links/language/russian.php                                     |    5 +-
 plugins/links/language/russian_utf-8.php                               |    5 +-
 plugins/links/language/slovenian.php                                   |    5 +-
 plugins/links/language/slovenian_utf-8.php                             |    5 +-
 plugins/links/language/spanish.php                                     |    5 +-
 plugins/links/language/spanish_utf-8.php                               |    5 +-
 plugins/links/language/ukrainian.php                                   |    5 +-
 plugins/links/language/ukrainian_koi8-u.php                            |    5 +-
 plugins/links/language/ukrainian_utf-8.php                             |    5 +-
 plugins/links/templates/admin/categoryeditor.thtml                     |    4 +
 plugins/polls/autoinstall.php                                          |   10 +-
 plugins/polls/functions.inc                                            |   63 +-
 plugins/polls/language/chinese_simplified_utf-8.php                    |    7 +-
 plugins/polls/language/chinese_traditional_utf-8.php                   |    7 +-
 plugins/polls/language/dutch.php                                       |    7 +-
 plugins/polls/language/dutch_utf-8.php                                 |    7 +-
 plugins/polls/language/estonian.php                                    |    7 +-
 plugins/polls/language/estonian_utf-8.php                              |    5 +-
 plugins/polls/language/french_canada.php                               |    7 +-
 plugins/polls/language/french_canada_utf-8.php                         |    7 +-
 plugins/polls/language/german.php                                      |    7 +-
 plugins/polls/language/german_formal.php                               |    7 +-
 plugins/polls/language/german_formal_utf-8.php                         |    7 +-
 plugins/polls/language/german_utf-8.php                                |    7 +-
 plugins/polls/language/hebrew_utf-8.php                                |    5 +-
 plugins/polls/language/japanese_utf-8.php                              |   53 +-
 plugins/polls/language/korean.php                                      |    7 +-
 plugins/polls/language/korean_utf-8.php                                |    7 +-
 plugins/polls/language/russian.php                                     |    7 +-
 plugins/polls/language/russian_utf-8.php                               |    7 +-
 plugins/polls/language/slovenian.php                                   |    7 +-
 plugins/polls/language/slovenian_utf-8.php                             |    7 +-
 plugins/polls/language/spanish.php                                     |    7 +-
 plugins/polls/language/spanish_utf-8.php                               |    7 +-
 plugins/polls/language/ukrainian.php                                   |    7 +-
 plugins/polls/language/ukrainian_koi8-u.php                            |    7 +-
 plugins/polls/language/ukrainian_utf-8.php                             |    7 +-
 plugins/spamx/BlackList.Examine.class.php                              |    2 +-
 plugins/spamx/DeleteComment.Action.class.php                           |    2 +-
 plugins/spamx/EditBlackList.Admin.class.php                            |    2 +-
 plugins/spamx/EditHeader.Admin.class.php                               |    2 +-
 plugins/spamx/EditIP.Admin.class.php                                   |    2 +-
 plugins/spamx/EditIPofURL.Admin.class.php                              |    2 +-
 plugins/spamx/Header.Examine.class.php                                 |    2 +-
 plugins/spamx/IP.Examine.class.php                                     |    2 +-
 plugins/spamx/IPofUrl.Examine.class.php                                |    2 +-
 plugins/spamx/Import.Admin.class.php                                   |    2 +-
 plugins/spamx/LogView.Admin.class.php                                  |    2 +-
 plugins/spamx/MTBlackList.Examine.class.php                            |    2 +-
 plugins/spamx/MailAdmin.Action.class.php                               |    2 +-
 plugins/spamx/MassDelTrackback.Admin.class.php                         |    2 +-
 plugins/spamx/MassDelete.Admin.class.php                               |    2 +-
 plugins/spamx/SLV.Examine.class.php                                    |    2 +-
 plugins/spamx/SLVbase.class.php                                        |    2 +-
 plugins/spamx/SLVreport.Action.class.php                               |    2 +-
 plugins/spamx/SLVwhitelist.Admin.class.php                             |    2 +-
 plugins/spamx/language/estonian.php                                    |    2 +-
 plugins/spamx/language/estonian_utf-8.php                              |    2 +-
 plugins/spamx/language/farsi_utf-8.php                                 |    2 +-
 plugins/spamx/language/french_canada.php                               |    2 +-
 plugins/spamx/language/french_canada_utf-8.php                         |    2 +-
 plugins/spamx/language/french_france.php                               |    2 +-
 plugins/spamx/language/french_france_utf-8.php                         |    2 +-
 plugins/spamx/language/italian.php                                     |    2 +-
 plugins/spamx/language/italian_utf-8.php                               |    2 +-
 plugins/spamx/language/japanese_utf-8.php                              |    4 +-
 plugins/spamx/language/russian.php                                     |    2 +-
 plugins/spamx/language/russian_utf-8.php                               |    2 +-
 plugins/spamx/language/slovenian.php                                   |    2 +-
 plugins/spamx/language/slovenian_utf-8.php                             |    2 +-
 plugins/spamx/language/spanish.php                                     |    2 +-
 plugins/spamx/language/spanish_utf-8.php                               |    2 +-
 plugins/spamx/language/ukrainian.php                                   |    2 +-
 plugins/spamx/language/ukrainian_koi8-u.php                            |    2 +-
 plugins/spamx/language/ukrainian_utf-8.php                             |    2 +-
 plugins/staticpages/autoinstall.php                                    |   12 +-
 plugins/staticpages/functions.inc                                      |  184 ++-
 plugins/staticpages/install_defaults.php                               |   51 +-
 plugins/staticpages/language/chinese_simplified_utf-8.php              |   19 +-
 plugins/staticpages/language/chinese_traditional_utf-8.php             |   19 +-
 plugins/staticpages/language/czech.php                                 |   19 +-
 plugins/staticpages/language/czech_utf-8.php                           |   19 +-
 plugins/staticpages/language/danish.php                                |   19 +-
 plugins/staticpages/language/danish_utf-8.php                          |   19 +-
 plugins/staticpages/language/dutch.php                                 |   19 +-
 plugins/staticpages/language/dutch_utf-8.php                           |   19 +-
 plugins/staticpages/language/english.php                               |   16 +-
 plugins/staticpages/language/english_utf-8.php                         |   16 +-
 plugins/staticpages/language/estonian.php                              |   19 +-
 plugins/staticpages/language/estonian_utf-8.php                        |   19 +-
 plugins/staticpages/language/farsi_utf-8.php                           |   19 +-
 plugins/staticpages/language/french_canada.php                         |   19 +-
 plugins/staticpages/language/french_canada_utf-8.php                   |   19 +-
 plugins/staticpages/language/german.php                                |   19 +-
 plugins/staticpages/language/german_formal.php                         |   19 +-
 plugins/staticpages/language/german_formal_utf-8.php                   |   19 +-
 plugins/staticpages/language/german_utf-8.php                          |   19 +-
 plugins/staticpages/language/hebrew_utf-8.php                          |   17 +-
 plugins/staticpages/language/italian.php                               |   19 +-
 plugins/staticpages/language/italian_utf-8.php                         |   19 +-
 plugins/staticpages/language/japanese_utf-8.php                        |   21 +-
 plugins/staticpages/language/korean.php                                |   19 +-
 plugins/staticpages/language/korean_utf-8.php                          |   19 +-
 plugins/staticpages/language/polish.php                                |   19 +-
 plugins/staticpages/language/polish_utf-8.php                          |   19 +-
 plugins/staticpages/language/portuguese_brazil.php                     |   19 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php               |   19 +-
 plugins/staticpages/language/slovenian.php                             |   19 +-
 plugins/staticpages/language/slovenian_utf-8.php                       |   19 +-
 plugins/staticpages/language/spanish.php                               |   19 +-
 plugins/staticpages/language/spanish_utf-8.php                         |   19 +-
 plugins/staticpages/language/swedish.php                               |   19 +-
 plugins/staticpages/language/swedish_utf-8.php                         |   19 +-
 plugins/staticpages/language/turkish.php                               |   19 +-
 plugins/staticpages/language/turkish_utf-8.php                         |   19 +-
 plugins/staticpages/language/ukrainian.php                             |   19 +-
 plugins/staticpages/language/ukrainian_koi8-u.php                      |   19 +-
 plugins/staticpages/language/ukrainian_utf-8.php                       |   19 +-
 plugins/staticpages/services.inc.php                                   |   11 +-
 plugins/staticpages/sql/mssql_updates.php                              |   39 +-
 plugins/staticpages/sql/mysql_updates.php                              |   39 +-
 plugins/staticpages/templates/admin/editor_advanced.thtml              |    2 +-
 plugins/xmlsitemap/language/estonian.php                               |   32 +-
 plugins/xmlsitemap/language/estonian_utf-8.php                         |   32 +-
 plugins/xmlsitemap/language/hebrew_utf-8.php                           |   28 +-
 plugins/xmlsitemap/language/japanese_utf-8.php                         |   36 +-
 public_html/admin/block.php                                            |   42 +-
 public_html/admin/configuration.php                                    |   13 +-
 public_html/admin/database.php                                         |  524 +++++++++-
 public_html/admin/group.php                                            |    8 +-
 public_html/admin/install/config-install.php                           |    1 +
 public_html/admin/install/language/hebrew_utf-8.php                    |    2 +-
 public_html/admin/install/language/japanese_utf-8.php                  |    2 +-
 public_html/admin/install/lib-install.php                              |   18 +-
 public_html/admin/install/toinnodb.php                                 |  116 --
 public_html/admin/mail.php                                             |    2 +-
 public_html/admin/moderation.php                                       |   22 +-
 public_html/admin/plugins.php                                          |  106 +-
 public_html/admin/plugins/calendar/index.php                           |   18 +-
 public_html/admin/plugins/links/category.php                           |   15 +-
 public_html/admin/plugins/links/index.php                              |   10 +-
 public_html/admin/plugins/polls/index.php                              |   65 +-
 public_html/admin/plugins/staticpages/index.php                        |   25 +-
 public_html/admin/story.php                                            |   42 +-
 public_html/admin/syndication.php                                      |   33 +-
 public_html/admin/topic.php                                            |   75 +-
 public_html/admin/trackback.php                                        |   12 +-
 public_html/admin/user.php                                             |   22 +-
 public_html/comment.php                                                |    5 +-
 public_html/docs/english/changes.html                                  |   34 +
 public_html/docs/english/config.html                                   |   44 +-
 public_html/docs/english/index.html                                    |    5 +-
 public_html/docs/english/staticpages.html                              |   71 +-
 public_html/docs/english/support.html                                  |    8 +-
 public_html/docs/english/theme.html                                    |   56 +-
 public_html/docs/english/themevars.html                                |   24 +-
 public_html/docs/history                                               |   84 +-
 public_html/javascript/storyeditor_fckeditor.js                        |    4 +-
 public_html/layout/professional/admin/mail/mailform.thtml              |   29 +-
 public_html/layout/professional/admin/story/storyeditor.thtml          |    4 +-
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |    6 +-
 public_html/layout/professional/admin/topic/topiceditor.thtml          |    4 +
 public_html/layout/professional/images/update.png                      |      
 public_html/layout/professional/profiles/contactauthorform.thtml       |   17 +-
 public_html/layout/professional/profiles/contactuserform.thtml         |   28 +-
 public_html/layout/professional/style.css                              |   38 +-
 public_html/lib-common.php                                             |   33 +-
 public_html/profiles.php                                               |   81 +-
 public_html/robots.txt                                                 |    1 +
 public_html/submit.php                                                 |    3 +-
 public_html/users.php                                                  |  127 +-
 public_html/usersettings.php                                           |   26 +-
 sql/mysql_tableanddata.php                                             |    2 +-
 sql/updates/mssql_1.6.0_to_1.6.1.php                                   |    3 +
 sql/updates/mysql_1.6.0_to_1.6.1.php                                   |    7 +-
 system/classes/listfactory.class.php                                   |  250 +++-
 system/classes/search.class.php                                        |  262 ++--
 system/classes/searchcriteria.class.php                                |  118 +-
 system/classes/story.class.php                                         |  135 +-
 system/classes/template.class.php                                      |    8 +-
 system/lib-admin.php                                                   |  299 +++--
 system/lib-comment.php                                                 |    3 +-
 system/lib-custom.php.dist                                             |   11 +
 system/lib-plugins.php                                                 |   15 -
 system/lib-security.php                                                |  127 ++
 312 files changed, 6688 insertions(+), 2258 deletions(-)

diffs (truncated from 19522 to 300 lines):

diff -r a8de0db60197 -r aa322b3c4d3d language/afrikaans.php
--- a/language/afrikaans.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/afrikaans.php	Sun Nov 01 09:43:28 2009 +0100
@@ -824,7 +824,10 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -859,7 +862,8 @@
     26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
     27 => 'of Laai Onderwerp Ikoon',
     28 => 'Maksimum',
-    29 => 'L&ecirc;er Oplaai Foute'
+    29 => 'L&ecirc;er Oplaai Foute',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -1061,6 +1065,7 @@
     39 => 'Upload a plugin',
     40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
     41 => 'Upload',
+    42 => 'Click to update',
     99 => 'An unknown error occured',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
@@ -1322,7 +1327,26 @@
     'size' => 'Grootte',
     'bytes' => 'Grepe',
     'total_number' => 'Totale aantal rugsteunings: %d',
-    'download' => 'Click to download this file'
+    'download' => 'Click to download this file',
+    'new_backup' => 'New Backup',
+    'delete_failure' => 'One or more backup files could not be deleted.',
+    'delete_success' => 'Backup file(s) successfully deleted.',
+    'convert_menu' => 'Convert to InnoDB',
+    'convert_title' => 'Convert to InnoDB tables',
+    'convert_button' => 'Convert',
+    'sorry_no_innodb' => 'Sorry, your version of MySQL does not support InnoDB tables.',
+    'innodb_explain' => 'InnoDB tables provide better performance on <em>really</em> large databases but make the backup process more complicated. Please <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">read up</a> on the pros and cons of InnoDB tables before you perform this operation.',
+    'already_converted' => 'Note: It appears that all of the tables have already been converted to InnoDB.',
+    'conversion_patience' => 'Note: Conversion may take some time - please be patient.',
+    'innodb_success' => 'Successfully converted tables to InnoDB.',
+    'table_issues' => 'There may have been problems with some tables, though. Please check error.log for details.',
+    'optimize_menu' => 'Optimize Tables',
+    'optimize_title' => 'Optimize Tables',
+    'optimize_button' => 'Optimize',
+    'optimize_explain' => 'Optimizing tables may help to improve the performance of your site. The actual impact depends on the table usage and some tables may benefit from it more than others. Do no expect to see a huge difference in performance. The <a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">MySQL manual</a> states: <q>it is not likely that you need to do this more than once a week or month</q>.',
+    'last_optimization' => 'Last optimization',
+    'optimization_patience' => 'Note: Optimization may take some time - please be patient.',
+    'optimize_success' => 'Successfully optimized database tables.'
 );
 
 ###############################################################################
@@ -1471,7 +1495,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1571,7 +1595,10 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
-    'na' => 'N/A'
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
+    'na' => 'N/A',
+    'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1843,12 +1870,16 @@
     'censorlist' => 'Censor List',
     'ip_lookup' => 'IP Lookup',
     'url_rewrite' => 'Enable URL Rewrite',
+    'meta_tags' => 'Meta Tags',
+    'meta_description' => 'Default Meta Description',
+    'meta_keywords' => 'Default Meta Keywords',
     'default_permissions_block' => 'Block Default Permissions',
     'default_permissions_story' => 'Story Default Permissions',
     'default_permissions_topic' => 'Topic Default Permissions',
     'atom_max_stories' => 'Max. Stories in Webservices Feed',
     'disable_webservices' => 'Disable Webservices?',
     'restrict_webservices' => 'Restrict Webservices?',
+    'article_comment_close_enabled' => 'Automatically close comments (default)',
     '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?',
@@ -1940,7 +1971,8 @@
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => '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)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
-?>
\ No newline at end of file
+?>
diff -r a8de0db60197 -r aa322b3c4d3d language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/afrikaans_utf-8.php	Sun Nov 01 09:43:28 2009 +0100
@@ -824,7 +824,10 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -859,7 +862,8 @@
     26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
     27 => 'of Laai Onderwerp Ikoon',
     28 => 'Maksimum',
-    29 => 'L&ecirc;er Oplaai Foute'
+    29 => 'L&ecirc;er Oplaai Foute',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -1061,6 +1065,7 @@
     39 => 'Upload a plugin',
     40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
     41 => 'Upload',
+    42 => 'Click to update',
     99 => 'An unknown error occured',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
@@ -1322,7 +1327,26 @@
     'size' => 'Grootte',
     'bytes' => 'Grepe',
     'total_number' => 'Totale aantal rugsteunings: %d',
-    'download' => 'Click to download this file'
+    'download' => 'Click to download this file',
+    'new_backup' => 'New Backup',
+    'delete_failure' => 'One or more backup files could not be deleted.',
+    'delete_success' => 'Backup file(s) successfully deleted.',
+    'convert_menu' => 'Convert to InnoDB',
+    'convert_title' => 'Convert to InnoDB tables',
+    'convert_button' => 'Convert',
+    'sorry_no_innodb' => 'Sorry, your version of MySQL does not support InnoDB tables.',
+    'innodb_explain' => 'InnoDB tables provide better performance on <em>really</em> large databases but make the backup process more complicated. Please <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">read up</a> on the pros and cons of InnoDB tables before you perform this operation.',
+    'already_converted' => 'Note: It appears that all of the tables have already been converted to InnoDB.',
+    'conversion_patience' => 'Note: Conversion may take some time - please be patient.',
+    'innodb_success' => 'Successfully converted tables to InnoDB.',
+    'table_issues' => 'There may have been problems with some tables, though. Please check error.log for details.',
+    'optimize_menu' => 'Optimize Tables',
+    'optimize_title' => 'Optimize Tables',
+    'optimize_button' => 'Optimize',
+    'optimize_explain' => 'Optimizing tables may help to improve the performance of your site. The actual impact depends on the table usage and some tables may benefit from it more than others. Do no expect to see a huge difference in performance. The <a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">MySQL manual</a> states: <q>it is not likely that you need to do this more than once a week or month</q>.',
+    'last_optimization' => 'Last optimization',
+    'optimization_patience' => 'Note: Optimization may take some time - please be patient.',
+    'optimize_success' => 'Successfully optimized database tables.'
 );
 
 ###############################################################################
@@ -1471,7 +1495,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1571,7 +1595,10 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
-    'na' => 'N/A'
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
+    'na' => 'N/A',
+    'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1843,12 +1870,16 @@
     'censorlist' => 'Censor List',
     'ip_lookup' => 'IP Lookup',
     'url_rewrite' => 'Enable URL Rewrite',
+    'meta_tags' => 'Meta Tags',
+    'meta_description' => 'Default Meta Description',
+    'meta_keywords' => 'Default Meta Keywords',
     'default_permissions_block' => 'Block Default Permissions',
     'default_permissions_story' => 'Story Default Permissions',
     'default_permissions_topic' => 'Topic Default Permissions',
     'atom_max_stories' => 'Max. Stories in Webservices Feed',
     'disable_webservices' => 'Disable Webservices?',
     'restrict_webservices' => 'Restrict Webservices?',
+    'article_comment_close_enabled' => 'Automatically close comments (default)',
     '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?',
@@ -1940,7 +1971,8 @@
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => '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)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
-?>
\ No newline at end of file
+?>
diff -r a8de0db60197 -r aa322b3c4d3d language/bosnian.php
--- a/language/bosnian.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/bosnian.php	Sun Nov 01 09:43:28 2009 +0100
@@ -828,7 +828,10 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -863,7 +866,8 @@
     26 => 'make this the default topic for archived stories. Only one topic allowed.',
     27 => 'Or Upload Topic Icon',
     28 => 'Maximum',
-    29 => 'File Upload Errors'
+    29 => 'File Upload Errors',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -1065,6 +1069,7 @@
     39 => 'Upload a plugin',
     40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
     41 => 'Upload',
+    42 => 'Click to update',
     99 => 'An unknown error occured',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
@@ -1326,7 +1331,26 @@
     'size' => 'Velicina',
     'bytes' => 'Bytes',
     'total_number' => 'Ukupan broj sigurnosnih backupova: %d',
-    'download' => 'Click to download this file'
+    'download' => 'Click to download this file',
+    'new_backup' => 'New Backup',
+    'delete_failure' => 'One or more backup files could not be deleted.',
+    'delete_success' => 'Backup file(s) successfully deleted.',
+    'convert_menu' => 'Convert to InnoDB',
+    'convert_title' => 'Convert to InnoDB tables',
+    'convert_button' => 'Convert',
+    'sorry_no_innodb' => 'Sorry, your version of MySQL does not support InnoDB tables.',
+    'innodb_explain' => 'InnoDB tables provide better performance on <em>really</em> large databases but make the backup process more complicated. Please <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">read up</a> on the pros and cons of InnoDB tables before you perform this operation.',
+    'already_converted' => 'Note: It appears that all of the tables have already been converted to InnoDB.',
+    'conversion_patience' => 'Note: Conversion may take some time - please be patient.',
+    'innodb_success' => 'Successfully converted tables to InnoDB.',
+    'table_issues' => 'There may have been problems with some tables, though. Please check error.log for details.',
+    'optimize_menu' => 'Optimize Tables',
+    'optimize_title' => 'Optimize Tables',
+    'optimize_button' => 'Optimize',
+    'optimize_explain' => 'Optimizing tables may help to improve the performance of your site. The actual impact depends on the table usage and some tables may benefit from it more than others. Do no expect to see a huge difference in performance. The <a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">MySQL manual</a> states: <q>it is not likely that you need to do this more than once a week or month</q>.',
+    'last_optimization' => 'Last optimization',
+    'optimization_patience' => 'Note: Optimization may take some time - please be patient.',
+    'optimize_success' => 'Successfully optimized database tables.'
 );
 
 ###############################################################################
@@ -1475,7 +1499,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1575,7 +1599,10 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
-    'na' => 'N/A'
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
+    'na' => 'N/A',

From geeklog-cvs at lists.geeklog.net  Sun Nov  1 12:38:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Nov 2009 12:38:15 -0500
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_1b1 for changeset
	aa322b3c4d3d
Message-ID: <hg.cadb28a7bc7b.1257097095.1485632861@qs1489.pair.com>

changeset 7435:cadb28a7bc7b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cadb28a7bc7b
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 01 18:38:05 2009 +0100
description:
Added tag geeklog_1_6_1b1 for changeset aa322b3c4d3d

diffstat:

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

diffs (8 lines):

diff -r aa322b3c4d3d -r cadb28a7bc7b .hgtags
--- a/.hgtags	Sun Nov 01 09:43:28 2009 +0100
+++ b/.hgtags	Sun Nov 01 18:38:05 2009 +0100
@@ -7,3 +7,4 @@
 f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
 f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
 f0de67e8e9304e43062f293941dee29def2ec8db geeklog_1_4_1_stable
+aa322b3c4d3debfac52df37fdd2cfedaba632480 geeklog_1_6_1b1

From geeklog-cvs at lists.geeklog.net  Tue Nov  3 15:54:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 03 Nov 2009 15:54:04 -0500
Subject: [geeklog-cvs] geeklog: Wrong CSS class (fix by Tom Homer)
Message-ID: <hg.dcad55dde562.1257281644.1485632861@qs1489.pair.com>

changeset 7436:dcad55dde562
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/dcad55dde562
user: Dirk Haun <dirk at haun-online.de>
date: Tue Nov 03 21:53:52 2009 +0100
description:
Wrong CSS class (fix by Tom Homer)

diffstat:

 plugins/staticpages/functions.inc |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r cadb28a7bc7b -r dcad55dde562 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Nov 01 18:38:05 2009 +0100
+++ b/plugins/staticpages/functions.inc	Tue Nov 03 21:53:52 2009 +0100
@@ -1339,7 +1339,7 @@
             $newstaticpages[] = COM_createLink($astaticpage, $url, $attr);
         }
 
-        $retval .= COM_makeList( $newstaticpages, 'list-new-comments' );
+        $retval .= COM_makeList( $newstaticpages, 'list-new-plugins' );
     }
     else
     {

From geeklog-cvs at lists.geeklog.net  Wed Nov  4 07:00:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Nov 2009 07:00:50 -0500
Subject: [geeklog-cvs] geeklog: Fixed a bug in the Group Editor that didn't
	let you add...
Message-ID: <hg.37aac60623c4.1257336050.1485632861@qs1489.pair.com>

changeset 7437:37aac60623c4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/37aac60623c4
user: Dirk Haun <dirk at haun-online.de>
date: Wed Nov 04 13:00:40 2009 +0100
description:
Fixed a bug in the Group Editor that didn't let you add groups to other groups unless your $_TABLES['groups'] happened to be called "groups" (bug #0000998)

diffstat:

 public_html/admin/group.php |   4 ++--
 public_html/docs/history    |  13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r dcad55dde562 -r 37aac60623c4 public_html/admin/group.php
--- a/public_html/admin/group.php	Tue Nov 03 21:53:52 2009 +0100
+++ b/public_html/admin/group.php	Wed Nov 04 13:00:40 2009 +0100
@@ -1083,8 +1083,8 @@
         $features = $_POST['features'];
     }
     $groups = array();
-    if (isset($_POST[$_TABLES['groups']])) {
-        $groups = $_POST[$_TABLES['groups']];
+    if (isset($_POST['groups'])) {
+        $groups = $_POST['groups'];
     }
     $display .= savegroup(COM_applyFilter($_POST['grp_id'], true),
                           COM_applyFilter($_POST['grp_name']),
diff -r dcad55dde562 -r 37aac60623c4 public_html/docs/history
--- a/public_html/docs/history	Tue Nov 03 21:53:52 2009 +0100
+++ b/public_html/docs/history	Wed Nov 04 13:00:40 2009 +0100
@@ -1,5 +1,18 @@
 Geeklog History/Changes:
 
+Nov ??, 2009 (1.6.1rc1)
+------------
+
+Changes since 1.6.1b1:
+- Fixed a bug in the Group Editor that didn't let you add groups to other groups
+  unless your $_TABLES['groups'] happened to be called "groups" (bug #0000998)
+  [Dirk]
+
+Static Pages Plugin
+-------------------
+- Fixed use of wrong CSS class for the entries for the What's New block [Tom]
+
+
 Nov 1, 2009 (1.6.1b1)
 -----------
 

From geeklog-cvs at lists.geeklog.net  Wed Nov  4 19:56:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Nov 2009 19:56:14 -0500
Subject: [geeklog-cvs] geeklog: Limit the limit drop down box in the search
	results pag...
Message-ID: <hg.af60253641ad.1257382574.1485632861@qs1489.pair.com>

changeset 7438:af60253641ad
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/af60253641ad
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 00:43:55 2009 +0000
description:
Limit the limit drop down box in the search results page (feature request #0000910)

diffstat:

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

diffs (32 lines):

diff -r 37aac60623c4 -r af60253641ad system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Wed Nov 04 13:00:40 2009 +0100
+++ b/system/classes/listfactory.class.php	Thu Nov 05 00:43:55 2009 +0000
@@ -614,11 +614,28 @@
 
                 $selected = $this->_per_page == $val ? ' selected="selected"' : '';
 
+                // Prevent displaying too many limit items
+                if ($this->_total_found <= $val)
+                {
+                    // If this is the last item, chances are its going to be selected
+                    $selected = $this->_per_page >= $val ? ' selected="selected"' : '';
+                    $list_templates->set_var('limit_href', $href);
+                    $list_templates->set_var('limit_text', $text);
+                    $list_templates->set_var('limit_selected', $selected);
+                    $list_templates->parse('page_limit', 'limit', true);
+
+                    break;
+                }
+
+                $selected = $this->_per_page == $val ? ' selected="selected"' : '';
                 $list_templates->set_var('limit_text', $text);
                 $list_templates->set_var('limit_href', $href);
                 $list_templates->set_var('limit_selected', $selected);
                 $list_templates->parse('page_limit', 'limit', true);
             }
+            if (empty($text)) {
+                $list_templates->set_var('show_limit', 'display:none;');
+            }
         }
         else
         {

From geeklog-cvs at lists.geeklog.net  Wed Nov  4 19:56:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Nov 2009 19:56:15 -0500
Subject: [geeklog-cvs] geeklog: Fix to search page now uses XHTML when set,
	patch provi...
Message-ID: <hg.57bcdd15e6d4.1257382575.1485632861@qs1489.pair.com>

changeset 7439:57bcdd15e6d4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/57bcdd15e6d4
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 00:53:29 2009 +0000
description:
Fix to search page now uses XHTML when set, patch provided by taca (bug #0001022)

diffstat:

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

diffs (14 lines):

diff -r af60253641ad -r 57bcdd15e6d4 system/classes/search.class.php
--- a/system/classes/search.class.php	Thu Nov 05 00:43:55 2009 +0000
+++ b/system/classes/search.class.php	Thu Nov 05 00:53:29 2009 +0000
@@ -483,8 +483,8 @@
         {
             $obj->setStyle('inline');
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
-            $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br>');
-            $obj->setField('',          'description',  true,       false, '%s<br>');
+            $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
+            $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
             $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
             $obj->setField($LANG09[18], 'uid',          $show_user, true,  $LANG01[104].' %s ');
             $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');

From geeklog-cvs at lists.geeklog.net  Thu Nov  5 14:06:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 05 Nov 2009 14:06:39 -0500
Subject: [geeklog-cvs] geeklog: Fixed some layout issues with Table style
	search result...
Message-ID: <hg.d2f5a93daea6.1257447999.1485632861@qs1489.pair.com>

changeset 7440:d2f5a93daea6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d2f5a93daea6
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 19:05:28 2009 +0000
description:
Fixed some layout issues with Table style search results and made current sort order more visible.

diffstat:

 system/classes/listfactory.class.php |  32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r 57bcdd15e6d4 -r d2f5a93daea6 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Thu Nov 05 00:53:29 2009 +0000
+++ b/system/classes/listfactory.class.php	Thu Nov 05 19:05:28 2009 +0000
@@ -612,8 +612,6 @@
                 $href = $this->_page_url . "order={$this->_sort_arr['field']}&amp;" .
                             "direction={$this->_sort_arr['direction']}&amp;results=$val";
 
-                $selected = $this->_per_page == $val ? ' selected="selected"' : '';
-
                 // Prevent displaying too many limit items
                 if ($this->_total_found <= $val)
                 {
@@ -652,17 +650,11 @@
         }
         else
         {
-            $sort_selected = ' selected="selected"';
+            $sort_selected = '';
             $sort_text = $LANG09[68].' ';
             if (!$show_sort) {
                 $list_templates->set_var('show_sort', 'display:none;');
             }
-
-            // Write field
-            $list_templates->set_var('sort_text', "$sort_text...");
-            $list_templates->set_var('sort_href', "");
-            $list_templates->set_var('sort_selected', $sort_selected);
-            $list_templates->parse('page_sort', 'sort', true);
         }
 
         // Draw the sorting select box/table headings
@@ -678,10 +670,22 @@
                     $direction = $this->_def_sort_arr['direction'];
 
                     // Show the sort arrow
-                    if ($this->_sort_arr['field'] === $field['name']) {
-                        //$selected = $sort_selected;
+                    if ($this->_sort_arr['field'] === $field['name'])
+                    {
                         $direction = $this->_sort_arr['direction'] == 'asc' ? 'desc' : 'asc';
-                        $text .= " ($direction)";
+
+                        if ($this->_style == 'inline') {
+                            // Add drop down item for current sort order
+                            $list_templates->set_var('sort_text', $text.' ('.$this->_sort_arr['direction'].')');
+                            $list_templates->set_var('sort_href', '');
+                            $list_templates->set_var('sort_selected', ' selected="selected"');
+                            $list_templates->parse('page_sort', 'sort', true);
+
+                            // Set up the sort order for the opposite direction
+                            $text .= " ($direction)";
+                        } else {
+                            $selected = $sort_selected;
+                        }
                     }
 
                     $href = $this->_page_url . "results={$this->_per_page}&amp;" .
@@ -729,6 +733,10 @@
                         // Write field
                         $list_templates->set_var('field_text', $fieldvalue);
                         $list_templates->parse('item_field', 'field', true);
+                    } else {
+                        // Write an empty field
+                        $list_templates->set_var('field_text', '&nbsp;');
+                        $list_templates->parse('item_field', 'field', true);
                     }
                 }
             }

From geeklog-cvs at lists.geeklog.net  Thu Nov  5 16:36:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 05 Nov 2009 16:36:39 -0500
Subject: [geeklog-cvs] geeklog: Dont display sort by author when searching
	by author (f...
Message-ID: <hg.5f5387780b30.1257456999.1485632861@qs1489.pair.com>

changeset 7442:5f5387780b30
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5f5387780b30
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 21:35:39 2009 +0000
description:
Dont display sort by author when searching by author (feature request #0000910)

diffstat:

 system/classes/listfactory.class.php |  2 +-
 system/classes/search.class.php      |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 142904168971 -r 5f5387780b30 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Thu Nov 05 21:33:05 2009 +0000
+++ b/system/classes/listfactory.class.php	Thu Nov 05 21:35:39 2009 +0000
@@ -665,7 +665,7 @@
                 $text = $sort_text . $field['title'];
                 $href = '';
                 $selected = '';
-                
+
                 if ($this->_style == 'inline' && $show_sort && $field['sort'] != false)
                 {
                     $direction = $this->_def_sort_arr['direction'];
diff -r 142904168971 -r 5f5387780b30 system/classes/search.class.php
--- a/system/classes/search.class.php	Thu Nov 05 21:33:05 2009 +0000
+++ b/system/classes/search.class.php	Thu Nov 05 21:35:39 2009 +0000
@@ -481,12 +481,13 @@
         }
         else if ($style == 'google')
         {
+            $sort_uid = $this->_author == '' ? true : false;
             $obj->setStyle('inline');
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
             $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
             $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
             $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
-            $obj->setField($LANG09[18], 'uid',          $show_user, true,  $LANG01[104].' %s ');
+            $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
             $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');
             $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, true,  ' - %s');
             $obj->setField($LANG09[50], 'hits',         $show_hits, true,  ' - %s '.$LANG09[50]);

From geeklog-cvs at lists.geeklog.net  Thu Nov  5 16:36:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 05 Nov 2009 16:36:39 -0500
Subject: [geeklog-cvs] geeklog: Corrected some code logic,
	sort items were still being ...
Message-ID: <hg.142904168971.1257456999.1485632861@qs1489.pair.com>

changeset 7441:142904168971
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/142904168971
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 21:33:05 2009 +0000
description:
Corrected some code logic, sort items were still being displayed when they had been disabled using ListFactory::setField()

diffstat:

 system/classes/listfactory.class.php |  50 +++++++++++++++----------
 1 files changed, 30 insertions(+), 20 deletions(-)

diffs (76 lines):

diff -r d2f5a93daea6 -r 142904168971 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Thu Nov 05 19:05:28 2009 +0000
+++ b/system/classes/listfactory.class.php	Thu Nov 05 21:33:05 2009 +0000
@@ -665,42 +665,52 @@
                 $text = $sort_text . $field['title'];
                 $href = '';
                 $selected = '';
-                if ($show_sort && $field['sort'] != false)
+                
+                if ($this->_style == 'inline' && $show_sort && $field['sort'] != false)
                 {
                     $direction = $this->_def_sort_arr['direction'];
 
                     // Show the sort arrow
                     if ($this->_sort_arr['field'] === $field['name'])
                     {
+                        // Add drop down item for current sort order
+                        $list_templates->set_var('sort_text', $text.' ('.$this->_sort_arr['direction'].')');
+                        $list_templates->set_var('sort_href', '');
+                        $list_templates->set_var('sort_selected', ' selected="selected"');
+                        $list_templates->parse('page_sort', 'sort', true);
+
+                        // Set up the sort order for the opposite direction
                         $direction = $this->_sort_arr['direction'] == 'asc' ? 'desc' : 'asc';
+                        $text .= " ($direction)";
+                    }
+                    $href = $this->_page_url . "results={$this->_per_page}&amp;" .
+                                "order={$field['name']}&amp;direction=$direction";
 
-                        if ($this->_style == 'inline') {
-                            // Add drop down item for current sort order
-                            $list_templates->set_var('sort_text', $text.' ('.$this->_sort_arr['direction'].')');
-                            $list_templates->set_var('sort_href', '');
-                            $list_templates->set_var('sort_selected', ' selected="selected"');
-                            $list_templates->parse('page_sort', 'sort', true);
+                    // Write field
+                    $list_templates->set_var('sort_text', $text);
+                    $list_templates->set_var('sort_href', $href);
+                    $list_templates->set_var('sort_selected', '');
+                    $list_templates->parse('page_sort', 'sort', true);
+                }
+                else if ($this->_style == 'table')
+                {
+                    if ($show_sort && $field['sort'] != false)
+                    {
+                        $text = "<a href=\"$href\">$text</a>";
 
-                            // Set up the sort order for the opposite direction
-                            $text .= " ($direction)";
-                        } else {
+                        if ($this->_sort_arr['field'] === $field['name']) {
                             $selected = $sort_selected;
                         }
                     }
-
                     $href = $this->_page_url . "results={$this->_per_page}&amp;" .
                                 "order={$field['name']}&amp;direction=$direction";
 
-                    if ($this->_style == 'table') {
-                        $text = "<a href=\"$href\">$text</a>";
-                    }
+                    // Write field
+                    $list_templates->set_var('sort_text', $text);
+                    $list_templates->set_var('sort_href', $href);
+                    $list_templates->set_var('sort_selected', $selected);
+                    $list_templates->parse('page_sort', 'sort', true);
                 }
-
-                // Write field
-                $list_templates->set_var('sort_text', $text);
-                $list_templates->set_var('sort_href', $href);
-                $list_templates->set_var('sort_selected', $selected);
-                $list_templates->parse('page_sort', 'sort', true);
             }
         }
 

From geeklog-cvs at lists.geeklog.net  Thu Nov  5 17:00:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 05 Nov 2009 17:00:12 -0500
Subject: [geeklog-cvs] geeklog: Fixed sorting on table style
Message-ID: <hg.cb0edbf9c9ac.1257458412.1485632861@qs1489.pair.com>

changeset 7443:cb0edbf9c9ac
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cb0edbf9c9ac
user: Sami Barakat <sami at sbarakat.co.uk>
date: Thu Nov 05 21:59:17 2009 +0000
description:
Fixed sorting on table style

diffstat:

 system/classes/listfactory.class.php |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 5f5387780b30 -r cb0edbf9c9ac system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Thu Nov 05 21:35:39 2009 +0000
+++ b/system/classes/listfactory.class.php	Thu Nov 05 21:59:17 2009 +0000
@@ -694,6 +694,10 @@
                 }
                 else if ($this->_style == 'table')
                 {
+                    $direction = $this->_sort_arr['direction'] == 'asc' ? 'desc' : 'asc';
+                    $href = $this->_page_url . "results={$this->_per_page}&amp;" .
+                        "order={$field['name']}&amp;direction=$direction";
+
                     if ($show_sort && $field['sort'] != false)
                     {
                         $text = "<a href=\"$href\">$text</a>";
@@ -702,8 +706,6 @@
                             $selected = $sort_selected;
                         }
                     }
-                    $href = $this->_page_url . "results={$this->_per_page}&amp;" .
-                                "order={$field['name']}&amp;direction=$direction";
 
                     // Write field
                     $list_templates->set_var('sort_text', $text);

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 06:58:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 06:58:08 -0500
Subject: [geeklog-cvs] tools: On a Mac,
	check that we don't ship any files that have xa...
Message-ID: <hg.ca95b928d283.1257595088.-909925928@qs1489.pair.com>

changeset 44:ca95b928d283
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/tools/rev/ca95b928d283
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 12:57:44 2009 +0100
description:
On a Mac, check that we don't ship any files that have xattr set (bug #0001021)

diffstat:

 ship/mkdist.sh |  11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diffs (21 lines):

diff -r d70dcf7ba266 -r ca95b928d283 ship/mkdist.sh
--- a/ship/mkdist.sh	Sun Oct 11 19:15:09 2009 +0200
+++ b/ship/mkdist.sh	Sat Nov 07 12:57:44 2009 +0100
@@ -91,6 +91,17 @@
 find . -type f -name '.*' -exec rm \{\} \;
 #find . -name CVS -exec rm -r \{\} \; 2>/dev/null
 
+# if on a Mac, check that we don't have any of those pesky xattributes set
+xattr=`which xattr`
+if [ -n "$xattr" ]; then
+  xa=`xattr -r .`
+  if [ -n "$xa" ]; then
+    echo "xattr found:"
+    echo $xa
+    exit
+  fi
+fi
+
 find . -type f -exec chmod a-x \{\} \;
 chmod a+x emailgeeklogstories
 

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 07:00:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 07:00:16 -0500
Subject: [geeklog-cvs] geeklog: Fixed comments - no code changes
Message-ID: <hg.252d8d24012d.1257595216.1485632861@qs1489.pair.com>

changeset 7444:252d8d24012d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/252d8d24012d
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 11:15:02 2009 +0100
description:
Fixed comments - no code changes

diffstat:

 system/classes/timezoneconfig.class.php |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r cb0edbf9c9ac -r 252d8d24012d system/classes/timezoneconfig.class.php
--- a/system/classes/timezoneconfig.class.php	Thu Nov 05 21:59:17 2009 +0000
+++ b/system/classes/timezoneconfig.class.php	Sat Nov 07 11:15:02 2009 +0100
@@ -87,7 +87,7 @@
     /**
     * Set the user's preferred timezone
     *
-    * Note that does nothing if $_CONF['timezone'] is empty, i.e. if no
+    * Note that it does nothing if $_CONF['timezone'] is empty, i.e. if no
     * system timezone is defined, we don't set a user timezone either.
     *
     * @return void
@@ -141,7 +141,9 @@
     /**
     * Provide a dropdown menu of the available timezones
     *
-    * @return   string  HTML for the dropdown
+    * @param    string  $selected   (optional) currently selected timezone
+    * @param    array   $attributes (optional) extra attributes for select tag
+    * @return   string              HTML for the dropdown
     * @static
     *
     */

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 07:00:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 07:00:17 -0500
Subject: [geeklog-cvs] geeklog: Updated list of changes
Message-ID: <hg.3e2bd1e79a57.1257595217.1485632861@qs1489.pair.com>

changeset 7446:3e2bd1e79a57
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3e2bd1e79a57
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 11:53:47 2009 +0100
description:
Updated list of changes

diffstat:

 public_html/docs/english/changes.html |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r b0971977fd28 -r 3e2bd1e79a57 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sat Nov 07 11:35:44 2009 +0100
+++ b/public_html/docs/english/changes.html	Sat Nov 07 11:53:47 2009 +0100
@@ -28,16 +28,24 @@
     only in Topic").</li>
 <li>New autotags now allow you to embed polls in stories and everywhere else
     where autotags are allowed.</li>
-<li>Minor security enhancement: "Important" cookies (like the session cookies)
-    are now created with the HttpOnly flag set. This will help avoid some XSS
-    attacks, provided your browser supports this flag.</li>
 <li>The Migrate option in the install script can now also be applied to an
     existing database (i.e. you don't need to import a database dump to update
     your URLs and paths).</li>
 <li>The Database Backup admin panel now includes options to optimize the
     database and convert tables to InnoDB (MySQL only).</li>
+<li>Minor security enhancements:
+    <ul>
+        <li>"Important" cookies (like the session cookies) are now created with
+            the HttpOnly flag set. This will help avoid some XSS attacks,
+            provided your browser supports this flag.</li>
+        <li>Template errors will now trigger the <a href="http://www.geeklog.net/faqman/index.php?op=view&amp;t=65">standard error handler</a> instead of
+            exposing the template path.</li>
+        <li>Fixed inclusion protection for some of the Spam-X class files.</li>
+    </ul>
 </ul>
 
+<p>Please also see the list of <a href="theme.html#changes">theme changes</a>.</p>
+
 <h3>Bugfixes</h3>
 
 <ul>

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 07:00:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 07:00:16 -0500
Subject: [geeklog-cvs] geeklog: When a plugin returns 0 items for the Admins
	Block, don...
Message-ID: <hg.b0971977fd28.1257595216.1485632861@qs1489.pair.com>

changeset 7445:b0971977fd28
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b0971977fd28
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 11:35:44 2009 +0100
description:
When a plugin returns 0 items for the Admins Block, don't display that as 'N/A' (bug #0001025)

diffstat:

 plugins/spamx/functions.inc |   2 +-
 public_html/docs/history    |   2 ++
 public_html/lib-common.php  |  39 +++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diffs (75 lines):

diff -r 252d8d24012d -r b0971977fd28 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sat Nov 07 11:15:02 2009 +0100
+++ b/plugins/spamx/functions.inc	Sat Nov 07 11:35:44 2009 +0100
@@ -139,7 +139,7 @@
 
     if (SEC_hasRights('spamx.admin')) {
         return array($LANG_SX00['plugin_name'],
-            $_CONF['site_admin_url'] . '/plugins/spamx/index.php', 0);
+            $_CONF['site_admin_url'] . '/plugins/spamx/index.php', '');
     }
 }
 
diff -r 252d8d24012d -r b0971977fd28 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 11:15:02 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 11:35:44 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- When a plugin returns 0 items for the Admins Block, don't display that as
+  'N/A' (bug #0001025) [Dirk]
 - Fixed a bug in the Group Editor that didn't let you add groups to other groups
   unless your $_TABLES['groups'] happened to be called "groups" (bug #0000998)
   [Dirk]
diff -r 252d8d24012d -r b0971977fd28 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Nov 07 11:15:02 2009 +0100
+++ b/public_html/lib-common.php	Sat Nov 07 11:35:44 2009 +0100
@@ -2758,28 +2758,27 @@
 
         // This will show the admin options for all installed plugins (if any)
 
-        for( $i = 0; $i < $num_plugins; $i++ )
-        {
-            $plg = current( $plugin_options );
-
-            $adminmenu->set_var( 'option_url', $plg->adminurl );
-            $adminmenu->set_var( 'option_label', $plg->adminlabel );
-
-            if( empty( $plg->numsubmissions ))
-            {
-                $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
-            }
-            else
-            {
-                $adminmenu->set_var( 'option_count',
-                                     COM_numberFormat( $plg->numsubmissions ));
-            }
-
-            $menu_item = $adminmenu->parse( 'item',
-                    ( $thisUrl == $plg->adminurl ) ? 'current' : 'option', true );
+        for ($i = 0; $i < $num_plugins; $i++) {
+            $plg = current($plugin_options);
+
+            $adminmenu->set_var('option_url',   $plg->adminurl);
+            $adminmenu->set_var('option_label', $plg->adminlabel);
+
+            if (isset($plg->numsubmissions) &&
+                    is_numeric($plg->numsubmissions)) {
+                $adminmenu->set_var('option_count',
+                                    COM_numberFormat($plg->numsubmissions));
+            } elseif (! empty($plg->numsubmissions)) {
+                $adminmenu->set_var('option_count', $plg->numsubmissions);
+            } else {
+                $adminmenu->set_var('option_count', $LANG_ADMIN['na']);
+            }
+
+            $menu_item = $adminmenu->parse('item',
+                    ($thisUrl == $plg->adminurl) ? 'current' : 'option', true);
             $link_array[$plg->adminlabel] = $menu_item;
 
-            next( $plugin_options );
+            next($plugin_options);
         }
 
         if(( $_CONF['allow_mysqldump'] == 1 ) AND ( $_DB_dbms == 'mysql' ) AND

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 09:45:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 09:45:37 -0500
Subject: [geeklog-cvs] geeklog: Fixed wrong path reported in case of a
	missing 'data' d...
Message-ID: <hg.16c9168c8360.1257605137.1485632861@qs1489.pair.com>

changeset 7448:16c9168c8360
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/16c9168c8360
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 14:57:12 2009 +0100
description:
Fixed wrong path reported in case of a missing 'data' directory (reported by Markus Wollschlaeger)

diffstat:

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

diffs (24 lines):

diff -r 814bbee9ff4d -r 16c9168c8360 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Nov 07 13:16:38 2009 +0100
+++ b/public_html/admin/install/index.php	Sat Nov 07 14:57:12 2009 +0100
@@ -1062,7 +1062,7 @@
             $chmod_string = 'chmod -R 777 ';
             // Files to check if writable
             $file_list = array( $_PATH['db-config.php'],
-                                $gl_path . (file_exists($gl_path . 'data') ? 'data/' : 'public_html/data/'),
+                                $gl_path . 'data/',
                                 $gl_path . 'logs/error.log',
                                 $_PATH['public_html/'] . 'siteconfig.php',
                                 $_PATH['public_html/'] . 'backend/geeklog.rss',
diff -r 814bbee9ff4d -r 16c9168c8360 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 13:16:38 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 14:57:12 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- Fixed wrong path reported in case of a missing 'data' directory (reported by
+  Markus Wollschl?ger) [Dirk]
 - When a plugin returns 0 items for the Admins Block, don't display that as
   'N/A' (bug #0001025) [Dirk]
 - Fixed a bug in the Group Editor that didn't let you add groups to other groups

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 09:45:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 09:45:37 -0500
Subject: [geeklog-cvs] geeklog: Updated Hebrew language files,
	provided by LWC
Message-ID: <hg.814bbee9ff4d.1257605137.1485632861@qs1489.pair.com>

changeset 7447:814bbee9ff4d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/814bbee9ff4d
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 13:16:38 2009 +0100
description:
Updated Hebrew language files, provided by LWC

diffstat:

 language/hebrew_utf-8.php                           |  74 ++++++++++++------------
 plugins/links/language/hebrew_utf-8.php             |   4 +-
 plugins/polls/language/hebrew_utf-8.php             |   8 +-
 plugins/staticpages/language/hebrew_utf-8.php       |  41 +++++++------
 public_html/admin/install/language/hebrew_utf-8.php |   4 +-
 public_html/docs/history                            |   2 +
 6 files changed, 68 insertions(+), 65 deletions(-)

diffs (truncated from 338 to 300 lines):

diff -r 3e2bd1e79a57 -r 814bbee9ff4d language/hebrew_utf-8.php
--- a/language/hebrew_utf-8.php	Sat Nov 07 11:53:47 2009 +0100
+++ b/language/hebrew_utf-8.php	Sat Nov 07 13:16:38 2009 +0100
@@ -2,7 +2,7 @@
 
 ###############################################################################
 # hebrew.php
-# Version 1.6#1
+# Version 1.6.1#1
 # Copyright (C) 2009 http://lior.weissbrod.com
 #
 # Originally:
@@ -420,8 +420,8 @@
 $LANG08 = array(
     1 => '???????? ?????????? ???????????? ????????????, ?????? ??????/?? ??????',
     2 => '???????????? ?????????? ????????????',
-    3 => '?????????? ???????????? ?????????????? ?????????? ?????????? ???????? ??????????',
-    4 => '?????? ???????? ???? ????????, ???? ?????????? ?????????????? ????????, ???? ?????????? ?????? ????????????',
+    3 => '?????? ???????? ?????????? ?????????????? ???????????? ???????????? ?????????? ???????? ?????????? ?????????????? ????????',
+    4 => '?????? ???????? ???? ???????? ??????, ?????????? ?????????????? ????????, ?????????? ??????????????',
     5 => '??????????, ?????? ?????????? ?????? ??????????',
     6 => '???????????? ???? ?????????? ???????????? ?????? ??????????.',
     7 => '???????????? ???????????? ????',
@@ -429,7 +429,7 @@
     9 => '?????? ??????',
     10 => '?????? ?????????? ???????????? ??:',
     11 => '????????',
-    12 => '?????????? ???????????? ?????????? ??????????',
+    12 => '?????????? ?????????????? ????????',
     13 => '????????',
     14 => '??????????:',
     15 => 'HTML ???? ????????????',
@@ -829,7 +829,7 @@
     88 => '?????????? ?????????? ??????????',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => 'You can always hit "Preview" to extend the expiry time.'
+    91 => '???????? ???????????? ???????? ?????????? ???? "?????????? ????????????" ?????? ???????????? ???? ???????? ????????????.'
 );
 
 ###############################################################################
@@ -865,7 +865,7 @@
     27 => '???? ???????? ???????????? ??????????',
     28 => '??????????????',
     29 => '???????????? ???????????? ??????????',
-    30 => 'Stories in Topic'
+    30 => '???????????? ??????????'
 );
 
 ###############################################################################
@@ -995,10 +995,10 @@
 
 $LANG31 = array(
     1 => "?????? ?????????? ???????????? ?????????????? ???? {$_CONF['site_name']}",
-    2 => '??',
-    3 => '?????? ??',
+    2 => '???? ??????????',
+    3 => '?????????? ?????????????? ???? ??????????',
     4 => '????????',
-    5 => '?????? ????????????',
+    5 => '????????????',
     6 => '?????????? ??:',
     7 => '???? ????????????????',
     8 => '???????? ????????',
@@ -1034,7 +1034,7 @@
     6 => '??????????: ??-Plug-in ?????? ??????????!',
     7 => '??-plug-in ?????????? ???????? ???????????? ?????? ????????. ?????? ?????????? ???? ??-plugin ???????? ???????????? ????????.',
     8 => '?????????? ?????????? Plugin ??????????',
-    9 => '??-plugin ???????? ?????????? ???????? ???????? ???? Geeklog. ?????????? ???? ?????????? ???????? ???? <a href="http://www.geeklog.net">Geeklog</a> ???? ?????????? ?????????? ???????? ???????? ???? ??-plugin.',
+    9 => 'plugin ???? ???????? ?????????? ???????? ???????? ???? Geeklog. ?????????? ???? ?????????? ???????? ???? <a href="http://www.geeklog.net">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>?????? plugins ?????????????? ????????.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => '?????? ?????????? ???? ?????????? plug-in, ?????????? ???? ???????????? ???????????? ????????. ???? ???????? ???? ???????? ??-plugin ???????? ???????? ???? ????????????. ???? ???????????? ?????????????? ?????? ???????????? ?????????????? ???????? ??-plugin ????????????. ???? ?????????? ?????? ???????? ??-plugin ???????? ?????????? ????????????. ?????? ???????????? ???? ?????????? plugin ?????? ?????????? ???? ?????????????????????? ??????.',
     12 => '?????? ???? ???? plugin ???? ???????? ??-plugineditor()',
@@ -1067,7 +1067,7 @@
     39 => '?????????? plugin',
     40 => '???????? ???????????? ???????????? ???????????? plugin (tar.gz, tgz, zip) ???????????? ????????:',
     41 => '??????????',
-    42 => 'Click to update',
+    42 => '?????????? ?????? ??????????',
     99 => '???????????? ?????????? ???? ??????????',
     100 => '??????????.',
     101 => '?????????? ???????????? ???????? ???? ?????????? upload_max_filesize directive ??-php.ini.',
@@ -1330,25 +1330,25 @@
     'bytes' => 'Bytes',
     'total_number' => '???? ?????? ??????????????: %d',
     'download' => '?????????? ?????? ???????????? ???????? ????',
-    'new_backup' => 'New Backup',
-    'delete_failure' => 'One or more backup files could not be deleted.',
-    'delete_success' => 'Backup file(s) successfully deleted.',
-    'convert_menu' => 'Convert to InnoDB',
-    'convert_title' => 'Convert to InnoDB tables',
-    'convert_button' => 'Convert',
-    'sorry_no_innodb' => 'Sorry, your version of MySQL does not support InnoDB tables.',
-    'innodb_explain' => 'InnoDB tables provide better performance on <em>really</em> large databases but make the backup process more complicated. Please <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">read up</a> on the pros and cons of InnoDB tables before you perform this operation.',
-    'already_converted' => 'Note: It appears that all of the tables have already been converted to InnoDB.',
-    'conversion_patience' => 'Note: Conversion may take some time - please be patient.',
-    'innodb_success' => 'Successfully converted tables to InnoDB.',
-    'table_issues' => 'There may have been problems with some tables, though. Please check error.log for details.',
-    'optimize_menu' => 'Optimize Tables',
-    'optimize_title' => 'Optimize Tables',
-    'optimize_button' => 'Optimize',
-    'optimize_explain' => 'Optimizing tables may help to improve the performance of your site. The actual impact depends on the table usage and some tables may benefit from it more than others. Do no expect to see a huge difference in performance. The <a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">MySQL manual</a> states: <q>it is not likely that you need to do this more than once a week or month</q>.',
-    'last_optimization' => 'Last optimization',
-    'optimization_patience' => 'Note: Optimization may take some time - please be patient.',
-    'optimize_success' => 'Successfully optimized database tables.'
+    'new_backup' => '?????????? ??????',
+    'delete_failure' => '???????? ?????????? ?????? ???? ???????? ???? ?????????? ????????????.',
+    'delete_success' => '????????/???????? ?????????? ????????/?? ????????????.',
+    'convert_menu' => '???????? ??-InnoDB',
+    'convert_title' => '???????? ?????????????? InnoDB',
+    'convert_button' => '????????',
+    'sorry_no_innodb' => '??????????????, ???????? ??-MySQL ???????? ???? ?????????? ?????????????? InnoDB.',
+    'innodb_explain' => '???????????? InnoDB ?????????????? ?????????????? ?????????? ???????? ?????????????? <em>????????</em> ???????????? ?????? ???????????? ???? ?????????? ???????????? ?????????? ??????????. ?????? <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">??????????</a> ???? ???????????????? ?????????????????? ???? ???????????? InnoDB ???????? ???????????? ?????????? ????.',
+    'already_converted' => '???????? ????: ???????? ?????? ?????????????? ?????? ?????????? ??-InnoDB.',
+    'conversion_patience' => '???????? ????: ?????????? ?????????? ?????????? ???????????? - ?????? ???????????? ??????????????.',
+    'innodb_success' => '?????????????? ?????????? ???????????? ??-InnoDB.',
+    'table_issues' => '???? ??????, ?????????? ???????? ?????????? ???? ?????? ????????????????. ?????? ?????????? ???? error.log ?????????? ??????????.',
+    'optimize_menu' => '?????????? ????????????',
+    'optimize_title' => '?????????? ????????????',
+    'optimize_button' => '??????????',
+    'optimize_explain' => '?????????? ???? ???????????? ???????? ???????????? ???? ???????????? ??????????. ???????????? ???????????? ?????????? ???????????? ?????? ???????? ???????? ?????? ???????????????? ???????????? ?????????????? ?????? ???????? ??????????????. ???? ???????? ?????????? ?????????? ???????? ????????????????.<a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">?????????? -MySQL</a> ??????????: <q>???? ???????? ???????????? ?????????? ?????? ???????? ???????? ?????????? ???? ??????????</q>.',
+    'last_optimization' => '?????????????????? ??????????????',
+    'optimization_patience' => '???????? ????: ???????????? ???????? ?????????? ?????????? - ?????? ???????????? ??????????????.',
+    'optimize_success' => '???????????? ???????? ?????????? ?????????????? ????????????.'
 );
 
 ###############################################################################
@@ -1497,7 +1497,7 @@
     'public_html' => '"public_html" ?????????? ???????? ???????? ?????????? ?????? ???????????? ???????? ????????. ?????? ?????????? ???? ???????? ???????? public_html %s ?????? ???????? ???? ?????????????? ???????? ?????????? ???????? ??????????????.',
     'installation' => '?????????????? ????????????',
     'directory' => '(????????????)',
-    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
+    'failed_tmp'    => '?????????? ?????????? ???????? ???????? ?????????????? ??-%s ????????. ?????????? ???? ???????????? ?????????????? ????????!',
     'fix_it' => '?????? ?????????? ???????????? ?????? ??????????!',
     'reachable' => '??-%s ???????? ???????? ??????????.',
     'not_reachable' => '??????????! ??-%s ???????? ???????? ???????? ??????????.',
@@ -1600,7 +1600,7 @@
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
     'na' => '???? ????????',
-    'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.'
+    'token_expiry' => '???? ?????? ???? %s ?????????? ??????????????. ???????? ?????? ????, ?????????? ?????????????? ???????????? ?????????? ???? ???????? ???? ?????????? ???????? ?????????? ???? ???????????????? ????????.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1872,16 +1872,16 @@
     'censorlist' => '?????????? ????????????',
     'ip_lookup' => '?????????? IP',
     'url_rewrite' => '???????????? URL Rewrite',
-    'meta_tags' => 'Meta Tags',
-    'meta_description' => 'Default Meta Description',
-    'meta_keywords' => 'Default Meta Keywords',
+    'meta_tags' => '?????????? Meta',
+    'meta_description' => '?????????? ?????????? ???? Meta Description',
+    'meta_keywords' => '?????????? ?????????? ???? Meta Keywords',
     'default_permissions_block' => '???????????? ?????????? ?????????? ???? ???????????? ????????',
     'default_permissions_story' => '???????????? ?????????? ?????????? ???? ????????????',
     'default_permissions_topic' => '???????????? ?????????? ?????????? ???? ????????????',
     'atom_max_stories' => '???????? ?????????????? ?????????????????? ?????????? ???? ???????????? ??????',
     'disable_webservices' => '?????????? ???????????? ???????',
     'restrict_webservices' => '?????????? ???????????? ???????',
-    'article_comment_close_enabled' => 'Automatically close comments (default)',
+    'article_comment_close_enabled' => '?????????? ???????????? ???????????????? (?????????? ??????????)',
     'article_comment_close_days' => '???????? ?????????? ???????? ???????????????? ???????? ???????????? (?????????? ??????????)',
     'comment_close_rec_stories' => '???????? ?????????????? ?????? ?????????????? ?????????? ?????????? ??????????',
     'allow_reply_notifications' => '???????????? ???????????? ?????????????? ???? ?????????????',
@@ -1974,7 +1974,7 @@
     20 => array('?????????? ??????????' => 'phrase', '???? ???????????? ??????????????' => 'all', '?????????? ?????? ?????????????? ??????????????' => '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('??????????' => 'DENY', '?????????? ??????????' => 'SAMEORIGIN', '(????????????)' => ''),
-    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
+    23 => array('????????????' => 0, '????????????' => 1, '???????????? (?????????? ?????????? ?????? ???????? ????????)' => 2)
 );
 
 ?>
diff -r 3e2bd1e79a57 -r 814bbee9ff4d plugins/links/language/hebrew_utf-8.php
--- a/plugins/links/language/hebrew_utf-8.php	Sat Nov 07 11:53:47 2009 +0100
+++ b/plugins/links/language/hebrew_utf-8.php	Sat Nov 07 13:16:38 2009 +0100
@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2009
 # http://lior.weissbrod.com
-# Version 1.6#1
+# Version 1.6.1#1
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -168,7 +168,7 @@
     58 => '???????? ??????????',
     59 => '<p>?????? ?????????? ???? ???? ???????????????? ??????????????, ?????? ?????????? ???? ???????????? "???????? ??????????" ??????????. ?????? ???????? ???? ?????? ???????? ???????? ?????? ?????? ?????????? ?????????? ???????????????? ??????????????.</p>',
     60 => '???????????? %s ???????? ?????????? ?????? ???????? ???? ???????????????? %s.',
-    61 => 'Links in Category'
+    61 => '?????????????? ????????????????'
 );
 
 
diff -r 3e2bd1e79a57 -r 814bbee9ff4d plugins/polls/language/hebrew_utf-8.php
--- a/plugins/polls/language/hebrew_utf-8.php	Sat Nov 07 11:53:47 2009 +0100
+++ b/plugins/polls/language/hebrew_utf-8.php	Sat Nov 07 13:16:38 2009 +0100
@@ -7,7 +7,7 @@
 #
 # Copyright (C) 2009
 # http://lior.weissbrod.com
-# Version 1.6#1
+# Version 1.6.1#1
 
 #
 # This program is free software; you can redistribute it and/or
@@ -57,8 +57,8 @@
     'upgrade1' => '???????????? ???????? ???????? ???? plugins ????????????. ??????',
     'upgrade2' => '??????????',
     'editinstructions' => '?????? ???????? ???? ?????? ???????????? ???? ????????, ?????????? ???????? ?????? ???????? ???????????? ????.',
-    'pollclosed' => 'This poll is closed for voting.',
-    'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
+    'pollclosed' => '???????????? ???????? ???? ??????????.',
+    'pollhidden' => '?????? ????????????. ???????????? ???????? ?????????? ???????? ???????????? ??????????.',
     'start_poll' => '???????????? ???? ????????'
 );
 
@@ -133,7 +133,7 @@
     'delete_polls' => '?????????? ???????????? ???? ???????????????',
     'aftersave' => '???????? ?????????? ??????',
     'default_permissions' => '???????????? ?????????? ?????????? ???? ??????',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => '?????????? ?????????? Meta'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 3e2bd1e79a57 -r 814bbee9ff4d plugins/staticpages/language/hebrew_utf-8.php
--- a/plugins/staticpages/language/hebrew_utf-8.php	Sat Nov 07 11:53:47 2009 +0100
+++ b/plugins/staticpages/language/hebrew_utf-8.php	Sat Nov 07 13:16:38 2009 +0100
@@ -6,7 +6,7 @@
 #
 # Copyright (C) 2009
 # http://lior.weissbrod.com
-# Version 1.6#1
+# Version 1.6.1#1
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -109,8 +109,9 @@
     'limit_results' => '?????????? ????????????',
     'search' => '??????????',
     'submit' => '??????????',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => '?????? ???????????? ??????????',
+    'pages' => '????????????'
+
 );
 
 $PLG_staticpages_MESSAGE15 = '?????????????? ?????????? ???????????? ?????????????? ???????? ?????????? ???? ?????? ????????????????.';
@@ -140,15 +141,15 @@
     'default_permissions' => '???????????? ?????????? ?????????? ???? ????????',
     'aftersave' => '???????? ?????????? ????????',
     'atom_max_items' => '?????????? ?????????????????? ???? ???????????? ?????????? ???????????? ??????',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => '?????????? ?????????? Meta',
+    'newstaticpagesinterval' => '?????????? ???????? ???????? ??????',
+    'hidenewstaticpages' => '???????????? ???????????? ???????????? ??????????',
+    'title_trim_length' => '???????? ?????????? ????????????',
+    'includecenterblocks' => '?????????? ???????????? ???????????? ?????????????? ???????? ??????????????',
+    'includephp' => '?????????? ???????????? ???????????? ???? PHP',
+    'includesearch' => '?????????? ???????????? ???????????? ????????????',
+    'includesearchcenterblocks' => '?????????? ???????????? ???????????? ?????????????? ???????? ??????????????',
+    'includesearchphp' => '?????????? ???????????? ???????????? ???? PHP'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -157,19 +158,19 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => '???????????? ???????????? ???? ???????????? ????????????',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => '???????????? ?????????? ???? ???? ??????',
+    'fs_search' => '???????????? ??????????',
     'fs_permissions' => '???????????? ?????????? ??????????'
 );
 
 // Note: entries 0, 1, 9, and 12 are the same as in $LANG_configselects['Core']
 $LANG_configselects['staticpages'] = array(
-    0 => array('True' => 1, 'False' => 0),
-    1 => array('True' => true, 'False' => false),
-    2 => array('Date' => 'date', 'Page ID' => 'id', 'Title' => 'title'),
-    3 => array('Date' => 'date', 'Page ID' => 'id', 'Title' => 'title', 'Label' => 'label'),
-    9 => array('Forward to page' => 'item', 'Display List' => 'list', 'Display Home' => 'home', 'Display Admin' => 'admin'),
-    12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3)
+    0 => array('????' => 1, '????' => 0),
+    1 => array('????' => true, '????' => false),
+    2 => array('??????????' => 'date', '?????? ?????????? ????????' => 'id', '??????????' => 'title'),
+    3 => array('??????????' => 'date', '?????? ?????????? ????????' => 'id', '??????????' => 'title', '??????????' => 'label'),

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 11:22:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 11:22:15 -0500
Subject: [geeklog-cvs] geeklog: Limit sorting of Type and Date,
	patch provided by LWC (...
Message-ID: <hg.ad0616900bdb.1257610935.1485632861@qs1489.pair.com>

changeset 7449:ad0616900bdb
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ad0616900bdb
user: Sami Barakat <sami at sbarakat.co.uk>
date: Sat Nov 07 16:20:34 2009 +0000
description:
Limit sorting of Type and Date, patch provided by LWC (feature request #0000910)

diffstat:

 system/classes/search.class.php |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 16c9168c8360 -r ad0616900bdb system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Nov 07 14:57:12 2009 +0100
+++ b/system/classes/search.class.php	Sat Nov 07 16:20:34 2009 +0000
@@ -482,14 +482,16 @@
         else if ($style == 'google')
         {
             $sort_uid = $this->_author == '' ? true : false;
+            $sort_date = empty($this->_dateStart) || empty($this->_dateEnd) || $this->_dateStart != $this->_dateEnd ? true : false;
+            $sort_type = $this->_type == 'all' ? true : false;
             $obj->setStyle('inline');
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
             $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
             $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
             $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
             $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
-            $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');
-            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, true,  ' - %s');
+            $obj->setField($LANG09[17], 'date',         true,       $sort_date,  $LANG01[36].' %s');
+            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, $sort_type,  ' - %s');
             $obj->setField($LANG09[50], 'hits',         $show_hits, true,  ' - %s '.$LANG09[50]);
             $obj->setField('',          '_html',        true,       false, '</span>');
             $this->_wordlength = 50;

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 13:37:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 13:37:41 -0500
Subject: [geeklog-cvs] geeklog: Updated documentation,
	mostly to document the autotags ...
Message-ID: <hg.42760e758229.1257619061.1485632861@qs1489.pair.com>

changeset 7451:42760e758229
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/42760e758229
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 18:22:52 2009 +0100
description:
Updated documentation, mostly to document the autotags provided by the plugins

diffstat:

 public_html/docs/english/calendar.html    |  16 ++++++++++++++++
 public_html/docs/english/index.html       |   6 ++++--
 public_html/docs/english/links.html       |  21 +++++++++++++++++++++
 public_html/docs/english/polls.html       |  18 ++++++++++++++++++
 public_html/docs/english/staticpages.html |  22 +++++++++++++++++++---
 5 files changed, 78 insertions(+), 5 deletions(-)

diffs (157 lines):

diff -r 6e857a94c80e -r 42760e758229 public_html/docs/english/calendar.html
--- a/public_html/docs/english/calendar.html	Sat Nov 07 15:55:10 2009 +0100
+++ b/public_html/docs/english/calendar.html	Sat Nov 07 18:22:52 2009 +0100
@@ -122,6 +122,22 @@
 </ul>
 
 
+<h2><a name="autotags">Autotags</a></h2>
+
+<p>The Calendar Plugin provides one <a href="http://www.geeklog.net/article.php/autolinks" title="geeklog.net: About Autolinks and Autotags">autotag</a>,
+<code>[event:]</code>. You can use this autotag to link to an event in the
+calendar without having to type out the URL. Simply add the event's ID after
+the colon. It will then create a link to that event and use the event's title
+as the link text. Alternatively, you can add your own link text after the ID
+(but before the closing bracket).</p>
+
+<p>For example, on geeklog.net:</p>
+<ul>
+<li><code>[event:20090805065311513]</code> will be translated to: <code>&lt;a href="http://www.geeklog.net/calendar/event.php?eid=20090805065311513"&gt;FrOSCon - Free and Open Source Software Conference&lt;/a&gt;</code></li>
+<li><code>[event:20090805065311513 FrOSCon 2009]</code> will be translated to: <code>&lt;a href="http://www.geeklog.net/calendar/event.php?eid=20090805065311513"&gt;FrOSCon 2009&lt;/a&gt;</code></li>
+</ul>
+
+
 <div class="footer">
     <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
     All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.
diff -r 6e857a94c80e -r 42760e758229 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html	Sat Nov 07 15:55:10 2009 +0100
+++ b/public_html/docs/english/index.html	Sat Nov 07 18:22:52 2009 +0100
@@ -16,8 +16,8 @@
 you will find it very easy to use, and very powerful.
 
 <p>These documents have been created to make Geeklog even easier for you!
-Apart from the usual stuff like how to install Geeklog, we also have
-provided the full Developer API documentation, so you can develop your own
+Apart from the usual stuff like how to install Geeklog, we also provide links
+to the full Developer API documentation, so you can develop your own
 themes and plugins and make it even better.
 
 <ul>
@@ -51,6 +51,8 @@
   <li><a href="changes.html">List of Changes</a></li>
 </ul>
 
+<p>Further information about using Geeklog can be found in our ever-expanding <a href="http://wiki.geeklog.net/">Geeklog Documentation Wiki</a>, maintained by the Geeklog community.</p>
+
 <h2><a name="features">Features of Geeklog</a></h2>
 
 <p>Geeklog is a PHP/MySQL based application for managing dynamic web content.
diff -r 6e857a94c80e -r 42760e758229 public_html/docs/english/links.html
--- a/public_html/docs/english/links.html	Sat Nov 07 15:55:10 2009 +0100
+++ b/public_html/docs/english/links.html	Sat Nov 07 18:22:52 2009 +0100
@@ -158,6 +158,27 @@
 directory - but that is not used any more and can be safely removed.</p>
 
 
+<h2><a name="autotags">Autotags</a></h2>
+
+<p>The Links Plugin provides one <a href="http://www.geeklog.net/article.php/autolinks" title="geeklog.net: About Autolinks and Autotags">autotag</a>,
+<code>[link:]</code>. You can use this autotag to embed one of the links from
+your site's Links section into an article or a comment (amongst other things)
+without having to type out the full URL. Simply add the link's ID after the
+colon. It will then create a link to the site in question and use the link's
+title as the link text. Alternatively, you can add your own link text after the
+ID (but before the closing bracket).</p>
+
+<p>For example, on geeklog.net:</p>
+<ul>
+<li><code>[link:20030921074903113]</code> will be translated to: <code>&lt;a href="http://www.geeklog.net/links/portal.php/link/20030921074903113"&gt;Groklaw&lt;/a&gt;</code></li>
+<li><code>[event:20030921074903113 read everything about the SCO case]</code> will be translated to: <code>&lt;a href="http://www.geeklog.net/links/portal.php/link/20030921074903113"&gt;read everything about the SCO case&lt;/a&gt;</code></li>
+</ul>
+
+<p>Note that the <code>[link:]</code> autotag will always create links that go
+through Geeklog's <tt>portal.php</tt> script so that the number of clicks on
+that link can be counted.</p>
+
+
 <div class="footer">
     <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
     All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.
diff -r 6e857a94c80e -r 42760e758229 public_html/docs/english/polls.html
--- a/public_html/docs/english/polls.html	Sat Nov 07 15:55:10 2009 +0100
+++ b/public_html/docs/english/polls.html	Sat Nov 07 18:22:52 2009 +0100
@@ -129,6 +129,24 @@
 you shouldn't take the results too seriously.</p>
 
 
+<h2><a name="autotags">Autotags</a></h2>
+
+<p>The Polls Plugin provides 3 <a href="http://www.geeklog.net/article.php/autolinks" title="geeklog.net: About Autolinks and Autotags">autotags</a>,
+<code>[poll:]</code>, <code>[poll_result:]</code>, and <code>[poll_vote:]</code>.</p>
+
+<ul>
+<li>The <code>[poll:]</code> autotag will provide a link to a poll. Simply add
+the poll's ID after the colon. By default, the poll's title will be used as the
+link text. You can provide your own link text after the poll ID (but before the
+closing bracket).</li>
+<li>The <code>[poll_result:]</code> autotag lets you embed the results from a
+poll in a story (or anywhere else where autotags are allowed).</li>
+<li>The <code>[poll_vote:]</code> autotag can be used to embed a poll into an
+article (or anywhere else where autotags are allowed) so that users don't need
+to go to the polls block to vote.</li>
+</ul>
+
+
 <div class="footer">
     <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
     All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.
diff -r 6e857a94c80e -r 42760e758229 public_html/docs/english/staticpages.html
--- a/public_html/docs/english/staticpages.html	Sat Nov 07 15:55:10 2009 +0100
+++ b/public_html/docs/english/staticpages.html	Sat Nov 07 18:22:52 2009 +0100
@@ -26,7 +26,7 @@
   <li>Static pages can be displayed on Geeklog's <a href="#frontpage">index and topic pages</a> and can even replace it entirely ("splash screen")</li>
   <li>"<a href="#cloning">cloning</a>" of existing pages</li>
   <li>Makes use of Geeklog's <a href="#url">URL rewrite feature</a></li>
-  <li>Provides <code>[staticpage:]</code> and <code>[staticpage_content:]</code> autotags</li>
+  <li>Provides <a href="#autotags">two autotags</a></li>
   <li>proper support for Geeklog permissions</li>
 </ul>
 
@@ -135,11 +135,11 @@
 
 <p>To make use of URL rewriting, you will need to set the option "Enable URL Rewriting" to True in Geeklog's Configuration admin panel.</p>
 
-<h3><a name="delete">Deleting pages with their owner</a></h3>
+<h2><a name="delete">Deleting pages with their owner</a></h2>
 
 <p>As all objects in Geeklog, static pages have an owner (the user that created the static page). When that user's account is deleted for some reason, any static pages owned by that user can either be deleted as well or they can be assigned to another user in Geeklog's Root group.</p>
 
-<p>In the Configuration admin panel for the static pages plugin, you can set the "Delete Pages with Owner?" option to either "False" (which is also the default), meaning that static pages will not be deleted withtheir owner, but assigned to a member of the Root group instead (the user withthe lowest user ID, most likely the Admin). Setting the option to "True" means that static pages will be deleted when their owner's account is deleted.</p>
+<p>In the Configuration admin panel for the static pages plugin, you can set the "<a href="#desc_delete_pages">Delete Pages with Owner?</a>" option to either "False" (which is also the default), meaning that static pages will not be deleted withtheir owner, but assigned to a member of the Root group instead (the user withthe lowest user ID, most likely the Admin). Setting the option to "True" means that static pages will be deleted when their owner's account is deleted.</p>
 
 <h2><a name="config.php">Configuration</a></h2>
 
@@ -283,6 +283,22 @@
   <td valign="top">Set to true to include static pages that execute PHP.</td></tr>
 </table>
 
+
+<h2><a name="autotags">Autotags</a></h2>
+
+<p>The Static Pages Plugin provides 2 <a href="http://www.geeklog.net/article.php/autolinks" title="geeklog.net: About Autolinks and Autotags">autotags</a>,
+<code>[staticpage:]</code> and <code>[staticpage_content:]</code>.</p>
+
+<ul>
+<li>The <code>[staticpage:]</code> autotag will provide a link to a static page.
+    Simply add the page's ID after the colon. By default, the title of the
+    static page will be used as the link text. You can provide your own link
+    text after the page ID (but before the closing bracket).</li>
+<li>The <code>[staticpage_content:]</code> autotag will be replaced with the
+    contents of the static page in question. This can be useful when you need
+    to use a piece of text in more than one place.</li>
+</ul>
+
 <div class="footer">
     <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
     All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 13:37:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 13:37:41 -0500
Subject: [geeklog-cvs] geeklog: Fixed link to the "locale" section of
	config.html
Message-ID: <hg.6e857a94c80e.1257619061.1485632861@qs1489.pair.com>

changeset 7450:6e857a94c80e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6e857a94c80e
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 15:55:10 2009 +0100
description:
Fixed link to the "locale" section of config.html

diffstat:

 public_html/docs/english/calendar.html |  4 ++--
 public_html/docs/english/changes.html  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 16c9168c8360 -r 6e857a94c80e public_html/docs/english/calendar.html
--- a/public_html/docs/english/calendar.html	Sat Nov 07 14:57:12 2009 +0100
+++ b/public_html/docs/english/calendar.html	Sat Nov 07 15:55:10 2009 +0100
@@ -117,8 +117,8 @@
 are also relevant for the calendar plugin:</p>
 <ul>
 <li>Times and dates are formatted according to the current language and the
-    <a href="config.html#locale">locale settings</a> from Geeklog's main
-    configuration.</li>
+    <a href="config.html#languages_locale">locale settings</a> from Geeklog's
+    main configuration.</li>
 </ul>
 
 
diff -r 16c9168c8360 -r 6e857a94c80e public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sat Nov 07 14:57:12 2009 +0100
+++ b/public_html/docs/english/changes.html	Sat Nov 07 15:55:10 2009 +0100
@@ -1382,8 +1382,8 @@
     access to).</li>
   <li>Several fixes have been made to make sure that Geeklog can now be
     properly localized (provided you have a language file that is up to date
-    and have chosen the proper <a href="config.html#locale">locale settings</a>
-    for your country and language).</li>
+    and have chosen the proper <a href="config.html#languages_locale">locale
+    settings</a> for your country and language).</li>
   <li>The variable $_CONF['site_admin_url'] is now used properly so that you
     can rename Geeklog's <tt>admin</tt> directory if needed.</li>
   <li>New RDF parser will now import most (if not all) RDF news feeds

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 13:37:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 13:37:42 -0500
Subject: [geeklog-cvs] geeklog: Merging (and documenting feature request
	#0000910)
Message-ID: <hg.3026a81e17b7.1257619062.1485632861@qs1489.pair.com>

changeset 7452:3026a81e17b7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3026a81e17b7
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 18:26:27 2009 +0100
description:
Merging (and documenting feature request #0000910)

diffstat:

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

diffs (34 lines):

diff -r 42760e758229 -r 3026a81e17b7 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 18:22:52 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 18:26:27 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- Improved display of the "Sort by" and "Show n results" dropdowns on the
+  search results page (feature request #0000910) [Sami, LWC]
 - Fixed wrong path reported in case of a missing 'data' directory (reported by
   Markus Wollschl?ger) [Dirk]
 - When a plugin returns 0 items for the Admins Block, don't display that as
diff -r 42760e758229 -r 3026a81e17b7 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Nov 07 18:22:52 2009 +0100
+++ b/system/classes/search.class.php	Sat Nov 07 18:26:27 2009 +0100
@@ -482,14 +482,16 @@
         else if ($style == 'google')
         {
             $sort_uid = $this->_author == '' ? true : false;
+            $sort_date = empty($this->_dateStart) || empty($this->_dateEnd) || $this->_dateStart != $this->_dateEnd ? true : false;
+            $sort_type = $this->_type == 'all' ? true : false;
             $obj->setStyle('inline');
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
             $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
             $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
             $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
             $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
-            $obj->setField($LANG09[17], 'date',         true,       true,  $LANG01[36].' %s');
-            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, true,  ' - %s');
+            $obj->setField($LANG09[17], 'date',         true,       $sort_date,  $LANG01[36].' %s');
+            $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, $sort_type,  ' - %s');
             $obj->setField($LANG09[50], 'hits',         $show_hits, true,  ' - %s '.$LANG09[50]);
             $obj->setField('',          '_html',        true,       false, '</span>');
             $this->_wordlength = 50;

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 13:37:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 13:37:43 -0500
Subject: [geeklog-cvs] geeklog: Links plugin: When URL rewriting is enabled,
	return rew...
Message-ID: <hg.825540f1937d.1257619063.1485632861@qs1489.pair.com>

changeset 7453:825540f1937d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/825540f1937d
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 18:31:22 2009 +0100
description:
Links plugin: When URL rewriting is enabled, return rewritten URLs for search results

diffstat:

 plugins/links/functions.inc |  1 +
 public_html/docs/history    |  4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diffs (25 lines):

diff -r 3026a81e17b7 -r 825540f1937d plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sat Nov 07 18:26:27 2009 +0100
+++ b/plugins/links/functions.inc	Sat Nov 07 18:31:22 2009 +0100
@@ -382,6 +382,7 @@
     $search->setFTSQL($ftsql);
     $search->setRank(3);
     $search->setAppendQuery(false);
+    $search->setURLRewrite(true);
 
     return $search;
 }
diff -r 3026a81e17b7 -r 825540f1937d public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 18:26:27 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 18:31:22 2009 +0100
@@ -16,6 +16,10 @@
 
 - Updated Hebrew language files, provided by LWC
 
+Links Plugins
+-------------
+- When URL rewriting is enabled, return rewritten URLs for search results [Dirk]
+
 Static Pages Plugin
 -------------------
 - Fixed use of wrong CSS class for the entries for the What's New block [Tom]

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 13:37:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 13:37:44 -0500
Subject: [geeklog-cvs] geeklog: Set the default blockorder in steps of 10
	and ensure th...
Message-ID: <hg.b52c72b9844c.1257619064.1485632861@qs1489.pair.com>

changeset 7454:b52c72b9844c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b52c72b9844c
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 18:45:37 2009 +0100
description:
Set the default blockorder in steps of 10 and ensure that the blocks provided by the Calendar and Polls plugins are the last block on either side

diffstat:

 plugins/calendar/sql/mssql_install.php |   2 +-
 plugins/calendar/sql/mysql_install.php |   2 +-
 plugins/polls/sql/mssql_install.php    |   2 +-
 plugins/polls/sql/mysql_install.php    |   2 +-
 sql/mssql_tableanddata.php             |  14 +++++++-------
 sql/mysql_tableanddata.php             |  14 +++++++-------
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (94 lines):

diff -r 825540f1937d -r b52c72b9844c plugins/calendar/sql/mssql_install.php
--- a/plugins/calendar/sql/mssql_install.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/plugins/calendar/sql/mssql_install.php	Sat Nov 07 18:45:37 2009 +0100
@@ -136,6 +136,6 @@
 
 $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend, owner_id) VALUES ('2008050110130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',getdate(),getdate(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,1)";
 
-$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
+$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',100,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
 
 ?>
diff -r 825540f1937d -r b52c72b9844c plugins/calendar/sql/mysql_install.php
--- a/plugins/calendar/sql/mysql_install.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/plugins/calendar/sql/mysql_install.php	Sat Nov 07 18:45:37 2009 +0100
@@ -119,6 +119,6 @@
 
 $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend, owner_id) VALUES ('2008050110130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',CURDATE(),CURDATE(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,1)";
 
-$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
+$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',100,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
 
 ?>
diff -r 825540f1937d -r b52c72b9844c plugins/polls/sql/mssql_install.php
--- a/plugins/polls/sql/mssql_install.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/plugins/polls/sql/mssql_install.php	Sat Nov 07 18:45:37 2009 +0100
@@ -117,7 +117,7 @@
     )  ON [PRIMARY]
 ";
 
-$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
+$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',100,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
 
 
 // default poll
diff -r 825540f1937d -r b52c72b9844c plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/plugins/polls/sql/mysql_install.php	Sat Nov 07 18:45:37 2009 +0100
@@ -96,7 +96,7 @@
 ) TYPE=MyISAM
 ";
 
-$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
+$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',100,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
 
 
 // default poll
diff -r 825540f1937d -r b52c72b9844c sql/mssql_tableanddata.php
--- a/sql/mssql_tableanddata.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/sql/mssql_tableanddata.php	Sat Nov 07 18:45:37 2009 +0100
@@ -1240,13 +1240,13 @@
 set identity_insert {$_TABLES['blocks']} on;
 
 
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1,1,'user_block','gldefault','User Functions','all',2,'','',getdate(),1,'',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (2,1,'admin_block','gldefault','Admins Only','all',1,'','',getdate(),1,'',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (3,1,'section_block','gldefault','Topics','all',0,'','',getdate(),1,'',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (4,1,'whats_new_block','gldefault','What''s New','all',3,'','',getdate(),0,'',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (5,1,'first_block','normal','About Geeklog','homeonly',1,'<p><b>Welcome to Geeklog!</b></p><p>If you''re already familiar with Geeklog - and especially if you''re not: There have been many improvements to Geeklog since earlier versions that you might want to read up on. Please read the <a href=\"docs/english/changes.html\">release notes</a>. If you need help, please see the <a href=\"docs/english/support.html\">support options</a>.</p>','',getdate(),0,'',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (6,1,'whosonline_block','phpblock','Who''s Online','all',0,'','',getdate(),0,'phpblock_whosonline',4,2,3,3,2,2);
-INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (7,1,'older_stories','gldefault','Older Stories','all',5,'','',getdate(),1,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1,1,'user_block','gldefault','User Functions','all',30,'','',getdate(),1,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (2,1,'admin_block','gldefault','Admins Only','all',20,'','',getdate(),1,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (3,1,'section_block','gldefault','Topics','all',10,'','',getdate(),1,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (4,1,'whats_new_block','gldefault','What''s New','all',30,'','',getdate(),0,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (5,1,'first_block','normal','About Geeklog','homeonly',20,'<p><b>Welcome to Geeklog!</b></p><p>If you''re already familiar with Geeklog - and especially if you''re not: There have been many improvements to Geeklog since earlier versions that you might want to read up on. Please read the <a href=\"docs/english/changes.html\">release notes</a>. If you need help, please see the <a href=\"docs/english/support.html\">support options</a>.</p>','',getdate(),0,'',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (6,1,'whosonline_block','phpblock','Who''s Online','all',10,'','',getdate(),0,'phpblock_whosonline',4,2,3,3,2,2);
+INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (7,1,'older_stories','gldefault','Older Stories','all',40,'','',getdate(),1,'',4,2,3,3,2,2);
 
 
 set identity_insert {$_TABLES['blocks']} off;
diff -r 825540f1937d -r b52c72b9844c sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php	Sat Nov 07 18:31:22 2009 +0100
+++ b/sql/mysql_tableanddata.php	Sat Nov 07 18:45:37 2009 +0100
@@ -553,13 +553,13 @@
 $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (20,14) ";
 $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (21,15) ";
 
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1,1,'user_block','gldefault','User Functions','all',2,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (2,1,'admin_block','gldefault','Admins Only','all',1,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (3,1,'section_block','gldefault','Topics','all',0,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (4,1,'whats_new_block','gldefault','What\'s New','all',3,'','','0000-00-00 00:00:00',0,'',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (5,1,'first_block','normal','About Geeklog','homeonly',1,'<p><b>Welcome to Geeklog!</b></p><p>If you\'re already familiar with Geeklog - and especially if you\'re not: There have been many improvements to Geeklog since earlier versions that you might want to read up on. Please read the <a href=\"docs/english/changes.html\">release notes</a>. If you need help, please see the <a href=\"docs/english/support.html\">support options</a>.</p>','','0000-00-00 00:00:00',0,'',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (6,1,'whosonline_block','phpblock','Who\'s Online','all',0,'','','0000-00-00 00:00:00',0,'phpblock_whosonline',4,2,3,3,2,2) ";
-$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (7,1,'older_stories','gldefault','Older Stories','all',5,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1,1,'user_block','gldefault','User Functions','all',30,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (2,1,'admin_block','gldefault','Admins Only','all',20,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (3,1,'section_block','gldefault','Topics','all',10,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (4,1,'whats_new_block','gldefault','What\'s New','all',30,'','','0000-00-00 00:00:00',0,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (5,1,'first_block','normal','About Geeklog','homeonly',20,'<p><b>Welcome to Geeklog!</b></p><p>If you\'re already familiar with Geeklog - and especially if you\'re not: There have been many improvements to Geeklog since earlier versions that you might want to read up on. Please read the <a href=\"docs/english/changes.html\">release notes</a>. If you need help, please see the <a href=\"docs/english/support.html\">support options</a>.</p>','','0000-00-00 00:00:00',0,'',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (6,1,'whosonline_block','phpblock','Who\'s Online','all',10,'','','0000-00-00 00:00:00',0,'phpblock_whosonline',4,2,3,3,2,2) ";
+$_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (7,1,'older_stories','gldefault','Older Stories','all',40,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
 
 $_DATA[] = "INSERT INTO {$_TABLES['commentcodes']} (code, name) VALUES (0,'Comments Enabled') ";
 $_DATA[] = "INSERT INTO {$_TABLES['commentcodes']} (code, name) VALUES (-1,'Comments Disabled') ";

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 14:42:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 14:42:38 -0500
Subject: [geeklog-cvs] geeklog: Document that editing a story submission
	will ignore $_...
Message-ID: <hg.db650e2584a3.1257622958.1485632861@qs1489.pair.com>

changeset 7455:db650e2584a3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/db650e2584a3
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 20:39:08 2009 +0100
description:
Document that editing a story submission will ignore $_CONF['aftersave_story'] and send you back to the submission queue (cf. bug #0001010)

diffstat:

 public_html/docs/english/config.html |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r b52c72b9844c -r db650e2584a3 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sat Nov 07 18:45:37 2009 +0100
+++ b/public_html/docs/english/config.html	Sat Nov 07 20:39:08 2009 +0100
@@ -417,7 +417,10 @@
     <li>'list': show admin's list of stories (default)</li>
     <li>'home': display the site's homepage</li>
     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
-    </ul></td></tr>
+    </ul>
+  <strong>Note:</strong> This option is ignored for story submissions. Editing
+  a story submission will always send you back to the submission queue (i.e.
+  "Admin Home" aka Command &amp; Control).</td></tr>
 </table>
 
 <h3><a name="stories_trackback">Stories and Trackback: Trackback</a></h3>

From geeklog-cvs at lists.geeklog.net  Sat Nov  7 15:53:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Nov 2009 15:53:05 -0500
Subject: [geeklog-cvs] geeklog: "Refine search" lost the status of the
	"Titles Only" ch...
Message-ID: <hg.4ef1c9a5915c.1257627185.1485632861@qs1489.pair.com>

changeset 7456:4ef1c9a5915c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/4ef1c9a5915c
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 21:52:55 2009 +0100
description:
"Refine search" lost the status of the "Titles Only" checkbox

diffstat:

 public_html/docs/english/theme.html                     |   2 ++
 public_html/docs/history                                |   2 ++
 public_html/layout/professional/search/searchform.thtml |   2 +-
 system/classes/search.class.php                         |  11 ++++++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diffs (78 lines):

diff -r db650e2584a3 -r 4ef1c9a5915c public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sat Nov 07 20:39:08 2009 +0100
+++ b/public_html/docs/english/theme.html	Sat Nov 07 21:52:55 2009 +0100
@@ -222,6 +222,8 @@
 <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>
+<li>Added a <code>{title_checked}</code> variable to <tt>search/searchform.thtml</tt>, so that the "Refine search" option can keep the status of the "Titles
+    Only" checkbox.</li>
 </ul>
 
 <h3>Cosmetic changes</h3>
diff -r db650e2584a3 -r 4ef1c9a5915c public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 20:39:08 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 21:52:55 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- "Refine search" lost the status of the "Titles Only" checkbox [Dirk]
+  Note: This fix requires a change in search/searchform.thtml
 - Improved display of the "Sort by" and "Show n results" dropdowns on the
   search results page (feature request #0000910) [Sami, LWC]
 - Fixed wrong path reported in case of a missing 'data' directory (reported by
diff -r db650e2584a3 -r 4ef1c9a5915c public_html/layout/professional/search/searchform.thtml
--- a/public_html/layout/professional/search/searchform.thtml	Sat Nov 07 20:39:08 2009 +0100
+++ b/public_html/layout/professional/search/searchform.thtml	Sat Nov 07 21:52:55 2009 +0100
@@ -10,7 +10,7 @@
                                                 <option value="all" {key_all_selected}>{lang_all_words}</option>
                                                 <option value="any" {key_any_selected}>{lang_any_word}</option>
                                             </select>
-                                            <input type="checkbox" value="true" name="title"{xhtml}>{lang_titles}
+                                            <input type="checkbox" value="true" name="title"{title_checked}{xhtml}>{lang_titles}
                                         </td>
                                     </tr>
                                     <tr>
diff -r db650e2584a3 -r 4ef1c9a5915c system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Nov 07 20:39:08 2009 +0100
+++ b/system/classes/search.class.php	Sat Nov 07 21:52:55 2009 +0100
@@ -62,6 +62,7 @@
     var $_searchURL = '';
     var $_wordlength;
     var $_verbose = false; // verbose logging
+    var $_titlesOnly = false;
 
     /**
     * Constructor
@@ -104,6 +105,8 @@
         }
         $this->_type = isset($_GET['type']) ? COM_applyFilter($_GET['type']) : 'all';
         $this->_keyType = isset($_GET['keyType']) ? COM_applyFilter($_GET['keyType']) : $_CONF['search_def_keytype'];
+
+        $this->_titlesOnly = isset($_GET['title']) ? true : false;
     }
 
     /**
@@ -247,6 +250,11 @@
         $searchform->set_var ('query', $escquery);
         $searchform->set_var ('datestart', $this->_dateStart);
         $searchform->set_var ('dateend', $this->_dateEnd);
+        if ($this->_titlesOnly) {
+            $searchform->set_var('title_checked', ' checked="checked"');
+        } else {
+            $searchform->set_var('title_checked', '');
+        }
 
         $phrase_selected = '';
         $all_selected = '';
@@ -453,7 +461,8 @@
             ((!empty($this->_dateStart))  ? '&amp;datestart=' . $this->_dateStart : '' ) .
             ((!empty($this->_dateEnd))    ? '&amp;dateend=' . $this->_dateEnd : '' ) .
             ((!empty($this->_topic))      ? '&amp;topic=' . $this->_topic : '' ) .
-            ((!empty($this->_author))     ? '&amp;author=' . $this->_author : '' );
+            ((!empty($this->_author))     ? '&amp;author=' . $this->_author : '' ) .
+            ($this->_titlesOnly           ? '&amp;title=true' : '');
 
         $url = "{$this->_searchURL}&amp;type={$this->_type}&amp;mode=";
         $obj = new ListFactory($url.'search', $_CONF['search_limits'], $_CONF['num_search_results']);

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 07:58:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 07:58:38 -0500
Subject: [geeklog-cvs] geeklog: Documentation updates
Message-ID: <hg.2fa26121d032.1257685118.1485632861@qs1489.pair.com>

changeset 7457:2fa26121d032
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2fa26121d032
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 00:02:52 2009 +0100
description:
Documentation updates

diffstat:

 public_html/docs/english/changes.html |  4 ++--
 public_html/docs/history              |  2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 4ef1c9a5915c -r 2fa26121d032 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sat Nov 07 21:52:55 2009 +0100
+++ b/public_html/docs/english/changes.html	Sun Nov 08 00:02:52 2009 +0100
@@ -26,8 +26,8 @@
     meta tags <a href="http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/">may not be used</a> by some search engines.</li>
 <li>You can now have one featured story per topic (for stories set to "Show
     only in Topic").</li>
-<li>New autotags now allow you to embed polls in stories and everywhere else
-    where autotags are allowed.</li>
+<li>New <a href="polls.html#autotags">autotags</a> now allow you to embed polls
+    in stories and everywhere else where autotags are allowed.</li>
 <li>The Migrate option in the install script can now also be applied to an
     existing database (i.e. you don't need to import a database dump to update
     your URLs and paths).</li>
diff -r 4ef1c9a5915c -r 2fa26121d032 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 21:52:55 2009 +0100
+++ b/public_html/docs/history	Sun Nov 08 00:02:52 2009 +0100
@@ -8,6 +8,8 @@
   Note: This fix requires a change in search/searchform.thtml
 - Improved display of the "Sort by" and "Show n results" dropdowns on the
   search results page (feature request #0000910) [Sami, LWC]
+- The search results page used HTML <br> tags even when XHTML was requested
+  (bug #0001022, patch provided by taca)
 - Fixed wrong path reported in case of a missing 'data' directory (reported by
   Markus Wollschl?ger) [Dirk]
 - When a plugin returns 0 items for the Admins Block, don't display that as

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 07:58:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 07:58:39 -0500
Subject: [geeklog-cvs] geeklog: Updated list of changes
Message-ID: <hg.70bbec9684c5.1257685119.1485632861@qs1489.pair.com>

changeset 7458:70bbec9684c5
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/70bbec9684c5
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 12:21:12 2009 +0100
description:
Updated list of changes

diffstat:

 public_html/docs/english/changes.html |  3 +++
 public_html/docs/history              |  7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 2fa26121d032 -r 70bbec9684c5 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Nov 08 00:02:52 2009 +0100
+++ b/public_html/docs/english/changes.html	Sun Nov 08 12:21:12 2009 +0100
@@ -33,6 +33,7 @@
     your URLs and paths).</li>
 <li>The Database Backup admin panel now includes options to optimize the
     database and convert tables to InnoDB (MySQL only).</li>
+<li>Improved <a href="http://wiki.geeklog.net/index.php/Timezone_Support">timezone support</a> and let users actually set their own timezone.</li>
 <li>Minor security enhancements:
     <ul>
         <li>"Important" cookies (like the session cookies) are now created with
@@ -54,6 +55,8 @@
     this SQL request:<br>
     <code style="margin-left:2em">UPDATE gl_stories SET commentcode = 0, comment_expire = 0 WHERE commentcode = 1;</code></li>
 <li>The comment speed limit was being ignored.</li>
+<li>Fixed a bug in the Group Editor that didn't let you add groups to other
+    groups (this problem was only introduced in Geeklog 1.6.0).</li>
 <li>The admin group for the Static Pages plugin was created with a wrong name
     in Geeklog 1.6.0 (fresh installs only).</li>
 </ul>
diff -r 2fa26121d032 -r 70bbec9684c5 public_html/docs/history
--- a/public_html/docs/history	Sun Nov 08 00:02:52 2009 +0100
+++ b/public_html/docs/history	Sun Nov 08 12:21:12 2009 +0100
@@ -1,7 +1,7 @@
 Geeklog History/Changes:
 
-Nov ??, 2009 (1.6.1rc1)
-------------
+Nov 8, 2009 (1.6.1rc1)
+-----------
 
 Changes since 1.6.1b1:
 - "Refine search" lost the status of the "Titles Only" checkbox [Dirk]
@@ -12,8 +12,8 @@
   (bug #0001022, patch provided by taca)
 - Fixed wrong path reported in case of a missing 'data' directory (reported by
   Markus Wollschl?ger) [Dirk]
-- When a plugin returns 0 items for the Admins Block, don't display that as
-  'N/A' (bug #0001025) [Dirk]
+- When a plugin returns 0 items for its entry in the Admins Block, don't display
+  that as 'N/A' (bug #0001025) [Dirk]
 - Fixed a bug in the Group Editor that didn't let you add groups to other groups
   unless your $_TABLES['groups'] happened to be called "groups" (bug #0000998)
   [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 07:58:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 07:58:39 -0500
Subject: [geeklog-cvs] geeklog: Moved hard coded green color for the search
	result byli...
Message-ID: <hg.0f9a8d809cc5.1257685119.1485632861@qs1489.pair.com>

changeset 7459:0f9a8d809cc5
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0f9a8d809cc5
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 12:24:59 2009 +0100
description:
Moved hard coded green color for the search result byline (when using "Google" style) to the stylesheet

diffstat:

 public_html/docs/english/theme.html       |  2 ++
 public_html/docs/history                  |  2 ++
 public_html/layout/professional/style.css |  3 +++
 system/classes/search.class.php           |  2 +-
 4 files changed, 8 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 70bbec9684c5 -r 0f9a8d809cc5 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Nov 08 12:21:12 2009 +0100
+++ b/public_html/docs/english/theme.html	Sun Nov 08 12:24:59 2009 +0100
@@ -224,6 +224,8 @@
     service a Remote User was using to log in.</li>
 <li>Added a <code>{title_checked}</code> variable to <tt>search/searchform.thtml</tt>, so that the "Refine search" option can keep the status of the "Titles
     Only" checkbox.</li>
+<li>Moved hard-coded green color for the byline of search results in "Google"
+    style to the stylesheet: New class <code>searchresult-byline</code>.</li>
 </ul>
 
 <h3>Cosmetic changes</h3>
diff -r 70bbec9684c5 -r 0f9a8d809cc5 public_html/docs/history
--- a/public_html/docs/history	Sun Nov 08 12:21:12 2009 +0100
+++ b/public_html/docs/history	Sun Nov 08 12:24:59 2009 +0100
@@ -4,6 +4,8 @@
 -----------
 
 Changes since 1.6.1b1:
+- Moved hard coded green color for the search result byline (when using "Google"
+  style) to the stylesheet (new class "searchresult-byline") [Dirk]
 - "Refine search" lost the status of the "Titles Only" checkbox [Dirk]
   Note: This fix requires a change in search/searchform.thtml
 - Improved display of the "Sort by" and "Show n results" dropdowns on the
diff -r 70bbec9684c5 -r 0f9a8d809cc5 public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css	Sun Nov 08 12:21:12 2009 +0100
+++ b/public_html/layout/professional/style.css	Sun Nov 08 12:24:59 2009 +0100
@@ -634,6 +634,9 @@
   color:#000000;
   text-align:right;
 }
+.searchresult-byline {
+  color:green;
+}
 .site-slogan {
   color:#ffffff;
   background:transparent;
diff -r 70bbec9684c5 -r 0f9a8d809cc5 system/classes/search.class.php
--- a/system/classes/search.class.php	Sun Nov 08 12:21:12 2009 +0100
+++ b/system/classes/search.class.php	Sun Nov 08 12:24:59 2009 +0100
@@ -497,7 +497,7 @@
             $obj->setField('',          LF_ROW_NUMBER,  $show_num,  false, '<b>%d.</b>');
             $obj->setField($LANG09[16], 'title',        true,       true,  '%s<br' . XHTML . '>');
             $obj->setField('',          'description',  true,       false, '%s<br' . XHTML . '>');
-            $obj->setField('',          '_html',        true,       false, '<span style="color:green;">');
+            $obj->setField('',          '_html',        true,       false, '<span class="searchresult-byline">');
             $obj->setField($LANG09[18], 'uid',          $show_user, $sort_uid,  $LANG01[104].' %s ');
             $obj->setField($LANG09[17], 'date',         true,       $sort_date,  $LANG01[36].' %s');
             $obj->setField($LANG09[5],  LF_SOURCE_TITLE,$show_type, $sort_type,  ' - %s');

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 07:58:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 07:58:41 -0500
Subject: [geeklog-cvs] geeklog: E_ALL fix
Message-ID: <hg.026789ae2533.1257685121.1485632861@qs1489.pair.com>

changeset 7461:026789ae2533
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/026789ae2533
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 13:47:41 2009 +0100
description:
E_ALL fix

diffstat:

 system/classes/listfactory.class.php |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 1c2d87e8c9e2 -r 026789ae2533 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sun Nov 08 12:26:46 2009 +0100
+++ b/system/classes/listfactory.class.php	Sun Nov 08 13:47:41 2009 +0100
@@ -479,13 +479,17 @@
         $num_query_results = $this->_per_page - $this->_total_found;
         $pp_total = $this->_total_found;
         $limits = array();
-        for ($i = 0; $i < count($this->_sources_arr); $i++)
-        {
+        $num = count($this->_sources_arr);
+        for ($i = 0; $i < $num; $i++) {
             $limits[$i]['total'] = $this->_getTotal($this->_sources_arr[$i]);
             $limits[$i]['pp'] = round(($this->_sources_arr[$i]['rank'] / $this->_total_rank) * $num_query_results);
             $this->_total_found += $limits[$i]['total'];
             $pp_total += $limits[$i]['pp'];
         }
+        if ($num == 0) {
+            $limits[0]['total'] = 0;
+            $limits[0]['pp'] = 0;
+        }
         if ($pp_total < $this->_per_page) {
             $limits[0]['pp'] += $this->_per_page - $pp_total;
         } else if ($this->_per_page < $pp_total) {

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 07:58:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 07:58:40 -0500
Subject: [geeklog-cvs] geeklog: Use a plain space (not &nbsp;
	) for empty fields in sear...
Message-ID: <hg.1c2d87e8c9e2.1257685120.1485632861@qs1489.pair.com>

changeset 7460:1c2d87e8c9e2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1c2d87e8c9e2
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 12:26:46 2009 +0100
description:
Use a plain space (not &nbsp;) for empty fields in search results to ensure flush left border for results without an author field

diffstat:

 system/classes/listfactory.class.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 0f9a8d809cc5 -r 1c2d87e8c9e2 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sun Nov 08 12:24:59 2009 +0100
+++ b/system/classes/listfactory.class.php	Sun Nov 08 12:26:46 2009 +0100
@@ -747,7 +747,7 @@
                         $list_templates->parse('item_field', 'field', true);
                     } else {
                         // Write an empty field
-                        $list_templates->set_var('field_text', '&nbsp;');
+                        $list_templates->set_var('field_text', ' ');
                         $list_templates->parse('item_field', 'field', true);
                     }
                 }

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 12:23:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 12:23:20 -0500
Subject: [geeklog-cvs] geeklog: 1.6.1rc1
Message-ID: <hg.029182f0ca35.1257701000.1485632861@qs1489.pair.com>

changeset 7462:029182f0ca35
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/029182f0ca35
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 15:01:18 2009 +0100
description:
1.6.1rc1

diffstat:

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

diffs (12 lines):

diff -r 026789ae2533 -r 029182f0ca35 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Nov 08 13:47:41 2009 +0100
+++ b/public_html/admin/install/lib-install.php	Sun Nov 08 15:01:18 2009 +0100
@@ -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.1b1');
+    define('VERSION', '1.6.1rc1');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');

From geeklog-cvs at lists.geeklog.net  Sun Nov  8 12:23:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Nov 2009 12:23:20 -0500
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_1rc1 for changeset
	029182f0ca35
Message-ID: <hg.67b53de0bee7.1257701000.1485632861@qs1489.pair.com>

changeset 7463:67b53de0bee7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/67b53de0bee7
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 08 18:22:59 2009 +0100
description:
Added tag geeklog_1_6_1rc1 for changeset 029182f0ca35

diffstat:

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

diffs (8 lines):

diff -r 029182f0ca35 -r 67b53de0bee7 .hgtags
--- a/.hgtags	Sun Nov 08 15:01:18 2009 +0100
+++ b/.hgtags	Sun Nov 08 18:22:59 2009 +0100
@@ -8,3 +8,4 @@
 f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
 f0de67e8e9304e43062f293941dee29def2ec8db geeklog_1_4_1_stable
 aa322b3c4d3debfac52df37fdd2cfedaba632480 geeklog_1_6_1b1
+029182f0ca35cca84d0b464c1ef56643e603cad5 geeklog_1_6_1rc1

From geeklog-cvs at lists.geeklog.net  Mon Nov  9 04:37:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 09 Nov 2009 04:37:44 -0500
Subject: [geeklog-cvs] geeklog: Fixed wrong German translation of the
	dropdown to activ...
Message-ID: <hg.37256dc0dbb9.1257759464.1485632861@qs1489.pair.com>

changeset 7464:37256dc0dbb9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/37256dc0dbb9
user: Dirk Haun <dirk at haun-online.de>
date: Mon Nov 09 10:37:33 2009 +0100
description:
Fixed wrong German translation of the dropdown to activate/deactivate meta tags

diffstat:

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

diffs (48 lines):

diff -r 67b53de0bee7 -r 37256dc0dbb9 language/german.php
--- a/language/german.php	Sun Nov 08 18:22:59 2009 +0100
+++ b/language/german.php	Mon Nov 09 10:37:33 2009 +0100
@@ -1976,7 +1976,7 @@
     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)' => ''),
-    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
+    23 => array('Deaktiviert' => 0, 'Aktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 67b53de0bee7 -r 37256dc0dbb9 language/german_formal.php
--- a/language/german_formal.php	Sun Nov 08 18:22:59 2009 +0100
+++ b/language/german_formal.php	Mon Nov 09 10:37:33 2009 +0100
@@ -1977,7 +1977,7 @@
     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)' => ''),
-    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
+    23 => array('Deaktiviert' => 0, 'Aktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 67b53de0bee7 -r 37256dc0dbb9 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun Nov 08 18:22:59 2009 +0100
+++ b/language/german_formal_utf-8.php	Mon Nov 09 10:37:33 2009 +0100
@@ -1977,7 +1977,7 @@
     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)' => ''),
-    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
+    23 => array('Deaktiviert' => 0, 'Aktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>
diff -r 67b53de0bee7 -r 37256dc0dbb9 language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Nov 08 18:22:59 2009 +0100
+++ b/language/german_utf-8.php	Mon Nov 09 10:37:33 2009 +0100
@@ -1976,7 +1976,7 @@
     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)' => ''),
-    23 => array('Aktiviert' => 0, 'Deaktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
+    23 => array('Deaktiviert' => 0, 'Aktiviert' => 1, 'Aktiviert (Default nur auf der Startseite)' => 2)
 );
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sat Nov 14 17:55:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 14 Nov 2009 17:55:04 -0500
Subject: [geeklog-cvs] geeklog: It's 'polls',
	not 'poll' (since Geeklog 1.4.0) and shou...
Message-ID: <hg.60332a73eac2.1258239304.1485632861@qs1489.pair.com>

changeset 7471:60332a73eac2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/60332a73eac2
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 14 18:51:37 2009 +0100
description:
It's 'polls', not 'poll' (since Geeklog 1.4.0) and shouldn't really be referred to in non-plugin code

diffstat:

 system/lib-comment.php |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (84 lines):

diff -r edafbd281458 -r 60332a73eac2 system/lib-comment.php
--- a/system/lib-comment.php	Sat Nov 14 15:51:17 2009 +0100
+++ b/system/lib-comment.php	Sat Nov 14 18:51:37 2009 +0100
@@ -205,7 +205,7 @@
 *
 * @param    array    &$comments Database result set of comments to be printed
 * @param    string   $mode      'flat', 'threaded', etc
-* @param    string   $type      Type of item (article, poll, etc.)
+* @param    string   $type      Type of item (article, polls, etc.)
 * @param    string   $order     How to order the comments 'ASC' or 'DESC'
 * @param    boolean  $delete_option   if current user can delete comments
 * @param    boolean  $preview   Preview display (for edit) or not
@@ -566,7 +566,7 @@
 *
 * @param    string      $sid       ID for item to show comments for
 * @param    string      $title     Title of item
-* @param    string      $type      Type of item (article, poll, etc.)
+* @param    string      $type      Type of item (article, polls, etc.)
 * @param    string      $order     How to order the comments 'ASC' or 'DESC'
 * @param    string      $mode      comment mode (nested, flat, etc.)
 * @param    int         $pid       id of parent comment
@@ -1229,7 +1229,7 @@
 * @param    $uid        int         user id
 * @param    $username   string      optional name of anonymous user
 * @param    $ipaddress  string      poster's IP address
-* @param    $type       string      type of comment ('article', 'poll', ...)
+* @param    $type       string      type of comment ('article', 'polls', ...)
 * @param    $cid        int         comment id (or 0 when in submission queue)
 * @return               boolean     true if successfully sent, otherwise false
 *
@@ -1270,7 +1270,7 @@
     $mailbody = "$LANG03[16]: $title\n"
               . "$LANG03[5]: $author\n";
 
-    if (($type != 'article') && ($type != 'poll')) {
+    if ($type != 'article') {
         $mailbody .= "$LANG09[5]: $type\n";
     }
 
@@ -1308,7 +1308,7 @@
  * for the specified $type and $sid.
  *
  * @author  Vincent Furia, vinny01 AT users DOT sourceforge DOT net
- * @param   string      $type   article, poll, or plugin identifier
+ * @param   string      $type   article, or plugin identifier
  * @param   string      $sid    id of object comment belongs to
  * @param   int         $cid    Comment ID
  * @return  string      0 indicates success, >0 identifies problem
@@ -1360,7 +1360,7 @@
 * Display form to report abusive comment.
 *
 * @param    string  $cid    comment id
-* @param    string  $type   type of comment ('article', 'poll', ...)
+* @param    string  $type   type of comment ('article', 'polls', ...)
 * @return   string          HTML for the form (or error message)
 *
 */
@@ -1439,7 +1439,7 @@
 * Send report about abusive comment
 *
 * @param    string  $cid    comment id
-* @param    string  $type   type of comment ('article', 'poll', ...)
+* @param    string  $type   type of comment ('article', 'polls', ...)
 * @return   string          Meta refresh or HTML for error message
 *
 */
@@ -1495,7 +1495,7 @@
               . "$LANG03[16]: $title\n"
               . "$LANG03[5]: $author\n";
 
-    if (($type != 'article') && ($type != 'poll')) {
+    if ($type != 'article') {
         $mailbody .= "$LANG09[5]: $type\n";
     }
 
@@ -1611,7 +1611,7 @@
  * @author Jared Wenerd, wenerd87 AT gmail DOT com
  * @param string  $comment  comment text
  * @param string  $postmode ('html', 'plaintext', ...)
- * @param string  $type     Type of item (article, poll, etc.)
+ * @param string  $type     Type of item (article, polls, etc.)
  * @param bool    $edit     if true append edit tag
  * @param int     $cid      commentid if editing comment (for proper sig)
  * @return string of comment text

From geeklog-cvs at lists.geeklog.net  Sat Nov 14 17:55:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 14 Nov 2009 17:55:05 -0500
Subject: [geeklog-cvs] geeklog: Some German translations
Message-ID: <hg.41371043edf2.1258239305.1485632861@qs1489.pair.com>

changeset 7472:41371043edf2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/41371043edf2
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 14 23:09:35 2009 +0100
description:
Some German translations

diffstat:

 language/german.php                                  |  18 +++++++++---------
 language/german_formal.php                           |  18 +++++++++---------
 language/german_formal_utf-8.php                     |  18 +++++++++---------
 language/german_utf-8.php                            |  18 +++++++++---------
 plugins/staticpages/language/german.php              |   4 ++--
 plugins/staticpages/language/german_formal.php       |   4 ++--
 plugins/staticpages/language/german_formal_utf-8.php |   4 ++--
 plugins/staticpages/language/german_utf-8.php        |   4 ++--
 8 files changed, 44 insertions(+), 44 deletions(-)

diffs (296 lines):

diff -r 60332a73eac2 -r 41371043edf2 language/german.php
--- a/language/german.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/language/german.php	Sat Nov 14 23:09:35 2009 +0100
@@ -221,7 +221,7 @@
     38 => 'A reply has been made to your comment \'%s\'.',
     39 => 'You may view the comment thread at the following address:',
     40 => 'If you wish to receive no further notifications of replies, visit the following link:',
-    41 => 'Hello %s,',
+    41 => 'Hallo %s,',
     42 => 'Unsubscribe',
     43 => 'Unsubscribe from reply notifications'
 );
@@ -456,7 +456,7 @@
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m?chte keine E-Mails bekommen.',
     36 => 'Kopie:',
-    37 => 'Send me a copy of this email',
+    37 => 'Ich m?chte eine Kopie der E-Mail bekommen',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
 
@@ -803,7 +803,7 @@
     60 => '',
     61 => 'automatisch archivieren',
     62 => 'automatisch l?schen',
-    63 => 'Disable Comments',
+    63 => 'Kommentare abschalten',
     64 => '',
     65 => '',
     66 => '',
@@ -982,14 +982,14 @@
     18 => 'E-Mail',
     34 => 'Kommandozentrale',
     35 => 'Beitr?ge: Artikel',
-    36 => 'Parent or Comment',
+    36 => 'Bezug oder Kommentar',
     37 => '',
     38 => 'Abschicken',
     39 => 'Derzeit gibt es keine Beitr?ge zu moderieren.',
     40 => 'Neue User',
-    41 => 'Comment Submissions',
-    42 => 'User Name',
-    43 => 'Auto-publish Comments?'
+    41 => 'Beitr?ge: Kommentare',
+    42 => 'Username',
+    43 => 'Moderation aufheben?'
 );
 
 ###############################################################################
@@ -1156,8 +1156,8 @@
     12 => 'Der Block wurde gel?scht.',
     13 => 'Deine 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 => 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.',
+    16 => 'Abonnement wurde gel?scht. Du wirst nicht l?nger ?ber Antworten benachrichtigt.',
     17 => '',
     18 => '',
     19 => '',
diff -r 60332a73eac2 -r 41371043edf2 language/german_formal.php
--- a/language/german_formal.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/language/german_formal.php	Sat Nov 14 23:09:35 2009 +0100
@@ -222,7 +222,7 @@
     38 => 'A reply has been made to your comment \'%s\'.',
     39 => 'You may view the comment thread at the following address:',
     40 => 'If you wish to receive no further notifications of replies, visit the following link:',
-    41 => 'Hello %s,',
+    41 => 'Hallo %s,',
     42 => 'Unsubscribe',
     43 => 'Unsubscribe from reply notifications'
 );
@@ -457,7 +457,7 @@
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m?chte keine E-Mails bekommen.',
     36 => 'Kopie:',
-    37 => 'Send me a copy of this email',
+    37 => 'Schicken Sie mir eine Kopie der E-Mail',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
 
@@ -804,7 +804,7 @@
     60 => '',
     61 => 'automatisch archivieren',
     62 => 'automatisch l?schen',
-    63 => 'Kommentarm?glichkeit zeitgesteuert ausschalten',
+    63 => 'Kommentare abschalten',
     64 => '',
     65 => '',
     66 => '',
@@ -983,14 +983,14 @@
     18 => 'E-Mail',
     34 => 'Kommandozentrale',
     35 => 'Beitr?ge: Artikel',
-    36 => 'Parent or Kommentar',
+    36 => 'Bezug oder Kommentar',
     37 => '',
     38 => 'Abschicken',
     39 => 'Derzeit gibt es keine Beitr?ge zu moderieren.',
     40 => 'Neue User',
-    41 => 'Eingereichte Kommentare',
-    42 => 'User Name',
-    43 => 'Kommentare automatisch ver?ffentlichen?'
+    41 => 'Beitr?ge: Kommentare',
+    42 => 'Username',
+    43 => 'Moderation aufheben?'
 );
 
 ###############################################################################
@@ -1157,8 +1157,8 @@
     12 => 'Der Block wurde gel?scht.',
     13 => 'Ihre Kategorie wurde gespeichert.',
     14 => 'Die Kategorie und alle zugeh?rigen Artikel wurden gel?scht.',
-    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.',
+    15 => 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.',
+    16 => 'Abonnement wurde gel?scht. Sie werden nicht l?nger ?ber Antworten benachrichtigt.',
     17 => '',
     18 => '',
     19 => '',
diff -r 60332a73eac2 -r 41371043edf2 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/language/german_formal_utf-8.php	Sat Nov 14 23:09:35 2009 +0100
@@ -222,7 +222,7 @@
     38 => 'A reply has been made to your comment \'%s\'.',
     39 => 'You may view the comment thread at the following address:',
     40 => 'If you wish to receive no further notifications of replies, visit the following link:',
-    41 => 'Hello %s,',
+    41 => 'Hallo %s,',
     42 => 'Unsubscribe',
     43 => 'Unsubscribe from reply notifications'
 );
@@ -457,7 +457,7 @@
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m??chte keine E-Mails bekommen.',
     36 => 'Kopie:',
-    37 => 'Send me a copy of this email',
+    37 => 'Schicken Sie mir eine Kopie der E-Mail',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
 
@@ -804,7 +804,7 @@
     60 => '',
     61 => 'automatisch archivieren',
     62 => 'automatisch l??schen',
-    63 => 'Kommentarm??glichkeit zeitgesteuert ausschalten',
+    63 => 'Kommentare abschalten',
     64 => '',
     65 => '',
     66 => '',
@@ -983,14 +983,14 @@
     18 => 'E-Mail',
     34 => 'Kommandozentrale',
     35 => 'Beitr??ge: Artikel',
-    36 => 'Parent or Kommentar',
+    36 => 'Bezug oder Kommentar',
     37 => '',
     38 => 'Abschicken',
     39 => 'Derzeit gibt es keine Beitr??ge zu moderieren.',
     40 => 'Neue User',
-    41 => 'Eingereichte Kommentare',
-    42 => 'User Name',
-    43 => 'Kommentare automatisch ver??ffentlichen?'
+    41 => 'Beitr??ge: Kommentare',
+    42 => 'Username',
+    43 => 'Moderation aufheben?'
 );
 
 ###############################################################################
@@ -1157,8 +1157,8 @@
     12 => 'Der Block wurde gel??scht.',
     13 => 'Ihre Kategorie wurde gespeichert.',
     14 => 'Die Kategorie und alle zugeh??rigen Artikel wurden gel??scht.',
-    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.',
+    15 => 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.',
+    16 => 'Abonnement wurde gel??scht. Sie werden nicht l??nger ??ber Antworten benachrichtigt.',
     17 => '',
     18 => '',
     19 => '',
diff -r 60332a73eac2 -r 41371043edf2 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/language/german_utf-8.php	Sat Nov 14 23:09:35 2009 +0100
@@ -221,7 +221,7 @@
     38 => 'A reply has been made to your comment \'%s\'.',
     39 => 'You may view the comment thread at the following address:',
     40 => 'If you wish to receive no further notifications of replies, visit the following link:',
-    41 => 'Hello %s,',
+    41 => 'Hallo %s,',
     42 => 'Unsubscribe',
     43 => 'Unsubscribe from reply notifications'
 );
@@ -456,7 +456,7 @@
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m??chte keine E-Mails bekommen.',
     36 => 'Kopie:',
-    37 => 'Send me a copy of this email',
+    37 => 'Ich m??chte eine Kopie der E-Mail bekommen',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
 
@@ -803,7 +803,7 @@
     60 => '',
     61 => 'automatisch archivieren',
     62 => 'automatisch l??schen',
-    63 => 'Disable Comments',
+    63 => 'Kommentare abschalten',
     64 => '',
     65 => '',
     66 => '',
@@ -982,14 +982,14 @@
     18 => 'E-Mail',
     34 => 'Kommandozentrale',
     35 => 'Beitr??ge: Artikel',
-    36 => 'Parent or Comment',
+    36 => 'Bezug oder Kommentar'
     37 => '',
     38 => 'Abschicken',
     39 => 'Derzeit gibt es keine Beitr??ge zu moderieren.',
     40 => 'Neue User',
-    41 => 'Comment Submissions',
-    42 => 'User Name',
-    43 => 'Auto-publish Comments?'
+    41 => 'Beitr??ge: Kommentare',
+    42 => 'Username',
+    43 => 'Moderation aufheben?'
 );
 
 ###############################################################################
@@ -1156,8 +1156,8 @@
     12 => 'Der Block wurde gel??scht.',
     13 => 'Deine 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 => 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.',
+    16 => 'Abonnement wurde gel??scht. Du wirst nicht l??nger ??ber Antworten benachrichtigt.',
     17 => '',
     18 => '',
     19 => '',
diff -r 60332a73eac2 -r 41371043edf2 plugins/staticpages/language/german.php
--- a/plugins/staticpages/language/german.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/plugins/staticpages/language/german.php	Sat Nov 14 23:09:35 2009 +0100
@@ -112,8 +112,8 @@
     'limit_results' => 'Ergebnisse einschr?nken',
     'search' => 'Suchen',
     'submit' => 'Absenden',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Keine neuen Seiten',
+    'pages' => 'Seiten'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
diff -r 60332a73eac2 -r 41371043edf2 plugins/staticpages/language/german_formal.php
--- a/plugins/staticpages/language/german_formal.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/plugins/staticpages/language/german_formal.php	Sat Nov 14 23:09:35 2009 +0100
@@ -112,8 +112,8 @@
     'limit_results' => 'Ergebnisse einschr?nken',
     'search' => 'Suchen',
     'submit' => 'Absenden',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Keine neuen Seiten',
+    'pages' => 'Seiten'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
diff -r 60332a73eac2 -r 41371043edf2 plugins/staticpages/language/german_formal_utf-8.php
--- a/plugins/staticpages/language/german_formal_utf-8.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/plugins/staticpages/language/german_formal_utf-8.php	Sat Nov 14 23:09:35 2009 +0100
@@ -112,8 +112,8 @@
     'limit_results' => 'Ergebnisse einschr??nken',
     'search' => 'Suchen',
     'submit' => 'Absenden',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Keine neuen Seiten',
+    'pages' => 'Seiten'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
diff -r 60332a73eac2 -r 41371043edf2 plugins/staticpages/language/german_utf-8.php
--- a/plugins/staticpages/language/german_utf-8.php	Sat Nov 14 18:51:37 2009 +0100
+++ b/plugins/staticpages/language/german_utf-8.php	Sat Nov 14 23:09:35 2009 +0100
@@ -112,8 +112,8 @@
     'limit_results' => 'Ergebnisse einschr??nken',
     'search' => 'Suchen',
     'submit' => 'Absenden',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Keine neuen Seiten',
+    'pages' => 'Seiten'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';

From geeklog-cvs at lists.geeklog.net  Sun Nov 15 05:22:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Nov 2009 05:22:10 -0500
Subject: [geeklog-cvs] geeklog: Added lang attribute
Message-ID: <hg.d560b8c577b6.1258280530.1485632861@qs1489.pair.com>

changeset 7474:d560b8c577b6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d560b8c577b6
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 15 11:10:47 2009 +0100
description:
Added lang attribute

diffstat:

 public_html/docs/english/calendar.html    |  2 +-
 public_html/docs/english/changes.html     |  2 +-
 public_html/docs/english/config.html      |  2 +-
 public_html/docs/english/index.html       |  2 +-
 public_html/docs/english/install.html     |  2 +-
 public_html/docs/english/links.html       |  2 +-
 public_html/docs/english/polls.html       |  2 +-
 public_html/docs/english/spamx.html       |  2 +-
 public_html/docs/english/staticpages.html |  2 +-
 public_html/docs/english/support.html     |  2 +-
 public_html/docs/english/theme.html       |  2 +-
 public_html/docs/english/themevars.html   |  2 +-
 public_html/docs/english/trackback.html   |  2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diffs (130 lines):

diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/calendar.html
--- a/public_html/docs/english/calendar.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/calendar.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Calendar Plugin</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/changes.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Changes</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/config.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Configuration</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/index.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/install.html
--- a/public_html/docs/english/install.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/install.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Installation Instructions</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/links.html
--- a/public_html/docs/english/links.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/links.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Links Plugin</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/polls.html
--- a/public_html/docs/english/polls.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/polls.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Polls Plugin</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/spamx.html
--- a/public_html/docs/english/spamx.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/spamx.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Geeklog Spam-X Plugin</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/staticpages.html
--- a/public_html/docs/english/staticpages.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/staticpages.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Static Pages Plugin</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/support.html
--- a/public_html/docs/english/support.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/support.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Support</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/theme.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Theme How-To</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/themevars.html
--- a/public_html/docs/english/themevars.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/themevars.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Variables in Themes</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">
diff -r e6207655d9cc -r d560b8c577b6 public_html/docs/english/trackback.html
--- a/public_html/docs/english/trackback.html	Sun Nov 15 10:58:30 2009 +0100
+++ b/public_html/docs/english/trackback.html	Sun Nov 15 11:10:47 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+<html lang="en">
 <head>
   <title>Geeklog Documentation - Trackback, Pingback, Ping</title>
   <link rel="stylesheet" type="text/css" href="../docstyle.css" title="Dev Stylesheet">

From geeklog-cvs at lists.geeklog.net  Sun Nov 15 05:22:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Nov 2009 05:22:10 -0500
Subject: [geeklog-cvs] geeklog: A feeble attempt to update the age-old help
	texts
Message-ID: <hg.e6207655d9cc.1258280530.1485632861@qs1489.pair.com>

changeset 7473:e6207655d9cc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e6207655d9cc
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 15 10:58:30 2009 +0100
description:
A feeble attempt to update the age-old help texts

diffstat:

 public_html/admin/moderation.php          |   16 ++--
 public_html/docs/history                  |    2 +
 public_html/help/advancedsearch.html      |  107 +++++++++++---------------
 public_html/help/cccommentsubmission.html |   62 +++++++++++++++
 public_html/help/ccdraftsubmission.html   |   48 ++++++++++++
 public_html/help/cceventsubmission.html   |   68 +++++++---------
 public_html/help/cclinksubmission.html    |   68 +++++++---------
 public_html/help/ccstorysubmission.html   |   70 +++++++---------
 public_html/help/ccusersubmission.html    |   51 ++++++++++++
 public_html/help/submitevent.html         |   96 +++++++++++------------
 public_html/help/submitlink.html          |   73 +++++++----------
 public_html/help/submitstory.html         |  110 ++++++++++-----------------
 12 files changed, 421 insertions(+), 350 deletions(-)

diffs (truncated from 1033 to 300 lines):

diff -r 41371043edf2 -r e6207655d9cc public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sat Nov 14 23:09:35 2009 +0100
+++ b/public_html/admin/moderation.php	Sun Nov 15 10:58:30 2009 +0100
@@ -189,7 +189,7 @@
     if ($_CONF['sort_admin']) {
         uksort ($items, 'strcasecmp');
     }
-     // logout is always the last entry
+    // logout is always the last entry
     $item = render_cc_item ($admin_templates,
                     $_CONF['site_url'] . '/users.php?mode=logout',
                     $_CONF['layout_url'] . '/images/icons/logout.' . $_IMAGE_TYPE,
@@ -262,7 +262,7 @@
 {
     global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
 
-    require_once( $_CONF['path_system'] . 'lib-admin.php' );
+    require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $retval = '';
     $isplugin = false;
@@ -282,7 +282,7 @@
                 $isplugin = true;
             }
         }
-    } elseif ( $type == 'story') { // story submission
+    } elseif ($type == 'story') { // story submission
         $sql = "SELECT sid AS id,title,date,tid FROM {$_TABLES['storysubmission']}" . COM_getTopicSQL ('WHERE') . " ORDER BY date ASC";
         $H =  array($LANG29[10], $LANG29[14], $LANG29[15]);
         $section_title = $LANG29[35];
@@ -293,7 +293,7 @@
               . "ORDER BY cid ASC";
         $H = array($LANG29[10], $LANG29[36], $LANG29[14]);
         $section_title = $LANG29[41];
-        $section_help = 'ccstorysubmission.html'; // FIXME
+        $section_help = 'cccommentsubmission.html';
     }
 
     // run SQL but this time ignore any errors
@@ -381,7 +381,7 @@
 {
     global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
 
-    require_once ($_CONF['path_system'] . 'lib-admin.php');
+    require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $retval = '';
     $sql = "SELECT uid as id,username,fullname,email FROM {$_TABLES['users']} WHERE status = 2";
@@ -407,7 +407,7 @@
 
     $text_arr = array('has_menu'  => false,
                       'title'     => $LANG29[40],
-                      'help_url'  => '',
+                      'help_url'  => 'ccusersubmission.html',
                       'no_data'   => $LANG29[39],
                       'form_url'  => "{$_CONF['site_admin_url']}/moderation.php"
     );
@@ -447,7 +447,7 @@
 {
     global $_CONF, $_TABLES, $LANG24, $LANG29, $LANG_ADMIN;
 
-    require_once( $_CONF['path_system'] . 'lib-admin.php' );
+    require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $retval = '';
 
@@ -475,7 +475,7 @@
 
     $text_arr = array('has_menu'  => false,
                       'title'     => $LANG29[35] . ' (' . $LANG24[34] . ')',
-                      'help_url'  => '',
+                      'help_url'  => 'ccdraftsubmission.html',
                       'no_data'   => $LANG29[39],
                       'form_url'  => "{$_CONF['site_admin_url']}/moderation.php");
 
diff -r 41371043edf2 -r e6207655d9cc public_html/docs/history
--- a/public_html/docs/history	Sat Nov 14 23:09:35 2009 +0100
+++ b/public_html/docs/history	Sun Nov 15 10:58:30 2009 +0100
@@ -3,6 +3,8 @@
 Nov ??, 2009 (1.6.1)
 ------------
 Changes since 1.6.1rc1:
+- Updated the age-old help texts and added help files for comment and user
+  submissions as well as the draft stories list [Dirk]
 - The success message at the end of the install recommended setting
   db-config.php and siteconfig.php to 755. These files don't need to be
   executable, so recommend 644 instead (bug #0001036) [Dirk]
diff -r 41371043edf2 -r e6207655d9cc public_html/help/advancedsearch.html
--- a/public_html/help/advancedsearch.html	Sat Nov 14 23:09:35 2009 +0100
+++ b/public_html/help/advancedsearch.html	Sun Nov 15 10:58:30 2009 +0100
@@ -1,89 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
   <title>Advanced Search</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <link rel="stylesheet" type="text/css" href="../docs/docstyle.css" title="Dev Stylesheet">
 </head>
 
 <body>
 <h1>Advanced Search</h1>
 
-<p>Advanced search will allow you to query the entire database of stories
-and comments to find what your looking for.&nbsp; When conducting a query,
-at least one field must be selected. The query fields are:</p>
+<p>Advanced search will allow you to query the entire database of stories and
+comments to find what your looking for. When conducting a query, at least one
+field must be selected. The query fields are:</p>
 
 <table border="1" width="100%">
-<tr bgcolor="#000000">
-<td><font color="#FFFFFF">Field</font></td>
-
-<td>
-<center><font color="#FFFFFF">Required</font></center>
-</td>
-
-<td><font color="#FFFFFF">Description</font></td>
+<tr>
+    <th style="width:8%">Field</th>
+    <th>Required</th>
+    <th>Description</th>
 </tr>
 
 <tr>
-<td>Key Words</td>
-
-<td>
-<center>No</center>
-</td>
-
-<td>These are the key words you wish to search for, an example would be
-"Free" or "Fun" (without the quotes)<br>
-From the drop-down menu, you can select if search results should contain the
-exact phrase (exactly as you entered it), all of the words, or any of the words.</td>
+    <td>Key Words</td>
+    <td style="text-align:center;">No</td>
+    <td>These are the key words you wish to search for, an example would be
+        "Free" or "Fun" (without the quotes).<br>
+        From the drop-down menu, you can select if search results should contain        the exact phrase (exactly as you entered it), all of the words, or any
+        of the words.</td>
 </tr>
-
 <tr>
-<td>Date</td>
-
-<td>
-<center>No</center>
-</td>
-
-<td>Date range to search on.&nbsp; Enter the start date and end date for
-your search</td>
+    <td>Titles Only</td>
+    <td style="text-align:center;">No</td>
+    <td>Check this box if you only want to search item titles</td>
 </tr>
-
 <tr>
-<td>Topic</td>
-
-<td>
-<center>No</center>
-</td>
-
-<td>Select the topic you wish to search on from the drop down list</td>
+    <td>Date</td>
+    <td style="text-align:center;">No</td>
+    <td>Date range to search on. Enter the start date and end date for your
+        search</td>
 </tr>
-
 <tr>
-<td>Type</td>
-
-<td>
-<center>No</center>
-</td>
-
-<td>Select the type of the search.&nbsp; Your options are "All", which searches
-through all the searchable content of the site, or you can restrict your
-search to only one of "Stories", "Comments" as well as one
-of the installed plugins (e.g. "Static Pages").</td>
+    <td>Topic</td>
+    <td style="text-align:center;">No</td>
+    <td>Select the topic you wish to search on from the drop-down list</td>
 </tr>
-
 <tr>
-<td>Author</td>
-
-<td>
-<center>No</center>
-</td>
-
-<td>Select the author you wish to search on</td>
+    <td>Type</td>
+    <td style="text-align:center;">No</td>
+    <td>Select the type of the search. Your options are "All", which searches
+        through all the searchable content of the site, or you can restrict your
+        search to only one of "Stories", "Comments" as well as one
+        of the installed plugins (e.g. "Static Pages").</td>
+</tr>
+<tr>
+    <td>Authors</td>
+    <td style="text-align:center;">No</td>
+    <td>Select the author you wish to search on</td>
+</tr>
+<tr>
+    <td>Results</td>
+    <td style="text-align:center;">No</td>
+    <td>Select the number of search results you want to see per page</td>
 </tr>
 </table>
 
-<p><hr width="100%">
+<div class="footer">
+    <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
+    All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.
+</div>
 
-<p>Geeklog <a href="http://www.geeklog.net">http://www.geeklog.net</a>
-<br>Last Updated: August 2, 2003
 </body>
 </html>
diff -r 41371043edf2 -r e6207655d9cc public_html/help/cccommentsubmission.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/help/cccommentsubmission.html	Sun Nov 15 10:58:30 2009 +0100
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+  <title>Comment Submissions</title>
+  <link rel="stylesheet" type="text/css" href="../docs/docstyle.css" title="Dev Stylesheet">
+</head>
+
+<body>
+<h1>Comment Submissions</h1>
+
+<p>This is the command and control quick moderation area for comments. In this
+area you can edit, delete or approve comments. Select any combination of deletes
+or approves and click the submit button.</p>
+
+<table border="1" width="100%">
+<tr>
+    <th style="width:8%">Field</th>
+    <th>Description</th>
+</tr>
+<tr>
+    <td>Edit</td>
+    <td>Click this to edit the comment. Note that saving an edited comment
+        submission will approve it</td>
+</tr>
+<tr>
+    <td>Title</td>
+    <td>Title of the comment</td>
+</tr>
+<tr>
+    <td>Parent or Comment</td>
+    <td>Depending on the type of comment, this will either contain the comment's
+        text or a link to the parent object for which the comment was
+        submitted</td>
+</tr>
+<tr>
+    <td>Date</td>
+    <td>Date the comment was submitted</td>
+</tr>
+<tr>
+    <td>Delete / Approve</td>
+    <td>Radio buttons to select for delete or approval of the story
+        submission</td>
+</tr>
+<tr>
+    <td>User Name</td>
+    <td>Name of the user who submitted the comment. For registered users, this
+        will contain a link to their profile page
+</tr>
+<tr>
+    <td>Auto-publish Comments?</td>
+    <td>Check this box to allow any further comments by this user to be
+        published without moderation. Only available for registered users</td>
+</tr>
+</table>
+
+<div class="footer">
+    <a href="http://wiki.geeklog.net/">The Geeklog Documentation Project</a><br>
+    All trademarks and copyrights on this page are owned by their respective owners. Geeklog is copyleft.
+</div>
+
+</body>
+</html>
diff -r 41371043edf2 -r e6207655d9cc public_html/help/ccdraftsubmission.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/help/ccdraftsubmission.html	Sun Nov 15 10:58:30 2009 +0100
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+  <title>Draft Story Submissions</title>
+  <link rel="stylesheet" type="text/css" href="../docs/docstyle.css" title="Dev Stylesheet">

From geeklog-cvs at lists.geeklog.net  Sun Nov 15 11:22:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Nov 2009 11:22:38 -0500
Subject: [geeklog-cvs] geeklog: Finished updating German translation of the
	Static Page...
Message-ID: <hg.61d467f3c89b.1258302158.1485632861@qs1489.pair.com>

changeset 7475:61d467f3c89b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/61d467f3c89b
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 15 17:00:56 2009 +0100
description:
Finished updating German translation of the Static Pages language files

diffstat:

 plugins/staticpages/language/german.php              |  26 +++++++++++++-------------
 plugins/staticpages/language/german_formal.php       |  26 +++++++++++++-------------
 plugins/staticpages/language/german_formal_utf-8.php |  26 +++++++++++++-------------
 plugins/staticpages/language/german_utf-8.php        |  26 +++++++++++++-------------
 4 files changed, 52 insertions(+), 52 deletions(-)

diffs (208 lines):

diff -r d560b8c577b6 -r 61d467f3c89b plugins/staticpages/language/german.php
--- a/plugins/staticpages/language/german.php	Sun Nov 15 11:10:47 2009 +0100
+++ b/plugins/staticpages/language/german.php	Sun Nov 15 17:00:56 2009 +0100
@@ -113,10 +113,10 @@
     'search' => 'Suchen',
     'submit' => 'Absenden',
     'no_new_pages' => 'Keine neuen Seiten',
-    'pages' => 'Seiten'
+    'pages' => 'SEITEN'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_staticpages_MESSAGE15 = 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_staticpages_MESSAGE19 = 'Seite wurde gespeichert.';
 $PLG_staticpages_MESSAGE20 = 'Seite wurde gel?scht';
 
@@ -143,15 +143,15 @@
     'default_permissions' => 'Grundeinstellungen Statische Seiten',
     'aftersave' => 'Nach dem Speichern der Seiten',
     'atom_max_items' => 'Max. Seiten in Webservices News-Feed',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Meta-Tags verwenden',
+    'newstaticpagesinterval' => 'Zeitabstand f?r neue Seiten',
+    'hidenewstaticpages' => 'Neue Seiten ausblenden',
+    'title_trim_length' => 'Titel abschneiden nach',
+    'includecenterblocks' => 'Centerblock-Seiten ber?cksichtigen',
+    'includephp' => 'Seiten mit PHP ber?cksichtigen',
+    'includesearch' => 'Statische Seiten durchsuchen',
+    'includesearchcenterblocks' => 'Centerblock-Seiten ber?cksichtigen',
+    'includesearchphp' => 'Seiten mit PHP ber?cksichtigen'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -160,8 +160,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Statische Seiten Haupteinstellungen',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Was-ist-neu-Block',
+    'fs_search' => 'Suchergebnisse',
     'fs_permissions' => 'Grundeinstellungen Rechte'
 );
 
diff -r d560b8c577b6 -r 61d467f3c89b plugins/staticpages/language/german_formal.php
--- a/plugins/staticpages/language/german_formal.php	Sun Nov 15 11:10:47 2009 +0100
+++ b/plugins/staticpages/language/german_formal.php	Sun Nov 15 17:00:56 2009 +0100
@@ -113,10 +113,10 @@
     'search' => 'Suchen',
     'submit' => 'Absenden',
     'no_new_pages' => 'Keine neuen Seiten',
-    'pages' => 'Seiten'
+    'pages' => 'SEITEN'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_staticpages_MESSAGE15 = 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_staticpages_MESSAGE19 = 'Seite wurde gespeichert.';
 $PLG_staticpages_MESSAGE20 = 'Seite wurde gel?scht';
 
@@ -143,15 +143,15 @@
     'default_permissions' => 'Grundeinstellungen Statische Seiten',
     'aftersave' => 'Nach dem Speichern der Seiten',
     'atom_max_items' => 'Max. Seiten in Webservices News-Feed',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Meta-Tags verwenden',
+    'newstaticpagesinterval' => 'Zeitabstand f?r neue Seiten',
+    'hidenewstaticpages' => 'Neue Seiten ausblenden',
+    'title_trim_length' => 'Titel abschneiden nach',
+    'includecenterblocks' => 'Centerblock-Seiten ber?cksichtigen',
+    'includephp' => 'Seiten mit PHP ber?cksichtigen',
+    'includesearch' => 'Statische Seiten durchsuchen',
+    'includesearchcenterblocks' => 'Centerblock-Seiten ber?cksichtigen',
+    'includesearchphp' => 'Seiten mit PHP ber?cksichtigen'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -160,8 +160,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Statische Seiten Haupteinstellungen',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Was-ist-neu-Block',
+    'fs_search' => 'Suchergebnisse',
     'fs_permissions' => 'Grundeinstellungen Rechte'
 );
 
diff -r d560b8c577b6 -r 61d467f3c89b plugins/staticpages/language/german_formal_utf-8.php
--- a/plugins/staticpages/language/german_formal_utf-8.php	Sun Nov 15 11:10:47 2009 +0100
+++ b/plugins/staticpages/language/german_formal_utf-8.php	Sun Nov 15 17:00:56 2009 +0100
@@ -113,10 +113,10 @@
     'search' => 'Suchen',
     'submit' => 'Absenden',
     'no_new_pages' => 'Keine neuen Seiten',
-    'pages' => 'Seiten'
+    'pages' => 'SEITEN'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_staticpages_MESSAGE15 = 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_staticpages_MESSAGE19 = 'Seite wurde gespeichert.';
 $PLG_staticpages_MESSAGE20 = 'Seite wurde gel??scht';
 
@@ -143,15 +143,15 @@
     'default_permissions' => 'Grundeinstellungen Statische Seiten',
     'aftersave' => 'Nach dem Speichern der Seiten',
     'atom_max_items' => 'Max. Seiten in Webservices News-Feed',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Meta-Tags verwenden',
+    'newstaticpagesinterval' => 'Zeitabstand f??r neue Seiten',
+    'hidenewstaticpages' => 'Neue Seiten ausblenden',
+    'title_trim_length' => 'Titel abschneiden nach',
+    'includecenterblocks' => 'Centerblock-Seiten ber??cksichtigen',
+    'includephp' => 'Seiten mit PHP ber??cksichtigen',
+    'includesearch' => 'Statische Seiten durchsuchen',
+    'includesearchcenterblocks' => 'Centerblock-Seiten ber??cksichtigen',
+    'includesearchphp' => 'Seiten mit PHP ber??cksichtigen'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -160,8 +160,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Statische Seiten Haupteinstellungen',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Was-ist-neu-Block',
+    'fs_search' => 'Suchergebnisse',
     'fs_permissions' => 'Grundeinstellungen Rechte'
 );
 
diff -r d560b8c577b6 -r 61d467f3c89b plugins/staticpages/language/german_utf-8.php
--- a/plugins/staticpages/language/german_utf-8.php	Sun Nov 15 11:10:47 2009 +0100
+++ b/plugins/staticpages/language/german_utf-8.php	Sun Nov 15 17:00:56 2009 +0100
@@ -113,10 +113,10 @@
     'search' => 'Suchen',
     'submit' => 'Absenden',
     'no_new_pages' => 'Keine neuen Seiten',
-    'pages' => 'Seiten'
+    'pages' => 'SEITEN'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_staticpages_MESSAGE15 = 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_staticpages_MESSAGE19 = 'Seite wurde gespeichert.';
 $PLG_staticpages_MESSAGE20 = 'Seite wurde gel??scht';
 
@@ -143,15 +143,15 @@
     'default_permissions' => 'Grundeinstellungen Statische Seiten',
     'aftersave' => 'Nach dem Speichern der Seiten',
     'atom_max_items' => 'Max. Seiten in Webservices News-Feed',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Meta-Tags verwenden',
+    'newstaticpagesinterval' => 'Zeitabstand f??r neue Seiten',
+    'hidenewstaticpages' => 'Neue Seiten ausblenden',
+    'title_trim_length' => 'Titel abschneiden nach',
+    'includecenterblocks' => 'Centerblock-Seiten ber??cksichtigen',
+    'includephp' => 'Seiten mit PHP ber??cksichtigen',
+    'includesearch' => 'Statische Seiten durchsuchen',
+    'includesearchcenterblocks' => 'Centerblock-Seiten ber??cksichtigen',
+    'includesearchphp' => 'Seiten mit PHP ber??cksichtigen'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -160,8 +160,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Statische Seiten Haupteinstellungen',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Was-ist-neu-Block',
+    'fs_search' => 'Suchergebnisse',
     'fs_permissions' => 'Grundeinstellungen Rechte'
 );
 

From geeklog-cvs at lists.geeklog.net  Sun Nov 15 11:22:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Nov 2009 11:22:38 -0500
Subject: [geeklog-cvs] geeklog: Finished updating German translation of the
	Polls langu...
Message-ID: <hg.a034bcbc8fbe.1258302158.1485632861@qs1489.pair.com>

changeset 7476:a034bcbc8fbe
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a034bcbc8fbe
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 15 17:13:54 2009 +0100
description:
Finished updating German translation of the Polls language files

diffstat:

 plugins/polls/language/german.php              |  8 ++++----
 plugins/polls/language/german_formal.php       |  8 ++++----
 plugins/polls/language/german_formal_utf-8.php |  8 ++++----
 plugins/polls/language/german_utf-8.php        |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (128 lines):

diff -r 61d467f3c89b -r a034bcbc8fbe plugins/polls/language/german.php
--- a/plugins/polls/language/german.php	Sun Nov 15 17:00:56 2009 +0100
+++ b/plugins/polls/language/german.php	Sun Nov 15 17:13:54 2009 +0100
@@ -56,8 +56,8 @@
     'upgrade1' => 'Neue Version des Umfrage-Plugins installiert. Bitte',
     'upgrade2' => 'upgraden',
     'editinstructions' => 'Bitte f?r die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
-    'pollclosed' => 'This poll is closed for voting.',
-    'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
+    'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
+    'pollhidden' => 'Du hast schon abgestimmt. Die Ergebnisse dieser Umfrage werden ver?ffentlicht, sobald sie abgeschlossen ist.',
     'start_poll' => 'Zur Umfrage'
 );
 
@@ -107,7 +107,7 @@
     40 => 'Alle Antworten zu dieser Umfrage ansehen'
 );
 
-$PLG_polls_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_polls_MESSAGE15 = 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_polls_MESSAGE19 = 'Umfrage wurde gespeichert.';
 $PLG_polls_MESSAGE20 = 'Umfrage wurde gel?scht.';
 
@@ -132,7 +132,7 @@
     'delete_polls' => 'Umfragen mit User l?schen?',
     'aftersave' => 'Nach speichern der Umfrage',
     'default_permissions' => 'Grundeinstellungen Umfragen',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Meta-Tags verwenden'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 61d467f3c89b -r a034bcbc8fbe plugins/polls/language/german_formal.php
--- a/plugins/polls/language/german_formal.php	Sun Nov 15 17:00:56 2009 +0100
+++ b/plugins/polls/language/german_formal.php	Sun Nov 15 17:13:54 2009 +0100
@@ -56,8 +56,8 @@
     'upgrade1' => 'Neue Version des Umfrage-Plugins installiert. Bitte',
     'upgrade2' => 'upgraden',
     'editinstructions' => 'Bitte f?r die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
-    'pollclosed' => 'This poll is closed for voting.',
-    'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
+    'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
+    'pollhidden' => 'Sie haben schon abgestimmt. Die Ergebnisse dieser Umfrage werden ver?ffentlicht, sobald sie abgeschlossen ist.',
     'start_poll' => 'Zur Umfrage'
 );
 
@@ -107,7 +107,7 @@
     40 => 'Alle Antworten zu dieser Umfrage ansehen'
 );
 
-$PLG_polls_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_polls_MESSAGE15 = 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_polls_MESSAGE19 = 'Umfrage wurde gespeichert.';
 $PLG_polls_MESSAGE20 = 'Umfrage wurde gel?scht.';
 
@@ -132,7 +132,7 @@
     'delete_polls' => 'Umfragen mit User l?schen?',
     'aftersave' => 'Nach speichern der Umfrage',
     'default_permissions' => 'Grundeinstellungen Umfragen',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Meta-Tags verwenden'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 61d467f3c89b -r a034bcbc8fbe plugins/polls/language/german_formal_utf-8.php
--- a/plugins/polls/language/german_formal_utf-8.php	Sun Nov 15 17:00:56 2009 +0100
+++ b/plugins/polls/language/german_formal_utf-8.php	Sun Nov 15 17:13:54 2009 +0100
@@ -56,8 +56,8 @@
     'upgrade1' => 'Neue Version des Umfrage-Plugins installiert. Bitte',
     'upgrade2' => 'upgraden',
     'editinstructions' => 'Bitte f??r die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
-    'pollclosed' => 'This poll is closed for voting.',
-    'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
+    'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
+    'pollhidden' => 'Sie haben schon abgestimmt. Die Ergebnisse dieser Umfrage werden ver??ffentlicht, sobald sie abgeschlossen ist.',
     'start_poll' => 'Zur Umfrage'
 );
 
@@ -107,7 +107,7 @@
     40 => 'Alle Antworten zu dieser Umfrage ansehen'
 );
 
-$PLG_polls_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_polls_MESSAGE15 = 'Ihr Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_polls_MESSAGE19 = 'Umfrage wurde gespeichert.';
 $PLG_polls_MESSAGE20 = 'Umfrage wurde gel??scht.';
 
@@ -132,7 +132,7 @@
     'delete_polls' => 'Umfragen mit User l??schen?',
     'aftersave' => 'Nach speichern der Umfrage',
     'default_permissions' => 'Grundeinstellungen Umfragen',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Meta-Tags verwenden'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 61d467f3c89b -r a034bcbc8fbe plugins/polls/language/german_utf-8.php
--- a/plugins/polls/language/german_utf-8.php	Sun Nov 15 17:00:56 2009 +0100
+++ b/plugins/polls/language/german_utf-8.php	Sun Nov 15 17:13:54 2009 +0100
@@ -56,8 +56,8 @@
     'upgrade1' => 'Neue Version des Umfrage-Plugins installiert. Bitte',
     'upgrade2' => 'upgraden',
     'editinstructions' => 'Bitte f??r die Umfrage-ID mindestens eine Frage und zwei Antworten eintragen.',
-    'pollclosed' => 'This poll is closed for voting.',
-    'pollhidden' => 'You have already voted. This poll results will only be shown when voting is closed.',
+    'pollclosed' => 'Diese Umfrage ist abgeschlossen.',
+    'pollhidden' => 'Du hast schon abgestimmt. Die Ergebnisse dieser Umfrage werden ver??ffentlicht, sobald sie abgeschlossen ist.',
     'start_poll' => 'Zur Umfrage'
 );
 
@@ -107,7 +107,7 @@
     40 => 'Alle Antworten zu dieser Umfrage ansehen'
 );
 
-$PLG_polls_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
+$PLG_polls_MESSAGE15 = 'Dein Kommentar wurde gespeichert, muss aber noch von einem Moderator freigegeben werden.';
 $PLG_polls_MESSAGE19 = 'Umfrage wurde gespeichert.';
 $PLG_polls_MESSAGE20 = 'Umfrage wurde gel??scht.';
 
@@ -132,7 +132,7 @@
     'delete_polls' => 'Umfragen mit User l??schen?',
     'aftersave' => 'Nach speichern der Umfrage',
     'default_permissions' => 'Grundeinstellungen Umfragen',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Meta-Tags verwenden'
 );
 
 $LANG_configsubgroups['polls'] = array(

From geeklog-cvs at lists.geeklog.net  Wed Nov 18 14:43:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 18 Nov 2009 14:43:58 -0500
Subject: [geeklog-cvs] geeklog: Wrong constant PATH_SEPARATOR - should have
	been DIRECT...
Message-ID: <hg.e6d6d39f0db7.1258573438.1485632861@qs1489.pair.com>

changeset 7477:e6d6d39f0db7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e6d6d39f0db7
user: Dirk Haun <dirk at haun-online.de>
date: Wed Nov 18 20:42:43 2009 +0100
description:
Wrong constant PATH_SEPARATOR - should have been DIRECTORY_SEPARATOR (Thanks, Blaine)

diffstat:

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

diffs (34 lines):

diff -r a034bcbc8fbe -r e6d6d39f0db7 public_html/docs/history
--- a/public_html/docs/history	Sun Nov 15 17:13:54 2009 +0100
+++ b/public_html/docs/history	Wed Nov 18 20:42:43 2009 +0100
@@ -2,7 +2,9 @@
 
 Nov ??, 2009 (1.6.1)
 ------------
+
 Changes since 1.6.1rc1:
+- Fixed use of wrong constant in unpacker.class.php [Blaine]
 - Updated the age-old help texts and added help files for comment and user
   submissions as well as the draft stories list [Dirk]
 - The success message at the end of the install recommended setting
@@ -97,7 +99,7 @@
   bugs with the "Disable Comments" option in 1.6.0) may result in values outside
   of the range of the year dropdown for that option, in which case it reverted
   to the previous(!) year and caused comments to be closed immediately [Dirk]
-- When viewing your own profile page, you now get an "edit" link that take you
+- When viewing your own profile page, you now get an "edit" link that takes you
   to "My Account" [Dirk]
 - Additional checks in "Mail Story to a Friend", "Send mail to user", and
   "Mail Users" dialogs to make sure users don't enter email addresses into the
diff -r a034bcbc8fbe -r e6d6d39f0db7 system/classes/unpacker.class.php
--- a/system/classes/unpacker.class.php	Sun Nov 15 17:13:54 2009 +0100
+++ b/system/classes/unpacker.class.php	Wed Nov 18 20:42:43 2009 +0100
@@ -80,7 +80,7 @@
     function unpacker($file, $mime_type = null) {
 
         // default directory separator
-        $this->d_sep = PATH_SEPARATOR;
+        $this->d_sep = DIRECTORY_SEPARATOR;
 
         // if the file doesn't have it's path, assume local
         if (! strstr($file, $this->d_sep)) {

From geeklog-cvs at lists.geeklog.net  Thu Nov 19 04:31:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 19 Nov 2009 04:31:55 -0500
Subject: [geeklog-cvs] geeklog: It wasn't possible to email a user via their
	profile pa...
Message-ID: <hg.3a69d326b1af.1258623115.1485632861@qs1489.pair.com>

changeset 7478:3a69d326b1af
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3a69d326b1af
user: Dirk Haun <dirk at haun-online.de>
date: Thu Nov 19 10:31:00 2009 +0100
description:
It wasn't possible to email a user via their profile page - checked the wrong field for '@' characters (cf. bug #0000992; reported by rayleigh)

diffstat:

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

diffs (24 lines):

diff -r e6d6d39f0db7 -r 3a69d326b1af public_html/docs/history
--- a/public_html/docs/history	Wed Nov 18 20:42:43 2009 +0100
+++ b/public_html/docs/history	Thu Nov 19 10:31:00 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1rc1:
+- It wasn't possible to email a user via their profile page - checked the wrong
+  field for '@' characters (cf. bug #0000992; reported by rayleigh) [Dirk]
 - Fixed use of wrong constant in unpacker.class.php [Blaine]
 - Updated the age-old help texts and added help files for comment and user
   submissions as well as the draft stories list [Dirk]
diff -r e6d6d39f0db7 -r 3a69d326b1af public_html/profiles.php
--- a/public_html/profiles.php	Wed Nov 18 20:42:43 2009 +0100
+++ b/public_html/profiles.php	Thu Nov 19 10:31:00 2009 +0100
@@ -81,7 +81,7 @@
     }
 
     if (!empty($author) && !empty($subject) && !empty($message)) {
-        if (COM_isemail($authoremail) && (strpos($authoremail, '@') === false)) {
+        if (COM_isemail($authoremail) && (strpos($author, '@') === false)) {
             $result = DB_query("SELECT username,fullname,email FROM {$_TABLES['users']} WHERE uid = $uid");
             $A = DB_fetchArray($result);
 

From geeklog-cvs at lists.geeklog.net  Sat Nov 21 06:48:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Nov 2009 06:48:18 -0500
Subject: [geeklog-cvs] geeklog: Content in curly braces in a static page was
	mistaken f...
Message-ID: <hg.f4f296d8d2a6.1258804098.1485632861@qs1489.pair.com>

changeset 7479:f4f296d8d2a6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f4f296d8d2a6
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 21 11:08:14 2009 +0100
description:
Content in curly braces in a static page was mistaken for template variables in the static pages editor (bug #0001038)

diffstat:

 public_html/admin/plugins/staticpages/index.php |  2 ++
 public_html/docs/history                        |  2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diffs (24 lines):

diff -r 3a69d326b1af -r f4f296d8d2a6 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Thu Nov 19 10:31:00 2009 +0100
+++ b/public_html/admin/plugins/staticpages/index.php	Sat Nov 21 11:08:14 2009 +0100
@@ -361,6 +361,8 @@
     $content = '';
     if (isset($A['sp_content'])) {
         $content = htmlspecialchars(stripslashes($A['sp_content']));
+        $content = str_replace(array('{', '}'), array('&#123;', '&#125;'),
+                               $content);
     }
     $sp_template->set_var('sp_content', $content);
     if ($_SP_CONF['filter_html'] == 1) {
diff -r 3a69d326b1af -r f4f296d8d2a6 public_html/docs/history
--- a/public_html/docs/history	Thu Nov 19 10:31:00 2009 +0100
+++ b/public_html/docs/history	Sat Nov 21 11:08:14 2009 +0100
@@ -17,6 +17,8 @@
 
 Static Pages Plugin
 -------------------
+- Content in curly braces in a static page was mistaken for template variables
+  in the static pages editor (bug #0001038) [Dirk]
 - Added missing code to handle $_SP_CONF['includesearchcenterblocks'] and
   $_SP_CONF['includesearchphp'] options that was accidentally left out when
   merging Tom's patch [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Nov 21 09:39:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Nov 2009 09:39:11 -0500
Subject: [geeklog-cvs] geeklog: Updated Estonian plugin language files,
	provided by Art...
Message-ID: <hg.5b590216547a.1258814351.1485632861@qs1489.pair.com>

changeset 7480:5b590216547a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5b590216547a
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 21 14:28:12 2009 +0100
description:
Updated Estonian plugin language files, provided by Artur Raepp

diffstat:

 plugins/links/language/estonian.php             |   4 +-
 plugins/links/language/estonian_utf-8.php       |   6 +-
 plugins/polls/language/estonian.php             |   2 +-
 plugins/polls/language/estonian_utf-8.php       |   4 +-
 plugins/staticpages/language/estonian.php       |  32 ++++++++--------
 plugins/staticpages/language/estonian_utf-8.php |  34 ++++++++--------
 6 files changed, 41 insertions(+), 41 deletions(-)

diffs (195 lines):

diff -r f4f296d8d2a6 -r 5b590216547a plugins/links/language/estonian.php
--- a/plugins/links/language/estonian.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/links/language/estonian.php	Sat Nov 21 14:28:12 2009 +0100
@@ -169,8 +169,8 @@
     57 => 'Veel kontrollimata',
     58 => 'Kontrolli n??d',
     59 => '<p>K?igi n?htaval olevate linkide kontrollimiseks, kl?psa palun allpool oleval lingil "Kontrolli n??d". Pane t?hele, et kontrollimine v?ib s?ltuvalt n?htaval olevate linkide arvust v?tta veidi aega.</p>',
-    60 => 'Kasutaja %s proovis ?igustamatult  muuta kategooriat: %s.',
-    61 => 'Links in Category'
+    60 => 'Kasutaja %s proov<is ?igustamatult  muuta kategooriat: %s.',
+    61 => 'Linke kategoorias'
 );
 
 
diff -r f4f296d8d2a6 -r 5b590216547a plugins/links/language/estonian_utf-8.php
--- a/plugins/links/language/estonian_utf-8.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/links/language/estonian_utf-8.php	Sat Nov 21 14:28:12 2009 +0100
@@ -1,7 +1,7 @@
 <?php
 
 ###############################################################################
-# estonian_utf-8.php
+# estonian.php
 # This is the Estonian language file for the Geeklog Link plugin
 #
 # Copyright (C) 2001 Tony Bibbs
@@ -169,8 +169,8 @@
     57 => 'Veel kontrollimata',
     58 => 'Kontrolli n????d',
     59 => '<p>K??igi n??htaval olevate linkide kontrollimiseks, kl??psa palun allpool oleval lingil "Kontrolli n????d". Pane t??hele, et kontrollimine v??ib s??ltuvalt n??htaval olevate linkide arvust v??tta veidi aega.</p>',
-    60 => 'Kasutaja %s proovis ??igustamatult  muuta kategooriat: %s.',
-    61 => 'Links in Category'
+    60 => 'Kasutaja %s proov<is ??igustamatult  muuta kategooriat: %s.',
+    61 => 'Linke kategoorias'
 );
 
 
diff -r f4f296d8d2a6 -r 5b590216547a plugins/polls/language/estonian.php
--- a/plugins/polls/language/estonian.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/polls/language/estonian.php	Sat Nov 21 14:28:12 2009 +0100
@@ -134,7 +134,7 @@
     'delete_polls' => 'Kustuta k?sitlused, omanikuks?',
     'aftersave' => 'P?rast k?sitluse salvestamist',
     'default_permissions' => 'K?sitluse vaikimisi ?igused',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Luba Meta sildid'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r f4f296d8d2a6 -r 5b590216547a plugins/polls/language/estonian_utf-8.php
--- a/plugins/polls/language/estonian_utf-8.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/polls/language/estonian_utf-8.php	Sat Nov 21 14:28:12 2009 +0100
@@ -1,7 +1,7 @@
 <?php
 
 ###############################################################################
-# estonian_utf-8.php
+# estonian.php
 # This is the Estonian language file for the Geeklog Polls plugin
 #
 # Copyright (C) 2001 Tony Bibbs
@@ -134,7 +134,7 @@
     'delete_polls' => 'Kustuta k??sitlused, omanikuks?',
     'aftersave' => 'P??rast k??sitluse salvestamist',
     'default_permissions' => 'K??sitluse vaikimisi ??igused',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Luba Meta sildid'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r f4f296d8d2a6 -r 5b590216547a plugins/staticpages/language/estonian.php
--- a/plugins/staticpages/language/estonian.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/staticpages/language/estonian.php	Sat Nov 21 14:28:12 2009 +0100
@@ -110,13 +110,13 @@
     'limit_results' => 'Piira tulemused',
     'search' => 'Otsi',
     'submit' => 'Sisesta',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Pole uusi lehti',
+    'pages' => 'Lehti'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
-$PLG_staticpages_MESSAGE19 = 'Your page has been successfully saved.';
-$PLG_staticpages_MESSAGE20 = 'Your page has been successfully deleted.';
+$PLG_staticpages_MESSAGE15 = 'Sinu kommentaar on saadetud l?bivaatamiseks. See ilmub lehele p?rast moderaatorite poolset heakskiitmist.';
+$PLG_staticpages_MESSAGE19 = 'Sinu leht on edukalt salvestatud.';
+$PLG_staticpages_MESSAGE20 = 'Sinu leht on edukalt kustutatud.';
 
 // Messages for the plugin upgrade
 $PLG_staticpages_MESSAGE3001 = 'Plugina uuendamine pole toetatud.';
@@ -141,15 +141,15 @@
     'default_permissions' => 'Lehe vaikimisi ?igused',
     'aftersave' => 'P?rast lehe salvestamist',
     'atom_max_items' => 'Maks. lehti veebiteenuste l?imes',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Luba Meta sildid',
+    'newstaticpagesinterval' => 'Uute staatiliste lehtede aeg',
+    'hidenewstaticpages' => 'Peida: Uued staatilised lehed',
+    'title_trim_length' => 'Pealkirja k?rpimise pikkus',
+    'includecenterblocks' => 'Kaasa keskploki staatilised lehed',
+    'includephp' => 'Kaasa PHP-ga staatilised lehed',
+    'includesearch' => 'Luba staatilised lehed otsingus',
+    'includesearchcenterblocks' => 'Kaasa keskploki staatilised lehed',
+    'includesearchphp' => 'Kaasa PHP-ga staatilised lehed'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -158,8 +158,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Staatiliste  lehtede peaseadistused',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Mida uut plokk',
+    'fs_search' => 'Otsingu tulemused',
     'fs_permissions' => 'Vaikimisi ?igused'
 );
 
diff -r f4f296d8d2a6 -r 5b590216547a plugins/staticpages/language/estonian_utf-8.php
--- a/plugins/staticpages/language/estonian_utf-8.php	Sat Nov 21 11:08:14 2009 +0100
+++ b/plugins/staticpages/language/estonian_utf-8.php	Sat Nov 21 14:28:12 2009 +0100
@@ -1,7 +1,7 @@
 <?php
 
 ###############################################################################
-# estonian_utf-8.php
+# estonian.php
 # This is the Estonian language file for the Geeklog Static Page plugin
 #
 # Copyright (C) 2001 Tony Bibbs
@@ -110,13 +110,13 @@
     'limit_results' => 'Piira tulemused',
     'search' => 'Otsi',
     'submit' => 'Sisesta',
-    'no_new_pages' => 'No new pages',
-    'pages' => 'Pages'
+    'no_new_pages' => 'Pole uusi lehti',
+    'pages' => 'Lehti'
 );
 
-$PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
-$PLG_staticpages_MESSAGE19 = 'Your page has been successfully saved.';
-$PLG_staticpages_MESSAGE20 = 'Your page has been successfully deleted.';
+$PLG_staticpages_MESSAGE15 = 'Sinu kommentaar on saadetud l??bivaatamiseks. See ilmub lehele p??rast moderaatorite poolset heakskiitmist.';
+$PLG_staticpages_MESSAGE19 = 'Sinu leht on edukalt salvestatud.';
+$PLG_staticpages_MESSAGE20 = 'Sinu leht on edukalt kustutatud.';
 
 // Messages for the plugin upgrade
 $PLG_staticpages_MESSAGE3001 = 'Plugina uuendamine pole toetatud.';
@@ -141,15 +141,15 @@
     'default_permissions' => 'Lehe vaikimisi ??igused',
     'aftersave' => 'P??rast lehe salvestamist',
     'atom_max_items' => 'Maks. lehti veebiteenuste l??imes',
-    'meta_tags' => 'Enable Meta Tags',
-    'newstaticpagesinterval' => 'New Static Page Interval',
-    'hidenewstaticpages' => 'Hide New Static Pages',
-    'title_trim_length' => 'Title Trim Length',
-    'includecenterblocks' => 'Include Center Block Static Pages',
-    'includephp' => 'Include Static Pages with PHP',
-    'includesearch' => 'Enable Static Pages in Search',
-    'includesearchcenterblocks' => 'Include Center Block Static Pages',
-    'includesearchphp' => 'Include Static Pages with PHP'
+    'meta_tags' => 'Luba Meta sildid',
+    'newstaticpagesinterval' => 'Uute staatiliste lehtede aeg',
+    'hidenewstaticpages' => 'Peida: Uued staatilised lehed',
+    'title_trim_length' => 'Pealkirja k??rpimise pikkus',
+    'includecenterblocks' => 'Kaasa keskploki staatilised lehed',
+    'includephp' => 'Kaasa PHP-ga staatilised lehed',
+    'includesearch' => 'Luba staatilised lehed otsingus',
+    'includesearchcenterblocks' => 'Kaasa keskploki staatilised lehed',
+    'includesearchphp' => 'Kaasa PHP-ga staatilised lehed'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -158,8 +158,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Staatiliste  lehtede peaseadistused',
-    'fs_whatsnew' => 'What\'s New Block',
-    'fs_search' => 'Search Results',
+    'fs_whatsnew' => 'Mida uut plokk',
+    'fs_search' => 'Otsingu tulemused',
     'fs_permissions' => 'Vaikimisi ??igused'
 );