From geeklog-cvs at lists.geeklog.net  Sat Oct  3 08:51:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 08:51:22 -0400
Subject: [geeklog-cvs] geeklog: Fixed wrong / undefined variable
Message-ID: <hg.be90f91ee74f.1254574282.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/be90f91ee74f
changeset: 7343:be90f91ee74f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 10:57:31 2009 +0200
description:
Fixed wrong / undefined variable

diffstat:

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

diffs (12 lines):

diff -r 187ee0efcee2 -r be90f91ee74f plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Thu Oct 01 00:07:25 2009 +0100
+++ b/plugins/calendar/functions.inc	Sat Oct 03 10:57:31 2009 +0200
@@ -479,7 +479,7 @@
     // pseudo-formatted event description for the spam check
     $spamcheck = '';
     if (empty($A['url'])) {
-        $spamcheck .= $title;
+        $spamcheck .= $A['title'];
     } else {
         $spamcheck .= COM_createLink($A['title'], $A['url']);
     }

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 08:51:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 08:51:23 -0400
Subject: [geeklog-cvs] geeklog: Fresh installs of the static pages plugin in
	Geeklog 1....
Message-ID: <hg.1185208e854a.1254574283.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1185208e854a
changeset: 7345:1185208e854a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 14:50:24 2009 +0200
description:
Fresh installs of the static pages plugin in Geeklog 1.6.1 accidentally used a wrong name for the plugin's admin group. Silently fix that during the upgrade.

diffstat:

 plugins/staticpages/autoinstall.php       |   8 ++++++--
 plugins/staticpages/functions.inc         |   4 +++-
 plugins/staticpages/sql/mssql_updates.php |  20 +++++++++++++++++++-
 plugins/staticpages/sql/mysql_updates.php |  20 +++++++++++++++++++-
 public_html/docs/history                  |   5 ++++-
 5 files changed, 51 insertions(+), 6 deletions(-)

diffs (134 lines):

diff -r 3e03947c0624 -r 1185208e854a plugins/staticpages/autoinstall.php
--- a/plugins/staticpages/autoinstall.php	Sat Oct 03 11:46:54 2009 +0200
+++ b/plugins/staticpages/autoinstall.php	Sat Oct 03 14:50:24 2009 +0200
@@ -46,13 +46,13 @@
 {
     $pi_name         = 'staticpages';
     $pi_display_name = 'Static Pages';
-    $pi_admin        = $pi_display_name . ' Admin';
+    $pi_admin        = 'Static Page Admin'; // "Page"(!), not "Pages"
 
     $info = array(
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
         'pi_version'      => '1.6.1',
-        'pi_gl_version'   => '1.6.0',
+        'pi_gl_version'   => '1.6.1',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
 
@@ -142,6 +142,10 @@
         return false;
     }
 
+    if (! isset($_CONF['meta_tags'])) {
+        return false;
+    }
+
     return true;
 }
 
diff -r 3e03947c0624 -r 1185208e854a plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Oct 03 11:46:54 2009 +0200
+++ b/plugins/staticpages/functions.inc	Sat Oct 03 14:50:24 2009 +0200
@@ -1085,7 +1085,9 @@
         /* give the name of the tables, without $_TABLES[] */
         'tables' => array('staticpage'),
         /* give the full name of the group, as in the db */
-        'groups' => array('Static Page Admin'),
+        'groups' => array('Static Page Admin', // correct Admin group name
+                          'Static Pages Admin' // typo in Geeklog 1.6.0
+                         ),
         /* give the full name of the feature, as in the db */
         'features' => array('staticpages.edit', 'staticpages.delete', 'staticpages.PHP'),
         /* give the full name of the block, including 'phpblock_', etc */
diff -r 3e03947c0624 -r 1185208e854a plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Sat Oct 03 11:46:54 2009 +0200
+++ b/plugins/staticpages/sql/mssql_updates.php	Sat Oct 03 14:50:24 2009 +0200
@@ -46,7 +46,7 @@
 */
 function update_ConfValues_1_6_0()
 {
-    global $_CONF, $_SP_DEFAULT;
+    global $_CONF, $_TABLES, $_SP_DEFAULT;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
@@ -55,6 +55,24 @@
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 
+    // check for wrong Admin group name
+    $wrong_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                           "grp_name = 'Static Pages Admin'"); // wrong name
+    if (! empty($wrong_id)) {
+        $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                             "grp_name = 'Static Page Admin'"); // correct name
+        if (empty($grp_id)) {
+            // correct name not found - probably a fresh install: rename
+            DB_query("UPDATE {$_TABLES['groups']} SET grp_name = 'Static Page Admin' WHERE grp_name = 'Static Pages Admin'");
+        } else {
+            // both names exist: delete wrong group & assignments
+            DB_delete($_TABLES['access'], 'acc_grp_id', $wrong_id);
+            DB_delete($_TABLES['group_assignments'], 'ug_grp_id', $wrong_id);
+            DB_delete($_TABLES['group_assignments'], 'ug_main_grp_id', $wrong_id);
+            DB_delete($_TABLES['groups'], 'grp_name', 'Static Pages Admin');
+        }
+    }
+
     return true;
 }
 
diff -r 3e03947c0624 -r 1185208e854a plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Sat Oct 03 11:46:54 2009 +0200
+++ b/plugins/staticpages/sql/mysql_updates.php	Sat Oct 03 14:50:24 2009 +0200
@@ -47,7 +47,7 @@
 */
 function update_ConfValues_1_6_0()
 {
-    global $_CONF, $_SP_DEFAULT;
+    global $_CONF, $_TABLES, $_SP_DEFAULT;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
@@ -56,6 +56,24 @@
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 
+    // check for wrong Admin group name
+    $wrong_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                           "grp_name = 'Static Pages Admin'"); // wrong name
+    if (! empty($wrong_id)) {
+        $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                             "grp_name = 'Static Page Admin'"); // correct name
+        if (empty($grp_id)) {
+            // correct name not found - probably a fresh install: rename
+            DB_query("UPDATE {$_TABLES['groups']} SET grp_name = 'Static Page Admin' WHERE grp_name = 'Static Pages Admin'");
+        } else {
+            // both names exist: delete wrong group & assignments
+            DB_delete($_TABLES['access'], 'acc_grp_id', $wrong_id);
+            DB_delete($_TABLES['group_assignments'], 'ug_grp_id', $wrong_id);
+            DB_delete($_TABLES['group_assignments'], 'ug_main_grp_id', $wrong_id);
+            DB_delete($_TABLES['groups'], 'grp_name', 'Static Pages Admin');
+        }
+    }
+
     return true;
 }
 
diff -r 3e03947c0624 -r 1185208e854a public_html/docs/history
--- a/public_html/docs/history	Sat Oct 03 11:46:54 2009 +0200
+++ b/public_html/docs/history	Sat Oct 03 14:50:24 2009 +0200
@@ -87,8 +87,10 @@
 - Introduced [poll:], [poll_vote:], and [poll_result:] autotags, allowing to
   embed polls where autotags are allowed, provided by Tom Homer
 
-Static Pages Plugin
--------------------
+Static Pages Plugin 1.6.1
+-------------------
+- Fresh installs of the plugin in Geeklog 1.6.1 accidentally used a wrong name
+  for the plugin's admin group. Silently fix that during the upgrade [Dirk]
 - Made the list of pages sortable by author (feature request #0000978) [Dirk]
 - List available autotags in the static pages editor [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 08:51:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 08:51:22 -0400
Subject: [geeklog-cvs] geeklog: Keep track of the user id for submitted
	events (bug #00...
Message-ID: <hg.3e03947c0624.1254574282.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3e03947c0624
changeset: 7344:3e03947c0624
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 11:46:54 2009 +0200
description:
Keep track of the user id for submitted events (bug #0000993)

diffstat:

 plugins/calendar/autoinstall.php             |  10 ++++-
 plugins/calendar/functions.inc               |  62 +++++++++++++++++++++++--------
 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 +++++++++++++++++++++
 public_html/admin/plugins/calendar/index.php |   4 +-
 public_html/docs/history                     |   4 +-
 8 files changed, 151 insertions(+), 23 deletions(-)

diffs (truncated from 313 to 300 lines):

diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/autoinstall.php
--- a/plugins/calendar/autoinstall.php	Sat Oct 03 10:57:31 2009 +0200
+++ b/plugins/calendar/autoinstall.php	Sat Oct 03 11:46:54 2009 +0200
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -29,6 +29,12 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Calendar plugin automatic plugin install
+*
+* @package Calendar
+*/
+
 function plugin_autoinstall_calendar($pi_name)
 {
     $pi_name         = 'calendar';
@@ -38,7 +44,7 @@
     $info = array(
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
-        'pi_version'      => '1.1.0',
+        'pi_version'      => '1.1.1',
         'pi_gl_version'   => '1.6.0',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Oct 03 10:57:31 2009 +0200
+++ b/plugins/calendar/functions.inc	Sat Oct 03 11:46:54 2009 +0200
@@ -34,6 +34,12 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Implementation of the Plugin API for the Calendar plugin
+*
+* @package Calendar
+*/
+
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
 }
@@ -342,7 +348,7 @@
     return array (
         'eid',
         $_TABLES['events'],
-        "eid,title,description,location,address1,address2,city,state,zipcode,datestart,timestart,dateend,timeend,url",
+        "eid,title,description,location,address1,address2,city,state,zipcode,datestart,timestart,dateend,timeend,url,owner_id",
         $_TABLES['eventsubmission']
     );
 }
@@ -359,25 +365,25 @@
 * @return     string       Any wanted HTML output
 *
 */
-function plugin_moderationapprove_calendar ($id)
+function plugin_moderationapprove_calendar($id)
 {
     global $_CA_CONF, $_GROUPS, $_TABLES, $_USER;
 
-    $A = array ();
-    SEC_setDefaultPermissions ($A, $_CA_CONF['default_permissions']);
+    // The eventsubmission table only keeps track of the submitter's uid,
+    // but not of grous and permissions. So set those to sensible defaults.
 
-    // Since the eventsubmission table does not contain fields for the owner
-    // and group, we set those to the current user. Also set the default
-    // permissions as specified in the plugin's configuration
-    if (isset ($_GROUPS['Calendar Admin'])) {
+    if (isset($_GROUPS['Calendar Admin'])) {
         $group_id = $_GROUPS['Calendar Admin'];
     } else {
-        $group_id = SEC_getFeatureGroup ('calendar.moderate');
+        $group_id = SEC_getFeatureGroup('calendar.moderate');
     }
-    DB_query ("UPDATE {$_TABLES['events']} SET owner_id = '{$_USER['uid']}',"
-             ."group_id = '$group_id',perm_owner = {$A['perm_owner']}, "
-             ."perm_group = {$A['perm_group']}, perm_members = {$A['perm_members']},"
-             ."perm_anon = {$A['perm_anon']} WHERE eid = $id");
+
+    $A = array();
+    SEC_setDefaultPermissions($A, $_CA_CONF['default_permissions']);
+
+    DB_query("UPDATE {$_TABLES['events']} SET group_id = '$group_id', perm_owner = '{$A['perm_owner']}', perm_group = '{$A['perm_group']}', perm_members = '{$A['perm_members']}', perm_anon = '{$A['perm_anon']}' WHERE eid = '$id'");
+
+    return '';
 }
 
 /**
@@ -573,8 +579,8 @@
                 !SEC_hasRights('calendar.submit')) {
 
             DB_save ($_TABLES['eventsubmission'],
-                     'eid,title,event_type,url,datestart,timestart,dateend,timeend,allday,location,address1,address2,city,state,zipcode,description',
-                     "{$A['eid']},'{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}'");
+                     'eid,title,event_type,url,datestart,timestart,dateend,timeend,allday,location,address1,address2,city,state,zipcode,description,owner_id',
+                     "{$A['eid']},'{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}',{$_USER['uid']}");
 
             if (isset ($_CA_CONF['notification']) &&
                     ($_CA_CONF['notification'] == 1)) {
@@ -1440,7 +1446,7 @@
 */
 function plugin_upgrade_calendar()
 {
-    global $_CONF, $_TABLES;
+    global $_CONF, $_TABLES, $_DB_dbms;
 
     $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
                                     "pi_name = 'calendar'");
@@ -1459,6 +1465,30 @@
     $inst_parms = plugin_autoinstall_calendar('calendar');
     $pi_gl_version = $inst_parms['info']['pi_gl_version'];
 
+    require_once $_CONF['path'] . 'plugins/calendar/sql/'
+                                . $_DB_dbms . '_updates.php';
+
+    $current_version = $installed_version;
+    $done = false;
+    while (! $done) {
+        switch ($current_version) {
+        case '1.1.0':
+            if (isset($_UPDATES[$current_version])) {
+                $_SQL = $_UPDATES[$current_version];
+                foreach ($_SQL as $sql) {
+                    DB_query($sql);
+                }
+            }
+
+            $current_version = '1.1.1';
+            break;
+
+        default:
+            $done = true;
+            break;
+        }
+    }
+
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'calendar'");
 
     return true;
diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/sql/mssql_install.php
--- a/plugins/calendar/sql/mssql_install.php	Sat Oct 03 10:57:31 2009 +0200
+++ b/plugins/calendar/sql/mssql_install.php	Sat Oct 03 11:46:54 2009 +0200
@@ -77,7 +77,8 @@
     [address1] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [event_type] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [timestart] [smalldatetime] NULL ,
-    [timeend] [smalldatetime] NULL
+    [timeend] [smalldatetime] NULL,
+    [owner_id] [numeric](8, 0) NULL
 ) ON [PRIMARY] 
 ";
 
@@ -133,7 +134,7 @@
     )  ON [PRIMARY]
 ";
 
-$_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) 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)";
+$_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)";
 
diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/sql/mssql_updates.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/calendar/sql/mssql_updates.php	Sat Oct 03 11:46:54 2009 +0200
@@ -0,0 +1,43 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Calendar Plugin 1.1                                                       |
+// +---------------------------------------------------------------------------+
+// | Upgrade SQL                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Authors: Dirk Haun        - dirk AT haun-online DOT de                    |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is licensed 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* MS SQL updates
+*
+* @package Calendar
+*/
+
+$_UPDATES = array(
+
+    '1.1.0' => array(
+        "ALTER TABLE {$_TABLES['eventsubmission']} ADD [owner_id] [numeric](8, 0) NULL AFTER timeend"
+    )
+
+);
+
+?>
diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/sql/mysql_install.php
--- a/plugins/calendar/sql/mysql_install.php	Sat Oct 03 10:57:31 2009 +0200
+++ b/plugins/calendar/sql/mysql_install.php	Sat Oct 03 11:46:54 2009 +0200
@@ -82,6 +82,7 @@
   event_type varchar(40) NOT NULL default '',
   timestart time default NULL,
   timeend time default NULL,
+  owner_id mediumint(8) unsigned NOT NULL default '1',
   PRIMARY KEY  (eid)
 ) TYPE=MyISAM
 ";
@@ -116,7 +117,7 @@
 ) TYPE=MyISAM
 ";
 
-$_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) 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)";
+$_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)";
 
diff -r be90f91ee74f -r 3e03947c0624 plugins/calendar/sql/mysql_updates.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/calendar/sql/mysql_updates.php	Sat Oct 03 11:46:54 2009 +0200
@@ -0,0 +1,43 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Calendar Plugin 1.1                                                       |
+// +---------------------------------------------------------------------------+
+// | Upgrade SQL                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Authors: Dirk Haun        - dirk AT haun-online DOT de                    |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is licensed 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* MySQL updates
+*
+* @package Calendar
+*/
+
+$_UPDATES = array(
+
+    '1.1.0' => array(
+        "ALTER TABLE {$_TABLES['eventsubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1' AFTER timeend"
+    )
+
+);
+
+?>
diff -r be90f91ee74f -r 3e03947c0624 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php	Sat Oct 03 10:57:31 2009 +0200
+++ b/public_html/admin/plugins/calendar/index.php	Sat Oct 03 11:46:54 2009 +0200
@@ -104,7 +104,9 @@
             return $retval;
         }
     } else {
-        $A['owner_id'] = $_USER['uid'];
+        if (empty($A['owner_id'])) {
+            $A['owner_id'] = $_USER['uid'];
+        }
         if (isset ($_GROUPS['Calendar Admin'])) {
             $A['group_id'] = $_GROUPS['Calendar Admin'];
         } else {
diff -r be90f91ee74f -r 3e03947c0624 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 03 10:57:31 2009 +0200

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 09:18:56 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 09:18:56 -0400
Subject: [geeklog-cvs] geeklog: Fixed handling of owner_id for anonymous
	event submissions
Message-ID: <hg.c1c6258c8b23.1254575936.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c1c6258c8b23
changeset: 7346:c1c6258c8b23
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 15:08:13 2009 +0200
description:
Fixed handling of owner_id for anonymous event submissions

diffstat:

 plugins/calendar/functions.inc |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 1185208e854a -r c1c6258c8b23 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Oct 03 14:50:24 2009 +0200
+++ b/plugins/calendar/functions.inc	Sat Oct 03 15:08:13 2009 +0200
@@ -578,9 +578,15 @@
         if (($_CA_CONF['eventsubmission'] == 1) &&
                 !SEC_hasRights('calendar.submit')) {
 
+            if (COM_isAnonUser()) {
+                $uid = 1;
+            } else {
+                $uid = $_USER['uid'];
+            }
+
             DB_save ($_TABLES['eventsubmission'],
                      'eid,title,event_type,url,datestart,timestart,dateend,timeend,allday,location,address1,address2,city,state,zipcode,description,owner_id',
-                     "{$A['eid']},'{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}',{$_USER['uid']}");
+                     "{$A['eid']},'{$A['title']}','{$A['event_type']}','{$A['url']}','{$A['datestart']}','{$A['timestart']}','{$A['dateend']}','{$A['timeend']}',{$A['allday']},'{$A['location']}','{$A['address1']}','{$A['address2']}','{$A['city']}','{$A['state']}','{$A['zipcode']}','{$A['description']}',{$uid}");
 
             if (isset ($_CA_CONF['notification']) &&
                     ($_CA_CONF['notification'] == 1)) {

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 09:18:56 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 09:18:56 -0400
Subject: [geeklog-cvs] geeklog: Need to handle "upgrade" step from Calendar
	version 1.0.3
Message-ID: <hg.752c977d9aa0.1254575936.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/752c977d9aa0
changeset: 7347:752c977d9aa0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 15:18:47 2009 +0200
description:
Need to handle "upgrade" step from Calendar version 1.0.3

diffstat:

 plugins/calendar/functions.inc |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r c1c6258c8b23 -r 752c977d9aa0 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Oct 03 15:08:13 2009 +0200
+++ b/plugins/calendar/functions.inc	Sat Oct 03 15:18:47 2009 +0200
@@ -1478,6 +1478,10 @@
     $done = false;
     while (! $done) {
         switch ($current_version) {
+        case '1.0.3':
+            $current_version = '1.1.0';
+            break;
+
         case '1.1.0':
             if (isset($_UPDATES[$current_version])) {
                 $_SQL = $_UPDATES[$current_version];

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 13:35:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 13:35:11 -0400
Subject: [geeklog-cvs] geeklog: The Polls plugin requires Geeklog 1.6.1 now
Message-ID: <hg.696d17bec61e.1254591311.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/696d17bec61e
changeset: 7348:696d17bec61e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 15:53:36 2009 +0200
description:
The Polls plugin requires Geeklog 1.6.1 now

diffstat:

 plugins/polls/autoinstall.php |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 752c977d9aa0 -r 696d17bec61e plugins/polls/autoinstall.php
--- a/plugins/polls/autoinstall.php	Sat Oct 03 15:18:47 2009 +0200
+++ b/plugins/polls/autoinstall.php	Sat Oct 03 15:53:36 2009 +0200
@@ -52,7 +52,7 @@
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
         'pi_version'      => '2.1.1',
-        'pi_gl_version'   => '1.6.0',
+        'pi_gl_version'   => '1.6.1',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
 
@@ -142,6 +142,10 @@
         return false;
     }
 
+    if (! isset($_CONF['meta_tags'])) {
+        return false;
+    }
+
     return true;
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 13:35:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 13:35:12 -0400
Subject: [geeklog-cvs] geeklog: Minor code cleanup - no change in
	functionality
Message-ID: <hg.97dcb0f29746.1254591312.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/97dcb0f29746
changeset: 7349:97dcb0f29746
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 16:23:00 2009 +0200
description:
Minor code cleanup - no change in functionality

diffstat:

 system/lib-admin.php |  110 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 59 insertions(+), 51 deletions(-)

diffs (125 lines):

diff -r 696d17bec61e -r 97dcb0f29746 system/lib-admin.php
--- a/system/lib-admin.php	Sat Oct 03 15:53:36 2009 +0200
+++ b/system/lib-admin.php	Sat Oct 03 16:23:00 2009 +0200
@@ -625,62 +625,70 @@
 
     $retval = false;
 
-    $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
+    $access = SEC_hasAccess($A['owner_id'], $A['group_id'], $A['perm_owner'],
+                    $A['perm_group'], $A['perm_members'], $A['perm_anon']);
 
-    if (($access > 0) && (hasBlockTopicAccess ($A['tid']) > 0)) {
-        switch($fieldname) {
-            case 'edit':
-                if ($access == 3) {
-                    $retval = COM_createLink($icon_arr['edit'],
-                        "{$_CONF['site_admin_url']}/block.php?mode=edit&amp;bid={$A['bid']}");
+    if (($access > 0) && (hasBlockTopicAccess($A['tid']) > 0)) {
+        switch ($fieldname) {
+        case 'edit':
+            if ($access == 3) {
+                $retval = COM_createLink($icon_arr['edit'],
+                    "{$_CONF['site_admin_url']}/block.php?mode=edit&amp;bid={$A['bid']}");
+            }
+            break;
+
+        case 'title':
+            $retval = stripslashes($A['title']);
+            if (empty($retval)) {
+                $retval = '(' . $A['name'] . ')';
+            }
+            break;
+
+        case 'blockorder':
+            $retval .= $A['blockorder'];
+            break;
+
+        case 'is_enabled':
+            if ($access == 3) {
+                if ($A['is_enabled'] == 1) {
+                    $switch = ' checked="checked"';
+                } else {
+                    $switch = '';
                 }
-                break;
-            case 'title':
-                $retval = stripslashes ($A['title']);
-                if (empty ($retval)) {
-                    $retval = '(' . $A['name'] . ')';
+                $retval = "<input type=\"checkbox\" name=\"enabledblocks[{$A['bid']}]\" "
+                    . "onclick=\"submit()\" value=\"{$A['onleft']}\"$switch" . XHTML . ">";
+                $retval .= "<input type=\"hidden\" name=\"" . CSRF_TOKEN . "\" value=\"{$token}\"" . XHTML . ">";
+            }
+            break;
+
+        case 'move':
+            if ($access == 3) {
+                if ($A['onleft'] == 1) {
+                    $side = $LANG21[40];
+                    $blockcontrol_image = 'block-right.' . $_IMAGE_TYPE;
+                    $moveTitleMsg = $LANG21[59];
+                    $switchside = '1';
+                } else {
+                    $blockcontrol_image = 'block-left.' . $_IMAGE_TYPE;
+                    $moveTitleMsg = $LANG21[60];
+                    $switchside = '0';
                 }
-                break;
-            case 'blockorder':
-                $retval .= $A['blockorder'];
-                break;
-            case 'is_enabled':
-                if ($access == 3) {
-                    if ($A['is_enabled'] == 1) {
-                        $switch = ' checked="checked"';
-                    } else {
-                        $switch = '';
-                    }
-                    $retval = "<input type=\"checkbox\" name=\"enabledblocks[{$A['bid']}]\" "
-                        . "onclick=\"submit()\" value=\"{$A['onleft']}\"$switch" . XHTML . ">";
-                    $retval .= "<input type=\"hidden\" name=\"" . CSRF_TOKEN . "\" value=\"{$token}\"" . XHTML . ">";
-                }
-                break;
-            case 'move':
-                if ($access == 3) {
-                    if ($A['onleft'] == 1) {
-                        $side = $LANG21[40];
-                        $blockcontrol_image = 'block-right.' . $_IMAGE_TYPE;
-                        $moveTitleMsg = $LANG21[59];
-                        $switchside = '1';
-                    } else {
-                        $blockcontrol_image = 'block-left.' . $_IMAGE_TYPE;
-                        $moveTitleMsg = $LANG21[60];
-                        $switchside = '0';
-                    }
-                    $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
-                            ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
-                            ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up&amp;".CSRF_TOKEN."={$token}\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
-                            ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside&amp;".CSRF_TOKEN."={$token}\" alt=\"$moveTitleMsg\"" . XHTML . ">"
-                            ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn&amp;".CSRF_TOKEN."={$token}\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
-                            ."</map>";
-                }
-                break;
-            default:
-                $retval = $fieldvalue;
-                break;
+                $csrftoken = '&amp;' . CSRF_TOKEN . '=' . $token;
+                $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
+                        ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
+                        ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up{$csrftoken}\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
+                        ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside{$csrftoken}\" alt=\"$moveTitleMsg\"" . XHTML . ">"
+                        ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn${csrftoken}\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
+                        ."</map>";
+            }
+            break;
+
+        default:
+            $retval = $fieldvalue;
+            break;
         }
     }
+
     return $retval;
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 13:35:13 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 13:35:13 -0400
Subject: [geeklog-cvs] geeklog: Security token is only need once in this
	form / list
Message-ID: <hg.a8311a63ee0c.1254591313.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a8311a63ee0c
changeset: 7350:a8311a63ee0c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 16:27:35 2009 +0200
description:
Security token is only need once in this form / list

diffstat:

 system/lib-admin.php |  101 ++++++++++++++++++++++++++++----------------------
 1 files changed, 57 insertions(+), 44 deletions(-)

diffs (115 lines):

diff -r 97dcb0f29746 -r a8311a63ee0c system/lib-admin.php
--- a/system/lib-admin.php	Sat Oct 03 16:23:00 2009 +0200
+++ b/system/lib-admin.php	Sat Oct 03 16:27:35 2009 +0200
@@ -987,54 +987,67 @@
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG33, $_IMAGE_TYPE;
 
+    static $added_token;
+
     $retval = '';
 
-    switch($fieldname) {
-        case 'edit':
-            $retval = COM_createLink($icon_arr['edit'],
-                "{$_CONF['site_admin_url']}/syndication.php?mode=edit&amp;fid={$A['fid']}");
-            break;
-        case 'type':
-            if ($A['type'] == 'article') {
-                $retval = $LANG33[55];
-            } else {
-                $retval = ucwords($A['type']);
-            }
-            break;
-        case 'format':
-            $retval = str_replace ('-' , ' ', ucwords ($A['format']));
-            break;
-        case 'updated':
-            $retval = strftime ($_CONF['daytime'], $A['date']);
-            break;
-        case 'is_enabled':
-            if ($A['is_enabled'] == 1) {
-                $switch = ' checked="checked"';
-            } else {
-                $switch = '';
-            }
-            $retval = "<input type=\"checkbox\" name=\"enabledfeeds[]\" "
-                . "onclick=\"submit()\" value=\"{$A['fid']}\"$switch" . XHTML . ">";
+    switch ($fieldname) {
+    case 'edit':
+        $retval = COM_createLink($icon_arr['edit'],
+            "{$_CONF['site_admin_url']}/syndication.php?mode=edit&amp;fid={$A['fid']}");
+        break;
+
+    case 'type':
+        if ($A['type'] == 'article') {
+            $retval = $LANG33[55];
+        } else {
+            $retval = ucwords($A['type']);
+        }
+        break;
+
+    case 'format':
+        $retval = str_replace('-' , ' ', ucwords($A['format']));
+        break;
+
+    case 'updated':
+        $retval = strftime($_CONF['daytime'], $A['date']);
+        break;
+
+    case 'is_enabled':
+        if ($A['is_enabled'] == 1) {
+            $switch = ' checked="checked"';
+        } else {
+            $switch = '';
+        }
+        $retval = "<input type=\"checkbox\" name=\"enabledfeeds[]\" "
+            . "onclick=\"submit()\" value=\"{$A['fid']}\"$switch" . XHTML . ">";
+        if (! isset($added_token)) {
             $retval .= "<input type=\"hidden\" name=\"" . CSRF_TOKEN . "\" value=\"{$token}\"" . XHTML . ">";
-            break;
-        case 'header_tid':
-            if ($A['header_tid'] == 'all') {
-                $retval = $LANG33[43];
-            } elseif ($A['header_tid'] == 'none') {
-                $retval = $LANG33[44];
-            } else {
-                $retval = DB_getItem ($_TABLES['topics'], 'topic',
-                                      "tid = '{$A['header_tid']}'");
-            }
-            break;
-        case 'filename':
-            $url = SYND_getFeedUrl ();
-            $retval = COM_createLink($A['filename'], $url . $A['filename']);
-            break;
-        default:
-            $retval = $fieldvalue;
-            break;
+            $added_token = true;
+        }
+        break;
+
+    case 'header_tid':
+        if ($A['header_tid'] == 'all') {
+            $retval = $LANG33[43];
+        } elseif ($A['header_tid'] == 'none') {
+            $retval = $LANG33[44];
+        } else {
+            $retval = DB_getItem($_TABLES['topics'], 'topic',
+                                 "tid = '{$A['header_tid']}'");
+        }
+        break;
+
+    case 'filename':
+        $url = SYND_getFeedUrl();
+        $retval = COM_createLink($A['filename'], $url . $A['filename']);
+        break;
+
+    default:
+        $retval = $fieldvalue;
+        break;
     }
+
     return $retval;
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 13:35:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 13:35:14 -0400
Subject: [geeklog-cvs] geeklog: Security token is only need once in this
	form / list
Message-ID: <hg.d9d8f9519bcc.1254591314.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d9d8f9519bcc
changeset: 7351:d9d8f9519bcc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 16:32:24 2009 +0200
description:
Security token is only need once in this form / list

diffstat:

 system/lib-admin.php |  67 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 29 deletions(-)

diffs (82 lines):

diff -r a8311a63ee0c -r d9d8f9519bcc system/lib-admin.php
--- a/system/lib-admin.php	Sat Oct 03 16:27:35 2009 +0200
+++ b/system/lib-admin.php	Sat Oct 03 16:32:24 2009 +0200
@@ -1221,40 +1221,49 @@
 {
     global $_CONF, $LANG_TRB;
 
+    static $added_token;
+
     $retval = '';
 
     switch($fieldname) {
-        case "edit":
-            $retval = COM_createLink($icon_arr['edit'],
-                "{$_CONF['site_admin_url']}/trackback.php?mode=editservice&amp;service_id={$A['pid']}");
-            break;
-        case "name":
-            $retval = COM_createLink($A['name'], $A['site_url']);
-            break;
-        case "method":
-            if ($A['method'] == 'weblogUpdates.ping') {
-                $retval = $LANG_TRB['ping_standard'];
-            } else if ($A['method'] == 'weblogUpdates.extendedPing') {
-                $retval = $LANG_TRB['ping_extended'];
-            } else {
-                $retval = '<span class="warningsmall">' .
-                        $LANG_TRB['ping_unknown'] .  '</span>';
-            }
-            break;
-        case "is_enabled":
-            if ($A['is_enabled'] == 1) {
-                $switch = ' checked="checked"';
-            } else {
-                $switch = '';
-            }
-            $retval = "<input type=\"checkbox\" name=\"changedservices[]\" "
-                . "onclick=\"submit()\" value=\"{$A['pid']}\"$switch" . XHTML . ">";
+    case 'edit':
+        $retval = COM_createLink($icon_arr['edit'],
+            "{$_CONF['site_admin_url']}/trackback.php?mode=editservice&amp;service_id={$A['pid']}");
+        break;
+
+    case 'name':
+        $retval = COM_createLink($A['name'], $A['site_url']);
+        break;
+
+    case 'method':
+        if ($A['method'] == 'weblogUpdates.ping') {
+            $retval = $LANG_TRB['ping_standard'];
+        } else if ($A['method'] == 'weblogUpdates.extendedPing') {
+            $retval = $LANG_TRB['ping_extended'];
+        } else {
+            $retval = '<span class="warningsmall">' . $LANG_TRB['ping_unknown']
+                    .  '</span>';
+        }
+        break;
+
+    case 'is_enabled':
+        if ($A['is_enabled'] == 1) {
+            $switch = ' checked="checked"';
+        } else {
+            $switch = '';
+        }
+        $retval = "<input type=\"checkbox\" name=\"changedservices[]\" "
+            . "onclick=\"submit()\" value=\"{$A['pid']}\"$switch" . XHTML . ">";
+        if (! isset($added_token)) {
             $retval .= "<input type=\"hidden\" name=\"" . CSRF_TOKEN
                     . "\" value=\"{$token}\"" . XHTML . ">";
-            break;
-        default:
-            $retval = $fieldvalue;
-            break;
+            $added_token = true;
+        }
+        break;
+
+    default:
+        $retval = $fieldvalue;
+        break;
     }
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 13:35:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 13:35:16 -0400
Subject: [geeklog-cvs] geeklog: Call CUSTOM_userCheck from admin/user.php
	(bug #0000925)
Message-ID: <hg.7db76f494446.1254591316.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7db76f494446
changeset: 7352:7db76f494446
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 19:34:59 2009 +0200
description:
Call CUSTOM_userCheck from admin/user.php (bug #0000925)

diffstat:

 public_html/admin/user.php |  12 ++++++++++++
 public_html/docs/history   |   5 ++++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r d9d8f9519bcc -r 7db76f494446 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Oct 03 16:32:24 2009 +0200
+++ b/public_html/admin/user.php	Sat Oct 03 19:34:59 2009 +0200
@@ -521,6 +521,18 @@
             return edituser($uid, 56);
         }
 
+        if ($_CONF['custom_registration'] &&
+                function_exists('CUSTOM_userCheck')) {
+            $ret = CUSTOM_userCheck($username, $email);
+            if (! empty($ret)) {
+                // need a numeric return value - otherwise use default message
+                if (! is_numeric($ret['number'])) {
+                    $ret['number'] = 400;
+                }
+                return edituser($uid, $ret['number']);
+            }
+        }
+
         if (empty ($uid) || !empty ($passwd)) {
             $passwd = SEC_encryptPassword($passwd);
         } else {
diff -r d9d8f9519bcc -r 7db76f494446 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 03 16:32:24 2009 +0200
+++ b/public_html/docs/history	Sat Oct 03 19:34:59 2009 +0200
@@ -3,13 +3,16 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
+- You can now have one featured story per topic (feature request #0000750,
+  patch provided by Tom Homer)
 - 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
   email headers (using a string for that parameter still works as CC:) [Dirk]
 - Fixed reply notification for the very first comment (bug #0000973)
   [dengen, Dirk]
-- When an anonymous commentor left a name, use it in the comment notification
+- When an anonymous commenter left a name, use it in the comment notification
   email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
   the actual comment editor and it caused problems on the moderation page [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 15:18:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 15:18:36 -0400
Subject: [geeklog-cvs] geeklog: Display the number of stories in the current
	topic in t...
Message-ID: <hg.566b2b4b5535.1254597516.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/566b2b4b5535
changeset: 7353:566b2b4b5535
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 20:40:08 2009 +0200
description:
Display the number of stories in the current topic in the Topic Editor (feature request #0000806)

diffstat:

 language/english.php                                          |   3 +-
 language/english_utf-8.php                                    |   3 +-
 public_html/admin/topic.php                                   |  35 +++++++++--
 public_html/docs/english/theme.html                           |   3 +
 public_html/docs/history                                      |   2 +
 public_html/layout/professional/admin/topic/topiceditor.thtml |   4 +
 6 files changed, 41 insertions(+), 9 deletions(-)

diffs (124 lines):

diff -r 7db76f494446 -r 566b2b4b5535 language/english.php
--- a/language/english.php	Sat Oct 03 19:34:59 2009 +0200
+++ b/language/english.php	Sat Oct 03 20:40:08 2009 +0200
@@ -863,7 +863,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'
 );
 
 ###############################################################################
diff -r 7db76f494446 -r 566b2b4b5535 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Oct 03 19:34:59 2009 +0200
+++ b/language/english_utf-8.php	Sat Oct 03 20:40:08 2009 +0200
@@ -863,7 +863,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'
 );
 
 ###############################################################################
diff -r 7db76f494446 -r 566b2b4b5535 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Oct 03 19:34:59 2009 +0200
+++ b/public_html/admin/topic.php	Sat Oct 03 20:40:08 2009 +0200
@@ -174,10 +174,20 @@
     $topic_templates->set_var('max_url_length', 255);
     $topic_templates->set_var('image_url', $A['imageurl']);
 
-    $topic_templates->set_var('lang_metadescription', $LANG_ADMIN['meta_description']);
-    $topic_templates->set_var('meta_description', stripslashes($A['meta_description']));
-    $topic_templates->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
-    $topic_templates->set_var('meta_keywords', stripslashes($A['meta_keywords']));
+    $topic_templates->set_var('lang_metadescription',
+                              $LANG_ADMIN['meta_description']);
+    $topic_templates->set_var('lang_metakeywords',
+                              $LANG_ADMIN['meta_keywords']);
+    $desc = '';
+    if (! empty($A['meta_description'])) {
+        $desc = $A['meta_description'];
+    }
+    $keywords = '';
+    if (! empty($A['meta_keywords'])) {
+        $keywords = $A['meta_keywords'];
+    }
+    $topic_templates->set_var('meta_description', $desc);
+    $topic_templates->set_var('meta_keywords', $keywords);
 
     $topic_templates->set_var ('lang_defaulttopic', $LANG27[22]);
     $topic_templates->set_var ('lang_defaulttext', $LANG27[23]);
@@ -199,6 +209,17 @@
             $topic_templates->set_var ('archive_disabled', 'disabled');
         }
     }
+
+    if (empty($tid)) {
+        $num_stories = $LANG_ADMIN['na'];
+    } else {
+        $nresult = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE tid = '" . addslashes($tid) . "'" . COM_getPermSql('AND'));
+        $N = DB_fetchArray( $nresult );
+        $num_stories = $N['count'];
+    }
+
+    $topic_templates->set_var('lang_num_stories', $LANG27[30]);
+    $topic_templates->set_var('num_stories', $num_stories);
     $topic_templates->set_var('gltoken_name', CSRF_TOKEN);
     $topic_templates->set_var('gltoken', SEC_createToken());
     $topic_templates->parse('output', 'editor');
@@ -259,9 +280,9 @@
         if ($imageurl == '/images/topics/') {
             $imageurl = '';
         }
-        $topic = addslashes ($topic);
-        $meta_description = addslashes ($meta_description);
-        $meta_keywords = addslashes ($meta_keywords);
+        $topic = addslashes($topic);
+        $meta_description = addslashes(strip_tags($meta_description));
+        $meta_keywords = addslashes(strip_tags($meta_keywords));
 
         if ($is_default == 'on') {
             $is_default = 1;
diff -r 7db76f494446 -r 566b2b4b5535 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sat Oct 03 19:34:59 2009 +0200
+++ b/public_html/docs/english/theme.html	Sat Oct 03 20:40:08 2009 +0200
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>The Topic Editor now contains a line displaying the number of stories in
+    the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
+    <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
 <li>Cosmetics: Fixed the position of the story preview when using the
     advanced editor (was slightly shifted to the right, <a
     href="http://project.geeklog.net/tracking/view.php?id=963">bug #0000963</a>). Changes to the <code>&lt;div id="preview"&gt;</code> in
diff -r 7db76f494446 -r 566b2b4b5535 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 03 19:34:59 2009 +0200
+++ b/public_html/docs/history	Sat Oct 03 20:40:08 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Display the number of stories in the current topic in the Topic Editor
+  (feature request #0000806) [Dirk]
 - Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
 - You can now have one featured story per topic (feature request #0000750,
   patch provided by Tom Homer)
diff -r 7db76f494446 -r 566b2b4b5535 public_html/layout/professional/admin/topic/topiceditor.thtml
--- a/public_html/layout/professional/admin/topic/topiceditor.thtml	Sat Oct 03 19:34:59 2009 +0200
+++ b/public_html/layout/professional/admin/topic/topiceditor.thtml	Sat Oct 03 20:40:08 2009 +0200
@@ -41,6 +41,10 @@
                                         <td><input type="checkbox" name="is_archive" {archive_checked} {archive_disabled}{xhtml}> ({lang_archivetext})</td>
                                     </tr>
                                     <tr>
+                                        <td class="alignright">{lang_num_stories}:</td>
+                                        <td>{num_stories}</td>
+                                    </tr>
+                                    <tr>
                                         <td colspan="2"><hr{xhtml}></td>
                                     </tr>
                                     <tr>

From geeklog-cvs at lists.geeklog.net  Sat Oct  3 15:18:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 03 Oct 2009 15:18:36 -0400
Subject: [geeklog-cvs] geeklog: Made the meta tag handling somewhat more
	consistent
Message-ID: <hg.82e167a0e3a4.1254597516.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/82e167a0e3a4
changeset: 7354:82e167a0e3a4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 03 21:15:34 2009 +0200
description:
Made the meta tag handling somewhat more consistent

diffstat:

 plugins/staticpages/functions.inc               |   4 ++--
 plugins/staticpages/services.inc.php            |  11 +++++++----
 public_html/admin/plugins/polls/index.php       |  19 +++++++++----------
 public_html/admin/plugins/staticpages/index.php |  13 +++++++------
 public_html/admin/topic.php                     |  31 ++++++++++++++-----------------
 5 files changed, 39 insertions(+), 39 deletions(-)

diffs (179 lines):

diff -r 566b2b4b5535 -r 82e167a0e3a4 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Oct 03 20:40:08 2009 +0200
+++ b/plugins/staticpages/functions.inc	Sat Oct 03 21:15:34 2009 +0200
@@ -276,8 +276,8 @@
 
     // Meta Tags
     If ($_SP_CONF['meta_tags'] > 0) {
-        $meta_description  = stripslashes ($A['meta_description']);
-        $meta_keywords  = stripslashes ($A['meta_keywords']);
+        $meta_description  = $A['meta_description'];
+        $meta_keywords  = $A['meta_keywords'];
         $headercode .= COM_createMetaTags($meta_description, $meta_keywords);
     }
 
diff -r 566b2b4b5535 -r 82e167a0e3a4 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Oct 03 20:40:08 2009 +0200
+++ b/plugins/staticpages/services.inc.php	Sat Oct 03 21:15:34 2009 +0200
@@ -563,15 +563,18 @@
         }
         $sql = array();
         $sql['mysql'] = "SELECT sp_title,sp_content,sp_hits,sp_date,sp_format,"
-                      . "commentcode,meta_description,meta_keywords,owner_id,group_id,perm_owner,perm_group,"
+                      . "commentcode,meta_description,meta_keywords,owner_id,"
+                      . "group_id,perm_owner,perm_group,"
                       . "perm_members,perm_anon,sp_tid,sp_help,sp_php,"
                       . "sp_inblock FROM {$_TABLES['staticpage']} "
                       . "WHERE (sp_id = '$page')" . $perms;
         $sql['mssql'] = "SELECT sp_title,"
                       . "CAST(sp_content AS text) AS sp_content,sp_hits,"
-                      . "sp_date,sp_format,commentcode,owner_id,group_id,"
-                      . "perm_owner,perm_group,perm_members,perm_anon,sp_tid,"
-                      . "sp_help,sp_php,sp_inblock "
+                      . "sp_date,sp_format,commentcode,"
+                      . "CAST(meta_description AS text) AS meta_description,"
+                      . "CAST(meta_keywords AS text) AS meta_keywords,"
+                      . "owner_id,group_id,perm_owner,perm_group,perm_members,"
+                      . "perm_anon,sp_tid,sp_help,sp_php,sp_inblock "
                       . "FROM {$_TABLES['staticpage']} WHERE (sp_id = '$page')"
                       . $perms;
         $result = DB_query ($sql);
diff -r 566b2b4b5535 -r 82e167a0e3a4 public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sat Oct 03 20:40:08 2009 +0200
+++ b/public_html/admin/plugins/polls/index.php	Sat Oct 03 21:15:34 2009 +0200
@@ -164,8 +164,8 @@
     list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
 
     $topic = COM_stripslashes($topic);
-    $meta_description = COM_stripslashes($meta_description);
-    $meta_keywords = COM_stripslashes($meta_keywords);
+    $meta_description = strip_tags(COM_stripslashes($meta_description));
+    $meta_keywords = strip_tags(COM_stripslashes($meta_keywords));
     $pid = COM_sanitizeID($pid);
     $old_pid = COM_sanitizeID($old_pid);
     if (empty($pid)) {
@@ -249,9 +249,9 @@
     DB_delete($_TABLES['pollanswers'], 'pid', $del_pid);
     DB_delete($_TABLES['pollquestions'], 'pid', $del_pid);
 
-    $topic = addslashes ($topic);
-    $meta_description = addslashes ($meta_description);
-    $meta_keywords = addslashes ($meta_keywords);
+    $topic = addslashes($topic);
+    $meta_description = addslashes($meta_description);
+    $meta_keywords = addslashes($meta_keywords);
 
     $k = 0; // set up a counter to make sure we do assign a straight line of question id's
     $v = 0; // re-count votes sine they might have been changed
@@ -305,9 +305,7 @@
     $sql .= ",'$statuscode','$commentcode',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon";
 
     // Save poll topic
-    DB_save($_TABLES['polltopics'],"pid, topic, meta_description, meta_keywords, voters, questions, date, display, "
-           . "is_open, hideresults, statuscode, commentcode, owner_id, group_id, "
-           . "perm_owner, perm_group, perm_members, perm_anon",$sql);
+    DB_save($_TABLES['polltopics'], "pid, topic, meta_description, meta_keywords, voters, questions, date, display, is_open, hideresults, statuscode, commentcode, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon", $sql);
 
     if (empty($old_pid) || ($old_pid == $pid)) {
         PLG_itemSaved($pid, 'polls');
@@ -618,8 +616,9 @@
             $hideresults = COM_applyFilter ($_POST['hideresults']);
         }
         $display .= savepoll ($pid, $old_pid, $_POST['question'], $mainpage,
-                        $_POST['topic'], $_POST['meta_description'], $_POST['meta_keywords'], 
-                        $statuscode, $open, $hideresults,
+                        $_POST['topic'], $_POST['meta_description'],
+                        $_POST['meta_keywords'], $statuscode, $open,
+                        $hideresults,
                         COM_applyFilter ($_POST['commentcode'], true),
                         $_POST['answer'], $_POST['votes'], $_POST['remark'],
                         COM_applyFilter ($_POST['owner_id'], true),
diff -r 566b2b4b5535 -r 82e167a0e3a4 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sat Oct 03 20:40:08 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Sat Oct 03 21:15:34 2009 +0200
@@ -551,12 +551,13 @@
 * @param sp_inblock      string  Flag: wrap page in a block (or not)
 *
 */
-function submitstaticpage ($sp_id, $sp_uid, $sp_title, $sp_content, $sp_hits,
-                           $sp_format, $sp_onmenu, $sp_label, $commentcode,
-                           $owner_id, $group_id, $perm_owner, $perm_group,
-                           $perm_members, $perm_anon, $sp_php, $sp_nf,
-                           $sp_old_id, $sp_centerblock, $sp_help, $sp_tid,
-                           $sp_where, $sp_inblock, $postmode, $meta_description, $meta_keywords)
+function submitstaticpage($sp_id, $sp_uid, $sp_title, $sp_content, $sp_hits,
+                          $sp_format, $sp_onmenu, $sp_label, $commentcode,
+                          $owner_id, $group_id, $perm_owner, $perm_group,
+                          $perm_members, $perm_anon, $sp_php, $sp_nf,
+                          $sp_old_id, $sp_centerblock, $sp_help, $sp_tid,
+                          $sp_where, $sp_inblock, $postmode, $meta_description,
+                          $meta_keywords)
 {
     global $_CONF, $_TABLES, $LANG12, $LANG_STATIC, $_SP_CONF;
 
diff -r 566b2b4b5535 -r 82e167a0e3a4 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Oct 03 20:40:08 2009 +0200
+++ b/public_html/admin/topic.php	Sat Oct 03 21:15:34 2009 +0200
@@ -178,16 +178,12 @@
                               $LANG_ADMIN['meta_description']);
     $topic_templates->set_var('lang_metakeywords',
                               $LANG_ADMIN['meta_keywords']);
-    $desc = '';
     if (! empty($A['meta_description'])) {
-        $desc = $A['meta_description'];
+        $topic_templates->set_var('meta_description', $A['meta_description']);
     }
-    $keywords = '';
     if (! empty($A['meta_keywords'])) {
-        $keywords = $A['meta_keywords'];
+        $topic_templates->set_var('meta_keywords', $A['meta_keywords']);
     }
-    $topic_templates->set_var('meta_description', $desc);
-    $topic_templates->set_var('meta_keywords', $keywords);
 
     $topic_templates->set_var ('lang_defaulttopic', $LANG27[22]);
     $topic_templates->set_var ('lang_defaulttext', $LANG27[23]);
@@ -249,7 +245,7 @@
 * @param    string  $is_archive     'on' if this is the archive topic
 * @return   string                  HTML redirect or error message
 */
-function savetopic($tid,$topic,$imageurl,$meta_description, $meta_keywords,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default,$is_archive)
+function savetopic($tid,$topic,$imageurl,$meta_description,$meta_keywords,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default,$is_archive)
 {
     global $_CONF, $_TABLES, $LANG27, $MESSAGE;
 
@@ -258,7 +254,7 @@
     // Convert array values to numeric permission values
     list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
 
-    $tid = COM_sanitizeID ($tid);
+    $tid = COM_sanitizeID($tid);
 
     $access = 0;
     if (DB_count ($_TABLES['topics'], 'tid', $tid) > 0) {
@@ -608,15 +604,16 @@
     if (isset($_POST['is_archive'])) {
         $is_archive = $_POST['is_archive'];
     }
-    $display .= savetopic (COM_applyFilter ($_POST['tid']), $_POST['topic'],
-                           $imageurl, $_POST['meta_description'], $_POST['meta_keywords'],
-                           COM_applyFilter ($_POST['sortnum'], true),
-                           COM_applyFilter ($_POST['limitnews'], true),
-                           COM_applyFilter ($_POST['owner_id'], true),
-                           COM_applyFilter ($_POST['group_id'], true),
-                           $_POST['perm_owner'], $_POST['perm_group'],
-                           $_POST['perm_members'], $_POST['perm_anon'],
-                           $is_default, $is_archive);
+    $display .= savetopic(COM_applyFilter($_POST['tid']), $_POST['topic'],
+                          $imageurl, $_POST['meta_description'],
+                          $_POST['meta_keywords'],
+                          COM_applyFilter($_POST['sortnum'], true),
+                          COM_applyFilter($_POST['limitnews'], true),
+                          COM_applyFilter($_POST['owner_id'], true),
+                          COM_applyFilter($_POST['group_id'], true),
+                          $_POST['perm_owner'], $_POST['perm_group'],
+                          $_POST['perm_members'], $_POST['perm_anon'],
+                          $is_default, $is_archive);
 } else if ($mode == 'edit') {
     $display .= COM_siteHeader('menu', $LANG27[1]);
     $tid = '';

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 05:10:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 05:10:32 -0400
Subject: [geeklog-cvs] geeklog: Changed "Reply To" to a more intuitive "Your
	Email Addr...
Message-ID: <hg.bca4b093d603.1254647432.1485632861@qs1489.pair.com>

changeset 7355:bca4b093d603
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bca4b093d603
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 09:36:19 2009 +0200
description:
Changed "Reply To" to a more intuitive "Your Email Address" (cf. bug #0000992)

diffstat:

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

diffs (24 lines):

diff -r 82e167a0e3a4 -r bca4b093d603 language/english.php
--- a/language/english.php	Sat Oct 03 21:15:34 2009 +0200
+++ b/language/english.php	Sun Oct 04 09:36:19 2009 +0200
@@ -428,7 +428,7 @@
     9 => 'User URL',
     10 => 'Send mail to',
     11 => 'Your Name:',
-    12 => 'Reply To:',
+    12 => 'Your Email Address',
     13 => 'Subject:',
     14 => 'Message:',
     15 => 'HTML will not be translated.',
diff -r 82e167a0e3a4 -r bca4b093d603 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Oct 03 21:15:34 2009 +0200
+++ b/language/english_utf-8.php	Sun Oct 04 09:36:19 2009 +0200
@@ -428,7 +428,7 @@
     9 => 'User URL',
     10 => 'Send mail to',
     11 => 'Your Name:',
-    12 => 'Reply To:',
+    12 => 'Your Email Address:',
     13 => 'Subject:',
     14 => 'Message:',
     15 => 'HTML will not be translated.',

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 05:10:33 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 05:10:33 -0400
Subject: [geeklog-cvs] geeklog: Additional checks in "Mail Story to a
	Friend" and "Send...
Message-ID: <hg.6155fbeb6262.1254647433.1485632861@qs1489.pair.com>

changeset 7357:6155fbeb6262
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6155fbeb6262
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 11:10:08 2009 +0200
description:
Additional checks in "Mail Story to a Friend" and "Send mail to user" dialogs to make sure users don't enter email addresses into the name fields (bug #0000992)

diffstat:

 language/english.php       |   4 +-
 language/english_utf-8.php |   4 +-
 public_html/docs/history   |   3 +
 public_html/profiles.php   |  63 ++++++++++++++++++-------------
 4 files changed, 43 insertions(+), 31 deletions(-)

diffs (125 lines):

diff -r 7c38c0c6ce0c -r 6155fbeb6262 language/english.php
--- a/language/english.php	Sun Oct 04 10:08:27 2009 +0200
+++ b/language/english.php	Sun Oct 04 11:10:08 2009 +0200
@@ -419,8 +419,8 @@
 $LANG08 = array(
     1 => 'There was an error sending your message. Please try again.',
     2 => 'Message sent successfully.',
-    3 => 'Please make sure you use a valid email address in the Reply To field.',
-    4 => 'Please fill in the Your Name, Reply To, Subject and Message fields',
+    3 => 'Please make sure you use a valid email address in the Your Email Address field.',
+    4 => 'Please fill in the Your Name, Your Email Address, Subject and Message fields',
     5 => 'Error: No such user.',
     6 => 'There was an error.',
     7 => 'User Profile for',
diff -r 7c38c0c6ce0c -r 6155fbeb6262 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Oct 04 10:08:27 2009 +0200
+++ b/language/english_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
@@ -419,8 +419,8 @@
 $LANG08 = array(
     1 => 'There was an error sending your message. Please try again.',
     2 => 'Message sent successfully.',
-    3 => 'Please make sure you use a valid email address in the Reply To field.',
-    4 => 'Please fill in the Your Name, Reply To, Subject and Message fields',
+    3 => 'Please make sure you use a valid email address in the Your Email Address field.',
+    4 => 'Please fill in the Your Name, Your Email Address, Subject and Message fields',
     5 => 'Error: No such user.',
     6 => 'There was an error.',
     7 => 'User Profile for',
diff -r 7c38c0c6ce0c -r 6155fbeb6262 public_html/docs/history
--- a/public_html/docs/history	Sun Oct 04 10:08:27 2009 +0200
+++ b/public_html/docs/history	Sun Oct 04 11:10:08 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Additional checks in "Mail Story to a Friend" and "Send mail to user" dialogs
+  to make sure users don't enter email addresses into the name fields (bug
+  #0000992) [Dirk]
 - Added an option to send a copy to self to the "Mail Story to a Friend" dialog
   and made the look of this and the "Send mail to user" dialogs more consistent
   [Dirk]
diff -r 7c38c0c6ce0c -r 6155fbeb6262 public_html/profiles.php
--- a/public_html/profiles.php	Sun Oct 04 10:08:27 2009 +0200
+++ b/public_html/profiles.php	Sun Oct 04 11:10:08 2009 +0200
@@ -81,7 +81,7 @@
     }
 
     if (!empty($author) && !empty($subject) && !empty($message)) {
-        if (COM_isemail($authoremail)) {
+        if (COM_isemail($authoremail) && (strpos($authoremail, '@') === false)) {
             $result = DB_query("SELECT username,fullname,email FROM {$_TABLES['users']} WHERE uid = $uid");
             $A = DB_fetchArray($result);
 
@@ -530,36 +530,45 @@
         break;
 
     case 'sendstory':
-        $sid = COM_applyFilter ($_POST['sid']);
-        if (empty ($sid)) {
-            $display = COM_refresh ($_CONF['site_url'] . '/index.php');
+        $sid = COM_applyFilter($_POST['sid']);
+        if (empty($sid)) {
+            $display = COM_refresh($_CONF['site_url'] . '/index.php');
         } else {
-            if (empty ($_POST['toemail']) || empty ($_POST['fromemail'])
-                    || !COM_isEmail ($_POST['toemail'])
-                    || !COM_isEmail ($_POST['fromemail'])) {
+            if (empty($_POST['toemail']) || empty($_POST['fromemail']) ||
+                    !COM_isEmail($_POST['toemail']) ||
+                    !COM_isEmail($_POST['fromemail']) ||
+                    (strpos($_POST['to'], '@') !== false) ||
+                    (strpos($_POST['from'], '@') !== false)) {
+                $display .= COM_siteHeader('menu', $LANG08[17])
+                         . mailstoryform ($sid, COM_applyFilter($_POST['to']),
+                                COM_applyFilter($_POST['toemail']),
+                                COM_applyFilter($_POST['from']),
+                                COM_applyFilter($_POST['fromemail']),
+                                $_POST['shortmsg'], 52)
+                         . COM_siteFooter();
+            } else if (empty($_POST['to']) || empty($_POST['from']) ||
+                    empty($_POST['shortmsg'])) {
                 $display .= COM_siteHeader ('menu', $LANG08[17])
-                         . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
-                                          COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
-                                          $_POST['shortmsg'], 52)
-                         . COM_siteFooter ();
-            } else if (empty ($_POST['to']) || empty ($_POST['from']) ||
-                    empty ($_POST['shortmsg'])) {
-                $display .= COM_siteHeader ('menu', $LANG08[17])
-                         . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
-                                          COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
-                                          $_POST['shortmsg'])
-                         . COM_siteFooter ();
+                         . COM_showMessageText($LANG08[22])
+                         . mailstoryform($sid, COM_applyFilter($_POST['to']),
+                                COM_applyFilter($_POST['toemail']),
+                                COM_applyFilter($_POST['from']),
+                                COM_applyFilter($_POST['fromemail']),
+                                $_POST['shortmsg'])
+                         . COM_siteFooter();
             } else {
-                $msg = PLG_itemPreSave ('emailstory', $_POST['shortmsg']);
-                if (!empty ($msg)) {
-                    $display .= COM_siteHeader ('menu', '')
-                             . COM_errorLog ($msg, 2)
-                             . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
-                                              COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
-                                              $_POST['shortmsg'])
-                             . COM_siteFooter ();
+                $msg = PLG_itemPreSave('emailstory', $_POST['shortmsg']);
+                if (!empty($msg)) {
+                    $display .= COM_siteHeader('menu', $LANG08[17])
+                             . COM_errorLog($msg, 2)
+                             . mailstoryform($sid, COM_applyFilter($_POST['to']),
+                                COM_applyFilter($_POST['toemail']),
+                                COM_applyFilter($_POST['from']),
+                                COM_applyFilter($_POST['fromemail']),
+                                $_POST['shortmsg'])
+                             . COM_siteFooter();
                 } else {
-                    $display .= mailstory ($sid, $_POST['to'], $_POST['toemail'],
+                    $display .= mailstory($sid, $_POST['to'], $_POST['toemail'],
                         $_POST['from'], $_POST['fromemail'], $_POST['shortmsg']);
                 }
             }

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 05:10:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 05:10:32 -0400
Subject: [geeklog-cvs] geeklog: Added an option to send a copy to self to
	the "Mail Sto...
Message-ID: <hg.7c38c0c6ce0c.1254647432.1485632861@qs1489.pair.com>

changeset 7356:7c38c0c6ce0c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7c38c0c6ce0c
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 10:08:27 2009 +0200
description:
Added an option to send a copy to self to the "Mail Story to a Friend" dialog and made the look of this and the "Send mail to user" dialogs more consistent

diffstat:

 public_html/docs/english/theme.html                              |  10 +++++
 public_html/docs/history                                         |   9 +++-
 public_html/layout/professional/profiles/contactauthorform.thtml |  17 ++++++--
 public_html/layout/professional/profiles/contactuserform.thtml   |  28 ++++++-------
 public_html/profiles.php                                         |  18 +++++++--
 5 files changed, 55 insertions(+), 27 deletions(-)

diffs (180 lines):

diff -r bca4b093d603 -r 7c38c0c6ce0c public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Oct 04 09:36:19 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Oct 04 10:08:27 2009 +0200
@@ -198,6 +198,12 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Added a "send copy to myself" option to
+    <tt>profiles/contactauthorform.thtml</tt></li>
+<li>Cosmetics: Made the look and layout of the "Send mail to user"
+    (<tt>contactuserform.thtml</tt>) and "Mail Story to a Friend"
+    (<tt>contactauthorform.thtml</tt>) dialogs more consistent (alignment, size
+    of input fields).</li>
 <li>The Topic Editor now contains a line displaying the number of stories in
     the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
     <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
@@ -238,12 +244,16 @@
 <li>Links: Removed a <code>width="150"</code> from the Category editor template
     (<tt>admin/categoryeditor.thtml</tt>) that pushed the first column too far
     to the right.</li>
+<li>Static Pages: Added new input fields for a meta description and meta
+    keywords to the Static Pages editor.</li>
 <li>Static Pages: In the Static Pages editor, moved the Hits display below
     the Last Updated entry (<tt>admin/editor.thtml</tt>,
     <tt>admin/editor_advanced.thtml</tt>).</li>
 <li>Static Pages: Added textarea fileds for meta description and meta keywords
     in the Static Pages editor (<tt>admin/editor.thtml</tt>,
     <tt>admin/editor_advanced.thtml</tt>).</li>
+<li>Polls: Added new input fields for a meta description and meta keywords to
+    the Polls editor.</li>
 <li>Polls: Added new CSS classes <tt>poll-autotag-message</tt>,
     <tt>poll-autotag</tt>, <tt>poll-autotag-left</tt>, used when embedding polls
     via the new autotags.</li>
diff -r bca4b093d603 -r 7c38c0c6ce0c public_html/docs/history
--- a/public_html/docs/history	Sun Oct 04 09:36:19 2009 +0200
+++ b/public_html/docs/history	Sun Oct 04 10:08:27 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Added an option to send a copy to self to the "Mail Story to a Friend" dialog
+  and made the look of this and the "Send mail to user" dialogs more consistent
+  [Dirk]
 - Display the number of stories in the current topic in the Topic Editor
   (feature request #0000806) [Dirk]
 - Call CUSTOM_userCheck from admin/user.php (bug #0000925) [Dirk]
@@ -51,8 +54,8 @@
 - Only list [code], [raw] tags when story.* permissions are required [Dirk]
 - [page_break] was not listed when all HTML was allowed for Root users [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer
-- When an error occurs in bigdump.php (during migration) keep the language when
-  sending the user back to migrate.php (bug #0000943) [Dirk]
+- When an error occurs in bigdump.php (during migration) keep the selected
+  language when sending the user back to migrate.php (bug #0000943) [Dirk]
 - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
   displaying the date and time in search results [Dirk]
 - When disabling a feed, delete the feed file [Dirk]
@@ -94,7 +97,7 @@
 
 Static Pages Plugin 1.6.1
 -------------------
-- Fresh installs of the plugin in Geeklog 1.6.1 accidentally used a wrong name
+- Fresh installs of the plugin in Geeklog 1.6.0 accidentally used a wrong name
   for the plugin's admin group. Silently fix that during the upgrade [Dirk]
 - Made the list of pages sortable by author (feature request #0000978) [Dirk]
 - List available autotags in the static pages editor [Dirk]
diff -r bca4b093d603 -r 7c38c0c6ce0c public_html/layout/professional/profiles/contactauthorform.thtml
--- a/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Oct 04 09:36:19 2009 +0200
+++ b/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Oct 04 10:08:27 2009 +0200
@@ -23,14 +23,21 @@
         </tr>
         <tr>
             <td class="alignright" style="vertical-align:top;"><b>{lang_shortmessage}:</b></td>
-            <td><textarea name="shortmsg" rows="8" style="width:100%">{shortmsg}</textarea></td>
+            <td><textarea name="shortmsg" rows="10" style="width:100%">{shortmsg}</textarea></td>
+        </tr>
+        <tr>
+            <td class="alignright"><b>{lang_cc}</b></td>
+            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
         </tr>
         {captcha}
         <tr>
-            <td colspan="2" class="warning aligncenter"><br{xhtml}>{lang_warning}<br{xhtml}><br{xhtml}>
-                <input type="hidden" name="sid" value="{story_id}"{xhtml}>
-                <input type="hidden" name="what" value="sendstory"{xhtml}>
-                <input type="submit" value="{lang_sendmessage}"{xhtml}>
+            <td colspan="2" class="warning aligncenter" style="padding-top:10px;">
+                {lang_warning}
+                <div style="padding:5px;">
+                    <input type="hidden" name="sid" value="{story_id}"{xhtml}>
+                    <input type="hidden" name="what" value="sendstory"{xhtml}>
+                    <input type="submit" value="{lang_sendmessage}"{xhtml}>
+                </div>
             </td>
         </tr>
     </table>
diff -r bca4b093d603 -r 7c38c0c6ce0c public_html/layout/professional/profiles/contactuserform.thtml
--- a/public_html/layout/professional/profiles/contactuserform.thtml	Sun Oct 04 09:36:19 2009 +0200
+++ b/public_html/layout/professional/profiles/contactuserform.thtml	Sun Oct 04 10:08:27 2009 +0200
@@ -1,31 +1,29 @@
+<p>{lang_description}</p>
 <form action="{site_url}/profiles.php" method="post" name="contact">
-    <table cellspacing="0" cellpadding="0" width="100%" class="plugin">
+    <table cellspacing="0" cellpadding="3" width="100%">
         <tr>
-            <td colspan="2" class="pluginInfo">{lang_description}</td>
+            <td class="alignright"><b>{lang_username}</b></td>
+            <td><input type="text" name="author" size="40" maxlength="96" value="{username}"{xhtml}></td>
         </tr>
         <tr>
-            <td>{lang_username}</td>
-            <td><input type="text" name="author" size="32" value="{username}" maxlength="32"{xhtml}></td>
+            <td class="alignright"><b>{lang_useremail}</b></td>
+            <td><input type="text" name="authoremail" size="40" maxlength="96" value="{useremail}"{xhtml}></td>
         </tr>
         <tr>
-            <td>{lang_useremail}</td>
-            <td><input type="text" name="authoremail" size="32" value="{useremail}" maxlength="96"{xhtml}></td>
+            <td class="alignright"><b>{lang_subject}</b></td>
+            <td><input type="text" name="subject" size="40" maxlength="96" value="{subject}"{xhtml}></td>
         </tr>
         <tr>
-            <td>{lang_cc}</td>
-            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
+            <td class="alignright" style="vertical-align:top;"><b>{lang_message}</b></td>
+            <td><textarea name="message" rows="10" style="width:100%">{message}</textarea></td>
         </tr>
         <tr>
-            <td>{lang_subject}</td>
-            <td><input type="text" name="subject" size="32" maxlength="96" value="{subject}"{xhtml}></td>
-        </tr>
-        <tr>
-            <td style="vertical-align:top;">{lang_message}</td>
-            <td><textarea name="message" wrap="physical" rows="10" cols="50">{message}</textarea></td>
+            <td class="alignright"><b>{lang_cc}</b></td>
+            <td><input type="checkbox" name="cc" checked="checked"{xhtml}>&nbsp;{lang_cc_description}</td>
         </tr>
         {captcha}
         <tr>
-            <td colspan="2" class="warning alignleft" style="padding-left:200px;padding-top:10px;">
+            <td colspan="2" class="warning aligncenter" style="padding-top:10px;">
                 {lang_nohtml}
                 <div style="padding:5px;">
                     <input type="hidden" name="what" value="contact"{xhtml}>
diff -r bca4b093d603 -r 7c38c0c6ce0c public_html/profiles.php
--- a/public_html/profiles.php	Sun Oct 04 09:36:19 2009 +0200
+++ b/public_html/profiles.php	Sun Oct 04 10:08:27 2009 +0200
@@ -371,11 +371,19 @@
                                   . $sid);
     }
 
-    $mailto = COM_formatEmailAddress ($to, $toemail);
-    $mailfrom = COM_formatEmailAddress ($from, $fromemail);
-    $subject = COM_undoSpecialChars(strip_tags('Re: '.$story->DisplayElements('title')));
+    $mailto = COM_formatEmailAddress($to, $toemail);
+    $mailfrom = COM_formatEmailAddress($from, $fromemail);
+    $subject = 'Re: ' . COM_undoSpecialChars(strip_tags($story->DisplayElements('title')));
 
-    $sent = COM_mail ($mailto, $subject, $mailtext, $mailfrom);
+    $sent = COM_mail($mailto, $subject, $mailtext, $mailfrom);
+
+    if ($sent && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
+        $ccmessage = sprintf($LANG08[38], $to);
+        $ccmessage .= "\n------------------------------------------------------------\n\n" . $mailtext;
+
+        $sent = COM_mail($mailfrom, $subject, $ccmessage, $mailfrom);
+    }
+
     COM_updateSpeedlimit ('mail');
 
     // Increment numemails counter for story
@@ -468,6 +476,8 @@
     $mail_template->set_var('toname', $to);
     $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
     $mail_template->set_var('toemail', $toemail);
+    $mail_template->set_var('lang_cc', $LANG08[36]);
+    $mail_template->set_var('lang_cc_description', $LANG08[37]);
     $mail_template->set_var('lang_shortmessage', $LANG08[27]);
     $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
     $mail_template->set_var('lang_warning', $LANG08[22]);

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 07:34:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 07:34:45 -0400
Subject: [geeklog-cvs] geeklog: More consistency for the Mail Users dialog
	(cf. bug #00...
Message-ID: <hg.b6d086ec0e01.1254656085.1485632861@qs1489.pair.com>

changeset 7358:b6d086ec0e01
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b6d086ec0e01
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 13:32:11 2009 +0200
description:
More consistency for the Mail Users dialog (cf. bug #0000992)

diffstat:

 language/english.php                                      |   6 +-
 language/english_utf-8.php                                |   6 +-
 language/german.php                                       |   8 ++--
 language/german_formal.php                                |   8 ++--
 language/german_formal_utf-8.php                          |   8 ++--
 language/german_utf-8.php                                 |   8 ++--
 public_html/admin/mail.php                                |   2 +-
 public_html/docs/english/changes.html                     |  24 ++++++++++++
 public_html/docs/english/theme.html                       |   7 ++-
 public_html/docs/history                                  |   6 +-
 public_html/layout/professional/admin/mail/mailform.thtml |  29 +++++++-------
 11 files changed, 68 insertions(+), 44 deletions(-)

diffs (280 lines):

diff -r 6155fbeb6262 -r b6d086ec0e01 language/english.php
--- a/language/english.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/english.php	Sun Oct 04 13:32:11 2009 +0200
@@ -994,10 +994,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'From',
-    3 => 'Reply-to',
+    2 => 'From Name',
+    3 => 'From Email Address',
     4 => 'Subject',
-    5 => 'Body',
+    5 => 'Message',
     6 => 'Send to:',
     7 => 'All users',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/english_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
@@ -994,10 +994,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'From',
-    3 => 'Reply-to',
+    2 => 'From Name',
+    3 => 'From Email Address',
     4 => 'Subject',
-    5 => 'Body',
+    5 => 'Message',
     6 => 'Send to:',
     7 => 'All users',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german.php
--- a/language/german.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german.php	Sun Oct 04 13:32:11 2009 +0200
@@ -455,7 +455,7 @@
     33 => 'Kompletter Artikel unter',
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m?chte keine E-Mails bekommen.',
-    36 => 'Copy:',
+    36 => 'Kopie:',
     37 => 'Send me a copy of this email',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
@@ -993,10 +993,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'Von',
-    3 => 'Reply-to',
+    2 => 'Von (Name)',
+    3 => 'Von (E-Mail)',
     4 => 'Betreff',
-    5 => 'Text',
+    5 => 'Nachricht',
     6 => 'Senden',
     7 => 'Alle User',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_formal.php
--- a/language/german_formal.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_formal.php	Sun Oct 04 13:32:11 2009 +0200
@@ -456,7 +456,7 @@
     33 => 'Kompletter Artikel unter',
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m?chte keine E-Mails bekommen.',
-    36 => 'Copy:',
+    36 => 'Kopie:',
     37 => 'Send me a copy of this email',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
@@ -994,10 +994,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'Von',
-    3 => 'Reply-to',
+    2 => 'Von (Name)',
+    3 => 'Von (E-Mail)',
     4 => 'Betreff',
-    5 => 'Text',
+    5 => 'Nachricht',
     6 => 'Senden',
     7 => 'Alle User',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_formal_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
@@ -456,7 +456,7 @@
     33 => 'Kompletter Artikel unter',
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m??chte keine E-Mails bekommen.',
-    36 => 'Copy:',
+    36 => 'Kopie:',
     37 => 'Send me a copy of this email',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
@@ -994,10 +994,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'Von',
-    3 => 'Reply-to',
+    2 => 'Von (Name)',
+    3 => 'Von (E-Mail)',
     4 => 'Betreff',
-    5 => 'Text',
+    5 => 'Nachricht',
     6 => 'Senden',
     7 => 'Alle User',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/language/german_utf-8.php	Sun Oct 04 13:32:11 2009 +0200
@@ -455,7 +455,7 @@
     33 => 'Kompletter Artikel unter',
     34 => 'Ende dieser Nachricht',
     35 => 'Sorry, dieser User m??chte keine E-Mails bekommen.',
-    36 => 'Copy:',
+    36 => 'Kopie:',
     37 => 'Send me a copy of this email',
     38 => "This is a copy of the email that you sent to %s from <{$_CONF['site_url']}>:"
 );
@@ -993,10 +993,10 @@
 
 $LANG31 = array(
     1 => "{$_CONF['site_name']} Mail Utility",
-    2 => 'Von',
-    3 => 'Reply-to',
+    2 => 'Von (Name)',
+    3 => 'Von (E-Mail)',
     4 => 'Betreff',
-    5 => 'Text',
+    5 => 'Nachricht',
     6 => 'Senden',
     7 => 'Alle User',
     8 => 'Admin',
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/admin/mail.php
--- a/public_html/admin/mail.php	Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/admin/mail.php	Sun Oct 04 13:32:11 2009 +0200
@@ -153,7 +153,7 @@
 
     if (empty($vars['fra']) OR empty($vars['fraepost']) OR
             empty($vars['subject']) OR empty($vars['message']) OR
-            empty($vars['to_group'])) {
+            empty($vars['to_group']) OR (strpos($vars['fra'], '@') !== false)) {
         $retval .= COM_showMessageText($LANG31[26]);
 
         return $retval;
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/english/changes.html	Sun Oct 04 13:32:11 2009 +0200
@@ -16,6 +16,30 @@
 <a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
 list of files that have been changed since the last release.</p>
 
+<h2><a name="changes161">Geeklog 1.6.1</a></h2>
+
+<h3>New Features and Improvements</h3>
+
+<ul>
+<li>Geeklog now lets you enter meta descriptions and meta keywords for the main
+    page, for stories, topics, static pages, and polls. Please note that these
+    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>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>
+</ul>
+
+<h3>Bugfixes</h3>
+
+<ul>
+<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>
+
 <h2><a name="changes160sr2">Geeklog 1.6.0sr2</a></h2>
 
 <p>This release addresses the following security issue:</p>
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Oct 04 13:32:11 2009 +0200
@@ -201,9 +201,10 @@
 <li>Added a "send copy to myself" option to
     <tt>profiles/contactauthorform.thtml</tt></li>
 <li>Cosmetics: Made the look and layout of the "Send mail to user"
-    (<tt>contactuserform.thtml</tt>) and "Mail Story to a Friend"
-    (<tt>contactauthorform.thtml</tt>) dialogs more consistent (alignment, size
-    of input fields).</li>
+    (<tt>profiles/contactuserform.thtml</tt>), "Mail Story to a Friend"
+    (<tt>profiles/contactauthorform.thtml</tt>), and "Mail Users"
+    (<tt>admin/mail/mailform.thtml</tt>) dialogs more consistent (alignment,
+    size of input fields).</li>
 <li>The Topic Editor now contains a line displaying the number of stories in
     the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
     <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/docs/history
--- a/public_html/docs/history	Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/docs/history	Sun Oct 04 13:32:11 2009 +0200
@@ -3,9 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
-- Additional checks in "Mail Story to a Friend" and "Send mail to user" dialogs
-  to make sure users don't enter email addresses into the name fields (bug
-  #0000992) [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
+  name fields (bug #0000992) [Dirk]
 - Added an option to send a copy to self to the "Mail Story to a Friend" dialog
   and made the look of this and the "Send mail to user" dialogs more consistent
   [Dirk]
diff -r 6155fbeb6262 -r b6d086ec0e01 public_html/layout/professional/admin/mail/mailform.thtml
--- a/public_html/layout/professional/admin/mail/mailform.thtml	Sun Oct 04 11:10:08 2009 +0200
+++ b/public_html/layout/professional/admin/mail/mailform.thtml	Sun Oct 04 13:32:11 2009 +0200
@@ -1,7 +1,7 @@
 <form action="{php_self}" method="post">
-    <table cellpadding="2" cellspacing="0">
+    <table cellspacing="0" cellpadding="3" width="100%">
         <tr>
-            <td class="alignright">{lang_to}:</td>
+            <td class="alignright"><b>{lang_to}:</b></td>
             <td>
                 <select name="to_group">
                     <option value="">{lang_selectgroup}</option>
@@ -10,26 +10,23 @@
             </td>
         </tr>
         <tr>
-            <td class="alignright">{lang_from}:</td>
+            <td class="alignright"><b>{lang_from}:</b></td>
             <td><input type="text" name="fra" value="{site_name}" size="40"{xhtml}></td>
         </tr>
         <tr>
-            <td class="alignright">{lang_replyto}:</td>
+            <td class="alignright"><b>{lang_replyto}:</b></td>
             <td><input type="text" name="fraepost" value="{site_mail}" size="40"{xhtml}></td>
         </tr>
         <tr>
-            <td class="alignright">{lang_subject}:</td>
+            <td class="alignright"><b>{lang_subject}:</b></td>
             <td><input type="text" name="subject" size="40"{xhtml}></td>
         </tr>
         <tr>
-            <td class="alignright" style="vertical-align:top;">{lang_body}:</td>
-            <td><textarea rows="12" name="message" cols="44"></textarea></td>
+            <td class="alignright" style="vertical-align:top;"><b>{lang_body}:</b></td>
+            <td><textarea name="message" rows="10" style="width:100%"></textarea></td>
         </tr>
         <tr>
-            <td colspan="2" class="alignleft"><b>{lang_options}</b></td>
-        </tr>
-        <tr>
-            <td>&nbsp;</td>
+            <td class="alignright"><b>{lang_options}:</b></td>
             <td><input type="checkbox" name="html"{xhtml}> {lang_HTML}</td>
         </tr>
         <tr>
@@ -41,10 +38,12 @@
             <td><input type="checkbox" name="overstyr"{xhtml}> {lang_ignoreusersettings}</td>
         </tr>
         <tr>
-            <td colspan="2" class="aligncenter">
-                <input type="submit" value="{lang_send}"{xhtml}>
-                <input type="hidden" name="mail" value="mail"{xhtml}>
-                <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+            <td colspan="2" class="aligncenter" style="padding-top:10px;">
+                <div style="padding:5px;">
+                    <input type="submit" value="{lang_send}"{xhtml}>
+                    <input type="hidden" name="mail" value="mail"{xhtml}>
+                    <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+                </div>
             </td>
         </tr>
     </table>

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 13:57:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 13:57:05 -0400
Subject: [geeklog-cvs] geeklog: Minor code cleanup
Message-ID: <hg.d37545da9eb2.1254679025.1485632861@qs1489.pair.com>

changeset 7360:d37545da9eb2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d37545da9eb2
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 17:36:41 2009 +0200
description:
Minor code cleanup

diffstat:

 public_html/admin/configuration.php |  13 ++++++-------
 public_html/usersettings.php        |  25 ++++++++++++-------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diffs (80 lines):

diff -r b71518e57545 -r d37545da9eb2 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php	Sun Oct 04 13:51:37 2009 +0200
+++ b/public_html/admin/configuration.php	Sun Oct 04 17:36:41 2009 +0200
@@ -63,16 +63,15 @@
     $themes = array();
 
     $themeFiles = COM_getThemes(true);
-    usort($themeFiles,
-          create_function('$a,$b', 'return strcasecmp($a,$b);'));
+    usort($themeFiles, 'strcasecmp');
 
     foreach ($themeFiles as $theme) {
-        $words = explode ('_', $theme);
-        $bwords = array ();
+        $words = explode('_', $theme);
+        $bwords = array();
         foreach ($words as $th) {
-            if ((strtolower ($th{0}) == $th{0}) &&
-                (strtolower ($th{1}) == $th{1})) {
-                $bwords[] = strtoupper ($th{0}) . substr ($th, 1);
+            if ((strtolower($th{0}) == $th{0}) &&
+                (strtolower($th{1}) == $th{1})) {
+                $bwords[] = ucfirst($th);
             } else {
                 $bwords[] = $th;
             }
diff -r b71518e57545 -r d37545da9eb2 public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Oct 04 13:51:37 2009 +0200
+++ b/public_html/usersettings.php	Sun Oct 04 17:36:41 2009 +0200
@@ -484,38 +484,37 @@
     if ($_CONF['allow_user_themes'] == 1) {
         $selection = '<select id="theme" name="theme">' . LB;
 
-        if (empty ($_USER['theme'])) {
+        if (empty($_USER['theme'])) {
             $usertheme = $_CONF['theme'];
         } else {
             $usertheme = $_USER['theme'];
         }
 
-        $themeFiles = COM_getThemes ();
-        usort ($themeFiles,
-               create_function ('$a,$b', 'return strcasecmp($a,$b);'));
+        $themeFiles = COM_getThemes();
+        usort($themeFiles, 'strcasecmp');
 
         foreach ($themeFiles as $theme) {
             $selection .= '<option value="' . $theme . '"';
             if ($usertheme == $theme) {
                 $selection .= ' selected="selected"';
             }
-            $words = explode ('_', $theme);
-            $bwords = array ();
+            $words = explode('_', $theme);
+            $bwords = array();
             foreach ($words as $th) {
-                if ((strtolower ($th{0}) == $th{0}) &&
-                    (strtolower ($th{1}) == $th{1})) {
-                    $bwords[] = strtoupper ($th{0}) . substr ($th, 1);
+                if ((strtolower($th{0}) == $th{0}) &&
+                    (strtolower($th{1}) == $th{1})) {
+                    $bwords[] = ucfirst($th);
                 } else {
                     $bwords[] = $th;
                 }
             }
-            $selection .= '>' . implode (' ', $bwords) . '</option>' . LB;
+            $selection .= '>' . implode(' ', $bwords) . '</option>' . LB;
         }
         $selection .= '</select>';
-        $preferences->set_var ('theme_selector', $selection);
-        $preferences->parse ('theme_selection', 'theme', true);
+        $preferences->set_var('theme_selector', $selection);
+        $preferences->parse('theme_selection', 'theme', true);
     } else {
-        $preferences->set_var ('theme_selection', '');
+        $preferences->set_var('theme_selection', '');
     }
 
     require_once ('Date/TimeZone.php');

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 13:57:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 13:57:06 -0400
Subject: [geeklog-cvs] geeklog: Suggested new helper functions:
	SEC_filterPermissions, ...
Message-ID: <hg.aaa5a1f1850e.1254679026.1485632861@qs1489.pair.com>

changeset 7362:aaa5a1f1850e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/aaa5a1f1850e
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 19:56:54 2009 +0200
description:
Suggested new helper functions: SEC_filterPermissions, SEC_hasAccess2

diffstat:

 system/lib-security.php |  70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diffs (78 lines):

diff -r cb9ad1e4b759 -r aaa5a1f1850e system/lib-security.php
--- a/system/lib-security.php	Sun Oct 04 18:07:39 2009 +0200
+++ b/system/lib-security.php	Sun Oct 04 19:56:54 2009 +0200
@@ -1222,4 +1222,74 @@
     return $retval;
 }
 
+/**
+* Prepare an array of the standard permission values
+*
+* This helper functions does the following:
+* 1) filter permission values, e.g. after a POST request
+* 2) translates the permission checkbox arrays into numerical values
+* 3) ensures that all the standard permission entries are set, so you don't
+*    have to check with isset() all the time
+*
+* <code>
+* $PERM = SEC_filterPermissions($_POST);
+* if ($PERM['perm_anon'] != 0) { ...
+* </code>
+*
+* @param    array   $A  array to filter on, e.g. $_POST
+* @return   array       array of only the 6 standard permission values
+* @see      SEC_getPermissionValues
+*
+*/
+function SEC_filterPermissions($A)
+{
+    $retval = array();
+
+    if (isset($A['owner_id'])) {
+        $retval['owner_id'] = COM_applyFilter($A['owner_id'], true);
+    } else {
+        $retval['owner_id'] = 0;
+    }
+
+    if (isset($A['group_id'])) {
+        $retval['group_id'] = COM_applyFilter($A['group_id'], true);
+    } else {
+        $retval['group_id'] = 0;
+    }
+
+    $perms = array('perm_owner', 'perm_group', 'perm_members', 'perm_anon');
+
+    $B = array();
+    foreach ($perms as $p) {
+        if (isset($A[$p])) {
+            $B[$p] = $A[$p];
+        } else {
+            $B[$p] = array();
+        }
+    }
+
+    $B = SEC_getPermissionValues($B['perm_owner'], $B['perm_group'],
+                                 $B['perm_members'], $B['perm_anon']);
+    for ($i = 0; $i < 4; $i++) {
+        $retval[$perms[$i]] = $B[$i];
+    }
+
+    return $retval;
+}
+
+/**
+* Helper function for when you want to call SEC_hasAccess and have all the
+* values to check in an array.
+*
+* @param    array   $A  array with the standard permission values
+* @return   int         returns 3 for read/edit 2 for read only 0 for no access
+* @see      SEC_hasAccess
+*
+*/
+function SEC_hasAccess2($A)
+{
+    return SEC_hasAccess($A['owner_id'], $A['group_id'], $A['perm_owner'],
+                         $A['perm_group'], $A['perm_members'], $A['perm_anon']);
+}
+
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 13:57:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 13:57:05 -0400
Subject: [geeklog-cvs] geeklog: When viewing your own profile page,
	you now get an "edi...
Message-ID: <hg.b71518e57545.1254679025.1485632861@qs1489.pair.com>

changeset 7359:b71518e57545
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b71518e57545
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 13:51:37 2009 +0200
description:
When viewing your own profile page, you now get an "edit" link that take you to "My Account"

diffstat:

 public_html/docs/history |    2 +
 public_html/users.php    |  127 ++++++++++++++++++++++-------------------
 2 files changed, 70 insertions(+), 59 deletions(-)

diffs (242 lines):

diff -r b6d086ec0e01 -r b71518e57545 public_html/docs/history
--- a/public_html/docs/history	Sun Oct 04 13:32:11 2009 +0200
+++ b/public_html/docs/history	Sun Oct 04 13:51:37 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- When viewing your own profile page, you now get an "edit" link that take 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
   name fields (bug #0000992) [Dirk]
diff -r b6d086ec0e01 -r b71518e57545 public_html/users.php
--- a/public_html/users.php	Sun Oct 04 13:32:11 2009 +0200
+++ b/public_html/users.php	Sun Oct 04 13:51:37 2009 +0200
@@ -59,75 +59,76 @@
 *
 * This grabs the user profile for a given user and displays it
 *
-* @param    int     $user   User ID of profile to get
+* @param    int     $uid    User ID of profile to get
 * @param    int     $msg    Message to display (if != 0)
 * @param    string  $plugin optional plugin name for message
 * @return   string          HTML for user profile page
 *
 */
-function userprofile($user, $msg = 0, $plugin = '')
+function userprofile($uid, $msg = 0, $plugin = '')
 {
-    global $_CONF, $_TABLES, $_USER, $LANG01, $LANG04, $LANG09, $LANG28, $LANG_LOGIN;
+    global $_CONF, $_TABLES, $_USER, $_IMAGE_TYPE,
+           $LANG01, $LANG04, $LANG09, $LANG28, $LANG_LOGIN, $LANG_ADMIN;
 
     $retval = '';
-    if (empty ($_USER['username']) &&
+    if (empty($_USER['username']) &&
         (($_CONF['loginrequired'] == 1) || ($_CONF['profileloginrequired'] == 1))) {
-        $retval .= COM_siteHeader ('menu', $LANG_LOGIN[1]);
-        $retval .= COM_startBlock ($LANG_LOGIN[1], '',
-                           COM_getBlockTemplate ('_msg_block', 'header'));
+        $retval .= COM_siteHeader('menu', $LANG_LOGIN[1]);
+        $retval .= COM_startBlock($LANG_LOGIN[1], '',
+                           COM_getBlockTemplate('_msg_block', 'header'));
         $login = new Template($_CONF['path_layout'] . 'submit');
-        $login->set_file (array ('login'=>'submitloginrequired.thtml'));
-        $login->set_var ( 'xhtml', XHTML );
-        $login->set_var ('login_message', $LANG_LOGIN[2]);
-        $login->set_var ('site_url', $_CONF['site_url']);
-        $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
-        $login->set_var ('layout_url', $_CONF['layout_url']);
-        $login->set_var ('lang_login', $LANG_LOGIN[3]);
-        $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
-        $login->parse ('output', 'login');
-        $retval .= $login->finish ($login->get_var('output'));
-        $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-        $retval .= COM_siteFooter ();
+        $login->set_file(array('login'=>'submitloginrequired.thtml'));
+        $login->set_var('xhtml', XHTML);
+        $login->set_var('login_message', $LANG_LOGIN[2]);
+        $login->set_var('site_url', $_CONF['site_url']);
+        $login->set_var('site_admin_url', $_CONF['site_admin_url']);
+        $login->set_var('layout_url', $_CONF['layout_url']);
+        $login->set_var('lang_login', $LANG_LOGIN[3]);
+        $login->set_var('lang_newuser', $LANG_LOGIN[4]);
+        $login->parse('output', 'login');
+        $retval .= $login->finish($login->get_var('output'));
+        $retval .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+        $retval .= COM_siteFooter();
 
         return $retval;
     }
 
-    $result = DB_query ("SELECT {$_TABLES['users']}.uid,username,fullname,regdate,homepage,about,location,pgpkey,photo,email,status FROM {$_TABLES['userinfo']},{$_TABLES['users']} WHERE {$_TABLES['userinfo']}.uid = {$_TABLES['users']}.uid AND {$_TABLES['users']}.uid = $user");
-    $nrows = DB_numRows ($result);
+    $result = DB_query("SELECT {$_TABLES['users']}.uid,username,fullname,regdate,homepage,about,location,pgpkey,photo,email,status FROM {$_TABLES['userinfo']},{$_TABLES['users']} WHERE {$_TABLES['userinfo']}.uid = {$_TABLES['users']}.uid AND {$_TABLES['users']}.uid = $uid");
+    $nrows = DB_numRows($result);
     if ($nrows == 0) { // no such user
-        return COM_refresh ($_CONF['site_url'] . '/index.php');
+        return COM_refresh($_CONF['site_url'] . '/index.php');
     }
-    $A = DB_fetchArray ($result);
+    $A = DB_fetchArray($result);
 
-    if ($A['status'] == USER_ACCOUNT_DISABLED && !SEC_hasRights ('user.edit')) {
-        COM_displayMessageAndAbort (30, '', 403, 'Forbidden');
+    if ($A['status'] == USER_ACCOUNT_DISABLED && !SEC_hasRights('user.edit')) {
+        COM_displayMessageAndAbort(30, '', 403, 'Forbidden');
     }
 
-    $display_name = htmlspecialchars(COM_getDisplayName($user, $A['username'],
+    $display_name = htmlspecialchars(COM_getDisplayName($uid, $A['username'],
                                                         $A['fullname']));
 
-    $retval .= COM_siteHeader ('menu', $LANG04[1] . ' ' . $display_name);
+    $retval .= COM_siteHeader('menu', $LANG04[1] . ' ' . $display_name);
     if ($msg > 0) {
         $retval .= COM_showMessage($msg, $plugin);
     }
 
     // format date/time to user preference
-    $curtime = COM_getUserDateTimeFormat ($A['regdate']);
+    $curtime = COM_getUserDateTimeFormat($A['regdate']);
     $A['regdate'] = $curtime[0];
 
-    $user_templates = new Template ($_CONF['path_layout'] . 'users');
-    $user_templates->set_file (array ('profile' => 'profile.thtml',
-                                      'row'     => 'commentrow.thtml',
-                                      'strow'   => 'storyrow.thtml'));
-    $user_templates->set_var ('xhtml', XHTML);
-    $user_templates->set_var ('site_url', $_CONF['site_url']);
-    $user_templates->set_var ('start_block_userprofile',
-            COM_startBlock ($LANG04[1] . ' ' . $display_name));
-    $user_templates->set_var ('end_block', COM_endBlock ());
-    $user_templates->set_var ('lang_username', $LANG04[2]);
+    $user_templates = new Template($_CONF['path_layout'] . 'users');
+    $user_templates->set_file(array('profile' => 'profile.thtml',
+                                    'row'     => 'commentrow.thtml',
+                                    'strow'   => 'storyrow.thtml'));
+    $user_templates->set_var('xhtml', XHTML);
+    $user_templates->set_var('site_url', $_CONF['site_url']);
+    $user_templates->set_var('start_block_userprofile',
+            COM_startBlock($LANG04[1] . ' ' . $display_name));
+    $user_templates->set_var('end_block', COM_endBlock());
+    $user_templates->set_var('lang_username', $LANG04[2]);
 
     if ($_CONF['show_fullname'] == 1) {
-        if (empty ($A['fullname'])) {
+        if (empty($A['fullname'])) {
             $username = $A['username'];
             $fullname = '';
         } else {
@@ -142,38 +143,46 @@
     $fullname = htmlspecialchars($fullname);
 
     if ($A['status'] == USER_ACCOUNT_DISABLED) {
-        $username = sprintf ('<s title="%s">%s</s>', $LANG28[42], $username);
-        if (!empty ($fullname)) {
-            $fullname = sprintf ('<s title="%s">%s</s>', $LANG28[42], $fullname);
+        $username = sprintf('<s title="%s">%s</s>', $LANG28[42], $username);
+        if (!empty($fullname)) {
+            $fullname = sprintf('<s title="%s">%s</s>', $LANG28[42], $fullname);
         }
     }
 
-    $user_templates->set_var ('username', $username);
-    $user_templates->set_var ('user_fullname', $fullname);
+    $user_templates->set_var('username', $username);
+    $user_templates->set_var('user_fullname', $fullname);
 
-    if (SEC_hasRights ('user.edit')) {
-        global $_IMAGE_TYPE, $LANG_ADMIN;
-
+    if (!COM_isAnonUser() && ($_USER['uid'] == $uid)) {
+        $edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
+                   . $_IMAGE_TYPE . '" alt="' . $LANG01[48]
+                   . '" title="' . $LANG01[48] . '"' . XHTML . '>';
+        $edit_link_url = COM_createLink($edit_icon,
+                            $_CONF['site_url'] . '/usersettings.php');
+        $user_templates->set_var('edit_icon', $edit_icon);
+        $user_templates->set_var('edit_link', $edit_link_url);
+        $user_templates->set_var('user_edit', $edit_link_url);
+    } elseif (SEC_hasRights('user.edit')) {
         $edit_icon = '<img src="' . $_CONF['layout_url'] . '/images/edit.'
                    . $_IMAGE_TYPE . '" alt="' . $LANG_ADMIN['edit']
                    . '" title="' . $LANG_ADMIN['edit'] . '"' . XHTML . '>';
         $edit_link_url = COM_createLink($edit_icon,
             "{$_CONF['site_admin_url']}/user.php?mode=edit&amp;uid={$A['uid']}");
-        $user_templates->set_var ('edit_icon', $edit_icon);
-        $user_templates->set_var ('edit_link', $edit_link_url);
-        $user_templates->set_var ('user_edit', $edit_link_url);
+        $user_templates->set_var('edit_icon', $edit_icon);
+        $user_templates->set_var('edit_link', $edit_link_url);
+        $user_templates->set_var('user_edit', $edit_link_url);
     }
 
     if (isset ($A['photo']) && empty ($A['photo'])) {
         $A['photo'] = '(none)'; // user does not have a photo
     }
-    $photo = USER_getPhoto ($user, $A['photo'], $A['email'], -1);
+    $photo = USER_getPhoto ($uid, $A['photo'], $A['email'], -1);
     $user_templates->set_var ('user_photo', $photo);
 
     $user_templates->set_var ('lang_membersince', $LANG04[67]);
     $user_templates->set_var ('user_regdate', $A['regdate']);
     $user_templates->set_var ('lang_email', $LANG04[5]);
-    $user_templates->set_var ('user_id', $user);
+    $user_templates->set_var ('user_id', $uid);
+    $user_templates->set_var ('uid', $uid);
     $user_templates->set_var ('lang_sendemail', $LANG04[81]);
     $user_templates->set_var ('lang_homepage', $LANG04[6]);
     $user_templates->set_var ('user_homepage', COM_killJS ($A['homepage']));
@@ -209,7 +218,7 @@
 
     // list of last 10 stories by this user
     if (count($tids) > 0) {
-        $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
+        $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $uid) AND (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
         $sql .= " ORDER BY unixdate DESC LIMIT 10";
         $result = DB_query ($sql);
         $nrows = DB_numRows ($result);
@@ -257,7 +266,7 @@
     $sidList = "'$sidList'";
 
     // then, find all comments by the user in those stories
-    $sql = "SELECT sid,title,cid,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['comments']} WHERE (uid = $user) GROUP BY sid,title,cid,UNIX_TIMESTAMP(date)";
+    $sql = "SELECT sid,title,cid,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['comments']} WHERE (uid = $uid) GROUP BY sid,title,cid,UNIX_TIMESTAMP(date)";
 
     // SQL NOTE:  Using a HAVING clause is usually faster than a where if the
     // field is part of the select
@@ -295,12 +304,12 @@
 
     // posting stats for this user
     $user_templates->set_var ('lang_number_stories', $LANG04[84]);
-    $sql = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND');
+    $sql = "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE (uid = $uid) AND (draft_flag = 0) AND (date <= NOW())" . COM_getPermSQL ('AND');
     $result = DB_query($sql);
     $N = DB_fetchArray ($result);
     $user_templates->set_var ('number_stories', COM_numberFormat ($N['count']));
     $user_templates->set_var ('lang_number_comments', $LANG04[85]);
-    $sql = "SELECT COUNT(*) AS count FROM {$_TABLES['comments']} WHERE (uid = $user)";
+    $sql = "SELECT COUNT(*) AS count FROM {$_TABLES['comments']} WHERE (uid = $uid)";
     if (!empty ($sidList)) {
         $sql .= " AND (sid in ($sidList))";
     }
@@ -312,14 +321,14 @@
 
     // Call custom registration function if enabled and exists
     if ($_CONF['custom_registration'] && function_exists ('CUSTOM_userDisplay') ) {
-        $user_templates->set_var ('customfields', CUSTOM_userDisplay ($user));
+        $user_templates->set_var ('customfields', CUSTOM_userDisplay ($uid));
     }
-    PLG_profileVariablesDisplay ($user, $user_templates);
+    PLG_profileVariablesDisplay ($uid, $user_templates);
 
     $user_templates->parse ('output', 'profile');
     $retval .= $user_templates->finish ($user_templates->get_var ('output'));
 
-    $retval .= PLG_profileBlocksDisplay ($user);
+    $retval .= PLG_profileBlocksDisplay ($uid);
     $retval .= COM_siteFooter ();
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 13:57:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 13:57:06 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Removed some <b> tags from the
	story editor ...
Message-ID: <hg.cb9ad1e4b759.1254679026.1485632861@qs1489.pair.com>

changeset 7361:cb9ad1e4b759
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cb9ad1e4b759
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 18:07:39 2009 +0200
description:
Cosmetics: Removed some <b> tags from the story editor templates

diffstat:

 public_html/layout/professional/admin/story/storyeditor.thtml          |  4 ++--
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r d37545da9eb2 -r cb9ad1e4b759 public_html/layout/professional/admin/story/storyeditor.thtml
--- a/public_html/layout/professional/admin/story/storyeditor.thtml	Sun Oct 04 17:36:41 2009 +0200
+++ b/public_html/layout/professional/admin/story/storyeditor.thtml	Sun Oct 04 18:07:39 2009 +0200
@@ -198,7 +198,7 @@
                                         <td><textarea name="bodytext" cols="45" rows="20" style="width:100%">{story_bodytext}</textarea></td>
                                     </tr>
                                     <tr>
-                                        <td class="alignright" style="vertical-align:top;"><b>{lang_postmode}:</b></td>
+                                        <td class="alignright" style="vertical-align:top;">{lang_postmode}:</td>
                                         <td style="vertical-align:top;">
                                             <select name="postmode">
                                                 {post_options}
@@ -208,7 +208,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="alignright" style="vertical-align:top;"><b>{lang_images}:</b></td>
+                                        <td class="alignright" style="vertical-align:top;">{lang_images}:</td>
                                         <td style="vertical-align:top;">
                                             {saved_images}
                                             {image_form_elements}
diff -r d37545da9eb2 -r cb9ad1e4b759 public_html/layout/professional/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sun Oct 04 17:36:41 2009 +0200
+++ b/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sun Oct 04 18:07:39 2009 +0200
@@ -240,9 +240,9 @@
             </div>
             <fieldset id="se_perms" style="margin-top:10px; display:none;">
                 <legend>{lang_permissions}</legend>
-                <p><b>{lang_owner}:</b> {owner_name}<input type="hidden" name="owner_id" value="{owner_id}"{xhtml}></p>
-                <p><b>{lang_group}:</b> {group_dropdown}</p>
-                <p><b>{lang_permissions}:</b></p>
+                <p>{lang_owner}: {owner_name}<input type="hidden" name="owner_id" value="{owner_id}"{xhtml}></p>
+                <p>{lang_group}: {group_dropdown}</p>
+                <p>{lang_permissions}:</p>
                 <p>{lang_perm_key}</p>
                 {permissions_editor}
                 <p>{lang_permissions_msg}</p>

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 17:22:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 17:22:20 -0400
Subject: [geeklog-cvs] geeklog: Display the number of links in the current
	category in ...
Message-ID: <hg.21144754222c.1254691340.1485632861@qs1489.pair.com>

changeset 7364:21144754222c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/21144754222c
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 21:47:24 2009 +0200
description:
Display the number of links in the current category in the Category Editor.

diffstat:

 plugins/links/language/english.php                 |   3 ++-
 plugins/links/language/english_utf-8.php           |   3 ++-
 plugins/links/templates/admin/categoryeditor.thtml |   4 ++++
 public_html/admin/plugins/links/category.php       |  10 ++++++++++
 public_html/docs/history                           |   2 ++
 5 files changed, 20 insertions(+), 2 deletions(-)

diffs (72 lines):

diff -r 8b1e9b058fbd -r 21144754222c plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sun Oct 04 21:38:38 2009 +0200
+++ b/plugins/links/language/english.php	Sun Oct 04 21:47:24 2009 +0200
@@ -206,7 +206,8 @@
     57 => 'Not validated yet',
     58 => 'Validate now',
     59 => '<p>To validate all links displayed, please click on the "Validate now" link below. Please note that this might take some time depending on the amount of links displayed.</p>',
-    60 => 'User %s tried illegally to edit category %s.'
+    60 => 'User %s tried illegally to edit category %s.',
+    61 => 'Links in Category'
 );
 
 $LANG_LINKS_STATUS = array(
diff -r 8b1e9b058fbd -r 21144754222c plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sun Oct 04 21:38:38 2009 +0200
+++ b/plugins/links/language/english_utf-8.php	Sun Oct 04 21:47:24 2009 +0200
@@ -206,7 +206,8 @@
     57 => 'Not validated yet',
     58 => 'Validate now',
     59 => '<p>To validate all links displayed, please click on the "Validate now" link below. Please note that this might take some time depending on the amount of links displayed.</p>',
-    60 => 'User %s tried illegally to edit category %s.'
+    60 => 'User %s tried illegally to edit category %s.',
+    61 => 'Links in Category'
 );
 
 $LANG_LINKS_STATUS = array(
diff -r 8b1e9b058fbd -r 21144754222c plugins/links/templates/admin/categoryeditor.thtml
--- a/plugins/links/templates/admin/categoryeditor.thtml	Sun Oct 04 21:38:38 2009 +0200
+++ b/plugins/links/templates/admin/categoryeditor.thtml	Sun Oct 04 21:47:24 2009 +0200
@@ -23,6 +23,10 @@
                 <td>{topic_selection}<td>
             </tr>
             <tr>
+                <td align="right">{lang_num_links}:</td>
+                <td>{num_links}<td>
+            </tr>
+            <tr>
                 <td colspan="2"><hr{xhtml}></td>
             </tr>
             <tr>
diff -r 8b1e9b058fbd -r 21144754222c public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sun Oct 04 21:38:38 2009 +0200
+++ b/public_html/admin/plugins/links/category.php	Sun Oct 04 21:47:24 2009 +0200
@@ -274,6 +274,16 @@
     $T->set_var('topic_selection', '<select name="tid">' . $alltopics
                                    . $topics . '</select>');
 
+    if (empty($cid)) {
+        $num_links = $LANG_ADMIN['na'];
+    } else {
+        $nresult = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['links']} WHERE cid='{$cid}'" . COM_getPermSQL('AND'));
+        $N = DB_fetchArray($nresult);
+        $num_links = $N['count'];
+    }
+    $T->set_var('lang_num_links', $LANG_LINKS_ADMIN[61]);
+    $T->set_var('num_links', COM_numberFormat($num_links));
+
     // user access info
     $T->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
     $T->set_var('lang_owner', $LANG_ACCESS['owner']);
diff -r 8b1e9b058fbd -r 21144754222c public_html/docs/history
--- a/public_html/docs/history	Sun Oct 04 21:38:38 2009 +0200
+++ b/public_html/docs/history	Sun Oct 04 21:47:24 2009 +0200
@@ -88,6 +88,8 @@
 
 Links Plugin
 ------------
+- Display the number of links in the current category in the Category Editor.
+  Note: Does not (yet) count links in sub-categories [Dirk]
 - Link titles in autotags showed up with backslashes before quotes (bug
   #0000986) [Dirk]
 

From geeklog-cvs at lists.geeklog.net  Sun Oct  4 17:22:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 04 Oct 2009 17:22:19 -0400
Subject: [geeklog-cvs] geeklog: Format number of stories in topic
Message-ID: <hg.8b1e9b058fbd.1254691339.1485632861@qs1489.pair.com>

changeset 7363:8b1e9b058fbd
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/8b1e9b058fbd
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 04 21:38:38 2009 +0200
description:
Format number of stories in topic

diffstat:

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

diffs (12 lines):

diff -r aaa5a1f1850e -r 8b1e9b058fbd public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sun Oct 04 19:56:54 2009 +0200
+++ b/public_html/admin/topic.php	Sun Oct 04 21:38:38 2009 +0200
@@ -215,7 +215,7 @@
     }
 
     $topic_templates->set_var('lang_num_stories', $LANG27[30]);
-    $topic_templates->set_var('num_stories', $num_stories);
+    $topic_templates->set_var('num_stories', COM_numberFormat($num_stories));
     $topic_templates->set_var('gltoken_name', CSRF_TOKEN);
     $topic_templates->set_var('gltoken', SEC_createToken());
     $topic_templates->parse('output', 'editor');

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 05:04:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 05:04:48 -0400
Subject: [geeklog-cvs] geeklog: Document {story_introtext_only} and
	{story_bodytext_onl...
Message-ID: <hg.5eaf58482ac6.1255251888.1485632861@qs1489.pair.com>

changeset 7368:5eaf58482ac6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5eaf58482ac6
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 10 22:20:56 2009 +0200
description:
Document {story_introtext_only} and {story_bodytext_only} variables

diffstat:

 public_html/docs/english/themevars.html |  9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diffs (19 lines):

diff -r 458333aaa006 -r 5eaf58482ac6 public_html/docs/english/themevars.html
--- a/public_html/docs/english/themevars.html	Sat Oct 10 21:57:23 2009 +0200
+++ b/public_html/docs/english/themevars.html	Sat Oct 10 22:20:56 2009 +0200
@@ -216,6 +216,15 @@
         and <tt>story_text_no_br</tt> is that <tt>story_introtext</tt> inserts
         two HTML <tt>&lt;br&gt;</tt> tags between the intro and the body text
         whereas <tt>story_text_no_br</tt> does not do that (hence the name).</td></tr>
+<tr><td><code>story_introtext_only</code></td>
+    <td>Welcome and let me be the first to congratulate you on installing Geeklog ...</td>
+    <td>As the name implies, this variable <em>always</em> contains
+        <em>only</em> the story's intro text portion.</td>
+<tr><td><code>story_bodytext_only</code></td>
+    <td><i>(...)</i></td>
+    <td>This variable is only set when displaying the entire story. It contains
+        <em>only</em> the body text portion of the story, if
+        available.</td></tr>
 <tr><td><code>lang_todays_featured_article</code></td>
     <td>Today's Featured Article</td>
     <td>The words "Today's Featured Article" in the user's preferred language.

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 05:04:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 05:04:48 -0400
Subject: [geeklog-cvs] geeklog: Documented some more variables
Message-ID: <hg.47573867cc1d.1255251888.1485632861@qs1489.pair.com>

changeset 7369:47573867cc1d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/47573867cc1d
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 10 23:08:42 2009 +0200
description:
Documented some more variables

diffstat:

 public_html/docs/english/themevars.html |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r 5eaf58482ac6 -r 47573867cc1d public_html/docs/english/themevars.html
--- a/public_html/docs/english/themevars.html	Sat Oct 10 22:20:56 2009 +0200
+++ b/public_html/docs/english/themevars.html	Sat Oct 10 23:08:42 2009 +0200
@@ -267,12 +267,18 @@
     <td><code>&lt;/a&gt;</code></td>
     <td>Closing tag for a link to the story.</td></tr>
 <tr><td><code>read_more_class</code></td>
-<tr><td><code>email_icon</code></td>
     <td>class="story-read-more"</td>
     <td>This variable is empty when the body text is empty and contains the
         class attribute when the body text is not empty. Use the
         <code>story-read-more</code> class to change the layout of the "read
         more" link.</td></tr>
+<tr><td><code>email_icon</code></td>
+    <td>(icon)</td>
+    <td>The email icon, linking to the form to send the article to a
+        friend.</td></tr>
+<tr><td><code>email_story_url</code></td>
+    <td><tt>http://.../profiles.php?sid=welcome</tt></td>
+    <td>The URL of the form to send the article to a friend.</td></tr>
 <tr><td><code>print_icon</code></td>
     <td>(icon)</td>
     <td>The printer icon, linking to a "printer friendly" version of the story.</td></tr>
@@ -304,6 +310,9 @@
 <tr><td><code>comments_with_count</code></td>
     <td>2</td>
     <td>The number of comments to the story (will always be 1 or greater). <br>This string becomes a link as soon as there are comments available, pointing to <code>&lt;a href=".../article.php?story=20021022234959146#comments"&gt;</code></td></tr>
+<tr><td><code>comments_with_count</code></td>
+    <td>2</td>
+    <td>The number of comments to story only (may be 0).</td></tr>
 <tr><td><code>lang_comments</code></td>
     <td>comments</td>
     <td>The word "comments" in the user's preferred language.</td></tr>
@@ -419,6 +428,10 @@
 <tr><td><code>edit_icon</code></td>
     <td><code>&lt;a href=".../admin/story.php<br>?mode=edit&amp;sid=20021022234959146"&gt;&lt;img src=".../images/edit.gif"&gt;&lt;/a&gt;</code></td>
     <td>An icon linking to the admin's story editor to edit the story.</td></tr>
+<tr><td><code>edit_image</code></td>
+    <td><code>&lt;img src=".../images/edit.gif"&gt;</code></td>
+    <td>Only the <code>img</code> tag for the edit icon, without the
+        link.</td></tr>
 <tr><td><code>edit_url</code></td>
     <td><tt>http://www.example.com/admin/story.php<br>?mode=edit&amp;sid=20021022234959146</tt></td>
     <td>URL to open the story in the admin's story editor</td></tr>

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 05:04:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 05:04:50 -0400
Subject: [geeklog-cvs] geeklog: Added new option
	$_CONF['article_comment_close_enabled'...
Message-ID: <hg.e5bbed84d3b1.1255251890.1485632861@qs1489.pair.com>

changeset 7370:e5bbed84d3b1
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e5bbed84d3b1
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 11:00:55 2009 +0200
description:
Added new option $_CONF['article_comment_close_enabled'] to enable/disable automatically closing stories for comments after a certain amount of days (bug #0000959). Changed handling of comment_expire field in gl_stories such that 0 means the story is always open for comments.

diffstat:

 language/english.php                         |    1 +
 language/english_utf-8.php                   |    1 +
 language/german.php                          |    1 +
 language/german_formal.php                   |    1 +
 language/german_formal_utf-8.php             |    1 +
 language/german_utf-8.php                    |    1 +
 public_html/admin/install/config-install.php |    1 +
 public_html/admin/story.php                  |    6 +-
 public_html/docs/english/config.html         |    7 +
 public_html/docs/history                     |    4 +
 sql/updates/mssql_1.6.0_to_1.6.1.php         |    3 +
 sql/updates/mysql_1.6.0_to_1.6.1.php         |    3 +
 system/classes/story.class.php               |  110 ++++++++++++++++++---------
 13 files changed, 100 insertions(+), 40 deletions(-)

diffs (truncated from 382 to 300 lines):

diff -r 47573867cc1d -r e5bbed84d3b1 language/english.php
--- a/language/english.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/english.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1859,6 +1859,7 @@
     '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?',
diff -r 47573867cc1d -r e5bbed84d3b1 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/english_utf-8.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1859,6 +1859,7 @@
     '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?',
diff -r 47573867cc1d -r e5bbed84d3b1 language/german.php
--- a/language/german.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/german.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1853,6 +1853,7 @@
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
     'restrict_webservices' => 'Webservices beschr?nken?',
+    '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?',
diff -r 47573867cc1d -r e5bbed84d3b1 language/german_formal.php
--- a/language/german_formal.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/german_formal.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1854,6 +1854,7 @@
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
     'restrict_webservices' => 'Webservices beschr?nken?',
+    'article_comment_close_enabled' => 'Automatically close comments (default)',
     'article_comment_close_days' => 'Tage nach denen Kommentare uneditierbar werden (hier nur Grundeinstellung)',
     'comment_close_rec_stories' => 'Anzahl letzter Artikel, die kommentierbar sein sollen',
     'allow_reply_notifications' => 'Benachrichtigung auf Kommentare erlauben?',
diff -r 47573867cc1d -r e5bbed84d3b1 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/german_formal_utf-8.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1854,6 +1854,7 @@
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
     'restrict_webservices' => 'Webservices beschr??nken?',
+    'article_comment_close_enabled' => 'Automatically close comments (default)',
     'article_comment_close_days' => 'Tage nach denen Kommentare uneditierbar werden (hier nur Grundeinstellung)',
     'comment_close_rec_stories' => 'Anzahl letzter Artikel, die kommentierbar sein sollen',
     'allow_reply_notifications' => 'Benachrichtigung auf Kommentare erlauben?',
diff -r 47573867cc1d -r e5bbed84d3b1 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/language/german_utf-8.php	Sun Oct 11 11:00:55 2009 +0200
@@ -1853,6 +1853,7 @@
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
     'restrict_webservices' => 'Webservices beschr??nken?',
+    '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?',
diff -r 47573867cc1d -r e5bbed84d3b1 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/public_html/admin/install/config-install.php	Sun Oct 11 11:00:55 2009 +0200
@@ -232,6 +232,7 @@
     $c->add('comment_edit',0,'select',4,21,0,1680,TRUE);
     $c->add('commentsubmission',0,'select',4,21,0, 1682, TRUE);
     $c->add('comment_edittime',1800,'text',4,21,NULL,1684,TRUE);
+    $c->add('article_comment_close_enabled',0,'select',4,21,0, 1685, TRUE);
     $c->add('article_comment_close_days',30,'text',4,21,NULL,1686,TRUE);
     $c->add('comment_close_rec_stories',0,'text',4,21,NULL,1688,TRUE);
     $c->add('allow_reply_notifications',0,'select',4,21,0, 1689, TRUE);
diff -r 47573867cc1d -r e5bbed84d3b1 public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/public_html/admin/story.php	Sun Oct 11 11:00:55 2009 +0200
@@ -577,9 +577,9 @@
             COM_optionList ($_TABLES['trackbackcodes'], 'code,name',
                             $story->EditElements('trackbackcode')));
     // comment expire 
-    $story_templates->set_var ('lang_cmt_disable', $LANG24[63]);
-    if ($story->EditElements('cmt_close') ) {
-        $story_templates->set_var('is_checked5', 'checked="checked"'); //check box if enabled
+    $story_templates->set_var('lang_cmt_disable', $LANG24[63]);
+    if ($story->EditElements('cmt_close')) {
+        $story_templates->set_var('is_checked5', 'checked="checked"');
         $story_templates->set_var('showcmtclosedisabled', 'false');
     } else {
         $story_templates->set_var('showcmtclosedisabled', 'true');
diff -r 47573867cc1d -r e5bbed84d3b1 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sat Oct 10 23:08:42 2009 +0200
+++ b/public_html/docs/english/config.html	Sun Oct 11 11:00:55 2009 +0200
@@ -949,6 +949,13 @@
     submitted it. Requires that comments are editable (see <a href="#desc_comment_edit">above</a>). Anonymous users (those that did not register an account) can
     never edit their comments while admins can always edit comments.</td></tr>
 <tr>
+  <td valign="top"><a name="desc_article_comment_close_enabled">article_comment_close_enabled</a></td>
+  <td valign="top">0</td>
+  <td valign="top">Whether or not stories should be closed for comments after
+    a certain amount of days (see next option). This is only the default
+    setting for new stories and can be changed separately for each
+    story.</td></tr>
+<tr>
   <td valign="top"><a name="desc_article_comment_close_days">article_comment_close_days</a></td>
   <td valign="top">30</td>
   <td valign="top">Number of days after which a story is to be automatically
diff -r 47573867cc1d -r e5bbed84d3b1 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 10 23:08:42 2009 +0200
+++ b/public_html/docs/history	Sun Oct 11 11:00:55 2009 +0200
@@ -3,6 +3,10 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Added new option $_CONF['article_comment_close_enabled'] to enable/disable
+  automatically closing stories for comments after a certain amount of days
+  (bug #0000959). Changed handling of comment_expire field in gl_stories such
+  that 0 means the story is always open for comments [Dirk]
 - The "Admin Group" checkbox in the Group Editor didn't work (bug #0000995,
   reported & fix provided by Tsuchi)
 - Setting $_CONF['article_comment_close_days'] to a high value (to work around
diff -r 47573867cc1d -r e5bbed84d3b1 sql/updates/mssql_1.6.0_to_1.6.1.php
--- a/sql/updates/mssql_1.6.0_to_1.6.1.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/sql/updates/mssql_1.6.0_to_1.6.1.php	Sun Oct 11 11:00:55 2009 +0200
@@ -23,6 +23,9 @@
     $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);
 
+    // new option to enable / disable closing of comments after x days
+    $c->add('article_comment_close_enabled',0,'select',4,21,0, 1685, TRUE);
+
     return true;
 }
 
diff -r 47573867cc1d -r e5bbed84d3b1 sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Sun Oct 11 11:00:55 2009 +0200
@@ -24,6 +24,9 @@
     $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);
 
+    // new option to enable / disable closing of comments after x days
+    $c->add('article_comment_close_enabled',0,'select',4,21,0, 1685, TRUE);
+
     return true;
 }
 
diff -r 47573867cc1d -r e5bbed84d3b1 system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Oct 10 23:08:42 2009 +0200
+++ b/system/classes/story.class.php	Sun Oct 11 11:00:55 2009 +0200
@@ -263,11 +263,6 @@
                 STORY_AL_NUMERIC,
                 '_frontpage'
               ),
-            'comment_expire' => array
-              (
-                STORY_AL_NUMERIC,
-                '_comment_expire'
-              ),
            'commentcode' => array
               (
                 STORY_AL_NUMERIC,
@@ -404,15 +399,17 @@
 
         // Overwrite the date with the timestamp.
         $this->_date = $story['unixdate'];
+
         if (!empty($story['expireunix'])) {
             $this->_expire = $story['expireunix'];
         } else {
-            $this->_expire = '0';
+            $this->_expire = 0;
         }
+
         if (!empty($story['cmt_expire_unix'])) {
             $this->_comment_expire = $story['cmt_expire_unix'];
         } else {
-            $this->_comment_expire = '0';
+            $this->_comment_expire = 0;
         }
 
         // Store the original SID
@@ -471,6 +468,12 @@
             }
             $this->_date = time();
             $this->_expire = time();
+            if ($_CONF['article_comment_close_enabled']) {
+                $this->_comment_expire = time() +
+                    ($_CONF['article_comment_close_days'] * 86400);
+            } else {
+                $this->_comment_expire = 0;
+            }
             $this->_commentcode = $_CONF['comment_code'];
             $this->_trackbackcode = $_CONF['trackback_code'];
             $this->_title = '';
@@ -570,7 +573,12 @@
             $this->_trackbackcode = $_CONF['trackback_code'];
             $this->_featured = 0;
             $this->_expire = time();
-            $this->_expiredate = 0;
+            if ($_CONF['article_comment_close_enabled']) {
+                $this->_comment_expire = time() +
+                    ($_CONF['article_comment_close_days'] * 86400);
+            } else {
+                $this->_comment_expire = 0;
+            }
 
             if (DB_getItem($_TABLES['topics'], 'archive_flag', "tid = '{$this->_tid}'") == 1) {
                 $this->_frontpage = 0;
@@ -697,7 +705,8 @@
             if ($save === 1) {
                 $varname = '_' . $fieldname;
                 $sql .= $fieldname . ', ';
-                if (($fieldname == 'date') || ($fieldname == 'expire') || ($fieldname == 'comment_expire')) {
+                if (($fieldname == 'date') || ($fieldname == 'expire') ||
+                        ($fieldname == 'comment_expire')) {
                     // let the DB server do this conversion (cf. timezone hack)
                     $values .= 'FROM_UNIXTIME(' . $this->{$varname} . '), ';
                 } else {
@@ -861,7 +870,12 @@
 
         $this->_expire = time();
         $this->_date = time();
-        $this->_expiredate = 0;
+        if ($_CONF['article_comment_close_enabled']) {
+            $this->_comment_expire = time() +
+                ($_CONF['article_comment_close_days'] * 86400);
+        } else {
+            $this->_comment_expire = 0;
+        }
 
         // Handle Magic GPC Garbage:
         while (list($key, $value) = each($array))
@@ -1292,7 +1306,7 @@
     /**
      * Provide access to story elements. For the editor.
      *
-     * This is a peudo-property, implementing a getter for story
+     * This is a pseudo-property, implementing a getter for story
      * details as if as an associative array. Personally, I'd
      * rather be able to assign getters and setters to actual
      * properties to mask controlled access to private member
@@ -1383,43 +1397,67 @@
             break;
 
         case 'cmt_close':
-            if (isset($this->_comment_expire) && $this->_comment_expire != 0) {
-                $return = true;
+            $return = ($this->_comment_expire == 0) ? false : true;
+
+            break;
+
+        case 'cmt_close_second':
+            if ($this->_comment_expire == 0) {
+                $return = date('s', time() +
+                               ($_CONF['article_comment_close_days'] * 86400));
             } else {
-                $return = false;
-                //return default expire time to form
-                $this->_comment_expire = $this->_date + ($_CONF['article_comment_close_days']*86400);
+                $return = date('s', $this->_comment_expire);
             }
-            
-            break;
-            
-        case 'cmt_close_second':
-            $return = date('s', $this->_comment_expire);
 
             break;
 
         case 'cmt_close_minute':
-            $return = date('i', $this->_comment_expire);
+            if ($this->_comment_expire == 0) {
+                $return = date('i', time() +
+                               ($_CONF['article_comment_close_days'] * 86400));
+            } else {
+                $return = date('i', $this->_comment_expire);
+            }
 
             break;
 
         case 'cmt_close_hour':
-            $return = date('H', $this->_comment_expire);
+            if ($this->_comment_expire == 0) {
+                $return = date('H', time() +
+                               ($_CONF['article_comment_close_days'] * 86400));
+            } else {
+                $return = date('H', $this->_comment_expire);
+            }
 
             break;
 
         case 'cmt_close_day':
-            $return = date('d', $this->_comment_expire);
+            if ($this->_comment_expire == 0) {
+                $return = date('d', time() +
+                               ($_CONF['article_comment_close_days'] * 86400));

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 13:20:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 13:20:28 -0400
Subject: [geeklog-cvs] tools: Add a \n after the closing ?>
Message-ID: <hg.d70dcf7ba266.1255281628.-909925928@qs1489.pair.com>

changeset 43:d70dcf7ba266
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/tools/rev/d70dcf7ba266
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 19:15:09 2009 +0200
description:
Add a \n after the closing ?>

diffstat:

 lm/lm.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r e2a772170569 -r d70dcf7ba266 lm/lm.php
--- a/lm/lm.php	Sun Aug 30 19:25:20 2009 +0200
+++ b/lm/lm.php	Sun Oct 11 19:15:09 2009 +0200
@@ -391,6 +391,6 @@
     require_once $incpath . $module . '.inc';
 }
 
-echo "\n?>";
+echo "\n?>\n";
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 13:38:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 13:38:37 -0400
Subject: [geeklog-cvs] geeklog: Some quick German translations / corrections.
Message-ID: <hg.59f8f25b16c2.1255282717.1485632861@qs1489.pair.com>

changeset 7372:59f8f25b16c2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/59f8f25b16c2
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 19:38:14 2009 +0200
description:
Some quick German translations / corrections.

diffstat:

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

diffs (154 lines):

diff -r 6f0fe25ffbc7 -r 59f8f25b16c2 language/german.php
--- a/language/german.php	Sun Oct 11 19:18:47 2009 +0200
+++ b/language/german.php	Sun Oct 11 19:38:14 2009 +0200
@@ -866,7 +866,7 @@
     27 => 'oder ein Icon hochladen',
     28 => 'maximal',
     29 => 'Fehler beim Datei-Upload',
-    30 => 'Stories in Topic'
+    30 => 'Artikel i.d. Kategorie'
 );
 
 ###############################################################################
@@ -1231,7 +1231,7 @@
     89 => 'Kann OpenID-Server nicht finden bzgl. der angegebenen Identity-URL.',
     90 => 'OpenID- Identifizierung abgebrochen.',
     91 => 'You specified an invalid identity URL.',
-    92 => "Bitte <a href=\"{$_CONF['site_admin_url']}/sectest.php\">die Sicherheit Ihrer Site ?berpr?fen</a> bevor Sie sie benutzen!",
+    92 => "Bitte <a href=\"{$_CONF['site_admin_url']}/sectest.php\">die Sicherheit Deiner Site ?berpr?fen</a> bevor Du sie benutzt!",
     93 => 'Database back up war erfolgreich.',
     94 => 'Backup Failed: Dateigr??e unter 1kb',
     95 => 'Es gab einen Fehler.',
@@ -1469,9 +1469,9 @@
 # admin/sectest.php
 
 $LANG_SECTEST = array(
-    'sectest' => 'Geeklog Security Check',
-    'results' => 'Results of the Security Check',
-    'okay' => 'Everything seems to be in order.',
+    'sectest' => 'Geeklog Sicherheits-Check',
+    'results' => 'Ergebnis des Sicherheits-Checks',
+    'okay' => 'Es scheint alles in Ordnung zu sein.',
     'please_fix' => 'Please fix the above issues before using your site!',
     'please_note' => 'Please note that no site is ever 100% secure. This script can only test for obvious security issues.',
     'stay_informed' => 'To stay informed about new Geeklog releases and possible security issues, we suggest that you subscribe to the (low-traffic) %s mailing list and/or use the %s option in your Admin menu from time to time to check for available updates.',
@@ -1483,7 +1483,7 @@
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
     'not_sure' => 'Got an HTTP result code %s when trying to test your %s. Not sure what to make of it ...',
-    'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
+    'remove_inst' => 'Du solltest das Installations-Verzeichnis %s entfernen, sobald Deine Website fehlerfrei l?uft.',
     'remove_inst2' => 'Keeping it around would allow malicious users the ability to destroy your current install, take over your site, or retrieve sensitive information.',
     'inst_removed' => 'Good! You seem to have removed the install directory already.',
     'fix_password' => 'You still have not changed the <strong>default password</strong> from "password" on %s Root user account(s).',
diff -r 6f0fe25ffbc7 -r 59f8f25b16c2 language/german_formal.php
--- a/language/german_formal.php	Sun Oct 11 19:18:47 2009 +0200
+++ b/language/german_formal.php	Sun Oct 11 19:38:14 2009 +0200
@@ -867,7 +867,7 @@
     27 => 'oder ein Symbol hochladen',
     28 => 'maximal',
     29 => 'Fehler beim Datei-Upload',
-    30 => 'Stories in Topic'
+    30 => 'Artikel i.d. Kategorie'
 );
 
 ###############################################################################
@@ -1470,9 +1470,9 @@
 # admin/sectest.php
 
 $LANG_SECTEST = array(
-    'sectest' => 'Geeklog Security Check',
-    'results' => 'Results of the Security Check',
-    'okay' => 'Everything seems to be in order.',
+    'sectest' => 'Geeklog Sicherheits-Check',
+    'results' => 'Ergebnis des Sicherheits-Checks',
+    'okay' => 'Es scheint alles in Ordnung zu sein.',
     'please_fix' => 'Please fix the above issues before using your site!',
     'please_note' => 'Please note that no site is ever 100% secure. This script can only test for obvious security issues.',
     'stay_informed' => 'To stay informed about new Geeklog releases and possible security issues, we suggest that you subscribe to the (low-traffic) %s mailing list and/or use the %s option in your Admin menu from time to time to check for available updates.',
@@ -1484,7 +1484,7 @@
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
     'not_sure' => 'Got an HTTP result code %s when trying to test your %s. Not sure what to make of it ...',
-    'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
+    'remove_inst' => 'Sie sollten das Installations-Verzeichnis %s entfernen, sobald Ihre Website fehlerfrei l?uft.',
     'remove_inst2' => 'Keeping it around would allow malicious users the ability to destroy your current install, take over your site, or retrieve sensitive information.',
     'inst_removed' => 'Good! You seem to have removed the install directory already.',
     'fix_password' => 'You still have not changed the <strong>default password</strong> from "password" on %s Root user account(s).',
diff -r 6f0fe25ffbc7 -r 59f8f25b16c2 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun Oct 11 19:18:47 2009 +0200
+++ b/language/german_formal_utf-8.php	Sun Oct 11 19:38:14 2009 +0200
@@ -867,7 +867,7 @@
     27 => 'oder ein Symbol hochladen',
     28 => 'maximal',
     29 => 'Fehler beim Datei-Upload',
-    30 => 'Stories in Topic'
+    30 => 'Artikel i.d. Kategorie'
 );
 
 ###############################################################################
@@ -1470,9 +1470,9 @@
 # admin/sectest.php
 
 $LANG_SECTEST = array(
-    'sectest' => 'Geeklog Security Check',
-    'results' => 'Results of the Security Check',
-    'okay' => 'Everything seems to be in order.',
+    'sectest' => 'Geeklog Sicherheits-Check',
+    'results' => 'Ergebnis des Sicherheits-Checks',
+    'okay' => 'Es scheint alles in Ordnung zu sein.',
     'please_fix' => 'Please fix the above issues before using your site!',
     'please_note' => 'Please note that no site is ever 100% secure. This script can only test for obvious security issues.',
     'stay_informed' => 'To stay informed about new Geeklog releases and possible security issues, we suggest that you subscribe to the (low-traffic) %s mailing list and/or use the %s option in your Admin menu from time to time to check for available updates.',
@@ -1484,7 +1484,7 @@
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
     'not_sure' => 'Got an HTTP result code %s when trying to test your %s. Not sure what to make of it ...',
-    'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
+    'remove_inst' => 'Sie sollten das Installations-Verzeichnis %s entfernen, sobald Ihre Website fehlerfrei l??uft.',
     'remove_inst2' => 'Keeping it around would allow malicious users the ability to destroy your current install, take over your site, or retrieve sensitive information.',
     'inst_removed' => 'Good! You seem to have removed the install directory already.',
     'fix_password' => 'You still have not changed the <strong>default password</strong> from "password" on %s Root user account(s).',
diff -r 6f0fe25ffbc7 -r 59f8f25b16c2 language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Oct 11 19:18:47 2009 +0200
+++ b/language/german_utf-8.php	Sun Oct 11 19:38:14 2009 +0200
@@ -866,7 +866,7 @@
     27 => 'oder ein Icon hochladen',
     28 => 'maximal',
     29 => 'Fehler beim Datei-Upload',
-    30 => 'Stories in Topic'
+    30 => 'Artikel i.d. Kategorie'
 );
 
 ###############################################################################
@@ -1231,7 +1231,7 @@
     89 => 'Kann OpenID-Server nicht finden bzgl. der angegebenen Identity-URL.',
     90 => 'OpenID- Identifizierung abgebrochen.',
     91 => 'You specified an invalid identity URL.',
-    92 => "Bitte <a href=\"{$_CONF['site_admin_url']}/sectest.php\">die Sicherheit Ihrer Site ??berpr??fen</a> bevor Sie sie benutzen!",
+    92 => "Bitte <a href=\"{$_CONF['site_admin_url']}/sectest.php\">die Sicherheit Deiner Site ??berpr??fen</a> bevor Du sie benutzt!",
     93 => 'Database back up war erfolgreich.',
     94 => 'Backup Failed: Dateigr????e unter 1kb',
     95 => 'Es gab einen Fehler.',
@@ -1469,9 +1469,9 @@
 # admin/sectest.php
 
 $LANG_SECTEST = array(
-    'sectest' => 'Geeklog Security Check',
-    'results' => 'Results of the Security Check',
-    'okay' => 'Everything seems to be in order.',
+    'sectest' => 'Geeklog Sicherheits-Check',
+    'results' => 'Ergebnis des Sicherheits-Checks',
+    'okay' => 'Es scheint alles in Ordnung zu sein.',
     'please_fix' => 'Please fix the above issues before using your site!',
     'please_note' => 'Please note that no site is ever 100% secure. This script can only test for obvious security issues.',
     'stay_informed' => 'To stay informed about new Geeklog releases and possible security issues, we suggest that you subscribe to the (low-traffic) %s mailing list and/or use the %s option in your Admin menu from time to time to check for available updates.',
@@ -1483,7 +1483,7 @@
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
     'not_sure' => 'Got an HTTP result code %s when trying to test your %s. Not sure what to make of it ...',
-    'remove_inst' => 'You should really remove the install directory %s once you have your site up and running without any errors.',
+    'remove_inst' => 'Du solltest das Installations-Verzeichnis %s entfernen, sobald Deine Website fehlerfrei l??uft.',
     'remove_inst2' => 'Keeping it around would allow malicious users the ability to destroy your current install, take over your site, or retrieve sensitive information.',
     'inst_removed' => 'Good! You seem to have removed the install directory already.',
     'fix_password' => 'You still have not changed the <strong>default password</strong> from "password" on %s Root user account(s).',

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 13:38:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 13:38:37 -0400
Subject: [geeklog-cvs] geeklog: Synced all language files with their English
	equivalents
Message-ID: <hg.6f0fe25ffbc7.1255282717.1485632861@qs1489.pair.com>

changeset 7371:6f0fe25ffbc7
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6f0fe25ffbc7
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 19:18:47 2009 +0200
description:
Synced all language files with their English equivalents

diffstat:

 language/afrikaans.php                                     |   20 +-
 language/afrikaans_utf-8.php                               |   20 +-
 language/bosnian.php                                       |   20 +-
 language/bosnian_utf-8.php                                 |   20 +-
 language/bulgarian.php                                     |   20 +-
 language/bulgarian_utf-8.php                               |   20 +-
 language/catalan.php                                       |   20 +-
 language/catalan_utf-8.php                                 |   20 +-
 language/chinese_simplified_utf-8.php                      |   20 +-
 language/chinese_traditional_utf-8.php                     |   20 +-
 language/croatian.php                                      |   20 +-
 language/croatian_utf-8.php                                |   20 +-
 language/czech.php                                         |   20 +-
 language/czech_utf-8.php                                   |   20 +-
 language/danish.php                                        |   20 +-
 language/danish_utf-8.php                                  |   20 +-
 language/dutch.php                                         |   20 +-
 language/dutch_utf-8.php                                   |   20 +-
 language/estonian.php                                      |   24 +-
 language/estonian_utf-8.php                                |   24 +-
 language/farsi_utf-8.php                                   |   20 +-
 language/finnish.php                                       |   20 +-
 language/finnish_utf-8.php                                 |   20 +-
 language/french_canada.php                                 |   20 +-
 language/french_canada_utf-8.php                           |   20 +-
 language/french_france.php                                 |   20 +-
 language/french_france_utf-8.php                           |   20 +-
 language/german.php                                        |   15 +-
 language/german_formal.php                                 |   15 +-
 language/german_formal_utf-8.php                           |   15 +-
 language/german_utf-8.php                                  |   15 +-
 language/hebrew_utf-8.php                                  |   18 +-
 language/hellenic.php                                      |   20 +-
 language/hellenic_utf-8.php                                |   20 +-
 language/indonesian.php                                    |   20 +-
 language/indonesian_utf-8.php                              |   20 +-
 language/italian.php                                       |   20 +-
 language/italian_utf-8.php                                 |   20 +-
 language/japanese_utf-8.php                                |  405 +++++++++---------
 language/korean.php                                        |   20 +-
 language/korean_utf-8.php                                  |   20 +-
 language/norwegian.php                                     |   20 +-
 language/norwegian_utf-8.php                               |   20 +-
 language/polish.php                                        |   20 +-
 language/polish_utf-8.php                                  |   20 +-
 language/portuguese.php                                    |   20 +-
 language/portuguese_brazil.php                             |   20 +-
 language/portuguese_brazil_utf-8.php                       |   20 +-
 language/portuguese_utf-8.php                              |   20 +-
 language/romanian.php                                      |   20 +-
 language/romanian_utf-8.php                                |   20 +-
 language/russian.php                                       |   20 +-
 language/russian_utf-8.php                                 |   20 +-
 language/serbian.php                                       |   20 +-
 language/serbian_utf-8.php                                 |   20 +-
 language/slovak.php                                        |   20 +-
 language/slovak_utf-8.php                                  |   20 +-
 language/slovenian.php                                     |   20 +-
 language/slovenian_utf-8.php                               |   20 +-
 language/spanish.php                                       |   20 +-
 language/spanish_argentina.php                             |   20 +-
 language/spanish_argentina_utf-8.php                       |   20 +-
 language/spanish_utf-8.php                                 |   20 +-
 language/swedish.php                                       |   20 +-
 language/swedish_utf-8.php                                 |   20 +-
 language/turkish.php                                       |   20 +-
 language/turkish_utf-8.php                                 |   20 +-
 language/ukrainian.php                                     |   20 +-
 language/ukrainian_koi8-u.php                              |   20 +-
 language/ukrainian_utf-8.php                               |   20 +-
 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/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/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/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/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/language/chinese_simplified_utf-8.php  |    5 +-
 plugins/staticpages/language/chinese_traditional_utf-8.php |    5 +-
 plugins/staticpages/language/czech.php                     |    5 +-
 plugins/staticpages/language/czech_utf-8.php               |    5 +-
 plugins/staticpages/language/danish.php                    |    5 +-
 plugins/staticpages/language/danish_utf-8.php              |    5 +-
 plugins/staticpages/language/dutch.php                     |    5 +-
 plugins/staticpages/language/dutch_utf-8.php               |    5 +-
 plugins/staticpages/language/estonian.php                  |    5 +-
 plugins/staticpages/language/estonian_utf-8.php            |    5 +-
 plugins/staticpages/language/farsi_utf-8.php               |    5 +-
 plugins/staticpages/language/french_canada.php             |    5 +-
 plugins/staticpages/language/french_canada_utf-8.php       |    5 +-
 plugins/staticpages/language/german.php                    |    5 +-
 plugins/staticpages/language/german_formal.php             |    5 +-
 plugins/staticpages/language/german_formal_utf-8.php       |    5 +-
 plugins/staticpages/language/german_utf-8.php              |    5 +-
 plugins/staticpages/language/hebrew_utf-8.php              |    3 +-
 plugins/staticpages/language/italian.php                   |    5 +-
 plugins/staticpages/language/italian_utf-8.php             |    5 +-
 plugins/staticpages/language/japanese_utf-8.php            |    7 +-
 plugins/staticpages/language/korean.php                    |    5 +-
 plugins/staticpages/language/korean_utf-8.php              |    5 +-
 plugins/staticpages/language/polish.php                    |    5 +-
 plugins/staticpages/language/polish_utf-8.php              |    5 +-
 plugins/staticpages/language/portuguese_brazil.php         |    5 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php   |    5 +-
 plugins/staticpages/language/slovenian.php                 |    5 +-
 plugins/staticpages/language/slovenian_utf-8.php           |    5 +-
 plugins/staticpages/language/spanish.php                   |    5 +-
 plugins/staticpages/language/spanish_utf-8.php             |    5 +-
 plugins/staticpages/language/swedish.php                   |    5 +-
 plugins/staticpages/language/swedish_utf-8.php             |    5 +-
 plugins/staticpages/language/turkish.php                   |    5 +-
 plugins/staticpages/language/turkish_utf-8.php             |    5 +-
 plugins/staticpages/language/ukrainian.php                 |    5 +-
 plugins/staticpages/language/ukrainian_koi8-u.php          |    5 +-
 plugins/staticpages/language/ukrainian_utf-8.php           |    5 +-
 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/install/language/hebrew_utf-8.php        |    2 +-
 public_html/admin/install/language/japanese_utf-8.php      |    2 +-
 212 files changed, 1685 insertions(+), 890 deletions(-)

diffs (truncated from 8318 to 300 lines):

diff -r e5bbed84d3b1 -r 6f0fe25ffbc7 language/afrikaans.php
--- a/language/afrikaans.php	Sun Oct 11 11:00:55 2009 +0200
+++ b/language/afrikaans.php	Sun Oct 11 19:18:47 2009 +0200
@@ -824,7 +824,9 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,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'
 );
 
 ###############################################################################
@@ -1471,7 +1474,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,6 +1574,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1843,12 +1848,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 +1949,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 e5bbed84d3b1 -r 6f0fe25ffbc7 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sun Oct 11 11:00:55 2009 +0200
+++ b/language/afrikaans_utf-8.php	Sun Oct 11 19:18:47 2009 +0200
@@ -824,7 +824,9 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,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'
 );
 
 ###############################################################################
@@ -1471,7 +1474,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,6 +1574,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1843,12 +1848,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 +1949,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 e5bbed84d3b1 -r 6f0fe25ffbc7 language/bosnian.php
--- a/language/bosnian.php	Sun Oct 11 11:00:55 2009 +0200
+++ b/language/bosnian.php	Sun Oct 11 19:18:47 2009 +0200
@@ -828,7 +828,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -863,7 +865,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'
 );
 
 ###############################################################################
@@ -1475,7 +1478,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,6 +1578,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1847,12 +1852,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?',
@@ -1944,7 +1953,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 e5bbed84d3b1 -r 6f0fe25ffbc7 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Sun Oct 11 11:00:55 2009 +0200
+++ b/language/bosnian_utf-8.php	Sun Oct 11 19:18:47 2009 +0200
@@ -828,7 +828,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -863,7 +865,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'
 );
 
 ###############################################################################
@@ -1475,7 +1478,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,6 +1578,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1847,12 +1852,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?',
@@ -1944,7 +1953,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 e5bbed84d3b1 -r 6f0fe25ffbc7 language/bulgarian.php
--- a/language/bulgarian.php	Sun Oct 11 11:00:55 2009 +0200
+++ b/language/bulgarian.php	Sun Oct 11 19:18:47 2009 +0200
@@ -824,7 +824,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,8 @@
     26 => 'make this the default topic for archived stories. Only one topic allowed.',

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 14:51:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 14:51:42 -0400
Subject: [geeklog-cvs] geeklog: Fixed display of the Polls block when it
	only contained...
Message-ID: <hg.b04a760c72ea.1255287102.1485632861@qs1489.pair.com>

changeset 7373:b04a760c72ea
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b04a760c72ea
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 20:45:41 2009 +0200
description:
Fixed display of the Polls block when it only contained blocks not visible for anonymous visitors (bug #0000996)

diffstat:

 plugins/polls/functions.inc |  58 ++++++++++++++++------------
 public_html/docs/history    |   2 +
 2 files changed, 35 insertions(+), 25 deletions(-)

diffs (131 lines):

diff -r 59f8f25b16c2 -r b04a760c72ea plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Oct 11 19:38:14 2009 +0200
+++ b/plugins/polls/functions.inc	Sun Oct 11 20:45:41 2009 +0200
@@ -621,40 +621,41 @@
 /**
 * This shows a poll
 *
-* This will determine if a user needs to see the poll form OR the poll
-* result.
+* This will determine if a user needs to see the poll form OR the poll result.
 *
-* @param        int        $size       Size in pixels of poll results
-* @param        string     $pid        topic ID to show (optional)
-* @param        int        $displaytype       Possible values 0 = Normal, 1 = In Block, 2 = autotag 
+* @param        int     $size           Size in pixels of poll results
+* @param        string  $pid            Poll topic ID to show (optional)
+* @param        bool    $showall        Show only the first question or all
+* @param        int     $displaytype    Possible values 0 = Normal, 1 = In Block, 2 = autotag 
+* @return       string  HTML formatted string of poll
 * @see function COM_pollVote
 * @see function COM_pollResults
-* @return    String  HTML Formated string of Poll
 *
 */
-
-function POLLS_showPoll($size, $pid='', $showall = false, $displaytype = 0 )
+function POLLS_showPoll($size, $pid = '', $showall = false, $displaytype = 0)
 {
-    global $_CONF, $_PO_CONF, $_TABLES, $LANG_POLLS;
+    global $_CONF, $_TABLES, $_PO_CONF, $LANG_POLLS;
 
     $retval = '';
 
     DB_query("DELETE FROM {$_TABLES['pollvoters']} WHERE date < UNIX_TIMESTAMP() - {$_PO_CONF['polladdresstime']}");
-    
-    if(!empty($pid)) {
+
+    if (!empty($pid)) {
         $Q['is_open'] = DB_getItem($_TABLES['polltopics'], 'is_open', "pid = '".$pid."'");
 
-        if ($displaytype == 2 && $Q['is_open'] == 0) {
-            $retval = '<div class="poll-autotag-message">' . $LANG_POLLS['pollclosed']. "</div>";
+        if (($displaytype == 2) && ($Q['is_open'] == 0)) {
+            $retval = '<div class="poll-autotag-message">'
+                    . $LANG_POLLS['pollclosed'] . '</div>';
         }        
-        if(!isset($_COOKIE["poll-".$pid]) && !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
+        if (!isset($_COOKIE['poll-' . $pid]) && !POLLS_ipAlreadyVoted($pid) &&
+                ($Q['is_open'] == 1)) {
             $retval .= POLLS_pollVote($pid, $showall, $displaytype);
         } else {
             $retval .= POLLS_pollResults($pid, $size, '', '', $displaytype);
         }
     } else {
-        $result = DB_query("SELECT pid,topic,is_open FROM {$_TABLES['polltopics']} WHERE display = 1 ORDER BY date DESC");
-        $nrows = DB_numRows($result );
+        $result = DB_query("SELECT pid,topic,is_open FROM {$_TABLES['polltopics']} WHERE display = 1" . COM_getPermSql('AND') . " ORDER BY date DESC");
+        $nrows = DB_numRows($result);
 
         $title = DB_getItem($_TABLES['blocks'], 'title', "name='poll_block'");
 
@@ -662,23 +663,24 @@
             for ($i = 1; $i <= $nrows; $i++) {
                 $Q = DB_fetchArray($result);
                 $pid = $Q['pid'];
-                //if ($size < 120) { // assume we're in the poll block
-                if ($displaytype == 1) { // In the poll block
+                if ($displaytype == 1) { // in the poll block
                     $showall = false;
                 } else { // assume we're in polls/index.php
                     $retval .= COM_startBlock($title);
                     $showall = true;
                 }
 
-                if (!isset($_COOKIE["poll-".$pid]) && !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
+                if (!isset($_COOKIE['poll-' . $pid]) &&
+                        !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
                     $retval .= POLLS_pollVote($pid, $showall, $displaytype);
                 } else {
-                    $retval .= POLLS_pollResults($pid, $size, '', '', $displaytype);
+                    $retval .= POLLS_pollResults($pid, $size, '', '',
+                                                 $displaytype);
                 }
 
-                if ($size < 120) {
-                    if ($i < $nrows){
-                        $retval .= "<div class=\"poll-divider\"></div>";
+                if ($displaytype == 1) { // in the poll block
+                    if (($i < $nrows) && !empty($retval)) {
+                        $retval .= '<div class="poll-divider"></div>';
                     }
                 } else {
                     $retval .= COM_endBlock();
@@ -686,6 +688,7 @@
             }
         }
     }
+
     return $retval;
 }
 
@@ -953,10 +956,15 @@
     return $retval;
 }
 
+/**
+* Display the current poll(s) in a side block
+*
+* @return   string  HTML for the poll(s) to be displayed (or an empty string)
+*
+*/
 function phpblock_polls()
 {
-    $retval = POLLS_showPoll(60, '', false, 1);
-    return $retval;
+    return POLLS_showPoll(60, '', false, 1);
 }
 
 
diff -r 59f8f25b16c2 -r b04a760c72ea public_html/docs/history
--- a/public_html/docs/history	Sun Oct 11 19:38:14 2009 +0200
+++ b/public_html/docs/history	Sun Oct 11 20:45:41 2009 +0200
@@ -105,6 +105,8 @@
 
 Polls Plugin
 ------------
+- Fixed display of the Polls block when it only contained blocks not visible
+  for anonymous visitors (bug #0000996) [Dirk]
 - When upgrading from Geeklog 1.5.2, the length of the poll IDs was not extended
   to 40 characters - only fresh installs of Geeklog 1.6.0 and upgrades from
   older versions worked correctly (cf. feature request #0000754) [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 14:51:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 14:51:42 -0400
Subject: [geeklog-cvs] geeklog: Don't display "This poll has 0 more
	questions."
Message-ID: <hg.0ba218a98a1a.1255287102.1485632861@qs1489.pair.com>

changeset 7374:0ba218a98a1a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0ba218a98a1a
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 20:51:25 2009 +0200
description:
Don't display "This poll has 0 more questions."

diffstat:

 plugins/polls/functions.inc |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r b04a760c72ea -r 0ba218a98a1a plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Oct 11 20:45:41 2009 +0200
+++ b/plugins/polls/functions.inc	Sun Oct 11 20:51:25 2009 +0200
@@ -549,7 +549,10 @@
                     $filter = '';
                     if (!$showall) {
                         $nquestions--;
-                        $notification = $LANG25[35] . " $nquestions " . $LANG25[36];
+                        if ($nquestions > 0) {
+                            $notification = $LANG25[35] . " $nquestions "
+                                          . $LANG25[36];
+                        }
                         $filter = "AND qid='0'";
                         $nquestions = 1;
                     } else {

From geeklog-cvs at lists.geeklog.net  Sun Oct 11 16:19:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 11 Oct 2009 16:19:40 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation
Message-ID: <hg.62255fe7e5f9.1255292380.1485632861@qs1489.pair.com>

changeset 7375:62255fe7e5f9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/62255fe7e5f9
user: Dirk Haun <dirk at haun-online.de>
date: Sun Oct 11 22:19:31 2009 +0200
description:
Updated documentation

diffstat:

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

diffs (38 lines):

diff -r 0ba218a98a1a -r 62255fe7e5f9 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Oct 11 20:51:25 2009 +0200
+++ b/public_html/docs/english/changes.html	Sun Oct 11 22:19:31 2009 +0200
@@ -36,6 +36,10 @@
 <h3>Bugfixes</h3>
 
 <ul>
+<li>Fixed automatic <a href="config.html#desc_article_comment_close_enabled">closing of stories for comments</a> after a certain amount of days. If you need to
+    re-open comments on stories that were closed due to this bug, you can use
+    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 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 0ba218a98a1a -r 62255fe7e5f9 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sun Oct 11 20:51:25 2009 +0200
+++ b/public_html/docs/english/config.html	Sun Oct 11 22:19:31 2009 +0200
@@ -969,7 +969,7 @@
   <td valign="top">0</td>
   <td valign="top">Number of most recent stories for which comment posting is
     allowed. Posting a new story will automatically close comments for the
-    oldest of these stories.</td></tr>
+    oldest of these stories. Set to 0 to disable this option.</td></tr>
 <tr>
   <td valign="top"><a name="desc_allow_reply_notifications">allow_reply_notifications</a></td>
   <td valign="top">0</td>
diff -r 0ba218a98a1a -r 62255fe7e5f9 public_html/docs/history
--- a/public_html/docs/history	Sun Oct 11 20:51:25 2009 +0200
+++ b/public_html/docs/history	Sun Oct 11 22:19:31 2009 +0200
@@ -105,7 +105,7 @@
 
 Polls Plugin
 ------------
-- Fixed display of the Polls block when it only contained blocks not visible
+- Fixed display of the Polls block when it only contained polls not visible
   for anonymous visitors (bug #0000996) [Dirk]
 - When upgrading from Geeklog 1.5.2, the length of the poll IDs was not extended
   to 40 characters - only fresh installs of Geeklog 1.6.0 and upgrades from

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:37 -0400
Subject: [geeklog-cvs] geeklog: Documentation update
Message-ID: <hg.c837dd0217ac.1255785757.1485632861@qs1489.pair.com>

changeset 7377:c837dd0217ac
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c837dd0217ac
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 11:17:43 2009 +0200
description:
Documentation update

diffstat:

 public_html/docs/english/config.html |  33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r 62255fe7e5f9 -r c837dd0217ac public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sun Oct 11 22:19:31 2009 +0200
+++ b/public_html/docs/english/config.html	Sat Oct 17 11:17:43 2009 +0200
@@ -999,10 +999,8 @@
   <td valign="top">If you chose 'imagemagick' for
     <code>$_CONF['image_lib']</code> above, then this should hold the
     <strong>complete path</strong> to the mogrify executable (from the
-    ImageMagick package), e.g. '/usr/bin/mogrify'.<br>
-    You will need a fairly recent version of <a
-    href="http://www.imagemagick.org/">ImageMagick</a> for this to work
-    (version 5.4.9 or newer is recommended).</td></tr>
+    <a href="http://www.imagemagick.org/">ImageMagick</a> package), e.g.
+    '<tt>/usr/bin/mogrify</tt>' (ImageMagick 5.4.9 or newer recommended).</td></tr>
 <tr>
   <td valign="top"><a name="desc_path_to_netpbm">path_to_netpbm</a></td>
   <td valign="top"><i>(disabled)</i></td>
@@ -1050,7 +1048,7 @@
   <td valign="top">When set to <code>true</code>, this option enables debugging
     output to be written into Geeklog's <tt>error.log</tt> file during the
     upload of an image. This is useful to track down problems with the image
-    upload.</td></tr>
+    upload and resizing.</td></tr>
 </table>
 
 <h3><a name="images_articles">Images: Images in Articles</a></h3>
@@ -1140,8 +1138,9 @@
   <td valign="top"><i>(disabled)</i></td>
   <td valign="top">When enabled, this option should point to an image (full URL
     required!) that should be displayed for users without a user photo. When
-    this option is not set and a user does not have a user photo (or an avatar)
-    then Geeklog will simply not display anything.</td></tr>
+    this option is not set and a user does not have a user photo (or an <a 
+    href="#images_gravatar">avatar</a>) then Geeklog will simply not display
+    anything.</td></tr>
 </table>
 
 <h3><a name="images_gravatar">Images: Gravatar</a></h3>
@@ -1156,7 +1155,7 @@
   <td valign="top">If enabled (set to <tt>true</tt>), a user's avatar image will
     be requested from <a href="http://gravatar.com/">gravatar.com</a> if the
     user didn't upload a user photo (i.e. an uploaded photo always takes
-    priority).<br>
+    precedence).<br>
     Please note that this option may slow down your site on pages that display
     a lot of userphotos for different users (e.g. forum threads).</td></tr>
 <tr>
@@ -1415,7 +1414,10 @@
     display the actual error message to members of the Root group (to prevent
     leakage of possibly sensitive information). When set to <code>true</code>,
     this information will be displayed to <em>all</em> users. <strong>Use only
-    for debugging purposes!</strong></td></tr>
+    for debugging purposes!</strong><br>
+    Tip: If an error prevents you from logging into your site to enable that
+    option, you can also <a href="#desc_rootdebug_siteconfig">enable it in your
+    <tt>siteconfig.php</tt></a> file.</td></tr>
 </table>
 
 <h3><a name="misc_digest">Miscellaneous: Daily Digest</a></h3>
@@ -1602,6 +1604,19 @@
     another character encoding.<br>
     For <a href="http://wiki.geeklog.net/wiki/index.php/Multi-Language_Support">multi-language</a> setups, using <code>'utf-8'</code> as the default character
     set is recommended.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_rootdebug_siteconfig">rootdebug</a></td>
+  <td valign="top"><i>(disabled)</i></td>
+  <td valign="top">Same as the '<a href="#desc_rootdebug">rootdebug</a>' option
+    in the Configuration. However, sometimes an error may occur that prevents
+    you from logging into your site and enabling the 'rootdebug' option. In
+    such a case, you can uncomment this line and enable the option here.<br>
+    In addition to 'true' and 'false', you can also set this option to 'force'
+    (only in <tt>siteconfig.php</tt>). This will enable displaying of sensitive
+    information like passwords and cookies.<br>
+    In any case, the same strong warning as <a href="#desc_rootdebug">above</a>
+    applies here, too: <strong>Do not leave this option enabled on a "live"
+    site!</strong></td></tr>
 </table>
 
 

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:37 -0400
Subject: [geeklog-cvs] geeklog: Missing global declaration
Message-ID: <hg.5c0a38462d53.1255785757.1485632861@qs1489.pair.com>

changeset 7378:5c0a38462d53
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5c0a38462d53
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:01:42 2009 +0200
description:
Missing global declaration

diffstat:

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

diffs (12 lines):

diff -r c837dd0217ac -r 5c0a38462d53 system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Oct 17 11:17:43 2009 +0200
+++ b/system/classes/story.class.php	Sat Oct 17 13:01:42 2009 +0200
@@ -866,6 +866,8 @@
      */
     function loadSubmission()
     {
+        global $_CONF;
+
         $array = $_POST;
 
         $this->_expire = time();

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:38 -0400
Subject: [geeklog-cvs] geeklog: Fixed a long-standing quirk of the
	submission handling ...
Message-ID: <hg.d9ce993e1951.1255785758.1485632861@qs1489.pair.com>

changeset 7379:d9ce993e1951
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d9ce993e1951
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:11:32 2009 +0200
description:
Fixed a long-standing quirk of the submission handling where the "Submissions" entry in the Admins Block wasn't updated after accepting / rejecting a submission

diffstat:

 public_html/admin/moderation.php |  22 +++++++++++++---------
 public_html/docs/history         |   3 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs (54 lines):

diff -r 5c0a38462d53 -r d9ce993e1951 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sat Oct 17 13:01:42 2009 +0200
+++ b/public_html/admin/moderation.php	Sat Oct 17 13:11:32 2009 +0200
@@ -742,24 +742,28 @@
 // MAIN
 
 $display = '';
-$display .= COM_siteHeader ('menu', $LANG29[34]);
-$display .= COM_showMessageFromParameter();
 
-if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation') && SEC_checkToken()) {
+if (isset($_POST['mode']) && ($_POST['mode'] == 'moderation') &&
+        SEC_checkToken()) {
     $action = array();
     if (isset($_POST['action'])) {
         $action = $_POST['action'];
     }
     if ($_POST['type'] == 'user') {
-        $display .= moderateusers($_POST['id'], $action,
-                                  COM_applyFilter($_POST['count'], true));
+        $mod_result = moderateusers($_POST['id'], $action,
+                                    COM_applyFilter($_POST['count'], true));
     } else {
-        $display .= moderation($_POST['id'], $action, $_POST['type'],
-                               COM_applyFilter ($_POST['count'], true));
+        $mod_result = moderation($_POST['id'], $action, $_POST['type'],
+                                 COM_applyFilter($_POST['count'], true));
     }
+    $display .= COM_siteHeader('menu', $LANG29[34])
+             .  COM_showMessageFromParameter()
+             .  $mod_result;
 } else {
-    $display .= security_check_reminder();
-    $display .= commandcontrol(SEC_createToken());
+    $display .= COM_siteHeader('menu', $LANG29[34])
+             .  COM_showMessageFromParameter()
+             .  security_check_reminder()
+             .  commandcontrol(SEC_createToken());
 }
 
 $display .= COM_siteFooter();
diff -r 5c0a38462d53 -r d9ce993e1951 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 13:01:42 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 13:11:32 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Fixed a long-standing quirk of the submission handling where the "Submissions"
+  entry in the Admins Block wasn't updated after accepting / rejecting a
+  submission [Dirk]
 - Added new option $_CONF['article_comment_close_enabled'] to enable/disable
   automatically closing stories for comments after a certain amount of days
   (bug #0000959). Changed handling of comment_expire field in gl_stories such

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:38 -0400
Subject: [geeklog-cvs] geeklog: Merging - forgot to pull Randy's fix
Message-ID: <hg.eda2a40b633c.1255785758.1485632861@qs1489.pair.com>

changeset 7380:eda2a40b633c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/eda2a40b633c
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:12:44 2009 +0200
description:
Merging - forgot to pull Randy's fix

diffstat:

 public_html/admin/plugins.php |  39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diffs (114 lines):

diff -r d9ce993e1951 -r eda2a40b633c public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sat Oct 17 13:11:32 2009 +0200
+++ b/public_html/admin/plugins.php	Sat Oct 17 13:12:44 2009 +0200
@@ -491,7 +491,7 @@
  *                          returns false if no error occured
  *
  */
-function plugin_getUploadError($mFile) 
+function plugin_getUploadError($mFile)
 {
     global $LANG32;
 
@@ -514,7 +514,7 @@
         $retval = false;
 
     }
-    
+
     return $retval;
 }
 
@@ -534,9 +534,9 @@
     // If 'file_uploads' is enabled in php.ini
     // and the plugin directories are writable by the web server.
     $upload_enabled = (ini_get('file_uploads')
-                        && is_writable($_CONF['path'] . 'plugins/') 
+                        && is_writable($_CONF['path'] . 'plugins/')
                         && is_writable($_CONF['path_html'])
-                        && is_writable($path_admin . 'plugins/')) 
+                        && is_writable($path_admin . 'plugins/'))
                             ? true
                             : false;
 
@@ -663,7 +663,7 @@
                 }
             }
 
-            /** 
+            /**
              * Install the plugin
              * This doesn't work if the public_html & public_html/admin/plugins directories aren't 777
              */
@@ -686,11 +686,11 @@
             /**
              * One time I wanted to install a muffler on my car and
              * needed to match up the outside diameter of the car's
-             * exhaust pipe to the inside diameter of the muffler. 
+             * exhaust pipe to the inside diameter of the muffler.
              * Unfortunately, when I went to the auto parts store they
              * didn't have a coupling adapter that would perfectly
              * match the two pipes, only a bunch of smaller adapters.
-             * I ended up using about 4 small adapters to step down 
+             * I ended up using about 4 small adapters to step down
              * one size at a time to the size of the muffler's input.
              *
              * It's kind of like this regular expression:
@@ -1033,20 +1033,21 @@
         }
     }
 
-    // Add plugin's Admin group to the Root user group 
+    // Add plugin's Admin group to the Root user group
     // (assumes that the Root group's ID is always 1)
-    if ($admin_group_id > 1) {
+    if (count($groups) > 0) {
         if ($verbose) {
             COM_errorLog("Attempting to give all users in the Root group access to the '$plugin' Admin group", 1);
         }
 
-        DB_query("INSERT INTO {$_TABLES['group_assignments']} VALUES "
-                 . "($admin_group_id, NULL, 1)");
-        if (DB_error()) {
-            COM_errorLog('Error adding plugin admin group to Root group', 1);
-            PLG_uninstall($plugin);
-
-            return false;
+        foreach($groups as $key=>$value){
+            DB_query("INSERT INTO {$_TABLES['group_assignments']} VALUES "
+             . "($value, NULL, 1)");
+            if (DB_error()) {
+                COM_errorLog('Error adding plugin admin group to Root group', 1);
+                PLG_uninstall($plugin);
+                return false;
+            }
         }
     }
 
@@ -1061,7 +1062,7 @@
             if (DB_error()) {
                 COM_errorLog('Error adding plugin default data', 1);
                 PLG_uninstall($plugin);
-            
+
                 return false;
             }
         }
@@ -1108,7 +1109,7 @@
             PLG_uninstall($plugin);
 
             return false;
-        }   
+        }
     }
 
     if ($verbose) {
@@ -1248,7 +1249,7 @@
     }
 
 } elseif (isset($_FILES['plugin']) && SEC_checkToken() &&
-        SEC_hasRights('plugin.install,plugin.upload')) { 
+        SEC_hasRights('plugin.install,plugin.upload')) {
     $display .= plugin_upload();
 
 } else { // 'cancel' or no mode at all

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:40 -0400
Subject: [geeklog-cvs] geeklog: Creation of multiple plugin groups needs to
	be fixed in...
Message-ID: <hg.e02d71d401c3.1255785760.1485632861@qs1489.pair.com>

changeset 7381:e02d71d401c3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e02d71d401c3
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:26:13 2009 +0200
description:
Creation of multiple plugin groups needs to be fixed in the install script, too

diffstat:

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

diffs (42 lines):

diff -r eda2a40b633c -r e02d71d401c3 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Oct 17 13:12:44 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sat Oct 17 13:26:13 2009 +0200
@@ -874,18 +874,20 @@
 
     // Add plugin's Admin group to the Root user group 
     // (assumes that the Root group's ID is always 1)
-    if ($admin_group_id > 1) {
+    if (count($groups) > 0) {
         if ($verbose) {
             COM_errorLog("Attempting to give all users in the Root group access to the '$plugin' Admin group", 1);
         }
 
-        DB_query("INSERT INTO {$_TABLES['group_assignments']} VALUES "
-                 . "($admin_group_id, NULL, 1)");
-        if (DB_error()) {
-            COM_errorLog('Error adding plugin admin group to Root group', 1);
-            PLG_uninstall($plugin);
+        foreach ($groups as $key => $value) {
+            DB_query("INSERT INTO {$_TABLES['group_assignments']} VALUES "
+                     . "($admin_group_id, NULL, 1)");
+            if (DB_error()) {
+                COM_errorLog('Error adding plugin admin group to Root group', 1);
+                PLG_uninstall($plugin);
 
-            return false;
+                return false;
+            }
         }
     }
 
diff -r eda2a40b633c -r e02d71d401c3 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 13:12:44 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 13:26:13 2009 +0200
@@ -6,6 +6,7 @@
 - Fixed a long-standing quirk of the submission handling where the "Submissions"
   entry in the Admins Block wasn't updated after accepting / rejecting a
   submission [Dirk]
+- Fixed creation of multiple plugin groups in plugin autoinstall [Randy, Dirk]
 - Added new option $_CONF['article_comment_close_enabled'] to enable/disable
   automatically closing stories for comments after a certain amount of days
   (bug #0000959). Changed handling of comment_expire field in gl_stories such

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:41 -0400
Subject: [geeklog-cvs] geeklog: Don't display the comment form for a story
	when comment...
Message-ID: <hg.2b8b42245059.1255785761.1485632861@qs1489.pair.com>

changeset 7383:2b8b42245059
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2b8b42245059
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 14:09:44 2009 +0200
description:
Don't display the comment form for a story when comments aren't enabled for it (bug #0000994)

diffstat:

 public_html/comment.php  |  5 ++---
 public_html/docs/history |  2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r dfadb4aad5d1 -r 2b8b42245059 public_html/comment.php
--- a/public_html/comment.php	Sat Oct 17 13:51:45 2009 +0200
+++ b/public_html/comment.php	Sat Oct 17 14:09:44 2009 +0200
@@ -446,9 +446,8 @@
 
     if ($type == 'article') {
         $dbTitle = DB_getItem($_TABLES['stories'], 'title',
-                                "sid = '{$sid}'" . COM_getPermSQL('AND')
-                                . " AND (draft_flag = 0) AND (date <= NOW()) "
-                                . COM_getTopicSQL('AND'));
+                    "(sid = '$sid') AND (draft_flag = 0) AND (date <= NOW()) AND (commentcode = 0)"
+                    . COM_getPermSQL('AND') . COM_getTopicSQL('AND'));
         if ($dbTitle === null) {
             // no permissions, or no story of that title
             $display = COM_refresh($_CONF['site_url'] . '/index.php');
diff -r dfadb4aad5d1 -r 2b8b42245059 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 13:51:45 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 14:09:44 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Don't display the comment form for a story when comments aren't enabled for it
+  (bug #0000994) [Dirk]
 - Fixed a long-standing quirk of the submission handling where the "Submissions"
   entry in the Admins Block wasn't updated after accepting / rejecting a
   submission [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 09:22:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 09:22:40 -0400
Subject: [geeklog-cvs] geeklog: Add a robots "noindex" meta tag to the
	submission form ...
Message-ID: <hg.dfadb4aad5d1.1255785760.1485632861@qs1489.pair.com>

changeset 7382:dfadb4aad5d1
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/dfadb4aad5d1
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:51:45 2009 +0200
description:
Add a robots "noindex" meta tag to the submission form (like we already do for the comment submission form)

diffstat:

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

diffs (13 lines):

diff -r e02d71d401c3 -r dfadb4aad5d1 public_html/submit.php
--- a/public_html/submit.php	Sat Oct 17 13:26:13 2009 +0200
+++ b/public_html/submit.php	Sat Oct 17 13:51:45 2009 +0200
@@ -451,7 +451,8 @@
             $pagetitle = '';
             break;
     }
-    $display .= COM_siteHeader ('menu', $pagetitle);
+    $noindex = '<meta name="robots" content="noindex"' . XHTML . '>' . LB;
+    $display .= COM_siteHeader ('menu', $pagetitle, $noindex);
     $display .= submissionform($type, $mode, $topic);
     $display .= COM_siteFooter();
 }

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 16:35:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 16:35:50 -0400
Subject: [geeklog-cvs] geeklog: The template class should really trigger our
	error hand...
Message-ID: <hg.062fc7ef2c35.1255811750.1485632861@qs1489.pair.com>

changeset 7384:062fc7ef2c35
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/062fc7ef2c35
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 19:54:49 2009 +0200
description:
The template class should really trigger our error handler instead of printing out error messages

diffstat:

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

diffs (28 lines):

diff -r 2b8b42245059 -r 062fc7ef2c35 system/classes/template.class.php
--- a/system/classes/template.class.php	Sat Oct 17 14:09:44 2009 +0200
+++ b/system/classes/template.class.php	Sat Oct 17 19:54:49 2009 +0200
@@ -894,9 +894,11 @@
       $this->haltmsg($msg);
     }
 
+    /* we won't be coming back from haltmsg() in that case anyway
     if ($this->halt_on_error == 'yes') {
       die("<b>Halted.</b>");
     }
+    */
 
     return false;
   }
@@ -915,7 +917,11 @@
   * @see       halt
   */
   function haltmsg($msg) {
-    printf("<b>Template Error:</b> %s<br" . XHTML . ">\n", $msg);
+    if ($this->halt_on_error == 'yes') {
+      trigger_error(sprintf("Template Error: %s", $msg));
+    } else {
+      printf("<b>Template Error:</b> %s<br" . XHTML . ">\n", $msg);
+    }
   }
 
 }

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 16:35:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 16:35:50 -0400
Subject: [geeklog-cvs] geeklog: Our sample code should really initialize
	variables prop...
Message-ID: <hg.12aa30c5bdb4.1255811750.1485632861@qs1489.pair.com>

changeset 7385:12aa30c5bdb4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/12aa30c5bdb4
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 20:02:27 2009 +0200
description:
Our sample code should really initialize variables properly ...

diffstat:

 system/lib-custom.php.dist |  11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diffs (57 lines):

diff -r 062fc7ef2c35 -r 12aa30c5bdb4 system/lib-custom.php.dist
--- a/system/lib-custom.php.dist	Sat Oct 17 19:54:49 2009 +0200
+++ b/system/lib-custom.php.dist	Sat Oct 17 20:02:27 2009 +0200
@@ -63,6 +63,8 @@
 {
     global $_RIGHTS, $_CST_VERBOSE;
 
+    $retval = '';
+
     if ($_CST_VERBOSE) {
         COM_errorLog('**** Inside phpblock_showrights in lib-custom.php ****', 1);
     }
@@ -224,6 +226,8 @@
 {
     global $_CONF, $_TABLES;
 
+    $retval = '';
+
     $var = "Value from custom table";
     $retval .= '<tr>
         <td align="right"><b>Custom Fields:</b></td>
@@ -249,6 +253,8 @@
 {
     global $_CONF, $_TABLES;
 
+    $retval = '';
+
     $var = "Value from custom table";
     $cookietimeout = DB_getitem($_TABLES['users'], 'cookietimeout', $uid);
     $selection = '<select name="cooktime">' . LB;
@@ -299,6 +305,8 @@
 {
     global $_CONF, $_TABLES, $LANG04;
 
+    $retval = '';
+
     if (!empty ($msg) && ($msg != 'new')) {
         $retval .= COM_startBlock($LANG04[21]) . $msg . COM_endBlock();
     }
@@ -374,7 +382,9 @@
 function CUSTOM_userCheck ($username, $email='')
 {
     global $MESSAGE;
+
     $retval = '';
+
     // Example, check that the full name has been entered
     // and complain if it's missing
     if (empty($_POST['fullname'])) {
@@ -407,6 +417,7 @@
     global $_CONF, $_USER, $_TABLES;
 
     $retval = '';
+
     if( !isset( $_USER['noboxes'] )) {
         if( !empty( $_USER['uid'] )) {
             $noboxes = DB_getItem( $_TABLES['userindex'], 'noboxes', "uid = {$_USER['uid']}" );

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 17:00:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 17:00:51 -0400
Subject: [geeklog-cvs] geeklog: When a Story Admin did not have permission
	to edit a st...
Message-ID: <hg.c0af5c30022f.1255813251.1485632861@qs1489.pair.com>

changeset 7386:c0af5c30022f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c0af5c30022f
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 23:00:40 2009 +0200
description:
When a Story Admin did not have permission to edit a story, Geeklog threw a "call to a member function on a non-object" error when trying to display a proper "access denied" message (reported by Chase and Cesar)

diffstat:

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

diffs (25 lines):

diff -r 12aa30c5bdb4 -r c0af5c30022f public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Oct 17 20:02:27 2009 +0200
+++ b/public_html/admin/story.php	Sat Oct 17 23:00:40 2009 +0200
@@ -288,7 +288,7 @@
                                 COM_getBlockTemplate ('_msg_block', 'header'));
         $display .= $LANG24[41];
         $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-        $display .= STORY_renderArticle ($A, 'p');
+        $display .= STORY_renderArticle ($story, 'p');
         COM_accessLog("User {$_USER['username']} tried to illegally edit story $sid.");
         return $display;
     } elseif( $result == STORY_INVALID_SID ) {
diff -r 12aa30c5bdb4 -r c0af5c30022f public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 20:02:27 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 23:00:40 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- When a Story Admin did not have permission to edit a story, Geeklog threw a
+  "call to a member function on a non-object" error when trying to display a
+  proper "access denied" message (reported by Chase and Cesar) [Dirk]
 - Don't display the comment form for a story when comments aren't enabled for it
   (bug #0000994) [Dirk]
 - Fixed a long-standing quirk of the submission handling where the "Submissions"

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 21:08:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 21:08:06 -0400
Subject: [geeklog-cvs] geeklog: Looks like the Search API function
	setComment() is not ...
Message-ID: <hg.39932e68c099.1255828086.1485632861@qs1489.pair.com>

changeset 7387:39932e68c099
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/39932e68c099
user: Sami Barakat
date: Sun Oct 18 02:05:53 2009 +0100
description:
Looks like the Search API function setComment() is not required after all (cf. bug #0000902)

diffstat:

 system/classes/search.class.php         |  11 ++++-------
 system/classes/searchcriteria.class.php |  12 ------------
 system/lib-plugins.php                  |  15 ---------------
 3 files changed, 4 insertions(+), 34 deletions(-)

diffs (104 lines):

diff -r c0af5c30022f -r 39932e68c099 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Oct 17 23:00:40 2009 +0200
+++ b/system/classes/search.class.php	Sun Oct 18 02:05:53 2009 +0100
@@ -412,7 +412,6 @@
         $search_c->setSQL($sql);
         $search_c->setFTSQL($ftsql);
         $search_c->setRank(2);
-        $search_c->setComment(true);
 
         return array($search_s, $search_c);
     }
@@ -510,10 +509,7 @@
         $result_plugins = PLG_doSearch($this->_query, $this->_dateStart, $this->_dateEnd, $this->_topic, $this->_type, $this->_author, $this->_keyType, $page, 5);
 
         // Add core searches
-        if ($this->_type == 'all' || $this->_type == 'stories' || $this->_type == 'comments')
-        {
-            $result_plugins = array_merge($result_plugins, $this->_searchStories());
-        }
+        $result_plugins = array_merge($result_plugins, $this->_searchStories());
 
         // Loop through all plugins separating the new API from the old
         $new_api = 0;
@@ -524,9 +520,10 @@
         {
             if (is_a($result, 'SearchCriteria'))
             {
-                if ($this->_type == 'comments' && !$result->getComment()) {
+                if ($this->_type != 'all' && $this->_type != $result->getName())
+                {
                     if ($this->_verbose) {
-                        COM_errorLog($result->getName() . " using APIv2. Skipped as type is not comments");
+                        COM_errorLog($result->getName() . " using APIv2. Skipped as type is not " . $this->_type);
                     }
                     continue;
                 }
diff -r c0af5c30022f -r 39932e68c099 system/classes/searchcriteria.class.php
--- a/system/classes/searchcriteria.class.php	Sat Oct 17 23:00:40 2009 +0200
+++ b/system/classes/searchcriteria.class.php	Sun Oct 18 02:05:53 2009 +0100
@@ -41,7 +41,6 @@
     var $_url_rewrite;
     var $_append_query;
     var $_results = array();
-    var $_is_comment;
 
     function SearchCriteria( $pluginName, $pluginLabel )
     {
@@ -50,7 +49,6 @@
         $this->_rank = 3;
         $this->_url_rewrite = false;
         $this->_append_query = true;
-        $this->_is_comment = false;
     }
 
     function setSQL( $sql )
@@ -83,11 +81,6 @@
         $this->_results = $result_arr;
     }
 
-    function setComment( $bool )
-    {
-        $this->_is_comment = $bool;
-    }
-
     function getSQL()
     {
         return $this->_sql;
@@ -135,11 +128,6 @@
         return $this->_results;
     }
 
-    function getComment()
-    {
-        return $this->_is_comment;
-    }
-
     function buildSearchSQL( $keyType, $query, $columns, $sql = '' )
     {
         if ($keyType == 'all')
diff -r c0af5c30022f -r 39932e68c099 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Oct 17 23:00:40 2009 +0200
+++ b/system/lib-plugins.php	Sun Oct 18 02:05:53 2009 +0100
@@ -778,21 +778,6 @@
 
     $search_results = array();
 
-    // Search a single plugin if needed
-    if ($type != 'all') {
-        $function = 'plugin_dopluginsearch_' . $type;
-        if (function_exists($function)) {
-            $result = $function($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage);
-            if (is_array($result)) {
-                $search_results = array_merge($search_results, $result);
-            } else {
-                $search_results[] = $result;
-            }
-        }
-
-        return $search_results;
-    }
-
     foreach ($_PLUGINS as $pi_name) {
         $function = 'plugin_dopluginsearch_' . $pi_name;
         if (function_exists($function)) {

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 21:08:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 21:08:06 -0400
Subject: [geeklog-cvs] geeklog: Static page comments are now searchable (cf.
	bug #0000902)
Message-ID: <hg.dbf2c1e5cedc.1255828086.1485632861@qs1489.pair.com>

changeset 7388:dbf2c1e5cedc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/dbf2c1e5cedc
user: Sami Barakat
date: Sun Oct 18 02:06:26 2009 +0100
description:
Static page comments are now searchable (cf. bug #0000902)

diffstat:

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

diffs (102 lines):

diff -r 39932e68c099 -r dbf2c1e5cedc plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Oct 18 02:05:53 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sun Oct 18 02:06:26 2009 +0100
@@ -598,7 +598,7 @@
 */
 function plugin_dopluginsearch_staticpages($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
-    global $_TABLES, $LANG_STATIC;
+    global $_TABLES, $_DB_dbms, $LANG_STATIC, $LANG09;
 
     // Make sure the query is SQL safe
     $query = trim(addslashes($query));
@@ -614,18 +614,51 @@
         $sql .= "AND (sp_uid = '$author') ";
     }
 
-    $search = new SearchCriteria('staticpages', $LANG_STATIC['staticpages']);
+    $search_p = new SearchCriteria('staticpages', $LANG_STATIC['staticpages']);
 
     $columns = array('title' => 'sp_title', 'sp_content');
-    $sql .= $search->getDateRangeSQL('AND', 'sp_date', $datestart, $dateend);
-    list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+    $sql .= $search_p->getDateRangeSQL('AND', 'sp_date', $datestart, $dateend);
+    list($sql,$ftsql) = $search_p->buildSearchSQL($keyType, $query, $columns, $sql);
 
-    $search->setSQL($sql);
-    $search->setFTSQL($ftsql);
-    $search->setRank(3);
-    $search->setURLRewrite(true);
+    $search_p->setSQL($sql);
+    $search_p->setFTSQL($ftsql);
+    $search_p->setRank(3);
+    $search_p->setURLRewrite(true);
 
-    return $search;
+    // Search static page comments
+    $sql = "SELECT c.cid AS id, c.title AS title, c.comment AS description, ";
+    $sql .= "UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, ";
+
+    // MSSQL has a problem when concatenating numeric values
+    if ($_DB_dbms == 'mssql') {
+        $sql .= "'/comment.php?mode=view&amp;cid=' + CAST(c.cid AS varchar(10)) AS url ";
+    } else {
+        $sql .= "CONCAT('/comment.php?mode=view&amp;cid=',c.cid) AS url ";
+    }
+
+    $sql .= "FROM {$_TABLES['users']} AS u, {$_TABLES['comments']} AS c ";
+    $sql .= "LEFT JOIN {$_TABLES['staticpage']} AS s ON ((s.sp_id = c.sid) ";
+    $sql .= COM_getPermSQL('AND',0,2,'s') . COM_getTopicSQL('AND',0,'s') . COM_getLangSQL('sid','AND','s') . ") ";
+    $sql .= "WHERE (u.uid = c.uid) AND (s.commentcode >= 0) AND (s.sp_date <= NOW()) ";
+
+    if (!empty($topic)) {
+        $sql .= "AND (s.tid = '$topic') ";
+    }
+    if (!empty($author)) {
+        $sql .= "AND (c.uid = '$author') ";
+    }
+
+    $search_c = new SearchCriteria('comments', array($LANG_STATIC['staticpages'],$LANG09[66]));
+
+    $columns = array('title' => 'c.title', 'comment');
+    $sql .= $search_c->getDateRangeSQL('AND', 'c_date', $datestart, $dateend);
+    list($sql, $ftsql) = $search_c->buildSearchSQL($keyType, $query, $columns, $sql);
+
+    $search_c->setSQL($sql);
+    $search_c->setFTSQL($ftsql);
+    $search_c->setRank(2);
+
+    return array($search_p, $search_c);
 }
 
 
@@ -1009,7 +1042,7 @@
 
     $inst_parms = plugin_autoinstall_staticpages('staticpages');
     $pi_gl_version = $inst_parms['info']['pi_gl_version'];
-    
+
     require_once $_CONF['path'] . 'plugins/staticpages/sql/'
                                 . $_DB_dbms . '_updates.php';
 
@@ -1029,16 +1062,16 @@
                     DB_query($sql);
                 }
             }
-            
-            update_ConfValues_1_6_0();            
-            
+
+            update_ConfValues_1_6_0();
+
             $current_version = '1.6.1';
             break;
 
         default:
             $done = true;
         }
-    }    
+    }
 
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'staticpages'");
 

From geeklog-cvs at lists.geeklog.net  Sat Oct 17 21:27:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 17 Oct 2009 21:27:25 -0400
Subject: [geeklog-cvs] geeklog: Fixed sorting and limiting the results at
	the same time...
Message-ID: <hg.abd5bf00c26b.1255829245.1485632861@qs1489.pair.com>

changeset 7389:abd5bf00c26b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/abd5bf00c26b
user: Sami Barakat
date: Sun Oct 18 02:25:07 2009 +0100
description:
Fixed sorting and limiting the results at the same time (bug #0001007)

diffstat:

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

diffs (33 lines):

diff -r dbf2c1e5cedc -r abd5bf00c26b system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sun Oct 18 02:06:26 2009 +0100
+++ b/system/classes/listfactory.class.php	Sun Oct 18 02:25:07 2009 +0100
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.6.1                                                             |
 // +---------------------------------------------------------------------------+
 // | listfactory.class.php                                                     |
 // |                                                                           |
@@ -528,7 +528,9 @@
             foreach ($this->_page_limits as $key => $val)
             {
                 $text = is_numeric($key) ? sprintf($LANG09[67], $val) : $key;
-                $href = $this->_page_url . "results=$val";
+                $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"' : '';
 
                 $list_templates->set_var('limit_text', $text);
@@ -584,7 +586,8 @@
                         $text .= " ($direction)";
                     }
 
-                    $href = $this->_page_url . "order={$field['name']}&amp;direction=$direction";
+                    $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>";

From geeklog-cvs at lists.geeklog.net  Tue Oct 20 17:55:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 20 Oct 2009 17:55:11 -0400
Subject: [geeklog-cvs] geeklog: Staticpages dont have topics,
	things are never as simpl...
Message-ID: <hg.2b5aac1d58f8.1256075711.1485632861@qs1489.pair.com>

changeset 7390:2b5aac1d58f8
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2b5aac1d58f8
user: Sami Barakat
date: Tue Oct 20 22:53:07 2009 +0100
description:
Staticpages dont have topics, things are never as simple as copy and paste...

diffstat:

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

diffs (17 lines):

diff -r abd5bf00c26b -r 2b5aac1d58f8 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Oct 18 02:25:07 2009 +0100
+++ b/plugins/staticpages/functions.inc	Tue Oct 20 22:53:07 2009 +0100
@@ -638,12 +638,9 @@
 
     $sql .= "FROM {$_TABLES['users']} AS u, {$_TABLES['comments']} AS c ";
     $sql .= "LEFT JOIN {$_TABLES['staticpage']} AS s ON ((s.sp_id = c.sid) ";
-    $sql .= COM_getPermSQL('AND',0,2,'s') . COM_getTopicSQL('AND',0,'s') . COM_getLangSQL('sid','AND','s') . ") ";
+    $sql .= COM_getPermSQL('AND',0,2,'s') . COM_getLangSQL('sid','AND','s') . ") ";
     $sql .= "WHERE (u.uid = c.uid) AND (s.commentcode >= 0) AND (s.sp_date <= NOW()) ";
 
-    if (!empty($topic)) {
-        $sql .= "AND (s.tid = '$topic') ";
-    }
     if (!empty($author)) {
         $sql .= "AND (c.uid = '$author') ";
     }

From geeklog-cvs at lists.geeklog.net  Sun Oct 25 19:17:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 25 Oct 2009 19:17:40 -0400
Subject: [geeklog-cvs] geeklog: Added callback function to search API
	(feature request ...
Message-ID: <hg.0bee991937cc.1256512660.1485632861@qs1489.pair.com>

changeset 7391:0bee991937cc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0bee991937cc
user: Sami Barakat
date: Sun Oct 25 22:01:38 2009 +0000
description:
Added callback function to search API (feature request #0000985)

diffstat:

 system/classes/listfactory.class.php    |  87 +++++++++++++++++++++++++---
 system/classes/search.class.php         |  79 +++++++++++++------------
 system/classes/searchcriteria.class.php |  93 ++++++++++++++++++++-----------
 3 files changed, 178 insertions(+), 81 deletions(-)

diffs (truncated from 459 to 300 lines):

diff -r 2b5aac1d58f8 -r 0bee991937cc system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Tue Oct 20 22:53:07 2009 +0100
+++ b/system/classes/listfactory.class.php	Sun Oct 25 22:01:38 2009 +0000
@@ -206,7 +206,13 @@
         if ($name === ROW_NUMBER) {
             $sort = false;
         }
-        $this->_fields[] = array('title' => $title, 'name' => $name, 'display' => $display, 'sort' => $sort, 'format' => $format);
+        $this->_fields[] = array(
+            'title' => $title,
+            'name' => $name,
+            'display' => $display,
+            'sort' => $sort,
+            'format' => $format
+        );
     }
 
     /**
@@ -221,7 +227,26 @@
     */
     function setQuery( $title, $name, $sql, $rank )
     {
-        $this->_query_arr[] = array('title' => $title, 'name' => $name, 'sql' => $sql, 'rank' => $rank);
+        $this->_query_arr[] = array(
+            'type' => 'sql',
+            'title' => $title,
+            'name' => $name,
+            'sql' => $sql,
+            'rank' => $rank
+        );
+        $this->_total_rank += $rank;
+    }
+
+    function setCallback( $title, $name, $function, $rank, $total )
+    {
+        $this->_query_arr[] = array(
+            'type' => 'callback',
+            'title' => $title,
+            'name' => $name,
+            'func' => $function,
+            'rank' => $rank,
+            'total' => $total
+        );
         $this->_total_rank += $rank;
     }
 
@@ -282,21 +307,25 @@
     * @return int Total number of rows
     *
     */
-    function _numRows( $sql )
+    function _getTotal( $param )
     {
-        if (is_array($sql))
-        {
+        if ($param['type'] == 'callback') {
+            return $param['total'];
+        }
+        else {
+            $sql = $param['sql'];
+        }
+
+        if (is_array($sql)) {
             $sql['mysql'] = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql['mysql']);
             $sql['mssql'] = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql['mssql']);
         }
-        else
-        {
+        else {
             $sql = preg_replace('/SELECT.*FROM/is', 'SELECT COUNT(*) FROM', $sql);
         }
         $result = DB_query($sql);
         $num_rows = DB_numRows($result);
-        if ($num_rows <= 1)
-        {
+        if ($num_rows <= 1) {
             $B = DB_fetchArray($result, true);
             $num_rows = $B[0];
         }
@@ -397,7 +426,7 @@
         $limits = array();
         for ($i = 0; $i < count($this->_query_arr); $i++)
         {
-            $limits[$i]['total'] = $this->_numRows($this->_query_arr[$i]['sql']);
+            $limits[$i]['total'] = $this->_getTotal($this->_query_arr[$i]);
             $limits[$i]['pp'] = round(($this->_query_arr[$i]['rank'] / $this->_total_rank) * $num_query_results);
             $this->_total_found += $limits[$i]['total'];
             $pp_total += $limits[$i]['pp'];
@@ -415,6 +444,44 @@
             if ($limits[$i]['limit'] <= 0) {
                 continue;
             }
+
+            // This is a callback function
+            if ($this->_query_arr[$i]['type'] == 'callback')
+            {
+                if (is_callable($this->_query_arr[$i]['func']))
+                {
+                    $callback_rows = call_user_func_array($this->_query_arr[$i]['func'], array($limits[$i]['offset'], $limits[$i]['limit']));
+
+                    foreach ($callback_rows as $row)
+                    {
+                        $col = array();
+                        $col[SQL_TITLE] = $this->_query_arr[$i]['title'];
+                        $col[SQL_NAME] = $this->_query_arr[$i]['name'];
+
+                        foreach ($this->_fields as $field)
+                        {
+                            if (!is_numeric($field['name']) && $field['name'][0] != '_') {
+                                if (empty($row[ $field['name'] ])) {
+                                    $col[ $field['name'] ] = 'LF_NULL';
+                                } else {
+                                    $col[ $field['name'] ] = $row[ $field['name'] ];
+                                }
+                            }
+                        }
+
+                        // Need to call the format function before and after
+                        // sorting the results.
+                        if (is_callable($this->_function)) {
+                            $col = call_user_func_array($this->_function, array(true, $col));
+                        }
+
+                        $rows_arr[] = $col;
+                    }
+                }
+                continue;
+            }
+
+            // This is an SQL query, so execute it and format the results
             $limit_sql = " LIMIT {$limits[$i]['offset']},{$limits[$i]['limit']}";
 
             if (is_array($this->_query_arr[$i]['sql']))
diff -r 2b5aac1d58f8 -r 0bee991937cc system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Oct 20 22:53:07 2009 +0100
+++ b/system/classes/search.class.php	Sun Oct 25 22:01:38 2009 +0000
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.6.1                                                             |
 // +---------------------------------------------------------------------------+
 // | search.class.php                                                          |
 // |                                                                           |
@@ -342,8 +342,6 @@
     /**
     * Performs search on all stories
     *
-    * @author Tony Bibbs, tony AT geeklog DOT net
-    * @author Sami Barakat, s.m.barakat AT gmail DOT com
     * @access private
     * @return object plugin object
     *
@@ -425,7 +423,6 @@
     * in this function to allow legacy support to plugins using
     * the old API calls defined versions prior to Geeklog 1.5.1
     *
-    * @author Sami Barakat, s.m.barakat AT gmail DOT com
     * @access public
     * @return string HTML output for search results
     *
@@ -460,7 +457,7 @@
 
         $url = "{$this->_searchURL}&amp;type={$this->_type}&amp;mode=";
         $obj = new ListFactory($url.'search', $_CONF['search_limits'], $_CONF['num_search_results']);
-        $obj->setRowFunction(array($this, 'searchFormatCallBack'));
+        $obj->setRowFunction(array($this, 'searchFormatCallback'));
         $obj->setField('ID', 'id', false);
         $obj->setField('URL', 'url', false);
 
@@ -520,51 +517,62 @@
         {
             if (is_a($result, 'SearchCriteria'))
             {
+                $debug_info = $result->getName() . " using APIv2";
+
                 if ($this->_type != 'all' && $this->_type != $result->getName())
                 {
                     if ($this->_verbose) {
-                        COM_errorLog($result->getName() . " using APIv2. Skipped as type is not " . $this->_type);
+                        $new_api++;
+                        COM_errorLog("$debug_info. Skipped as type is not " . $this->_type);
                     }
                     continue;
                 }
 
-                $debug_info = $result->getName() . " using APIv2 with ";
-
-                if ($_CONF['search_use_fulltext'] == true && $result->getFTSQL() != '')
-                {
-                    $debug_info .= "FULLTEXT. ";
-                    $sql = $result->getFTSQL();
-                }
-                else
-                {
-                    $debug_info .= "LIKE. ";
-                    $sql = $result->getSQL();
-                }
-
-                $sql = $this->_convertsql($sql);
-
-                $debug_info .= "SQL = " . print_r($sql,1);
-                if ($this->_verbose) {
-                    COM_errorLog($debug_info);
-                }
-
                 $api_results = $result->getResults();
                 if (!empty($api_results)) {
                     $obj->addResultArray($api_results);
                 }
 
-                $obj->setQuery($result->getLabel(), $result->getName(), $sql, $result->getRank());
+                $api_callback_func = $result->getCallback();
+                if (!empty($api_callback_func))
+                {
+                    $debug_info .= " with Callback Function " . $api_callback_func;
+                    $obj->setCallback($result->getLabel(), $result->getName(), $api_callback_func, $result->getRank(), $result->getTotal());
+                }
+                else
+                {
+                    if ($_CONF['search_use_fulltext'] == true && $result->getFTSQL() != '')
+                    {
+                        $debug_info .= " with SQL FULLTEXT. ";
+                        $sql = $result->getFTSQL();
+                    }
+                    else
+                    {
+                        $debug_info .= " with SQL LIKE. ";
+                        $sql = $result->getSQL();
+                    }
+
+                    $sql = $this->_convertsql($sql);
+                    $debug_info .= "SQL = " . print_r($sql,1);
+                    $obj->setQuery($result->getLabel(), $result->getName(), $sql, $result->getRank());
+                }
+
                 $this->_url_rewrite[ $result->getName() ] = $result->UrlRewriteEnable();
                 $this->_append_query[ $result->getName() ] = $result->AppendQueryEnable();
-                $new_api++;
+
+                if ($this->_verbose) {
+                    $new_api++;
+                    COM_errorLog($debug_info);
+                }
             }
             else if (is_a($result, 'Plugin') && $result->num_searchresults != 0)
             {
                 // Some backwards compatibility
-                $debug_info = $result->plugin_name . " using APIv1 with backwards compatibility.";
-                $debug_info .= " Count: " . $result->num_searchresults;
-                $debug_info .= " Headings: " . implode(",", $result->searchheading);
                 if ($this->_verbose) {
+                    $old_api++;
+                    $debug_info = $result->plugin_name . " using APIv1 with backwards compatibility.";
+                    $debug_info .= " Count: " . $result->num_searchresults;
+                    $debug_info .= " Headings: " . implode(",", $result->searchheading);
                     COM_errorLog($debug_info);
                 }
 
@@ -617,7 +625,6 @@
 
                     $obj->addResult($api_results);
                 }
-                $old_api++;
             }
         }
 
@@ -673,19 +680,18 @@
     }
 
     /**
-    * CallBack function for the ListFactory class
+    * Callback function for the ListFactory class
     *
     * This function gets called by the ListFactory class and formats
     * each row accordingly for example pulling usernames from the
     * users table and displaying a link to their profile.
     *
-    * @author Sami Barakat, s.m.barakat AT gmail DOT com
     * @access public
     * @param array $row An array of plain data to format
     * @return array A reformatted version of the input array
     *
     */
-    function searchFormatCallBack( $preSort, $row )
+    function searchFormatCallback( $preSort, $row )
     {
         global $_CONF, $LANG09;
 
@@ -756,7 +762,6 @@
     * version depending where the text was cut. Works on a
     * word basis, so long words wont get cut.
     *
-    * @author Sami Barakat, s.m.barakat AT gmail DOT com
     * @access private
     * @param string $keyword The word to centre around
     * @param string $text The complete text string
@@ -879,7 +884,6 @@
     * number of similar heading names. Used for backwards

From geeklog-cvs at lists.geeklog.net  Sun Oct 25 19:17:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 25 Oct 2009 19:17:41 -0400
Subject: [geeklog-cvs] geeklog: Documented new functions,
	code cleanup and minor perfor...
Message-ID: <hg.3872f0c040e4.1256512661.1485632861@qs1489.pair.com>

changeset 7392:3872f0c040e4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3872f0c040e4
user: Sami Barakat
date: Sun Oct 25 23:15:27 2009 +0000
description:
Documented new functions, code cleanup and minor performance tweaks

diffstat:

 system/classes/listfactory.class.php |  201 +++++++++++++++++++++------------------
 system/classes/search.class.php      |  134 ++++++++++++--------------
 2 files changed, 172 insertions(+), 163 deletions(-)

diffs (truncated from 646 to 300 lines):

diff -r 0bee991937cc -r 3872f0c040e4 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sun Oct 25 22:01:38 2009 +0000
+++ b/system/classes/listfactory.class.php	Sun Oct 25 23:15:27 2009 +0000
@@ -47,15 +47,15 @@
     // Set up the fields that will be seen by the user
     $obj->setField(
         '#',            // Title of the field
-        ROW_NUMBER,     // The field identifier can be either:
-                        //   ROW_NUMBER - The number of each row will be displayed
-                        //   SQL_TITLE  - The title given the the SQL query will be displayed
+        LF_ROW_NUMBER,  // The field identifier can be either:
+                        //   LF_ROW_NUMBER - The number of each row will be displayed
+                        //   LF_SOURCE_TITLE  - The title given the the SQL query will be displayed
                         //   <string>   - SQL column name
         true,           // Enables the field
         true,           // The field can be sorted
         '<b>%d.</b>'    // Formats the data
     );
-    $obj->setField('Type', SQL_TITLE, true, true, '<b>%s</b>');
+    $obj->setField('Type', LF_SOURCE_TITLE, true, true, '<b>%s</b>');
     $obj->setField('Title', 'title');
     $obj->setField('Text', 'text');
     $obj->setField('Date', 'date');
@@ -72,7 +72,7 @@
     // Set up some queries to execute
     $sql = 'SELECT sid AS id, title, introtext AS text, date FROM stories';
     $obj->setQuery(
-        'Story', // The name given to the query which will be displayed in the SQL_TITLE field (optional)
+        'Story', // The name given to the query which will be displayed in the LF_SOURCE_TITLE field (optional)
         'story',
         $sql,    // The SQL string without the LIMIT or ORDER BY clauses. Notice the column names match the field identifiers
         5        // The rank of the query, 5 highest = more results, 1 lowest = least results
@@ -84,7 +84,7 @@
     // Note: the array must match the field identifier names stated previously
     $extra_row = array(
         'id' => -1,
-        SQL_TITLE => 'Extra Row',
+        LF_SOURCE_TITLE => 'Extra Row',
         'title' => 'An extra row example',
         'text' => 'With some really really really long text.....<b>and HTML</b>',
         'date' => '2008-07-08 03:00:00'
@@ -132,7 +132,7 @@
 
     // PRIVATE VARIABLES
     var $_fields = array();
-    var $_query_arr = array();
+    var $_sources_arr = array();
     var $_total_rank = 0;
     var $_sort_arr = array();
     var $_def_sort_arr = array();
@@ -148,7 +148,7 @@
     * Constructor
     *
     * Sets up private url variable and defines the
-    * SQL_TITLE, SQL_NAME and ROW_NUMBER constants.
+    * LF_SOURCE_TITLE, LF_SOURCE_NAME and LF_ROW_NUMBER constants.
     *
     * @access public
     * @param string $url The URL of the page the table appears on
@@ -171,9 +171,9 @@
             $this->_page_limits = array(10, 15, 20, 25, 30, 35);
         }
 
-        define('SQL_TITLE', 0);
-        define('SQL_NAME', 1);
-        define('ROW_NUMBER', 2);
+        define('LF_SOURCE_TITLE', 0);
+        define('LF_SOURCE_NAME', 1);
+        define('LF_ROW_NUMBER', 2);
     }
 
     /**
@@ -191,7 +191,7 @@
     /**
     * Sets a field in the list.
     *
-    * Note: ROW_NUMBER cannot be sorted
+    * Note: LF_ROW_NUMBER cannot be sorted
     *
     * @access public
     * @param string $title The title of the field which is displayed to the user
@@ -203,7 +203,7 @@
     */
     function setField( $title, $name, $display = true, $sort = true, $format = '%s' )
     {
-        if ($name === ROW_NUMBER) {
+        if ($name === LF_ROW_NUMBER) {
             $sort = false;
         }
         $this->_fields[] = array(
@@ -227,7 +227,7 @@
     */
     function setQuery( $title, $name, $sql, $rank )
     {
-        $this->_query_arr[] = array(
+        $this->_sources_arr[] = array(
             'type' => 'sql',
             'title' => $title,
             'name' => $name,
@@ -237,13 +237,30 @@
         $this->_total_rank += $rank;
     }
 
-    function setCallback( $title, $name, $function, $rank, $total )
+    /**
+    * Sets a callback function that provides another source for results.
+    *
+    * The function will be passed two parameters, $offset and $limit,
+    * which will determine how many results are requested. The callback
+    * function should then return a multidimensional array containing
+    * the results. This provides an alternative to the setQuery()
+    * function as results can be sourced from anywhere.
+    *
+    * @access public
+    * @param string $title The text that's displayed to the user
+    * @param string $name The local name given to the query
+    * @param string $function Any callable function, method or lambda
+    * @param int $rank The rating that determins how many results will be returned
+    * @param int $total The total number of results that are avaliable
+    *
+    */
+    function setCallback( $title, $name, $callback, $rank, $total )
     {
-        $this->_query_arr[] = array(
+        $this->_sources_arr[] = array(
             'type' => 'callback',
             'title' => $title,
             'name' => $name,
-            'func' => $function,
+            'func' => $callback,
             'rank' => $rank,
             'total' => $total
         );
@@ -251,7 +268,8 @@
     }
 
     /**
-    * Sets the callback function that gets called when formatting a row
+    * Sets the callback function thats called on every row for styling
+    * or formatting.
     *
     * @access public
     * @param callback $function Any callable function, method or lambda
@@ -300,20 +318,21 @@
     }
 
     /**
-    * Gets the total number of results from a query
+    * Gets the total number of results from source item, either an sql
+    * query or a callback function.
     *
     * @access private
-    * @param string $sql The query
+    * @param array $source The source we are currently working with
     * @return int Total number of rows
     *
     */
-    function _getTotal( $param )
+    function _getTotal( $source )
     {
-        if ($param['type'] == 'callback') {
-            return $param['total'];
+        if ($source['type'] == 'callback') {
+            return $source['total'];
         }
         else {
-            $sql = $param['sql'];
+            $sql = $source['sql'];
         }
 
         if (is_array($sql)) {
@@ -382,6 +401,42 @@
     }
 
     /**
+    * Applies styling to each row and adds extra meta details that are
+    * used else where in the ListFactory.
+    *
+    * @access private
+    * @param array $row_arr A single results row
+    * @param array $source The source we are currently working with
+    * @return array The row with styling applied and extra meta details
+    *
+    */
+    function _fillrow( $row_arr, $source )
+    {
+        $col = array();
+        $col[LF_SOURCE_TITLE] = $source['title'];
+        $col[LF_SOURCE_NAME] = $source['name'];
+
+        foreach ($this->_fields as $field)
+        {
+            if (!is_numeric($field['name']) && $field['name'][0] != '_') {
+                if (empty($row_arr[ $field['name'] ])) {
+                    $col[ $field['name'] ] = 'LF_NULL';
+                } else {
+                    $col[ $field['name'] ] = $row_arr[ $field['name'] ];
+                }
+            }
+        }
+
+        // Need to call the format function before and after
+        // sorting the results.
+        if (is_callable($this->_function)) {
+            $col = call_user_func_array($this->_function, array(true, $col));
+        }
+
+        return $col;
+    }
+
+    /**
     * Executes pre set queries
     *
     * @access public
@@ -400,7 +455,7 @@
         if (is_numeric($this->_sort_arr['field']))
         {
             $ord = $this->_def_sort_arr['field'];
-            $this->_sort_arr['field'] = SQL_TITLE;
+            $this->_sort_arr['field'] = LF_SOURCE_TITLE;
         }
         else
         {
@@ -424,10 +479,10 @@
         $num_query_results = $this->_per_page - $this->_total_found;
         $pp_total = $this->_total_found;
         $limits = array();
-        for ($i = 0; $i < count($this->_query_arr); $i++)
+        for ($i = 0; $i < count($this->_sources_arr); $i++)
         {
-            $limits[$i]['total'] = $this->_getTotal($this->_query_arr[$i]);
-            $limits[$i]['pp'] = round(($this->_query_arr[$i]['rank'] / $this->_total_rank) * $num_query_results);
+            $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'];
         }
@@ -438,45 +493,30 @@
         }
         $limits = $this->_getLimits($limits);
 
-        // Execute each query in turn
-        for ($i = 0; $i < count($this->_query_arr); $i++)
+        // Retrieve the results from each source in turn
+        for ($i = 0; $i < count($this->_sources_arr); $i++)
         {
             if ($limits[$i]['limit'] <= 0) {
                 continue;
             }
 
             // This is a callback function
-            if ($this->_query_arr[$i]['type'] == 'callback')
+            if ($this->_sources_arr[$i]['type'] == 'callback')
             {
-                if (is_callable($this->_query_arr[$i]['func']))
+                if (is_callable($this->_sources_arr[$i]['func']))
                 {
-                    $callback_rows = call_user_func_array($this->_query_arr[$i]['func'], array($limits[$i]['offset'], $limits[$i]['limit']));
+                    $callback_rows = call_user_func_array(
+                        $this->_sources_arr[$i]['func'],
+                        array($limits[$i]['offset'],
+                        $limits[$i]['limit'])
+                    );
 
-                    foreach ($callback_rows as $row)
-                    {
-                        $col = array();
-                        $col[SQL_TITLE] = $this->_query_arr[$i]['title'];
-                        $col[SQL_NAME] = $this->_query_arr[$i]['name'];
-
-                        foreach ($this->_fields as $field)
-                        {
-                            if (!is_numeric($field['name']) && $field['name'][0] != '_') {
-                                if (empty($row[ $field['name'] ])) {
-                                    $col[ $field['name'] ] = 'LF_NULL';
-                                } else {
-                                    $col[ $field['name'] ] = $row[ $field['name'] ];
-                                }
-                            }
-                        }
-
-                        // Need to call the format function before and after
-                        // sorting the results.
-                        if (is_callable($this->_function)) {
-                            $col = call_user_func_array($this->_function, array(true, $col));
-                        }
-
-                        $rows_arr[] = $col;
+                    foreach ($callback_rows as $row) {
+                        $rows_arr[] = $this->_fillrow($row, $this->_sources_arr[$i]);
                     }
+                } else {
+                    COM_errorLog('ListFactory: A callback function was set for "'.
+                        $this->_sources_arr[$i]['name'].'", but it could not be found.');
                 }
                 continue;
             }
@@ -484,42 +524,16 @@
             // This is an SQL query, so execute it and format the results
             $limit_sql = " LIMIT {$limits[$i]['offset']},{$limits[$i]['limit']}";

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 06:37:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 06:37:43 -0400
Subject: [geeklog-cvs] geeklog: Allow bigger values for a topic's Sort Order
	field (fea...
Message-ID: <hg.d0952e303944.1256812663.1485632861@qs1489.pair.com>

changeset 7393:d0952e303944
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d0952e303944
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 11:37:11 2009 +0100
description:
Allow bigger values for a topic's Sort Order field (feature request #0001011)

diffstat:

 public_html/docs/history             |  2 ++
 sql/mysql_tableanddata.php           |  2 +-
 sql/updates/mysql_1.6.0_to_1.6.1.php |  4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 3872f0c040e4 -r d0952e303944 public_html/docs/history
--- a/public_html/docs/history	Sun Oct 25 23:15:27 2009 +0000
+++ b/public_html/docs/history	Thu Oct 29 11:37:11 2009 +0100
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Allow bigger values for a topic's Sort Order field (feature request #0001011)
+  [Dirk]
 - When a Story Admin did not have permission to edit a story, Geeklog threw a
   "call to a member function on a non-object" error when trying to display a
   proper "access denied" message (reported by Chase and Cesar) [Dirk]
diff -r 3872f0c040e4 -r d0952e303944 sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php	Sun Oct 25 23:15:27 2009 +0000
+++ b/sql/mysql_tableanddata.php	Thu Oct 29 11:37:11 2009 +0100
@@ -396,7 +396,7 @@
   imageurl varchar(255) default NULL,
   meta_description TEXT NULL,
   meta_keywords TEXT NULL,
-  sortnum tinyint(3) default NULL,
+  sortnum smallint(3) default NULL,
   limitnews tinyint(3) default NULL,
   is_default tinyint(1) unsigned NOT NULL DEFAULT '0',
   archive_flag tinyint(1) unsigned NOT NULL DEFAULT '0',
diff -r 3872f0c040e4 -r d0952e303944 sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sun Oct 25 23:15:27 2009 +0000
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Thu Oct 29 11:37:11 2009 +0100
@@ -3,10 +3,12 @@
 // Add meta tag columns to story table 
 $_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD meta_description TEXT NULL AFTER frontpage, ADD meta_keywords TEXT NULL AFTER meta_description";
 
-
 // Add meta tag columns to topics table 
 $_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD meta_description TEXT NULL AFTER imageurl, ADD meta_keywords TEXT NULL AFTER meta_description";
 
+// allow bigger values for topic sort number
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} CHANGE sortnum sortnum smallint(3) default NULL";
+
 /**
  * Add new config options
  *

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:13 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:13 -0400
Subject: [geeklog-cvs] geeklog: Added an icon to make the plugin update
	option somewhat...
Message-ID: <hg.fdb273c78589.1256831653.1485632861@qs1489.pair.com>

changeset 7394:fdb273c78589
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/fdb273c78589
user: Dirk Haun <dirk at haun-online.de>
date: Mon Sep 28 22:20:30 2009 +0200
description:
Added an icon to make the plugin update option somewhat more obvious

diffstat:

 language/english.php                              |   1 +
 language/english_utf-8.php                        |   1 +
 public_html/admin/plugins.php                     |  26 ++++++++++++++++----------
 public_html/docs/english/theme.html               |   3 +++
 public_html/docs/history                          |   3 +++
 public_html/layout/professional/images/update.png |     
 system/lib-admin.php                              |  12 +++++++++++-
 7 files changed, 35 insertions(+), 11 deletions(-)

diffs (109 lines):

diff -r db4c6eb6e843 -r fdb273c78589 language/english.php
--- a/language/english.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/language/english.php	Mon Sep 28 22:20:30 2009 +0200
@@ -1065,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',
 
     // to match the PHP error constants,
     // http://www.php.net/manual/en/features.file-upload.errors.php
diff -r db4c6eb6e843 -r fdb273c78589 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/language/english_utf-8.php	Mon Sep 28 22:20:30 2009 +0200
@@ -1065,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',
 
     // to match the PHP error constants,
     // http://www.php.net/manual/en/features.file-upload.errors.php
diff -r db4c6eb6e843 -r fdb273c78589 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/public_html/admin/plugins.php	Mon Sep 28 22:20:30 2009 +0200
@@ -1165,17 +1165,23 @@
 
 // MAIN
 $display = '';
-if (isset($_POST['pluginenabler']) && SEC_checkToken()) {
-    if (isset($_POST['enabledplugins'])) {
-        changePluginStatus($_POST['enabledplugins']);
-    } else {
-        changePluginStatus(array());
+if (isset($_POST['pluginenabler'])) { // JavaScript-triggered POST request
+    if (isset($_POST['updatethisplugin'])) {
+        // translate into a standard update request (see below)
+        $_POST['mode'] = $LANG32[34];
+        $_POST['pi_name'] = $_POST['updatethisplugin'];
+    } elseif (SEC_checkToken()) {
+        if (isset($_POST['enabledplugins'])) {
+            changePluginStatus($_POST['enabledplugins']);
+        } else {
+            changePluginStatus(array());
+        }
+
+        // force a refresh so that the information of the plugin that was just
+        // enabled / disabled (menu entries, etc.) is displayed properly
+        header('Location: ' . $_CONF['site_admin_url'] . '/plugins.php');
+        exit;
     }
-
-    // force a refresh so that the information of the plugin that was just
-    // enabled / disabled (menu entries, etc.) is displayed properly
-    header('Location: ' . $_CONF['site_admin_url'] . '/plugins.php');
-    exit;
 }
 
 $mode = '';
diff -r db4c6eb6e843 -r fdb273c78589 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Sep 27 21:26:06 2009 +0200
+++ b/public_html/docs/english/theme.html	Mon Sep 28 22:20:30 2009 +0200
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Added an icon, <tt>images/update.png</tt>, to be displayed in the admin's
+    list of plugins when a plugin needs to be updated. The icon should have the
+    same size as the "edit" icon (16x16 pixel in the Professional theme).</li>
 <li>Cosmetics: Fixed the position of the story preview when using the
     advanced editor (was slightly shifted to the right, <a
     href="http://project.geeklog.net/tracking/view.php?id=963">bug #0000963</a>). Changes to the <code>&lt;div id="preview"&gt;</code> in
diff -r db4c6eb6e843 -r fdb273c78589 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 27 21:26:06 2009 +0200
+++ b/public_html/docs/history	Mon Sep 28 22:20:30 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Added an icon to make the plugin update option somewhat more obvious [Dirk]
+  (icon "stock_update-data.png" taken from Gnome 2.18 icon theme set by
+  AMAZIGH Aneglus, released under the GPL)
 - 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 db4c6eb6e843 -r fdb273c78589 public_html/layout/professional/images/update.png
Binary file public_html/layout/professional/images/update.png has changed
diff -r db4c6eb6e843 -r fdb273c78589 system/lib-admin.php
--- a/system/lib-admin.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/system/lib-admin.php	Mon Sep 28 22:20:30 2009 +0200
@@ -1064,7 +1064,17 @@
             } else {
                 $retval = "{$LANG32[37]}: $pi_installed_version,&nbsp;{$LANG32[36]}: $plugin_code_version";
                 if ($A['pi_enabled'] == 1) {
-                    $retval .= " <b>{$LANG32[38]}</b>";
+                    $retval .= " <b>{$LANG32[38]}</b>"
+                        . ' <input type="image" src="' . $_CONF['layout_url']
+                        . '/images/update.png" alt="[' . $LANG32[38]
+                        . ']" name="updatethisplugin" value="' . $A['pi_name']
+                        . '" onclick="submit()" title="' . $LANG32[42] . '"'
+                        . XHTML . '>';
+                    if (! isset($added_token)) {
+                        $retval .= '<input type="hidden" name="' . CSRF_TOKEN
+                                . '" ' . 'value="' . $token . '"' . XHTML . '>';
+                        $added_token = true;
+                    }
                 }
             }
             break;

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:23 -0400
Subject: [geeklog-cvs] geeklog: Fixed inclusion protection
Message-ID: <hg.c27e9026f22a.1256831663.1485632861@qs1489.pair.com>

changeset 7397:c27e9026f22a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c27e9026f22a
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 13:00:11 2009 +0100
description:
Fixed inclusion protection

diffstat:

 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 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diffs (228 lines):

diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/BlackList.Examine.class.php
--- a/plugins/spamx/BlackList.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/BlackList.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'BlackList.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'blacklist.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/DeleteComment.Action.class.php
--- a/plugins/spamx/DeleteComment.Action.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/DeleteComment.Action.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'DeleteComment.Action.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'deletecomment.action.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -14,7 +14,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditBlackList.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'editblacklist.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/EditHeader.Admin.class.php
--- a/plugins/spamx/EditHeader.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/EditHeader.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -15,7 +15,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditHeader.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'editheader.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/EditIP.Admin.class.php
--- a/plugins/spamx/EditIP.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/EditIP.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -14,7 +14,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIP.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'editip.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/EditIPofURL.Admin.class.php
--- a/plugins/spamx/EditIPofURL.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/EditIPofURL.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -14,7 +14,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIPofURL.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'editipofurl.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -15,7 +15,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'Header.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'header.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/IP.Examine.class.php
--- a/plugins/spamx/IP.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/IP.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'IP.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'ip.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'IPofUrl.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'ipofurl.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/Import.Admin.class.php
--- a/plugins/spamx/Import.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/Import.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -19,7 +19,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'Import.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'import.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/LogView.Admin.class.php
--- a/plugins/spamx/LogView.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/LogView.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'LogView.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'logview.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -17,7 +17,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'MTBlackList.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'mtblacklist.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/MailAdmin.Action.class.php
--- a/plugins/spamx/MailAdmin.Action.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/MailAdmin.Action.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
  * @subpackage Modules
  */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'MailAdmin.Action.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'mailadmin.action.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/MassDelTrackback.Admin.class.php
--- a/plugins/spamx/MassDelTrackback.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/MassDelTrackback.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -16,7 +16,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelTrackback.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'massdeltrackback.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/MassDelete.Admin.class.php
--- a/plugins/spamx/MassDelete.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/MassDelete.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -14,7 +14,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelete.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'massdelete.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/SLV.Examine.class.php
--- a/plugins/spamx/SLV.Examine.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/SLV.Examine.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLV.Examine.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'slv.examine.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/SLVbase.class.php
--- a/plugins/spamx/SLVbase.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/SLVbase.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVbase.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'slvbase.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/SLVreport.Action.class.php
--- a/plugins/spamx/SLVreport.Action.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/SLVreport.Action.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -13,7 +13,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVreport.Action.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'slvreport.action.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 
diff -r ec6b034771a6 -r c27e9026f22a plugins/spamx/SLVwhitelist.Admin.class.php
--- a/plugins/spamx/SLVwhitelist.Admin.class.php	Thu Oct 29 12:03:12 2009 +0100
+++ b/plugins/spamx/SLVwhitelist.Admin.class.php	Thu Oct 29 13:00:11 2009 +0100
@@ -14,7 +14,7 @@
 * @subpackage Modules
 */
 
-if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVwhitelist.Admin.class.php') !== false) {
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'slvwhitelist.admin.class.php') !== false) {
     die('This file can not be used on its own!');
 }
 

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:22 -0400
Subject: [geeklog-cvs] geeklog: Synced language files with their English
	equivalents
Message-ID: <hg.ec6b034771a6.1256831662.1485632861@qs1489.pair.com>

changeset 7396:ec6b034771a6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ec6b034771a6
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 12:03:12 2009 +0100
description:
Synced language files with their English equivalents

diffstat:

 language/afrikaans.php                 |  1 +
 language/afrikaans_utf-8.php           |  1 +
 language/bosnian.php                   |  1 +
 language/bosnian_utf-8.php             |  1 +
 language/bulgarian.php                 |  1 +
 language/bulgarian_utf-8.php           |  1 +
 language/catalan.php                   |  1 +
 language/catalan_utf-8.php             |  1 +
 language/chinese_simplified_utf-8.php  |  1 +
 language/chinese_traditional_utf-8.php |  1 +
 language/croatian.php                  |  1 +
 language/croatian_utf-8.php            |  1 +
 language/czech.php                     |  1 +
 language/czech_utf-8.php               |  1 +
 language/danish.php                    |  1 +
 language/danish_utf-8.php              |  1 +
 language/dutch.php                     |  1 +
 language/dutch_utf-8.php               |  1 +
 language/estonian.php                  |  1 +
 language/estonian_utf-8.php            |  1 +
 language/farsi_utf-8.php               |  1 +
 language/finnish.php                   |  1 +
 language/finnish_utf-8.php             |  1 +
 language/french_canada.php             |  1 +
 language/french_canada_utf-8.php       |  1 +
 language/french_france.php             |  1 +
 language/french_france_utf-8.php       |  1 +
 language/german.php                    |  1 +
 language/german_formal.php             |  1 +
 language/german_formal_utf-8.php       |  1 +
 language/german_utf-8.php              |  1 +
 language/hebrew_utf-8.php              |  1 +
 language/hellenic.php                  |  1 +
 language/hellenic_utf-8.php            |  1 +
 language/indonesian.php                |  1 +
 language/indonesian_utf-8.php          |  1 +
 language/italian.php                   |  1 +
 language/italian_utf-8.php             |  1 +
 language/japanese_utf-8.php            |  1 +
 language/korean.php                    |  1 +
 language/korean_utf-8.php              |  1 +
 language/norwegian.php                 |  1 +
 language/norwegian_utf-8.php           |  1 +
 language/polish.php                    |  1 +
 language/polish_utf-8.php              |  1 +
 language/portuguese.php                |  1 +
 language/portuguese_brazil.php         |  1 +
 language/portuguese_brazil_utf-8.php   |  1 +
 language/portuguese_utf-8.php          |  1 +
 language/romanian.php                  |  1 +
 language/romanian_utf-8.php            |  1 +
 language/russian.php                   |  1 +
 language/russian_utf-8.php             |  1 +
 language/serbian.php                   |  1 +
 language/serbian_utf-8.php             |  1 +
 language/slovak.php                    |  1 +
 language/slovak_utf-8.php              |  1 +
 language/slovenian.php                 |  1 +
 language/slovenian_utf-8.php           |  1 +
 language/spanish.php                   |  1 +
 language/spanish_argentina.php         |  1 +
 language/spanish_argentina_utf-8.php   |  1 +
 language/spanish_utf-8.php             |  1 +
 language/swedish.php                   |  1 +
 language/swedish_utf-8.php             |  1 +
 language/turkish.php                   |  1 +
 language/turkish_utf-8.php             |  1 +
 language/ukrainian.php                 |  1 +
 language/ukrainian_koi8-u.php          |  1 +
 language/ukrainian_utf-8.php           |  1 +
 70 files changed, 70 insertions(+), 0 deletions(-)

diffs (truncated from 770 to 300 lines):

diff -r bb675c876cb9 -r ec6b034771a6 language/afrikaans.php
--- a/language/afrikaans.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/afrikaans.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1064,6 +1064,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/afrikaans_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1064,6 +1064,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/bosnian.php
--- a/language/bosnian.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/bosnian.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1068,6 +1068,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/bosnian_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1068,6 +1068,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/bulgarian.php
--- a/language/bulgarian.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/bulgarian.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1064,6 +1064,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/bulgarian_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1064,6 +1064,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/catalan.php
--- a/language/catalan.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/catalan.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1062,6 +1062,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/catalan_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1062,6 +1062,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/chinese_simplified_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1067,6 +1067,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/chinese_traditional_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1067,6 +1067,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/croatian.php
--- a/language/croatian.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/croatian.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1064,6 +1064,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/croatian_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1066,6 +1066,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/czech.php
--- a/language/czech.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/czech.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/czech_utf-8.php
--- a/language/czech_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/czech_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/danish.php
--- a/language/danish.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/danish.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/danish_utf-8.php
--- a/language/danish_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/danish_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/dutch.php
--- a/language/dutch.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/dutch.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1070,6 +1070,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/dutch_utf-8.php
--- a/language/dutch_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/dutch_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1070,6 +1070,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/estonian.php
--- a/language/estonian.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/estonian.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1065,6 +1065,7 @@
     39 => 'Lae plugin',
     40 => 'Sa v?id otse siin laadida plugina arhiivi (.tar.gz, .tgz, .zip):',
     41 => 'Lae ?lesse',
+    42 => 'Click to update',
     99 => 'Oli tundmatu viga',
     100 => 'OK.',
     101 => '?lesse laetud faili suurus ?letab php.ini failis oleva upload_max_filesize direktiivi.',
diff -r bb675c876cb9 -r ec6b034771a6 language/estonian_utf-8.php
--- a/language/estonian_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/estonian_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1065,6 +1065,7 @@
     39 => 'Lae plugin',
     40 => 'Sa v??id otse siin laadida plugina arhiivi (.tar.gz, .tgz, .zip):',
     41 => 'Lae ??lesse',
+    42 => 'Click to update',
     99 => 'Oli tundmatu viga',
     100 => 'OK.',
     101 => '??lesse laetud faili suurus ??letab php.ini failis oleva upload_max_filesize direktiivi.',
diff -r bb675c876cb9 -r ec6b034771a6 language/farsi_utf-8.php
--- a/language/farsi_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/farsi_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1052,6 +1052,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/finnish.php
--- a/language/finnish.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/finnish.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1065,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/finnish_utf-8.php
--- a/language/finnish_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/finnish_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1067,6 +1067,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/french_canada.php
--- a/language/french_canada.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/french_canada.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1067,6 +1067,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/french_canada_utf-8.php
--- a/language/french_canada_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/french_canada_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1067,6 +1067,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/french_france.php
--- a/language/french_france.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/french_france.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/french_france_utf-8.php
--- a/language/french_france_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/french_france_utf-8.php	Thu Oct 29 12:03:12 2009 +0100
@@ -1063,6 +1063,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.',
diff -r bb675c876cb9 -r ec6b034771a6 language/german.php
--- a/language/german.php	Thu Oct 29 11:56:23 2009 +0100
+++ b/language/german.php	Thu Oct 29 12:03:12 2009 +0100

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:24 -0400
Subject: [geeklog-cvs] geeklog: Removed executable flag from file
	permissions, no chang...
Message-ID: <hg.e1700815379b.1256831664.1485632861@qs1489.pair.com>

changeset 7398:e1700815379b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e1700815379b
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 13:01:33 2009 +0100
description:
Removed executable flag from file permissions, no change in content

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:26 -0400
Subject: [geeklog-cvs] geeklog: The comment speed limit was being ignored
	(bug #0001003)
Message-ID: <hg.5260a7fb13df.1256831666.1485632861@qs1489.pair.com>

changeset 7399:5260a7fb13df
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5260a7fb13df
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 14:47:18 2009 +0100
description:
The comment speed limit was being ignored (bug #0001003)

diffstat:

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

diffs (31 lines):

diff -r e1700815379b -r 5260a7fb13df public_html/docs/history
--- a/public_html/docs/history	Thu Oct 29 13:01:33 2009 +0100
+++ b/public_html/docs/history	Thu Oct 29 14:47:18 2009 +0100
@@ -3,6 +3,7 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The comment speed limit was being ignored (bug #0001003) [Dirk]
 - Added an icon to make the plugin update option somewhat more obvious [Dirk]
   (icon "stock_update-data.png" taken from Gnome 2.18 icon theme set by
   AMAZIGH Aneglus, released under the GPL)
diff -r e1700815379b -r 5260a7fb13df system/lib-comment.php
--- a/system/lib-comment.php	Thu Oct 29 13:01:33 2009 +0100
+++ b/system/lib-comment.php	Thu Oct 29 14:47:18 2009 +0100
@@ -779,7 +779,7 @@
         return $retval;
     } else {
         COM_clearSpeedlimit ($_CONF['commentspeedlimit'], 'comment');
-        
+
         $last = 0;
         if ($mode != 'edit' && $mode != 'editsubmission' 
                 && $mode != $LANG03[28] && $mode != $LANG03[34]) {
@@ -1117,6 +1117,7 @@
         $pid = 0;
     }
 
+    COM_updateSpeedlimit('comment');
     if (empty($title) || empty($comment)) {
         COM_errorLog("CMT_saveComment: $uid from {$_SERVER['REMOTE_ADDR']} tried "
                    . 'to submit a comment with invalid $title and/or $comment.');

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 11:54:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 11:54:18 -0400
Subject: [geeklog-cvs] geeklog: Merged with "plgupdate" feature branch
Message-ID: <hg.bb675c876cb9.1256831658.1485632861@qs1489.pair.com>

changeset 7395:bb675c876cb9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bb675c876cb9
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 11:56:23 2009 +0100
description:
Merged with "plgupdate" feature branch

diffstat:

 language/afrikaans.php                                                 |   20 +-
 language/afrikaans_utf-8.php                                           |   20 +-
 language/bosnian.php                                                   |   20 +-
 language/bosnian_utf-8.php                                             |   20 +-
 language/bulgarian.php                                                 |   20 +-
 language/bulgarian_utf-8.php                                           |   20 +-
 language/catalan.php                                                   |   20 +-
 language/catalan_utf-8.php                                             |   20 +-
 language/chinese_simplified_utf-8.php                                  |   20 +-
 language/chinese_traditional_utf-8.php                                 |   20 +-
 language/croatian.php                                                  |   20 +-
 language/croatian_utf-8.php                                            |   20 +-
 language/czech.php                                                     |   20 +-
 language/czech_utf-8.php                                               |   20 +-
 language/danish.php                                                    |   20 +-
 language/danish_utf-8.php                                              |   20 +-
 language/dutch.php                                                     |   20 +-
 language/dutch_utf-8.php                                               |   20 +-
 language/english.php                                                   |   16 +-
 language/english_utf-8.php                                             |   16 +-
 language/estonian.php                                                  |   24 +-
 language/estonian_utf-8.php                                            |   24 +-
 language/farsi_utf-8.php                                               |   20 +-
 language/finnish.php                                                   |   20 +-
 language/finnish_utf-8.php                                             |   20 +-
 language/french_canada.php                                             |   20 +-
 language/french_canada_utf-8.php                                       |   20 +-
 language/french_france.php                                             |   20 +-
 language/french_france_utf-8.php                                       |   20 +-
 language/german.php                                                    |   34 +-
 language/german_formal.php                                             |   32 +-
 language/german_formal_utf-8.php                                       |   32 +-
 language/german_utf-8.php                                              |   34 +-
 language/hebrew_utf-8.php                                              |   18 +-
 language/hellenic.php                                                  |   20 +-
 language/hellenic_utf-8.php                                            |   20 +-
 language/indonesian.php                                                |   20 +-
 language/indonesian_utf-8.php                                          |   20 +-
 language/italian.php                                                   |   20 +-
 language/italian_utf-8.php                                             |   20 +-
 language/japanese_utf-8.php                                            |  405 ++++----
 language/korean.php                                                    |   20 +-
 language/korean_utf-8.php                                              |   20 +-
 language/norwegian.php                                                 |   20 +-
 language/norwegian_utf-8.php                                           |   20 +-
 language/polish.php                                                    |   20 +-
 language/polish_utf-8.php                                              |   20 +-
 language/portuguese.php                                                |   20 +-
 language/portuguese_brazil.php                                         |   20 +-
 language/portuguese_brazil_utf-8.php                                   |   20 +-
 language/portuguese_utf-8.php                                          |   20 +-
 language/romanian.php                                                  |   20 +-
 language/romanian_utf-8.php                                            |   20 +-
 language/russian.php                                                   |   20 +-
 language/russian_utf-8.php                                             |   20 +-
 language/serbian.php                                                   |   20 +-
 language/serbian_utf-8.php                                             |   20 +-
 language/slovak.php                                                    |   20 +-
 language/slovak_utf-8.php                                              |   20 +-
 language/slovenian.php                                                 |   20 +-
 language/slovenian_utf-8.php                                           |   20 +-
 language/spanish.php                                                   |   20 +-
 language/spanish_argentina.php                                         |   20 +-
 language/spanish_argentina_utf-8.php                                   |   20 +-
 language/spanish_utf-8.php                                             |   20 +-
 language/swedish.php                                                   |   20 +-
 language/swedish_utf-8.php                                             |   20 +-
 language/turkish.php                                                   |   20 +-
 language/turkish_utf-8.php                                             |   20 +-
 language/ukrainian.php                                                 |   20 +-
 language/ukrainian_koi8-u.php                                          |   20 +-
 language/ukrainian_utf-8.php                                           |   20 +-
 plugins/calendar/autoinstall.php                                       |   10 +-
 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/functions.inc                                            |   15 +-
 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                                          |    6 +-
 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/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                                    |    8 +-
 plugins/staticpages/functions.inc                                      |   79 +-
 plugins/staticpages/language/chinese_simplified_utf-8.php              |    5 +-
 plugins/staticpages/language/chinese_traditional_utf-8.php             |    5 +-
 plugins/staticpages/language/czech.php                                 |    5 +-
 plugins/staticpages/language/czech_utf-8.php                           |    5 +-
 plugins/staticpages/language/danish.php                                |    5 +-
 plugins/staticpages/language/danish_utf-8.php                          |    5 +-
 plugins/staticpages/language/dutch.php                                 |    5 +-
 plugins/staticpages/language/dutch_utf-8.php                           |    5 +-
 plugins/staticpages/language/estonian.php                              |    5 +-
 plugins/staticpages/language/estonian_utf-8.php                        |    5 +-
 plugins/staticpages/language/farsi_utf-8.php                           |    5 +-
 plugins/staticpages/language/french_canada.php                         |    5 +-
 plugins/staticpages/language/french_canada_utf-8.php                   |    5 +-
 plugins/staticpages/language/german.php                                |    5 +-
 plugins/staticpages/language/german_formal.php                         |    5 +-
 plugins/staticpages/language/german_formal_utf-8.php                   |    5 +-
 plugins/staticpages/language/german_utf-8.php                          |    5 +-
 plugins/staticpages/language/hebrew_utf-8.php                          |    3 +-
 plugins/staticpages/language/italian.php                               |    5 +-
 plugins/staticpages/language/italian_utf-8.php                         |    5 +-
 plugins/staticpages/language/japanese_utf-8.php                        |    7 +-
 plugins/staticpages/language/korean.php                                |    5 +-
 plugins/staticpages/language/korean_utf-8.php                          |    5 +-
 plugins/staticpages/language/polish.php                                |    5 +-
 plugins/staticpages/language/polish_utf-8.php                          |    5 +-
 plugins/staticpages/language/portuguese_brazil.php                     |    5 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php               |    5 +-
 plugins/staticpages/language/slovenian.php                             |    5 +-
 plugins/staticpages/language/slovenian_utf-8.php                       |    5 +-
 plugins/staticpages/language/spanish.php                               |    5 +-
 plugins/staticpages/language/spanish_utf-8.php                         |    5 +-
 plugins/staticpages/language/swedish.php                               |    5 +-
 plugins/staticpages/language/swedish_utf-8.php                         |    5 +-
 plugins/staticpages/language/turkish.php                               |    5 +-
 plugins/staticpages/language/turkish_utf-8.php                         |    5 +-
 plugins/staticpages/language/ukrainian.php                             |    5 +-
 plugins/staticpages/language/ukrainian_koi8-u.php                      |    5 +-
 plugins/staticpages/language/ukrainian_utf-8.php                       |    5 +-
 plugins/staticpages/services.inc.php                                   |   11 +-
 plugins/staticpages/sql/mssql_updates.php                              |   20 +-
 plugins/staticpages/sql/mysql_updates.php                              |   20 +-
 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/configuration.php                                    |   13 +-
 public_html/admin/group.php                                            |    2 +-
 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                              |   16 +-
 public_html/admin/mail.php                                             |    2 +-
 public_html/admin/moderation.php                                       |   22 +-
 public_html/admin/plugins.php                                          |   39 +-
 public_html/admin/plugins/calendar/index.php                           |    4 +-
 public_html/admin/plugins/links/category.php                           |   10 +
 public_html/admin/plugins/polls/index.php                              |   19 +-
 public_html/admin/plugins/staticpages/index.php                        |   13 +-
 public_html/admin/story.php                                            |   21 +-
 public_html/admin/topic.php                                            |   54 +-
 public_html/admin/user.php                                             |   12 +
 public_html/comment.php                                                |    5 +-
 public_html/docs/english/changes.html                                  |   28 +
 public_html/docs/english/config.html                                   |   42 +-
 public_html/docs/english/theme.html                                    |   14 +
 public_html/docs/english/themevars.html                                |   24 +-
 public_html/docs/history                                               |   53 +-
 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/profiles/contactauthorform.thtml       |   17 +-
 public_html/layout/professional/profiles/contactuserform.thtml         |   28 +-
 public_html/profiles.php                                               |   81 +-
 public_html/submit.php                                                 |    3 +-
 public_html/users.php                                                  |  127 +-
 public_html/usersettings.php                                           |   25 +-
 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                                   |  225 +++-
 system/classes/search.class.php                                        |  224 ++---
 system/classes/searchcriteria.class.php                                |  115 +-
 system/classes/story.class.php                                         |  121 +-
 system/classes/template.class.php                                      |    8 +-
 system/lib-admin.php                                                   |  278 +++---
 system/lib-custom.php.dist                                             |   11 +
 system/lib-plugins.php                                                 |   15 -
 system/lib-security.php                                                |   70 +
 273 files changed, 3189 insertions(+), 1714 deletions(-)

diffs (truncated from 12802 to 300 lines):

diff -r fdb273c78589 -r bb675c876cb9 language/afrikaans.php
--- a/language/afrikaans.php	Mon Sep 28 22:20:30 2009 +0200
+++ b/language/afrikaans.php	Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,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'
 );
 
 ###############################################################################
@@ -1471,7 +1474,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,6 +1574,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1843,12 +1848,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 +1949,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 fdb273c78589 -r bb675c876cb9 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Mon Sep 28 22:20:30 2009 +0200
+++ b/language/afrikaans_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,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'
 );
 
 ###############################################################################
@@ -1471,7 +1474,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,6 +1574,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1843,12 +1848,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 +1949,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 fdb273c78589 -r bb675c876cb9 language/bosnian.php
--- a/language/bosnian.php	Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bosnian.php	Thu Oct 29 11:56:23 2009 +0100
@@ -828,7 +828,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -863,7 +865,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'
 );
 
 ###############################################################################
@@ -1475,7 +1478,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,6 +1578,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1847,12 +1852,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?',
@@ -1944,7 +1953,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 fdb273c78589 -r bb675c876cb9 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bosnian_utf-8.php	Thu Oct 29 11:56:23 2009 +0100
@@ -828,7 +828,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -863,7 +865,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'
 );
 
 ###############################################################################
@@ -1475,7 +1478,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,6 +1578,8 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
     'na' => 'N/A'
 );
 
@@ -1847,12 +1852,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?',
@@ -1944,7 +1953,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 fdb273c78589 -r bb675c876cb9 language/bulgarian.php
--- a/language/bulgarian.php	Mon Sep 28 22:20:30 2009 +0200
+++ b/language/bulgarian.php	Thu Oct 29 11:56:23 2009 +0100
@@ -824,7 +824,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 ###############################################################################
@@ -859,7 +861,8 @@
     26 => 'make this the default topic for archived stories. Only one topic allowed.',

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 13:12:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 13:12:20 -0400
Subject: [geeklog-cvs] geeklog: Experimental: Give the user an idea how long
	they have ...
Message-ID: <hg.37fcd14cdee2.1256836340.1485632861@qs1489.pair.com>

changeset 7400:37fcd14cdee2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/37fcd14cdee2
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 18:09:46 2009 +0100
description:
Experimental: Give the user an idea how long they have until the security token expires

diffstat:

 language/english.php        |   3 ++-
 language/english_utf-8.php  |   3 ++-
 public_html/admin/story.php |  13 ++++++++++++-
 system/lib-security.php     |  27 +++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diffs (90 lines):

diff -r 5260a7fb13df -r 37fcd14cdee2 language/english.php
--- a/language/english.php	Thu Oct 29 14:47:18 2009 +0100
+++ b/language/english.php	Thu Oct 29 18:09:46 2009 +0100
@@ -827,7 +827,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => '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. You can always hit "Preview" to extend the expiry time.'
 );
 
 
diff -r 5260a7fb13df -r 37fcd14cdee2 language/english_utf-8.php
--- a/language/english_utf-8.php	Thu Oct 29 14:47:18 2009 +0100
+++ b/language/english_utf-8.php	Thu Oct 29 18:09:46 2009 +0100
@@ -827,7 +827,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => '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. You can always hit "Preview" to extend the expiry time.'
 );
 
 
diff -r 5260a7fb13df -r 37fcd14cdee2 public_html/admin/story.php
--- a/public_html/admin/story.php	Thu Oct 29 14:47:18 2009 +0100
+++ b/public_html/admin/story.php	Thu Oct 29 18:09:46 2009 +0100
@@ -727,11 +727,22 @@
     $story_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']);
     $story_templates->set_var('lang_delete', $LANG_ADMIN['delete']);
     $story_templates->set_var('gltoken_name', CSRF_TOKEN);
-    $story_templates->set_var('gltoken', SEC_createToken());
+    $token = SEC_createToken();
+    $story_templates->set_var('gltoken', $token);
     $story_templates->parse('output','editor');
 
     $display .= COM_startBlock ($LANG24[5], '',
                         COM_getBlockTemplate ('_admin_block', 'header'));
+
+    $expirytime = SEC_getTokenExpiryTime($token);
+    if ($expirytime > 0) {
+        $txt = '<p id="token-expirynotice">' . '' . '</p>';
+        $exptime = '<span id="token-expirytime">'
+                 . strftime($_CONF['timeonly'], $expirytime) . '</span>';
+        $display .= '<p id="token-expirynotice">'
+                 . sprintf($LANG24[91], $exptime) . '</p>';
+    }
+
     $display .= $story_templates->finish($story_templates->get_var('output'));
     $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
 
diff -r 5260a7fb13df -r 37fcd14cdee2 system/lib-security.php
--- a/system/lib-security.php	Thu Oct 29 14:47:18 2009 +0100
+++ b/system/lib-security.php	Thu Oct 29 18:09:46 2009 +0100
@@ -1178,6 +1178,33 @@
 }
 
 /**
+* Get a token's expiry time
+*
+* @param    string  $token  the token we're looking for
+* @return   int             UNIX timestamp of the expiry time or 0
+*
+*/
+function SEC_getTokenExpiryTime($token)
+{
+    global $_TABLES, $_USER;
+
+    $retval = 0;
+
+    if (!COM_isAnonUser()) {
+
+        $sql['mysql'] = "SELECT UNIX_TIMESTAMP(DATE_ADD(created, INTERVAL ttl SECOND)) AS expirytime FROM {$_TABLES['tokens']} WHERE (token = '$token') AND (owner_id = '{$_USER['uid']}') AND (ttl > 0)";
+        $sql['mssql'] = "SELECT UNIX_TIMESTAMP(DATEADD(ss, ttl, created)) AS expirytime FROM {$_TABLES['tokens']} WHERE (token = '$token') AND (owner_id = '{$_USER['uid']}') AND (ttl > 0)";
+
+        $result = DB_query($sql);
+        if (DB_numRows($result) == 1) {
+            list($retval) = DB_fetchArray($result);
+        }
+    }
+
+    return $retval;
+}
+
+/**
 * Set a cookie using the HttpOnly flag
 *
 * Use this function to set "important" cookies (session, password, ...).

From geeklog-cvs at lists.geeklog.net  Thu Oct 29 15:01:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 29 Oct 2009 15:01:06 -0400
Subject: [geeklog-cvs] geeklog: Fixed display of text excerpt for search
	results on PHP...
Message-ID: <hg.65103610c52f.1256842866.1485632861@qs1489.pair.com>

changeset 7401:65103610c52f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/65103610c52f
user: Dirk Haun <dirk at haun-online.de>
date: Thu Oct 29 19:50:58 2009 +0100
description:
Fixed display of text excerpt for search results on PHP 4, caused by differences in the handling of references between PHP 4 and 5 (bug #0001004)

diffstat:

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

diffs (32 lines):

diff -r 37fcd14cdee2 -r 65103610c52f public_html/docs/history
--- a/public_html/docs/history	Thu Oct 29 18:09:46 2009 +0100
+++ b/public_html/docs/history	Thu Oct 29 19:50:58 2009 +0100
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Fixed display of text excerpt for search results on PHP 4 (bug #0001004)
+  [Dirk]
 - The comment speed limit was being ignored (bug #0001003) [Dirk]
 - Added an icon to make the plugin update option somewhat more obvious [Dirk]
   (icon "stock_update-data.png" taken from Gnome 2.18 icon theme set by
diff -r 37fcd14cdee2 -r 65103610c52f system/classes/search.class.php
--- a/system/classes/search.class.php	Thu Oct 29 18:09:46 2009 +0100
+++ b/system/classes/search.class.php	Thu Oct 29 19:50:58 2009 +0100
@@ -457,7 +457,6 @@
 
         $url = "{$this->_searchURL}&amp;type={$this->_type}&amp;mode=";
         $obj = new ListFactory($url.'search', $_CONF['search_limits'], $_CONF['num_search_results']);
-        $obj->setRowFunction(array($this, 'searchFormatCallback'));
         $obj->setField('ID', 'id', false);
         $obj->setField('URL', 'url', false);
 
@@ -495,6 +494,8 @@
             $this->_wordlength = 50;
         }
         $obj->setDefaultSort('hits');
+        // set this only now, for compatibility with PHP 4
+        $obj->setRowFunction(array($this, 'searchFormatCallback'));
 
         // Start search timer
         $searchtimer = new timerobject();

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 08:57:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 08:57:50 -0400
Subject: [geeklog-cvs] geeklog: Retrofitted $_SP_CONF['includesearch']
	option (had to t...
Message-ID: <hg.7a15ec67da80.1256907470.1485632861@qs1489.pair.com>

changeset 7403:7a15ec67da80
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7a15ec67da80
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 12:00:15 2009 +0100
description:
Retrofitted $_SP_CONF['includesearch'] option (had to take it out to get Tom's patch integrated)

diffstat:

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

diffs (25 lines):

diff -r f7706912e8be -r 7a15ec67da80 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Thu Oct 15 13:05:28 2009 -0400
+++ b/plugins/staticpages/functions.inc	Fri Oct 30 12:00:15 2009 +0100
@@ -600,7 +600,11 @@
 */
 function plugin_dopluginsearch_staticpages($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
-    global $_TABLES, $_DB_dbms, $LANG_STATIC, $LANG09;
+    global $_TABLES, $_DB_dbms, $LANG_STATIC, $LANG09, $_SP_CONF;
+
+    if ($_SP_CONF['includesearch'] != 1) {
+        return;
+    }
 
     // Make sure the query is SQL safe
     $query = trim(addslashes($query));
@@ -1298,7 +1302,7 @@
     
     $sql = "SELECT sp_id, sp_title 
         FROM {$_TABLES['staticpage']} 
-        WHERE NOT ISNULL(sp_content) AND (sp_date >= (date_sub(NOW(), INTERVAL {$_SP_CONF['newstaticpagesinterval']} SECOND))) 
+        WHERE NOT ISNULL(sp_content) AND (sp_date >= (DATE_SUB(NOW(), INTERVAL {$_SP_CONF['newstaticpagesinterval']} SECOND))) 
         {$extra_sql} 
         " . COM_getPermSQL( 'AND' ) . " 
         ORDER BY sp_date DESC LIMIT 15";

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 08:57:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 08:57:51 -0400
Subject: [geeklog-cvs] geeklog: Include install_defaults.php to set new
	config options ...
Message-ID: <hg.3dde94a085fe.1256907471.1485632861@qs1489.pair.com>

changeset 7404:3dde94a085fe
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3dde94a085fe
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 12:01:33 2009 +0100
description:
Include install_defaults.php to set new config options to proper defaults during an upgrade

diffstat:

 plugins/staticpages/sql/mssql_updates.php |  2 ++
 plugins/staticpages/sql/mysql_updates.php |  2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diffs (24 lines):

diff -r 7a15ec67da80 -r 3dde94a085fe plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Fri Oct 30 12:00:15 2009 +0100
+++ b/plugins/staticpages/sql/mssql_updates.php	Fri Oct 30 12:01:33 2009 +0100
@@ -52,6 +52,8 @@
 
     $c = config::get_instance();
 
+    require_once $_CONF['path'] . 'plugins/staticpages/install_defaults.php';
+
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 
diff -r 7a15ec67da80 -r 3dde94a085fe plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Fri Oct 30 12:00:15 2009 +0100
+++ b/plugins/staticpages/sql/mysql_updates.php	Fri Oct 30 12:01:33 2009 +0100
@@ -53,6 +53,8 @@
 
     $c = config::get_instance();
 
+    require_once $_CONF['path'] . 'plugins/staticpages/install_defaults.php';
+
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 08:57:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 08:57:50 -0400
Subject: [geeklog-cvs] geeklog: Staticpages are now included in the What's
	New Block. C...
Message-ID: <hg.f7706912e8be.1256907470.1485632861@qs1489.pair.com>

changeset 7402:f7706912e8be
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f7706912e8be
user: Tom <websitemaster at cogeco.net>
date: Thu Oct 15 13:05:28 2009 -0400
description:
Staticpages are now included in the What's New Block. Configuration option included to disable staticpages from displaying in the block if a centerblock and/or execute PHP code.

Staticpages now have the option to not be included in the search results of Geeklog. This can be limited to just pages that are centerblocks and/or execute PHP code.

diffstat:

 plugins/staticpages/functions.inc              |  101 ++++++++++++++++++++++++-
 plugins/staticpages/install_defaults.php       |   51 ++++++++++--
 plugins/staticpages/language/english.php       |   16 +++-
 plugins/staticpages/language/english_utf-8.php |   16 +++-
 plugins/staticpages/sql/mssql_updates.php      |   14 +++
 plugins/staticpages/sql/mysql_updates.php      |   14 +++
 public_html/docs/english/staticpages.html      |   69 ++++++++++++++--
 7 files changed, 255 insertions(+), 26 deletions(-)

diffs (truncated from 456 to 300 lines):

diff -r 65103610c52f -r f7706912e8be plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Thu Oct 29 19:50:58 2009 +0100
+++ b/plugins/staticpages/functions.inc	Thu Oct 15 13:05:28 2009 -0400
@@ -572,11 +572,13 @@
 */
 function plugin_searchtypes_staticpages()
 {
-    global $LANG_STATIC;
+    global $LANG_STATIC, $_SP_CONF;
 
-    $tmp['staticpages'] = $LANG_STATIC['staticpages'];
-
-    return $tmp;
+    if ($_SP_CONF['includesearch'] == 1) {
+        $tmp['staticpages'] = $LANG_STATIC['staticpages'];
+        
+        return $tmp;
+    }
 }
 
 
@@ -1253,6 +1255,97 @@
 }
 
 /**
+* Return headlines for New Static Pages section in the What's New block, if enabled
+*
+* @return   mixed       array(headline, byline), or boolean false if disabled
+*
+*/
+function plugin_whatsnewsupported_staticpages()
+{
+    global $_SP_CONF, $LANG_STATIC, $LANG_WHATSNEW;
+
+    if ($_SP_CONF['hidenewstaticpages'] == 0) {
+        $retval = array($LANG_STATIC['pages'],
+                        COM_formatTimeString($LANG_WHATSNEW['new_last'],
+                                             $_SP_CONF['newstaticpagesinterval'])
+                       );
+    } else {
+        $retval = false;
+    }
+
+    return $retval;
+}
+
+/**
+* Return new Static Pages for the What's New block
+*
+* @return   string  HTML list of new staticpages
+*
+*/
+function plugin_getwhatsnew_staticpages()
+{
+    global $_CONF, $_TABLES, $_SP_CONF, $LANG_STATIC;
+
+    $retval = '';
+
+    $extra_sql = "";
+    if ($_SP_CONF['includecenterblocks'] == 0) {
+        $extra_sql =' AND sp_centerblock = 0';
+    }
+    if ($_SP_CONF['includephp'] == 0) {
+        $extra_sql .=' AND sp_php = 0';
+    }
+    
+    $sql = "SELECT sp_id, sp_title 
+        FROM {$_TABLES['staticpage']} 
+        WHERE NOT ISNULL(sp_content) AND (sp_date >= (date_sub(NOW(), INTERVAL {$_SP_CONF['newstaticpagesinterval']} SECOND))) 
+        {$extra_sql} 
+        " . COM_getPermSQL( 'AND' ) . " 
+        ORDER BY sp_date DESC LIMIT 15";
+
+    $result = DB_query( $sql );
+
+    $nrows = DB_numRows( $result );
+
+    if( $nrows > 0)
+    {
+        $newstaticpages = array();
+
+        for( $x = 0; $x < $nrows; $x++ )
+        {
+            $A = DB_fetchArray( $result );
+
+            $url = COM_buildUrl( $_CONF['site_url']
+                . '/staticpages/index.php?page=' . $A['sp_id'] );                
+
+            $title = COM_undoSpecialChars( stripslashes( $A['sp_title'] ));
+            $titletouse = COM_truncate( $title, $_SP_CONF['title_trim_length'],
+                                        '...' );
+            if( $title != $titletouse )
+            {
+                $attr = array('title' => htmlspecialchars($title));
+            }
+            else
+            {
+                $attr = array();
+            }
+            $astaticpage = str_replace( '$', '&#36;', $titletouse );
+            $astaticpage = str_replace( ' ', '&nbsp;', $astaticpage );
+
+            $newstaticpages[] = COM_createLink($astaticpage, $url, $attr);
+        }
+
+        $retval .= COM_makeList( $newstaticpages, 'list-new-comments' );
+    }
+    else
+    {
+        $retval .= $LANG_STATIC['no_new_pages'] . '<br' . XHTML . '>' . LB;
+    }
+
+    return $retval;
+}
+
+/**
 * Return information for a static page
 *
 * @param    string  $sp_id      static page ID or '*'
diff -r 65103610c52f -r f7706912e8be plugins/staticpages/install_defaults.php
--- a/plugins/staticpages/install_defaults.php	Thu Oct 29 19:50:58 2009 +0100
+++ b/plugins/staticpages/install_defaults.php	Thu Oct 15 13:05:28 2009 -0400
@@ -97,6 +97,24 @@
 $_SP_DEFAULT['filter_html'] = 0;
 $_SP_DEFAULT['censor'] = 1;
 
+// What's New Block
+$_SP_DEFAULT['new_staticpages_interval'] = 1209600; // 2 weeks
+$_SP_DEFAULT['hide_new_staticpages'] = 0;
+$_SP_DEFAULT['title_trim_length'] = 20;
+$_SP_DEFAULT['include_centerblocks'] = 0;
+$_SP_DEFAULT['include_PHP'] = 0;
+
+// Search Results Filter
+$_SP_DEFAULT['include_search'] = 1;
+$_SP_DEFAULT['include_search_centerblocks'] = 0;
+$_SP_DEFAULT['include_search_PHP'] = 0;
+
+// The maximum number of items displayed when an Atom feed is requested
+$_SP_DEFAULT['atom_max_items'] = 10;
+
+// Display Meta Tags for static pages (1 = show, 0 = don't) 
+$_SP_DEFAULT['meta_tags'] = 0;
+
 // Define default permissions for new pages created from the Admin panel.
 // Permissions are perm_owner, perm_group, perm_members, perm_anon (in that
 // order). Possible values:
@@ -106,11 +124,6 @@
 // (a value of 1, ie. write-only, does not make sense and is not allowed)
 $_SP_DEFAULT['default_permissions'] = array(3, 2, 2, 2);
 
-// The maximum number of items displayed when an Atom feed is requested
-$_SP_DEFAULT['atom_max_items'] = 10;
-
-// Display Meta Tags for static pages (1 = show, 0 = don't) 
-$_SP_DEFAULT['meta_tags'] = 0;
 
 /**
 * Initialize Static Pages plugin configuration
@@ -161,11 +174,33 @@
                 0, 0, null, 110, true, 'staticpages');
         $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select',
                 0, 0, 0, 120, true, 'staticpages');
+
+        $c->add('fs_whatsnew', NULL, 'fieldset',
+                0, 1, NULL, 0, true, 'staticpages');
+        $c->add('newstaticpagesinterval',$_SP_DEFAULT['new_staticpages_interval'],'text',
+                0, 1, NULL, 10, TRUE, 'staticpages');
+        $c->add('hidenewstaticpages',$_SP_DEFAULT['hide_new_staticpages'],'select',
+                0, 1, 0, 20, TRUE, 'staticpages');
+        $c->add('title_trim_length',$_SP_DEFAULT['title_trim_length'],'text',
+                0, 1, NULL, 30, TRUE, 'staticpages');
+        $c->add('includecenterblocks',$_SP_DEFAULT['include_centerblocks'],'select',
+                0, 1, 0, 40, TRUE, 'staticpages');
+        $c->add('includephp',$_SP_DEFAULT['include_PHP'],'select',
+                0, 1, 0, 50, TRUE, 'staticpages');        
+        
+        $c->add('fs_search', NULL, 'fieldset',
+                0, 2, NULL, 0, true, 'staticpages');
+        $c->add('includesearch', $_SP_DEFAULT['include_search'], 'select',
+                0, 2, 0, 10, true, 'staticpages');
+        $c->add('includesearchcenterblocks',$_SP_DEFAULT['include_search_centerblocks'],'select',
+                0, 2, 0, 20, TRUE, 'staticpages');
+        $c->add('includesearchphp',$_SP_DEFAULT['include_search_PHP'],'select',
+                0, 2, 0, 30, TRUE, 'staticpages');   
         
         $c->add('fs_permissions', NULL, 'fieldset',
-                0, 1, NULL, 0, true, 'staticpages');
-        $c->add('default_permissions', $_SP_DEFAULT['default_permissions'],
-                '@select', 0, 1, 12, 120, true, 'staticpages');
+                0, 3, NULL, 0, true, 'staticpages');
+        $c->add('default_permissions', $_SP_DEFAULT['default_permissions'],'@select',
+                0, 3, 12, 120, true, 'staticpages');
 
     }
 
diff -r 65103610c52f -r f7706912e8be plugins/staticpages/language/english.php
--- a/plugins/staticpages/language/english.php	Thu Oct 29 19:50:58 2009 +0100
+++ b/plugins/staticpages/language/english.php	Thu Oct 15 13:05:28 2009 -0400
@@ -108,7 +108,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -139,7 +141,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -148,6 +158,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 65103610c52f -r f7706912e8be plugins/staticpages/language/english_utf-8.php
--- a/plugins/staticpages/language/english_utf-8.php	Thu Oct 29 19:50:58 2009 +0100
+++ b/plugins/staticpages/language/english_utf-8.php	Thu Oct 15 13:05:28 2009 -0400
@@ -108,7 +108,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -139,7 +141,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'    
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -148,6 +158,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',    
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 65103610c52f -r f7706912e8be plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Thu Oct 29 19:50:58 2009 +0100
+++ b/plugins/staticpages/sql/mssql_updates.php	Thu Oct 15 13:05:28 2009 -0400
@@ -73,6 +73,20 @@
         }
     }
 
+    // What's New Block
+    $c->add('fs_whatsnew', NULL, 'fieldset', 0, 1, NULL, 0, true, 'staticpages');
+    $c->add('newstaticpagesinterval',$_SP_DEFAULT['new_staticpages_interval'],'text', 0, 1, NULL, 10, TRUE, 'staticpages');
+    $c->add('hidenewstaticpages',$_SP_DEFAULT['hide_new_staticpages'],'select', 0, 1, 0, 20, TRUE, 'staticpages');
+    $c->add('title_trim_length',$_SP_DEFAULT['title_trim_length'],'text', 0, 1, NULL, 30, TRUE, 'staticpages');
+    $c->add('includecenterblocks',$_SP_DEFAULT['include_centerblocks'],'select', 0, 1, 0, 40, TRUE, 'staticpages');
+    $c->add('includephp',$_SP_DEFAULT['include_PHP'],'select', 0, 1, 0, 50, TRUE, 'staticpages');        
+    
+    // Search Results
+    $c->add('fs_search', NULL, 'fieldset', 0, 2, NULL, 0, true, 'staticpages');
+    $c->add('includesearch', $_SP_DEFAULT['include_search'], 'select', 0, 2, 0, 10, true, 'staticpages');
+    $c->add('includesearchcenterblocks',$_SP_DEFAULT['include_search_centerblocks'],'select', 0, 2, 0, 20, TRUE, 'staticpages');
+    $c->add('includesearchphp',$_SP_DEFAULT['include_search_PHP'],'select', 0, 2, 0, 30, TRUE, 'staticpages');   
+
     return true;
 }
 

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 08:57:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 08:57:51 -0400
Subject: [geeklog-cvs] geeklog: Move Default Permissions fieldset during
	update
Message-ID: <hg.9ac31db1c2a3.1256907471.1485632861@qs1489.pair.com>

changeset 7405:9ac31db1c2a3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/9ac31db1c2a3
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 13:49:11 2009 +0100
description:
Move Default Permissions fieldset during update

diffstat:

 plugins/staticpages/sql/mssql_updates.php |  3 +++
 plugins/staticpages/sql/mysql_updates.php |  3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diffs (26 lines):

diff -r 3dde94a085fe -r 9ac31db1c2a3 plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Fri Oct 30 12:01:33 2009 +0100
+++ b/plugins/staticpages/sql/mssql_updates.php	Fri Oct 30 13:49:11 2009 +0100
@@ -75,6 +75,9 @@
         }
     }
 
+    // move Default Permissions fieldset
+    DB_query("UPDATE {$_TABLES['conf_values']} SET fieldset = 3 WHERE (group_name = 'staticpages') AND (fieldset = 1)");
+
     // What's New Block
     $c->add('fs_whatsnew', NULL, 'fieldset', 0, 1, NULL, 0, true, 'staticpages');
     $c->add('newstaticpagesinterval',$_SP_DEFAULT['new_staticpages_interval'],'text', 0, 1, NULL, 10, TRUE, 'staticpages');
diff -r 3dde94a085fe -r 9ac31db1c2a3 plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Fri Oct 30 12:01:33 2009 +0100
+++ b/plugins/staticpages/sql/mysql_updates.php	Fri Oct 30 13:49:11 2009 +0100
@@ -76,6 +76,9 @@
         }
     }
 
+    // move Default Permissions fieldset
+    DB_query("UPDATE {$_TABLES['conf_values']} SET fieldset = 3 WHERE (group_name = 'staticpages') AND (fieldset = 1)");
+
     // What's New Block
     $c->add('fs_whatsnew', NULL, 'fieldset', 0, 1, NULL, 0, true, 'staticpages');
     $c->add('newstaticpagesinterval',$_SP_DEFAULT['new_staticpages_interval'],'text', 0, 1, NULL, 10, TRUE, 'staticpages');

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 08:57:53 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 08:57:53 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation
Message-ID: <hg.e6d155a18b20.1256907473.1485632861@qs1489.pair.com>

changeset 7406:e6d155a18b20
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e6d155a18b20
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 13:57:11 2009 +0100
description:
Updated documentation

diffstat:

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

diffs (53 lines):

diff -r 9ac31db1c2a3 -r e6d155a18b20 public_html/docs/english/staticpages.html
--- a/public_html/docs/english/staticpages.html	Fri Oct 30 13:49:11 2009 +0100
+++ b/public_html/docs/english/staticpages.html	Fri Oct 30 13:57:11 2009 +0100
@@ -239,22 +239,23 @@
     <th style="width:25%">Default Value</th>
     <th style="width:50%">Description</th>
 </tr>
+<tr>
   <td valign="top"><a name="desc_newstaticpagesinterval">newstaticpagesinterval</a></td>
   <td valign="top">1209600</td>
   <td valign="top">Static pages are "new" if they are this many seconds old.</td></tr>
-<tr>
+<tr class="r2">
   <td valign="top"><a name="desc_hidenewstaticpages">hidenewstaticpages</a></td>
   <td valign="top">false</td>
   <td valign="top">Set to true to hide new static pages from the What's New block.</td></tr>
-<tr class="r2">
+<tr>
   <td valign="top"><a name="desc_title_trim_length">title_trim_length</a></td>
   <td valign="top">20</td>
   <td valign="top">Max. length of the title of items listed in the What's New block.</td></tr>
-<tr>
+<tr class="r2">
   <td valign="top"><a name="desc_includecenterblocks">includecenterblocks</a></td>
   <td valign="top">false</td>
   <td valign="top">Set to true to include static pages that are displayed as a center block.</td></tr>
-<tr class="r2">
+<tr>
   <td valign="top"><a name="desc_includephp">includephp</a></td>
   <td valign="top">false</td>
   <td valign="top">Set to true to include static pages that execute PHP.</td></tr>
@@ -268,6 +269,7 @@
     <th style="width:25%">Default Value</th>
     <th style="width:50%">Description</th>
 </tr>
+<tr>
   <td valign="top"><a name="desc_includesearch">includesearch</a></td>
   <td valign="top">true</td>
   <td valign="top">Set to true to enable static pages in search results.</td></tr>
diff -r 9ac31db1c2a3 -r e6d155a18b20 public_html/docs/history
--- a/public_html/docs/history	Fri Oct 30 13:49:11 2009 +0100
+++ b/public_html/docs/history	Fri Oct 30 13:57:11 2009 +0100
@@ -133,6 +133,10 @@
 
 Static Pages Plugin 1.6.1
 -------------------
+- Certain types or all Static Pages can now be excluded from the search results
+  (feature request #0000979, provided by Tom Homer)
+- New and updated Static Pages are now listed in the What's New block
+  (feature request #0000908, provided by Tom Homer)
 - Fresh installs of the plugin in Geeklog 1.6.0 accidentally used a wrong name
   for the plugin's admin group. Silently fix that during the upgrade [Dirk]
 - Made the list of pages sortable by author (feature request #0000978) [Dirk]

From geeklog-cvs at lists.geeklog.net  Fri Oct 30 12:29:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 30 Oct 2009 12:29:08 -0400
Subject: [geeklog-cvs] geeklog: Second attempt to fix bug #0000980 (Changing
	the Post M...
Message-ID: <hg.62c4bd0f9743.1256920148.1485632861@qs1489.pair.com>

changeset 7407:62c4bd0f9743
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/62c4bd0f9743
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 17:28:55 2009 +0100
description:
Second attempt to fix bug #0000980 (Changing the Post Mode in Advanced Editor mode selected the wrong tab), revised IE compatible patch provided by dengen.

diffstat:

 public_html/docs/history                        |  5 ++++-
 public_html/javascript/storyeditor_fckeditor.js |  4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r e6d155a18b20 -r 62c4bd0f9743 public_html/docs/history
--- a/public_html/docs/history	Fri Oct 30 13:57:11 2009 +0100
+++ b/public_html/docs/history	Fri Oct 30 17:28:55 2009 +0100
@@ -14,6 +14,9 @@
 - When a Story Admin did not have permission to edit a story, Geeklog threw a
   "call to a member function on a non-object" error when trying to display a
   proper "access denied" message (reported by Chase and Cesar) [Dirk]
+- Allow external apps to contribute to search results (feature request #0000985)
+  [Sami]
+- Remember current sort/limit in search results (bug #0001007) [Sami]
 - Don't display the comment form for a story when comments aren't enabled for it
   (bug #0000994) [Dirk]
 - Fixed a long-standing quirk of the submission handling where the "Submissions"
@@ -29,7 +32,7 @@
 - Setting $_CONF['article_comment_close_days'] to a high value (to work around
   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 current year a may have caused comments to be closed immediately [Dirk]
+  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
   to "My Account" [Dirk]
 - Additional checks in "Mail Story to a Friend", "Send mail to user", and
diff -r e6d155a18b20 -r 62c4bd0f9743 public_html/javascript/storyeditor_fckeditor.js
--- a/public_html/javascript/storyeditor_fckeditor.js	Fri Oct 30 13:57:11 2009 +0100
+++ b/public_html/javascript/storyeditor_fckeditor.js	Fri Oct 30 17:28:55 2009 +0100
@@ -43,8 +43,8 @@
     }
 
     function change_editmode(obj) {
-        showhideEditorDiv("editor",
-                document.getElementById('navlist').childElementCount - 6);
+        var navlistcount = document.getElementById('navlist').getElementsByTagName('li').length;
+        showhideEditorDiv("editor", navlistcount - 6);
         if (obj.value == 'html') {
             document.getElementById('html_editor').style.display='none';
             document.getElementById('text_editor').style.display='';

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 04:52:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 04:52:50 -0400
Subject: [geeklog-cvs] geeklog: Added CSS for the token expiry notice + some
	minor sour...
Message-ID: <hg.d1e9c15f5c60.1256979170.1485632861@qs1489.pair.com>

changeset 7408:d1e9c15f5c60
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d1e9c15f5c60
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 19:15:17 2009 +0100
description:
Added CSS for the token expiry notice + some minor source code / comments cosmetics

diffstat:

 public_html/layout/professional/style.css |  38 +++++++++++++------
 1 files changed, 26 insertions(+), 12 deletions(-)

diffs (107 lines):

diff -r 62c4bd0f9743 -r d1e9c15f5c60 public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css	Fri Oct 30 17:28:55 2009 +0100
+++ b/public_html/layout/professional/style.css	Fri Oct 30 19:15:17 2009 +0100
@@ -1,7 +1,7 @@
 /* STYLESHEET FORMAT GUIDE *****************************************************
 
-  split the following sections:
-  - semantics (direct formatting for <td>, <a > etc
+  split into the following sections:
+  - semantics (direct formatting for <td>, <a>, etc)
   - classes (.whatever)
   - common plugin CSS
   - navbar
@@ -181,14 +181,17 @@
   float:left;
   padding:5px;
 }
-.admin-menu { /* the box around the menu */
+.admin-menu {
+  /* the box around the menu */
   padding:5px;
   border:1px solid #EEEEEE;
 }
-.admin-menu-text { /* the text below the links */
+.admin-menu-text {
+  /* the text below the links */
   padding:5px;
 }
-.admin-menu-item { /* a single link in the menu */
+.admin-menu-item {
+  /* a single link in the menu */
   padding: 0px 5px 0px 5px;
 }
 .admin-list-smalltable {
@@ -220,7 +223,7 @@
   padding-top:2px;
   padding-bottom:2px;
 }
-/* Menus in blocks *****************************************************************/
+/* Menus in blocks ************************************************************/
 .blocklist ul {
   list-style:none;
   padding:0px;
@@ -264,7 +267,7 @@
 * html .clearfix {height: 1%;}
 .clearfix {display: block;}
 /* End hide from IE-mac */
-/* general formatting classes **************************************************/
+/* general formatting classes *************************************************/
 .b {
   font-weight:bold;
 }
@@ -485,15 +488,18 @@
   padding-bottom:5px;
   margin-left:105px;
 }
-.checkboxes-list {  /* this is used for example by COM_checkList */
+.checkboxes-list {
+  /* this is used for example by COM_checkList */
   list-style:none;
   padding:0px;
   margin:0px;
 }
-.checkboxes-list span { /* space between the text and the checkbox */
+.checkboxes-list span {
+  /* space between the text and the checkbox */
   padding-left:5px;
 }
-.checkboxes-list .gldefault { /* default blocks in the user settings block list */
+.checkboxes-list .gldefault {
+  /* default blocks in the user settings block list */
   font-weight:bold;
 }
 .missing-field {
@@ -722,6 +728,14 @@
   margin:0px;
 }
 /******************************************************************************/
+#token-expirynotice {
+  padding:1em;
+  border:1px solid #CCCCCC;
+  background:#F7F7F7;
+}
+#token-expirytime {
+  font-weight:bold;
+}
 .topicoption,
 .topicoption-off {
 }
@@ -994,7 +1008,7 @@
 
 /* Common CSS for on-hover tooltip feature */
 a.tooltip {
-  position: relative; /*this is the key*/
+  position: relative; /* this is the key */
   z-index:10;
   color:#000;
   text-decoration:none;
@@ -1007,7 +1021,7 @@
   display: none;
 }
 a.tooltip:hover span {
-  /*the span will display just on :hover state*/
+  /* the span will display just on :hover state */
   z-index:100;
   color:#033666;
   font-style:normal;

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 04:52:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 04:52:51 -0400
Subject: [geeklog-cvs] geeklog: Make the topic's meta description available
	in the Topi...
Message-ID: <hg.c776e22f2de6.1256979171.1485632861@qs1489.pair.com>

changeset 7409:c776e22f2de6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c776e22f2de6
user: Dirk Haun <dirk at haun-online.de>
date: Fri Oct 30 21:13:23 2009 +0100
description:
Make the topic's meta description available in the Topics Block

diffstat:

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

diffs (30 lines):

diff -r d1e9c15f5c60 -r c776e22f2de6 public_html/lib-common.php
--- a/public_html/lib-common.php	Fri Oct 30 19:15:17 2009 +0100
+++ b/public_html/lib-common.php	Fri Oct 30 21:13:23 2009 +0100
@@ -2122,7 +2122,7 @@
         $op = 'AND';
     }
 
-    $sql = "SELECT tid,topic,imageurl FROM {$_TABLES['topics']}" . $langsql;
+    $sql = "SELECT tid,topic,imageurl,meta_description FROM {$_TABLES['topics']}" . $langsql;
     if( !COM_isAnonUser() )
     {
         $tids = DB_getItem( $_TABLES['userindex'], 'tids',
@@ -2272,6 +2272,17 @@
         }
         $sections->set_var( 'topic_image', $topicimage );
 
+        $desc = trim($A['meta_description']);
+        $sections->set_var('topic_description', $desc);
+        $desc_escaped = htmlspecialchars($desc);
+        $sections->set_var('topic_description_escaped', $desc_escaped);
+        if (! empty($desc)) {
+            $sections->set_var('topic_title_attribute',
+                               'title="' . $desc_escaped . '"');
+        } else {
+            $sections->set_var('topic_title_attribute', '');
+        }
+
         if(( $A['tid'] == $topic ) && ( $page == 1 ))
         {
             $retval .= $sections->parse( 'item', 'inactive' );

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 04:52:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 04:52:51 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation
Message-ID: <hg.b07ac3dba962.1256979171.1485632861@qs1489.pair.com>

changeset 7410:b07ac3dba962
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b07ac3dba962
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 09:52:30 2009 +0100
description:
Updated documentation

diffstat:

 public_html/docs/english/changes.html |   4 ++++
 public_html/docs/english/index.html   |   5 +++--
 public_html/docs/english/support.html |   8 +++++---
 public_html/docs/english/theme.html   |  39 ++++++++++++++++++++++++---------------
 4 files changed, 36 insertions(+), 20 deletions(-)

diffs (147 lines):

diff -r c776e22f2de6 -r b07ac3dba962 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Fri Oct 30 21:13:23 2009 +0100
+++ b/public_html/docs/english/changes.html	Sat Oct 31 09:52:30 2009 +0100
@@ -31,6 +31,9 @@
 <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>
 </ul>
 
 <h3>Bugfixes</h3>
@@ -40,6 +43,7 @@
     re-open comments on stories that were closed due to this bug, you can use
     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>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 c776e22f2de6 -r b07ac3dba962 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html	Fri Oct 30 21:13:23 2009 +0100
+++ b/public_html/docs/english/index.html	Sat Oct 31 09:52:30 2009 +0100
@@ -114,7 +114,7 @@
 <p>Geeklog was originally developed for the Security Geeks web site and was
 originally authored by Jason Whittenburg.  In early 2001, Jason decided it
 was time to devote his time to other things and handed the project over to
-Tony Bibbs. Tony is now focusing on getting <a href="http://www.apteno.net/AptitudeCMS/trac">AptitudeCMS</a> (formerly Geeklog 2), a next generation CMS, off
+Tony Bibbs. Tony is now focusing on getting <a href="http://www.aptitudecms.org/">AptitudeCMS</a> (formerly Geeklog 2), a next generation CMS, off
 the ground, while Dirk Haun is now acting as the Geeklog maintainer.</p>
 
 <p>Geeklog is bona fide open-source software and has been released under the
@@ -126,7 +126,8 @@
 various steps may be over or under explained. It's assumed  that you have
 some working experience with some form of <a
 href="http://httpd.apache.org/">Apache</a> (or IIS), SQL databases (such as
-<a href="http://www.mysql.com/">MySQL</a>), and <a
+<a href="http://www.mysql.com/">MySQL</a> and <a
+href="http://www.microsoft.com/sql/">MS SQL</a>), and <a
 href="http://www.php.net/">PHP</a>.</p>
 
 <div class="footer">
diff -r c776e22f2de6 -r b07ac3dba962 public_html/docs/english/support.html
--- a/public_html/docs/english/support.html	Fri Oct 30 21:13:23 2009 +0100
+++ b/public_html/docs/english/support.html	Sat Oct 31 09:52:30 2009 +0100
@@ -40,6 +40,8 @@
 
 <p>Want to meet the Geeklog developers and other Geeklog users? Join us on <a href="irc://irc.freenode.net/geeklog">IRC</a>: channel #geeklog on irc.freenode.net.</p>
 
+<p>If you don't have an IRC client, you can also use the web-based <a href="http://www.geeklog.net/staticpages/index.php/irc-chat">IRC chat</a> option on <tt>geeklog.net</tt>.</p>
+
 <p><strong>Note:</strong> The channel is often very quiet. It's usually best to "just ask your question" and be willing to wait a bit for a response.</p>
 
 
@@ -47,7 +49,7 @@
 
 <h3>Bug Reports and Feature Requests</h3>
 
-<p>Found a bug? <a href="http://project.geeklog.net/">Submit a bug report</a> on our project website. Of course, you can also submit feature requests or patches there.</p>
+<p>Found a bug? <a href="http://project.geeklog.net/tracking/">Submit a bug report</a> on our project website. Of course, you can also submit feature requests or patches there.</p>
 
 <p><strong>Note:</strong> Before submitting a new bug report or feature request, please do a search first (on the project site as well as on the Geeklog Homepage) to make sure it hasn't been covered before. Thanks.</p>
 
@@ -55,14 +57,14 @@
 
 <p>Want to develop a plugin or some other add-on? Read the <a href="http://wiki.geeklog.net/index.php/Plugin_Developers_Handbook">Plugins Developer's Guide</a> and join the <a href="http://lists.geeklog.net/mailman/listinfo/geeklog-modules">geeklog-modules</a> and <a href="http://lists.geeklog.net/mailman/listinfo/geeklog-devel">geeklog-devel</a> mailing lists.</p>
 
-<p>Want to help in Geeklog development? See <a href="http://www.geeklog.net/article.php/developer-resources">this story</a> for suggestions on how to get started. And if you already made a modification, why not <a href="http://wiki.geeklog.net/index.php/Submitting_Patches">submit a patch</a>?
+<p>Want to help in Geeklog development? Here's an <a href="http://wiki.geeklog.net/index.php/Getting_Started">article on how to get started</a>. It has pointers to all the resources you need to know about.</p>
 
 
 <h2>Security Issues</h2>
 
 <p>The Geeklog developers take security very seriously. Should you need to report a security issue with Geeklog, please email details to <a href="mailto:geeklog-security at lists.geeklog.net" rel="nofollow">geeklog-security(at)lists.geeklog.net</a>. Thank you.</p>
 
-<p><strong>Note:</strong> Posts to geeklog-security are of course <em>not</em> discarded and you don't (and can't, actually) subscribe to this list. Simply send an email to this address and we will get back to you ASAP.</p>
+<p><strong>Note:</strong> Posts to geeklog-security are of course <em>not</em> discarded and you don't need to (and can't, actually) subscribe to this list. Simply send an email to this address and we will get back to you ASAP.</p>
 
 <p>Also see our <a href="http://www.geeklog.net/staticpages/index.php/GeeklogSecurity">Security statement</a> on the Geeklog Homepage.</p>
 
diff -r c776e22f2de6 -r b07ac3dba962 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Fri Oct 30 21:13:23 2009 +0100
+++ b/public_html/docs/english/theme.html	Sat Oct 31 09:52:30 2009 +0100
@@ -201,16 +201,36 @@
 <li>Added an icon, <tt>images/update.png</tt>, to be displayed in the admin's
     list of plugins when a plugin needs to be updated. The icon should have the
     same size as the "edit" icon (16x16 pixel in the Professional theme).</li>
+<li>The Topic Editor now contains a line displaying the number of stories in
+    the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
+    <code>{lang_num_stories}</code>, <code>{num_stories}</code></li>
+<li>Added a link back to the story to the "Mail Story to a Friend" form,
+    <tt>profiles/contactauthorform.thtml</tt>. Available variables:
+    <tt>{lang_title}</tt>, <tt>{story_title}</tt>, <tt>{story_url}</tt>,
+    <tt>{story_link}</tt>.</li>
 <li>Added a "send copy to myself" option to
     <tt>profiles/contactauthorform.thtml</tt></li>
+<li>Added textarea fields for meta description and meta keywords to the Story
+    Editor (<tt>admin/story/storyeditor.thtml</tt>,
+    <tt>admin/story/storyeditor_advanced.thtml</tt>).</li>
+<li>Added textarea fields for meta description and meta keywords to the Topic
+    Editor (<tt>admin/topic/topiceditor.thtml</tt>).</li>
+<li>Added a <code>{remoteservice}</code> variable in
+    <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
+    service a Remote User was using to log in.</li>
+</ul>
+
+<h3>Cosmetic changes</h3>
+
+<p>These changes are mostly cosmetic and won't affect the functionality of a
+theme if not applied:</p>
+
+<ul>
 <li>Cosmetics: Made the look and layout of the "Send mail to user"
     (<tt>profiles/contactuserform.thtml</tt>), "Mail Story to a Friend"
     (<tt>profiles/contactauthorform.thtml</tt>), and "Mail Users"
     (<tt>admin/mail/mailform.thtml</tt>) dialogs more consistent (alignment,
     size of input fields).</li>
-<li>The Topic Editor now contains a line displaying the number of stories in
-    the current topic. New variables in <tt>admin/topic/topiceditor.thtml</tt>:
-    <code>{lang_num_stories}</code>, <code>{num_stories}</tt></li>
 <li>Cosmetics: Fixed the position of the story preview when using the
     advanced editor (was slightly shifted to the right, <a
     href="http://project.geeklog.net/tracking/view.php?id=963">bug #0000963</a>). Changes to the <code>&lt;div id="preview"&gt;</code> in
@@ -225,21 +245,10 @@
     <tt>admin/common/edit_permissions.thtml</tt>. Introduced new CSS class
     <tt>admin-list-smalltable</tt>, which is almost identical to
     <tt>admin-list-table</tt> but without the <code>width:100%;</code></li>
-<li>Added a link back to the story to the "Mail Story to a Friend" form,
-    <tt>profiles/contactauthorform.thtml</tt>. Available variables:
-    <tt>{lang_title}</tt>, <tt>{story_title}</tt>, <tt>{story_url}</tt>,
-    <tt>{story_link}</tt>.</tt>
-<li>Added textarea fields for meta description and meta keywords to the Story
-    Editor (<tt>admin/story/storyeditor.thtml</tt>,
-    <tt>admin/story/storyeditor_advanced.thtml</tt>).</li>
-<li>Added textarea fields for meta description and meta keywords to the Topic
-    Editor (<tt>admin/topic/topiceditor.thtml</tt>).</li>
-<li>Added a <code>{remoteservice}</code> variable in
-    <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
-    service a Remote User was using to log in.</li>
 </ul>
 
 <h3>Changes to plugin templates</h3>
+
 <p>Note that plugin template files are kept in a directory
 <tt>plugins/<i>pluginnname</i>/templates</tt> and not in the <tt>layout</tt>
 directory.</p>

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 12:05:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 12:05:31 -0400
Subject: [geeklog-cvs] geeklog: Source code cosmetics
Message-ID: <hg.7af245e1a2ae.1257005131.1485632861@qs1489.pair.com>

changeset 7411:7af245e1a2ae
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7af245e1a2ae
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 11:28:04 2009 +0100
description:
Source code cosmetics

diffstat:

 public_html/admin/block.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r b07ac3dba962 -r 7af245e1a2ae public_html/admin/block.php
--- a/public_html/admin/block.php	Sat Oct 31 09:52:30 2009 +0100
+++ b/public_html/admin/block.php	Sat Oct 31 11:28:04 2009 +0100
@@ -642,6 +642,7 @@
 function reorderblocks()
 {
     global $_TABLES;
+
     $sql = "SELECT * FROM {$_TABLES['blocks']} ORDER BY onleft asc, blockorder asc;";
     $result = DB_query($sql);
     $nrows = DB_numRows($result);
@@ -670,13 +671,13 @@
 /**
 * Move blocks UP, Down and Switch Sides - Left and Right
 *
+* NOTE: Does not return.
+*
 */
 function moveBlock()
 {
     global $_CONF, $_TABLES, $LANG21;
 
-    $retval = '';
-
     $bid = COM_applyFilter($_GET['bid']);
     $where = COM_applyFilter($_GET['where']);
 
@@ -705,9 +706,8 @@
     } else {
         COM_errorLog("block admin error: Attempt to move an non existing block id: $bid");
     }
-    echo COM_refresh($_CONF['site_admin_url'] . "/block.php");
+    echo COM_refresh($_CONF['site_admin_url'] . '/block.php');
     exit;
-    return $retval;
 }
 
 

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 12:05:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 12:05:32 -0400
Subject: [geeklog-cvs] geeklog: Added a notice about the expiry time for the
	security t...
Message-ID: <hg.5db714583481.1257005132.1485632861@qs1489.pair.com>

changeset 7413:5db714583481
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/5db714583481
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 16:46:46 2009 +0100
description:
Added a notice about the expiry time for the security token (and the potential loss of changes) to most editors.

diffstat:

 language/english.php                            |   3 +-
 language/english_utf-8.php                      |   5 +-
 plugins/calendar/autoinstall.php                |   6 ++-
 plugins/links/autoinstall.php                   |   6 ++-
 plugins/polls/autoinstall.php                   |   4 ++
 plugins/staticpages/autoinstall.php             |   4 ++
 public_html/admin/block.php                     |  34 +++++++++++++---
 public_html/admin/group.php                     |   6 ++-
 public_html/admin/plugins/calendar/index.php    |  14 ++++++-
 public_html/admin/plugins/links/category.php    |   5 ++-
 public_html/admin/plugins/links/index.php       |  10 +++-
 public_html/admin/plugins/polls/index.php       |  46 ++++++++++++----------
 public_html/admin/plugins/staticpages/index.php |  12 ++++--
 public_html/admin/story.php                     |  26 +++++-------
 public_html/admin/syndication.php               |  31 ++++++++++++---
 public_html/admin/topic.php                     |  21 ++++++++++-
 public_html/admin/trackback.php                 |  12 +++++-
 public_html/admin/user.php                      |  10 +++--
 public_html/docs/english/theme.html             |   4 ++
 public_html/docs/history                        |   9 +++-
 system/lib-security.php                         |  30 +++++++++++++++
 21 files changed, 223 insertions(+), 75 deletions(-)

diffs (truncated from 748 to 300 lines):

diff -r 9941e73be2ae -r 5db714583481 language/english.php
--- a/language/english.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/language/english.php	Sat Oct 31 16:46:46 2009 +0100
@@ -828,7 +828,7 @@
     88 => 'Wiki-style format',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => '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. You can always hit "Preview" to extend the expiry time.'
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 
@@ -1581,6 +1581,7 @@
     '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
diff -r 9941e73be2ae -r 5db714583481 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/language/english_utf-8.php	Sat Oct 31 16:46:46 2009 +0100
@@ -828,7 +828,7 @@
     88 => 'Wiki-style format',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => '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. You can always hit "Preview" to extend the expiry time.'
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 
@@ -1580,7 +1580,8 @@
     'list_all'      => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',        
-    'na'            => 'N/A'
+    '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
diff -r 9941e73be2ae -r 5db714583481 plugins/calendar/autoinstall.php
--- a/plugins/calendar/autoinstall.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/plugins/calendar/autoinstall.php	Sat Oct 31 16:46:46 2009 +0100
@@ -45,7 +45,7 @@
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
         'pi_version'      => '1.1.1',
-        'pi_gl_version'   => '1.6.0',
+        'pi_gl_version'   => '1.6.1',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
 
@@ -133,6 +133,10 @@
         return false;
     }
 
+    if (!function_exists('SEC_getTokenExpiryNotice')) {
+        return false;
+    }
+
     return true;
 }
 
diff -r 9941e73be2ae -r 5db714583481 plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/plugins/links/autoinstall.php	Sat Oct 31 16:46:46 2009 +0100
@@ -52,7 +52,7 @@
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
         'pi_version'      => '2.1.0',
-        'pi_gl_version'   => '1.6.0',
+        'pi_gl_version'   => '1.6.1',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
 
@@ -184,6 +184,10 @@
         return false;
     }
 
+    if (!function_exists('SEC_getTokenExpiryNotice')) {
+        return false;
+    }
+
     return true;
 }
 
diff -r 9941e73be2ae -r 5db714583481 plugins/polls/autoinstall.php
--- a/plugins/polls/autoinstall.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/plugins/polls/autoinstall.php	Sat Oct 31 16:46:46 2009 +0100
@@ -146,6 +146,10 @@
         return false;
     }
 
+    if (! function_exists('SEC_getTokenExpiryNotice')) {
+        return false;
+    }
+
     return true;
 }
 
diff -r 9941e73be2ae -r 5db714583481 plugins/staticpages/autoinstall.php
--- a/plugins/staticpages/autoinstall.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/plugins/staticpages/autoinstall.php	Sat Oct 31 16:46:46 2009 +0100
@@ -146,6 +146,10 @@
         return false;
     }
 
+    if (! function_exists('SEC_getTokenExpiryNotice')) {
+        return false;
+    }
+
     return true;
 }
 
diff -r 9941e73be2ae -r 5db714583481 public_html/admin/block.php
--- a/public_html/admin/block.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/public_html/admin/block.php	Sat Oct 31 16:46:46 2009 +0100
@@ -33,7 +33,20 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Block administration page: Create, edit, delete, move, enable/disable blocks
+* for the left and right sidebars of your Geeklog site.
+*
+*/
+
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
 require_once 'auth.inc.php';
 
 // Uncomment the line below if you need to debug the HTTP variables being passed
@@ -94,6 +107,8 @@
 
     $retval .= COM_startBlock ($LANG21[3], '',
                                COM_getBlockTemplate ('_admin_block', 'header'));
+    $token = SEC_createToken();
+    $retval .= SEC_getTokenExpiryNotice($token);
 
     $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
     $block_templates->set_file('editor','defaultblockeditor.thtml');
@@ -164,10 +179,11 @@
     $block_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $block_templates->set_var('max_url_length', 255);
     $block_templates->set_var('gltoken_name', CSRF_TOKEN);
-    $block_templates->set_var('gltoken', SEC_createToken());
+    $block_templates->set_var('gltoken', $token);
     $block_templates->parse('output','editor');
+
     $retval .= $block_templates->finish($block_templates->get_var('output'));
-    $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
+    $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
 
     return $retval;
 }
@@ -238,14 +254,18 @@
         $access = 3;
     }
 
+    $token = SEC_createToken();
+
     $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
     $block_templates->set_file('editor','blockeditor.thtml');
     $block_templates->set_var('site_url', $_CONF['site_url']);
     $block_templates->set_var('xhtml', XHTML);
     $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
     $block_templates->set_var('layout_url', $_CONF['layout_url']);
-    $block_templates->set_var('start_block_editor', COM_startBlock ($LANG21[3],
-            '', COM_getBlockTemplate ('_admin_block', 'header')));
+    $block_start = COM_startBlock($LANG21[3], '',
+                        COM_getBlockTemplate('_admin_block', 'header'));
+    $block_start .= LB . SEC_getTokenExpiryNotice($token);
+    $block_templates->set_var('start_block_editor', $block_start);
 
     if (!empty($bid) && SEC_hasrights('block.delete')) {
         $delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
@@ -354,9 +374,9 @@
         $block_templates->set_var ('allow_autotags', '');
     }
     $block_templates->set_var('gltoken_name', CSRF_TOKEN);
-    $block_templates->set_var('gltoken', SEC_createToken());
-    $block_templates->set_var ('end_block',
-            COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
+    $block_templates->set_var('gltoken', $token);
+    $block_templates->set_var('end_block',
+            COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer')));
     $block_templates->parse('output', 'editor');
     $retval .= $block_templates->finish($block_templates->get_var('output'));
 
diff -r 9941e73be2ae -r 5db714583481 public_html/admin/group.php
--- a/public_html/admin/group.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/public_html/admin/group.php	Sat Oct 31 16:46:46 2009 +0100
@@ -45,7 +45,7 @@
 require_once '../lib-common.php';
 
 /**
-* Verifies that current user even has access to the page to this point
+* Security check to ensure user even belongs on this page
 */
 require_once 'auth.inc.php';
 
@@ -128,8 +128,10 @@
         $A['grp_gl_core'] = 0;
     }
 
+    $token = SEC_createToken();
     $retval .= COM_startBlock($LANG_ACCESS['groupeditor'], '',
                               COM_getBlockTemplate('_admin_block', 'header'));
+    $retval .= SEC_getTokenExpiryNotice($token);
 
     if (! empty($grp_id)) {
         // Groups tied to Geeklog's functionality shouldn't be deleted
@@ -267,7 +269,7 @@
     $group_templates->set_var('rights_options',
                               printrights($grp_id, $A['grp_gl_core']));
     $group_templates->set_var('gltoken_name', CSRF_TOKEN);
-    $group_templates->set_var('gltoken', SEC_createToken());
+    $group_templates->set_var('gltoken', $token);
     $group_templates->parse('output','editor');
     $retval .= $group_templates->finish($group_templates->get_var('output'));
     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
diff -r 9941e73be2ae -r 5db714583481 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/public_html/admin/plugins/calendar/index.php	Sat Oct 31 16:46:46 2009 +0100
@@ -32,7 +32,14 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Geeklog common function library
+*/
 require_once '../../../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
 require_once '../../auth.inc.php';
 
 // Uncomment the line below if you need to debug the HTTP variables being passed
@@ -125,8 +132,11 @@
         $event_templates->set_var('post_options', COM_optionList($_TABLES['postmodes'],'code,name',$A['postmode']));
     }
 
+    $token = SEC_createToken();
+
     $retval .= COM_startBlock($LANG_CAL_ADMIN[1], '',
-                              COM_getBlockTemplate ('_admin_block', 'header'));
+                              COM_getBlockTemplate('_admin_block', 'header'));
+    $retval .= SEC_getTokenExpiryNotice($token);
 
     if (!empty($A['eid'])) {
         $delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
@@ -330,7 +340,7 @@
     $event_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
     $event_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $event_templates->set_var('gltoken_name', CSRF_TOKEN);
-    $event_templates->set_var('gltoken', SEC_createToken());
+    $event_templates->set_var('gltoken', $token);
     $event_templates->parse('output', 'editor');
     $retval .= $event_templates->finish($event_templates->get_var('output'));
     $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
diff -r 9941e73be2ae -r 5db714583481 public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/public_html/admin/plugins/links/category.php	Sat Oct 31 16:46:46 2009 +0100
@@ -210,8 +210,11 @@
         return COM_showMessage(6, 'links');
     }
 
+    $token = SEC_createToken();
+
     $retval .= COM_startBlock($LANG_LINKS_ADMIN[56], '',
                               COM_getBlockTemplate('_admin_block', 'header'));
+    $retval .= SEC_getTokenExpiryNotice($token);
 
     $T = new Template($_CONF['path'] . 'plugins/links/templates/admin');
     $T->set_file(array('page' => 'categoryeditor.thtml'));
@@ -299,7 +302,7 @@
     $T->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $T->set_var('lang_lockmsg', $LANG_ACCESS['permmsg']);
     $T->set_var('gltoken_name', CSRF_TOKEN);
-    $T->set_var('gltoken', SEC_createToken());
+    $T->set_var('gltoken', $token);
 
     $T->parse('output', 'page');
     $retval .= $T->finish($T->get_var('output'));
diff -r 9941e73be2ae -r 5db714583481 public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php	Sat Oct 31 13:28:45 2009 +0100
+++ b/public_html/admin/plugins/links/index.php	Sat Oct 31 16:46:46 2009 +0100
@@ -150,8 +150,12 @@
         SEC_setDefaultPermissions ($A, $_LI_CONF['default_permissions']);
         $access = 3;
     }

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 12:05:33 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 12:05:33 -0400
Subject: [geeklog-cvs] geeklog: Use same template variable for advanced and
	normal editor
Message-ID: <hg.3f9da8f02061.1257005133.1485632861@qs1489.pair.com>

changeset 7414:3f9da8f02061
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3f9da8f02061
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 16:51:43 2009 +0100
description:
Use same template variable for advanced and normal editor

diffstat:

 plugins/staticpages/templates/admin/editor_advanced.thtml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 5db714583481 -r 3f9da8f02061 plugins/staticpages/templates/admin/editor_advanced.thtml
--- a/plugins/staticpages/templates/admin/editor_advanced.thtml	Sat Oct 31 16:46:46 2009 +0100
+++ b/plugins/staticpages/templates/admin/editor_advanced.thtml	Sat Oct 31 16:51:43 2009 +0100
@@ -83,7 +83,7 @@
              <tr id="html_editarea" style="display:{show_htmleditor};">
                 <td colspan="2" style="margin-top:10px;border:1px solid #CCC;">
                   <textarea id="html_content" name="sp_content" cols="45" rows="24" style="width:100%" wrap="virtual">{sp_content}</textarea>
-                  <div class="warningsmall" style="padding:10px;">{lang_allowedhtml}</div>
+                  <div class="warningsmall" style="padding:10px;">{lang_allowed_html}</div>
                 </td>
              </tr>
           <tr>

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 12:05:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 12:05:31 -0400
Subject: [geeklog-cvs] geeklog: Don't call COM_numberFormat on "N/A"
Message-ID: <hg.9941e73be2ae.1257005131.1485632861@qs1489.pair.com>

changeset 7412:9941e73be2ae
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/9941e73be2ae
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 13:28:45 2009 +0100
description:
Don't call COM_numberFormat on "N/A"

diffstat:

 public_html/admin/plugins/links/category.php |  4 ++--
 public_html/admin/topic.php                  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 7af245e1a2ae -r 9941e73be2ae public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sat Oct 31 11:28:04 2009 +0100
+++ b/public_html/admin/plugins/links/category.php	Sat Oct 31 13:28:45 2009 +0100
@@ -279,10 +279,10 @@
     } else {
         $nresult = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['links']} WHERE cid='{$cid}'" . COM_getPermSQL('AND'));
         $N = DB_fetchArray($nresult);
-        $num_links = $N['count'];
+        $num_links = COM_numberFormat($N['count']);
     }
     $T->set_var('lang_num_links', $LANG_LINKS_ADMIN[61]);
-    $T->set_var('num_links', COM_numberFormat($num_links));
+    $T->set_var('num_links', $num_links);
 
     // user access info
     $T->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
diff -r 7af245e1a2ae -r 9941e73be2ae public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Oct 31 11:28:04 2009 +0100
+++ b/public_html/admin/topic.php	Sat Oct 31 13:28:45 2009 +0100
@@ -211,11 +211,11 @@
     } else {
         $nresult = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE tid = '" . addslashes($tid) . "'" . COM_getPermSql('AND'));
         $N = DB_fetchArray( $nresult );
-        $num_stories = $N['count'];
+        $num_stories = COM_numberFormat($N['count']);
     }
 
     $topic_templates->set_var('lang_num_stories', $LANG27[30]);
-    $topic_templates->set_var('num_stories', COM_numberFormat($num_stories));
+    $topic_templates->set_var('num_stories', $num_stories);
     $topic_templates->set_var('gltoken_name', CSRF_TOKEN);
     $topic_templates->set_var('gltoken', SEC_createToken());
     $topic_templates->parse('output', 'editor');

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 12:05:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 12:05:34 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fix
Message-ID: <hg.6043bfcaf4c9.1257005134.1485632861@qs1489.pair.com>

changeset 7415:6043bfcaf4c9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6043bfcaf4c9
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 17:00:51 2009 +0100
description:
E_ALL fix

diffstat:

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

diffs (12 lines):

diff -r 3f9da8f02061 -r 6043bfcaf4c9 public_html/admin/syndication.php
--- a/public_html/admin/syndication.php	Sat Oct 31 16:51:43 2009 +0100
+++ b/public_html/admin/syndication.php	Sat Oct 31 17:00:51 2009 +0100
@@ -495,7 +495,7 @@
         $A[$name] = COM_stripslashes ($value);
     }
 
-    if ($A['is_enabled'] == 'on') {
+    if (isset($A['is_enabled']) && ($A['is_enabled'] == 'on')) {
         $A['is_enabled'] = 1;
     } else {
         $A['is_enabled'] = 0;

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:49:54 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:49:54 -0400
Subject: [geeklog-cvs] geeklog: Moved the functionality of the toinnodb.php
	script into...
Message-ID: <hg.ace128f1bd0b.1257022194.1485632861@qs1489.pair.com>

changeset 7416:ace128f1bd0b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ace128f1bd0b
user: Dirk Haun <dirk at haun-online.de>
date: Sat Sep 26 22:19:20 2009 +0200
description:
Moved the functionality of the toinnodb.php script into the Database Backups admin panel and added an option to optimze tables.

diffstat:

 language/english.php           |   22 +-
 language/english_utf-8.php     |   26 +-
 public_html/admin/database.php |  524 ++++++++++++++++++++++++++++++++++++++++--
 public_html/docs/history       |    3 +
 4 files changed, 538 insertions(+), 37 deletions(-)

diffs (truncated from 692 to 300 lines):

diff -r 2cb6f25e4350 -r ace128f1bd0b language/english.php
--- a/language/english.php	Tue Sep 22 01:37:10 2009 +0100
+++ b/language/english.php	Sat Sep 26 22:19:20 2009 +0200
@@ -1333,7 +1333,27 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
diff -r 2cb6f25e4350 -r ace128f1bd0b language/english_utf-8.php
--- a/language/english_utf-8.php	Tue Sep 22 01:37:10 2009 +0100
+++ b/language/english_utf-8.php	Sat Sep 26 22:19:20 2009 +0200
@@ -1032,7 +1032,7 @@
     6 => 'Warning: Plugin Already Installed!',
     7 => 'The plugin you are trying to install already exists.  Please delete the plugin before re-installing it',
     8 => 'Plugin Compatibility Check Failed',
-    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net/">Geeklog</a>.',
+    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>There are no plugins currently installed.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'To modify or delete a plugin, click on that plugin\'s edit icon below. This will show the plugin details including the authors\'s website. Both the installed version and the version returned from the plugin\'s code are shown. This will aid you to know if the plugin needs to be upgraded. To install or upgrade a plugin please consult its documentation.',
     12 => 'no plugin name provided to plugineditor()',
@@ -1333,7 +1333,27 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
@@ -1851,7 +1871,7 @@
     'url_rewrite' => "Enable URL Rewrite",
     'meta_tags' => "Meta Tags",
     'meta_description' => "Default Meta Description",
-    'meta_keywords' => "Default Meta Keywords",
+    'meta_keywords' => "Default Meta Keywords",    
     'default_permissions_block' => "Block Default Permissions",
     'default_permissions_story' => "Story Default Permissions",
     'default_permissions_topic' => "Topic Default Permissions",
diff -r 2cb6f25e4350 -r ace128f1bd0b public_html/admin/database.php
--- a/public_html/admin/database.php	Tue Sep 22 01:37:10 2009 +0100
+++ b/public_html/admin/database.php	Sat Sep 26 22:19:20 2009 +0200
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | database.php                                                              |
 // |                                                                           |
-// | Geeklog database backup administration page.                              |
+// | Geeklog database backup and maintenance page.                             |
 // +---------------------------------------------------------------------------+
 // | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
@@ -32,7 +32,22 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* This admin panel provides some simple database backup and administration
+* abilities. You can create and download database backups, optimize tables,
+* or convert tables to InnoDB.
+* All of these functions are currently only available for MySQL. The link to
+* this admin panel is actually hidden when not using MySQL.
+*/
+
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
 require_once 'auth.inc.php';
 
 $display = '';
@@ -48,12 +63,6 @@
 }
 
 /**
-* This page allows all Root admins to create a database backup.  It's pretty
-* simple actually.  The admin clicks a button, we do a mysqldump to a file in
-* the following format: geeklog_db_backup_YYYY_MM_DD_hh_mm_ss.sql  That's it.
-*/
-
-/**
 * Sort backup files with newest first, oldest last.
 * For use with usort() function.
 * This is needed because the sort order of the backup files, coming from the
@@ -80,7 +89,8 @@
 */
 function listbackups()
 {
-    global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG08, $LANG_ADMIN, $LANG_DB_BACKUP;
+    global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG08, $LANG_ADMIN,
+           $LANG_DB_BACKUP, $_DB_dbms;
 
     require_once $_CONF['path_system'] . 'lib-admin.php';
 
@@ -122,11 +132,23 @@
         $token = SEC_createToken();
         $menu_arr = array(
             array('url' => $_CONF['site_admin_url']
-                           . '/database.php?mode=backup&'.CSRF_TOKEN.'='.$token,
+                                . '/database.php?mode=backup&amp;'
+                                . CSRF_TOKEN . '=' . $token,
                   'text' => $LANG_ADMIN['create_new']),
+        );
+        if ($_DB_dbms == 'mysql') {
+            $menu_arr[] =
+                array('url' => $thisUrl . '?mode=optimize',
+                      'text' => $LANG_DB_BACKUP['optimize_menu']);
+            if (innodb_supported()) {
+                $menu_arr[] =
+                    array('url' => $thisUrl . '?mode=innodb',
+                          'text' => $LANG_DB_BACKUP['convert_menu']);
+            }
+        }
+        $menu_arr[] =
             array('url' => $_CONF['site_admin_url'],
-                  'text' => $LANG_ADMIN['admin_home'])
-        );
+                  'text' => $LANG_ADMIN['admin_home']);
         $retval .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups'], '',
                             COM_getBlockTemplate('_admin_block', 'header'));
         $retval .= ADMIN_createMenu(
@@ -263,21 +285,393 @@
     $dl->downloadFile($file);
 }
 
+/**
+* Delete selected backup files
+*
+* @return   string  empty string (nothing to do), or HTML error or success msg
+*
+*/
+function deletebackups()
+{
+    global $_CONF, $LANG_DB_BACKUP;
+
+    $retval = '';
+    $files = 0;
+    $failed = 0;
+
+    foreach ($_POST['delitem'] as $delfile) {
+        $file = COM_sanitizeFilename($delfile, true);
+        if (! empty($file)) {
+            $files++;
+            if (! @unlink($_CONF['backup_path'] . $file)) {
+                COM_errorLog('Unable to remove backup file "' . $file . '"');
+                $failed++;
+            }
+        }
+    }
+
+    if ($files > 0) {
+        if ($failed > 0) {
+            $retval .= COM_showMessageText($LANG_DB_BACKUP['delete_failure']);
+        } else {
+            $retval .= COM_showMessageText($LANG_DB_BACKUP['delete_success']);
+        }
+    }
+
+    return $retval;
+}
+
+/**
+* Create a simple form with two buttons
+*
+* Creates a simple form that has a Cancel and an "action" button, where
+* the latter invokes a POST request with $_POST['mode'] set to the given value.
+*
+* @param    string  $buttontext     text string for the "action" button
+* @param    string  $mode           mode value
+* @param    string  $token          CSRF token, will be created if empty
+* @return   string                  HTML form
+*
+*/
+function miniform_DoOrCancel($buttontext, $mode, $token = '')
+{
+    global $_CONF, $LANG_ADMIN;
+
+    $retval = '';
+
+    if (empty($token)) {
+        $token = SEC_createToken();
+    }
+
+    $retval .= '<div id="miniform"><form action="' . $_CONF['site_admin_url']
+            . '/database.php" method="post" style="display:inline;">' . LB;
+    $retval .= '<input type="submit" value="' . $buttontext . '"'
+            . XHTML . '>' . LB;
+    $retval .= '<input type="hidden" name="mode" value="' . $mode . '"'
+            . XHTML . '>' . LB;
+    $retval .= '<input type="hidden" name="' . CSRF_TOKEN . '" value="'
+            . $token . '"' . XHTML . '>' . LB;
+    $retval .= '</form>' . LB;
+    $retval .= '<form action="' . $_CONF['site_admin_url']
+            . '/database.php" method="post" style="display:inline;">' . LB;
+    $retval .= '<input type="submit" value="' . $LANG_ADMIN['cancel'] . '"'
+            . XHTML . '>' . LB;
+    $retval .= '</form></div>' . LB;
+
+    return $retval;
+}
+
+/**
+* Check for InnoDB table support (usually as of MySQL 4.0, but may be
+* available in earlier versions, e.g. "Max" or custom builds).
+*
+* @return   true = InnoDB tables supported, false = not supported
+*
+*/
+function innodb_supported()
+{
+    global $_DB_dbms;
+
+    $retval = false;
+
+    if ($_DB_dbms == 'mysql') {
+        $result = DB_query("SHOW TABLE TYPES");
+        $numEngines = DB_numRows($result);
+        for ($i = 0; $i < $numEngines; $i++) {
+            $A = DB_fetchArray($result);
+
+            if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
+                if (strcasecmp($A['Support'], 'yes') == 0) {
+                    $retval = true;
+                }
+                break;
+            }
+        }
+    }
+
+    return $retval;
+}
+
+/**
+* Check if all the tables have already been converted to InnoDB
+*
+* @return   bool    true: all tables are InnoDB, otherwise false
+*
+*/
+function already_converted()
+{
+    global $_CONF, $_TABLES, $_DB_name;
+
+    $retval = false;
+
+    $engine = DB_getItem($_TABLES['vars'], 'value', "name = 'database_engine'");
+    if (!empty($engine) && ($engine == 'InnoDB')) {
+        // need to look at all the tables
+        $result = DB_query("SHOW TABLES");
+        $numTables = DB_numRows($result);
+        for ($i = 0; $i < $numTables; $i++) {
+            $A = DB_fetchArray($result, true);
+            $table = $A[0];
+            if (in_array($table, $_TABLES)) {
+                $result2 = DB_query("SHOW TABLE STATUS FROM $_DB_name LIKE '$table'");

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:49:54 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:49:54 -0400
Subject: [geeklog-cvs] geeklog: Removed toinnodb.php script - functionality
	has been ro...
Message-ID: <hg.7f9887d0ea71.1257022194.1485632861@qs1489.pair.com>

changeset 7417:7f9887d0ea71
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7f9887d0ea71
user: Dirk Haun <dirk at haun-online.de>
date: Sat Sep 26 22:20:05 2009 +0200
description:
Removed toinnodb.php script - functionality has been rolled into the Database Backups admin panel

diffstat:

 public_html/admin/install/toinnodb.php |  116 --------------------------------------
 1 files changed, 0 insertions(+), 116 deletions(-)

diffs (120 lines):

diff -r ace128f1bd0b -r 7f9887d0ea71 public_html/admin/install/toinnodb.php
--- a/public_html/admin/install/toinnodb.php	Sat Sep 26 22:19:20 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-<?php
-
-/* Reminder: always indent with 4 spaces (no tabs). */
-// +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
-// +---------------------------------------------------------------------------+
-// | toinnodb.php                                                              |
-// |                                                                           |
-// | Change Geeklog tables from MyISAM to InnoDB.                              |
-// +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2009 by the following authors:                         |
-// |                                                                           |
-// | Authors: Dirk Haun - dirk AT haun-online DOT de                           |
-// +---------------------------------------------------------------------------+
-// |                                                                           |
-// | 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.           |
-// |                                                                           |
-// +---------------------------------------------------------------------------+
-
-require_once '../../lib-common.php';
-
-// bail if user isn't a Root user
-if (!SEC_inGroup('Root')) {
-    $display = COM_siteHeader('menu', $MESSAGE[30])
-             . COM_showMessageText($LANG20[6], $MESSAGE[30])
-             . COM_siteFooter();
-    COM_accessLog('User ' . COM_getDisplayName() . ' tried to illegally access the optimize database screen.');
-    COM_output($display);
-    exit;
-}
-
-/**
-* Check for InnoDB table support (usually as of MySQL 4.0, but may be
-* available in earlier versions, e.g. "Max" or custom builds).
-*
-* @return   true = InnoDB tables supported, false = not supported
-*
-*/
-function innodb_supported()
-{
-    global $_DB_dbms;
-
-    $retval = false;
-
-    if ($_DB_dbms == 'mysql') {
-        $result = DB_query("SHOW VARIABLES LIKE 'have_innodb'");
-        $A = DB_fetchArray($result, true);
-
-        if (strcasecmp($A[1], 'yes') == 0) {
-            $retval = true;
-        }
-    }
-
-    return $retval;
-}
-
-
-// MAIN
-
-echo COM_siteHeader('menu', 'Changing tables to InnoDB');
-echo COM_startBlock('Changing tables to InnoDB');
-
-if (innodb_supported()) {
-
-    echo '<p>This may take a while ...</p>' . LB;
-    flush();
-
-    $opt_time = new timerobject();
-    $opt_time->startTimer();
-
-    DB_displayError(true);
-
-    $result = DB_query("SHOW TABLES");
-    $numTables = DB_numRows($result);
-    for ($i = 0; $i < $numTables; $i++) {
-        $A = DB_fetchArray($result, true);
-        if (in_array($A[0], $_TABLES)) {
-            $make_innodb = DB_query("ALTER TABLE $A[0] TYPE=InnoDB", 1);
-            if ($make_innodb === false) {
-                echo '<p>SQL error for table "' . $A[0] . '" (ignored): '
-                     . DB_error() . '</p>' . LB;
-                flush();
-            }
-        }
-    }
-
-    DB_delete($_TABLES['vars'], 'name', 'database_engine');
-    DB_query("INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_engine', 'InnoDB')");
-
-    $exectime = $opt_time->stopTimer();
-
-    echo '<p>Changing ' . count($_TABLES) . ' tables to InnoDB took '
-         . $exectime . ' seconds.<p>' . LB;
-
-} else {
-
-    echo '<p>Sorry, your database does not support InnoDB tables.</p>' . LB;
-
-}
-
-echo COM_endBlock();
-echo COM_siteFooter();
-
-?>

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:49:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:49:55 -0400
Subject: [geeklog-cvs] geeklog: Merged with "dbadmin" feature branch
Message-ID: <hg.1ef30531a38e.1257022195.1485632861@qs1489.pair.com>

changeset 7418:1ef30531a38e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1ef30531a38e
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 18:03:53 2009 +0100
description:
Merged with "dbadmin" feature branch

diffstat:

 language/english.php                   |   22 +-
 language/english_utf-8.php             |   26 +-
 public_html/admin/database.php         |  524 +++++++++++++++++++++++++++++++++++--
 public_html/admin/install/toinnodb.php |  116 --------
 public_html/docs/history               |    3 +
 5 files changed, 538 insertions(+), 153 deletions(-)

diffs (truncated from 812 to 300 lines):

diff -r 6043bfcaf4c9 -r 1ef30531a38e language/english.php
--- a/language/english.php	Sat Oct 31 17:00:51 2009 +0100
+++ b/language/english.php	Sat Oct 31 18:03:53 2009 +0100
@@ -1336,7 +1336,27 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
diff -r 6043bfcaf4c9 -r 1ef30531a38e language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Oct 31 17:00:51 2009 +0100
+++ b/language/english_utf-8.php	Sat Oct 31 18:03:53 2009 +0100
@@ -1034,7 +1034,7 @@
     6 => 'Warning: Plugin Already Installed!',
     7 => 'The plugin you are trying to install already exists.  Please delete the plugin before re-installing it',
     8 => 'Plugin Compatibility Check Failed',
-    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net/">Geeklog</a>.',
+    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>There are no plugins currently installed.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'To modify or delete a plugin, click on that plugin\'s edit icon below. This will show the plugin details including the authors\'s website. Both the installed version and the version returned from the plugin\'s code are shown. This will aid you to know if the plugin needs to be upgraded. To install or upgrade a plugin please consult its documentation.',
     12 => 'no plugin name provided to plugineditor()',
@@ -1336,7 +1336,27 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
@@ -1855,7 +1875,7 @@
     'url_rewrite' => "Enable URL Rewrite",
     'meta_tags' => "Meta Tags",
     'meta_description' => "Default Meta Description",
-    'meta_keywords' => "Default Meta Keywords",
+    'meta_keywords' => "Default Meta Keywords",    
     'default_permissions_block' => "Block Default Permissions",
     'default_permissions_story' => "Story Default Permissions",
     'default_permissions_topic' => "Topic Default Permissions",
diff -r 6043bfcaf4c9 -r 1ef30531a38e public_html/admin/database.php
--- a/public_html/admin/database.php	Sat Oct 31 17:00:51 2009 +0100
+++ b/public_html/admin/database.php	Sat Oct 31 18:03:53 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | database.php                                                              |
 // |                                                                           |
-// | Geeklog database backup administration page.                              |
+// | Geeklog database backup and maintenance page.                             |
 // +---------------------------------------------------------------------------+
 // | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
@@ -32,7 +32,22 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* This admin panel provides some simple database backup and administration
+* abilities. You can create and download database backups, optimize tables,
+* or convert tables to InnoDB.
+* All of these functions are currently only available for MySQL. The link to
+* this admin panel is actually hidden when not using MySQL.
+*/
+
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
 require_once 'auth.inc.php';
 
 $display = '';
@@ -48,12 +63,6 @@
 }
 
 /**
-* This page allows all Root admins to create a database backup.  It's pretty
-* simple actually.  The admin clicks a button, we do a mysqldump to a file in
-* the following format: geeklog_db_backup_YYYY_MM_DD_hh_mm_ss.sql  That's it.
-*/
-
-/**
 * Sort backup files with newest first, oldest last.
 * For use with usort() function.
 * This is needed because the sort order of the backup files, coming from the
@@ -80,7 +89,8 @@
 */
 function listbackups()
 {
-    global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG08, $LANG_ADMIN, $LANG_DB_BACKUP;
+    global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG08, $LANG_ADMIN,
+           $LANG_DB_BACKUP, $_DB_dbms;
 
     require_once $_CONF['path_system'] . 'lib-admin.php';
 
@@ -122,11 +132,23 @@
         $token = SEC_createToken();
         $menu_arr = array(
             array('url' => $_CONF['site_admin_url']
-                           . '/database.php?mode=backup&'.CSRF_TOKEN.'='.$token,
+                                . '/database.php?mode=backup&amp;'
+                                . CSRF_TOKEN . '=' . $token,
                   'text' => $LANG_ADMIN['create_new']),
+        );
+        if ($_DB_dbms == 'mysql') {
+            $menu_arr[] =
+                array('url' => $thisUrl . '?mode=optimize',
+                      'text' => $LANG_DB_BACKUP['optimize_menu']);
+            if (innodb_supported()) {
+                $menu_arr[] =
+                    array('url' => $thisUrl . '?mode=innodb',
+                          'text' => $LANG_DB_BACKUP['convert_menu']);
+            }
+        }
+        $menu_arr[] =
             array('url' => $_CONF['site_admin_url'],
-                  'text' => $LANG_ADMIN['admin_home'])
-        );
+                  'text' => $LANG_ADMIN['admin_home']);
         $retval .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups'], '',
                             COM_getBlockTemplate('_admin_block', 'header'));
         $retval .= ADMIN_createMenu(
@@ -263,21 +285,393 @@
     $dl->downloadFile($file);
 }
 
+/**
+* Delete selected backup files
+*
+* @return   string  empty string (nothing to do), or HTML error or success msg
+*
+*/
+function deletebackups()
+{
+    global $_CONF, $LANG_DB_BACKUP;
+
+    $retval = '';
+    $files = 0;
+    $failed = 0;
+
+    foreach ($_POST['delitem'] as $delfile) {
+        $file = COM_sanitizeFilename($delfile, true);
+        if (! empty($file)) {
+            $files++;
+            if (! @unlink($_CONF['backup_path'] . $file)) {
+                COM_errorLog('Unable to remove backup file "' . $file . '"');
+                $failed++;
+            }
+        }
+    }
+
+    if ($files > 0) {
+        if ($failed > 0) {
+            $retval .= COM_showMessageText($LANG_DB_BACKUP['delete_failure']);
+        } else {
+            $retval .= COM_showMessageText($LANG_DB_BACKUP['delete_success']);
+        }
+    }
+
+    return $retval;
+}
+
+/**
+* Create a simple form with two buttons
+*
+* Creates a simple form that has a Cancel and an "action" button, where
+* the latter invokes a POST request with $_POST['mode'] set to the given value.
+*
+* @param    string  $buttontext     text string for the "action" button
+* @param    string  $mode           mode value
+* @param    string  $token          CSRF token, will be created if empty
+* @return   string                  HTML form
+*
+*/
+function miniform_DoOrCancel($buttontext, $mode, $token = '')
+{
+    global $_CONF, $LANG_ADMIN;
+
+    $retval = '';
+
+    if (empty($token)) {
+        $token = SEC_createToken();
+    }
+
+    $retval .= '<div id="miniform"><form action="' . $_CONF['site_admin_url']
+            . '/database.php" method="post" style="display:inline;">' . LB;
+    $retval .= '<input type="submit" value="' . $buttontext . '"'
+            . XHTML . '>' . LB;
+    $retval .= '<input type="hidden" name="mode" value="' . $mode . '"'
+            . XHTML . '>' . LB;
+    $retval .= '<input type="hidden" name="' . CSRF_TOKEN . '" value="'
+            . $token . '"' . XHTML . '>' . LB;
+    $retval .= '</form>' . LB;
+    $retval .= '<form action="' . $_CONF['site_admin_url']
+            . '/database.php" method="post" style="display:inline;">' . LB;
+    $retval .= '<input type="submit" value="' . $LANG_ADMIN['cancel'] . '"'
+            . XHTML . '>' . LB;
+    $retval .= '</form></div>' . LB;
+
+    return $retval;
+}
+
+/**
+* Check for InnoDB table support (usually as of MySQL 4.0, but may be
+* available in earlier versions, e.g. "Max" or custom builds).
+*
+* @return   true = InnoDB tables supported, false = not supported
+*
+*/
+function innodb_supported()
+{
+    global $_DB_dbms;
+
+    $retval = false;
+
+    if ($_DB_dbms == 'mysql') {
+        $result = DB_query("SHOW TABLE TYPES");
+        $numEngines = DB_numRows($result);
+        for ($i = 0; $i < $numEngines; $i++) {
+            $A = DB_fetchArray($result);
+
+            if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
+                if (strcasecmp($A['Support'], 'yes') == 0) {
+                    $retval = true;
+                }
+                break;
+            }
+        }
+    }
+
+    return $retval;
+}
+
+/**
+* Check if all the tables have already been converted to InnoDB
+*
+* @return   bool    true: all tables are InnoDB, otherwise false
+*
+*/
+function already_converted()
+{
+    global $_CONF, $_TABLES, $_DB_name;
+
+    $retval = false;
+
+    $engine = DB_getItem($_TABLES['vars'], 'value', "name = 'database_engine'");
+    if (!empty($engine) && ($engine == 'InnoDB')) {
+        // need to look at all the tables
+        $result = DB_query("SHOW TABLES");
+        $numTables = DB_numRows($result);
+        for ($i = 0; $i < $numTables; $i++) {
+            $A = DB_fetchArray($result, true);
+            $table = $A[0];
+            if (in_array($table, $_TABLES)) {
+                $result2 = DB_query("SHOW TABLE STATUS FROM $_DB_name LIKE '$table'");

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:49:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:49:57 -0400
Subject: [geeklog-cvs] geeklog: Parse error - missing comma
Message-ID: <hg.751bf49fc6f4.1257022197.1485632861@qs1489.pair.com>

changeset 7419:751bf49fc6f4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/751bf49fc6f4
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 18:20:09 2009 +0100
description:
Parse error - missing comma

diffstat:

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

diffs (12 lines):

diff -r 1ef30531a38e -r 751bf49fc6f4 language/english.php
--- a/language/english.php	Sat Oct 31 18:03:53 2009 +0100
+++ b/language/english.php	Sat Oct 31 18:20:09 2009 +0100
@@ -1600,7 +1600,7 @@
     'list_all'      => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',        
-    'na'            => 'N/A'
+    '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.'
 );
 

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:49:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:49:58 -0400
Subject: [geeklog-cvs] geeklog: Out stripos() emulation threw an error on
	PHP 4 when $n...
Message-ID: <hg.aa4bb7a5514e.1257022198.1485632861@qs1489.pair.com>

changeset 7420:aa4bb7a5514e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/aa4bb7a5514e
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 18:34:19 2009 +0100
description:
Out stripos() emulation threw an error on PHP 4 when $needle was empty (bug #0001008)

diffstat:

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

diffs (23 lines):

diff -r 751bf49fc6f4 -r aa4bb7a5514e public_html/docs/history
--- a/public_html/docs/history	Sat Oct 31 18:20:09 2009 +0100
+++ b/public_html/docs/history	Sat Oct 31 18:34:19 2009 +0100
@@ -3,6 +3,7 @@
 Nov 1, 2009 (1.6.1)
 -----------
 
+- 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]
 - Added an option to optimze tables to the Database Backups admin panel [Dirk]
diff -r 751bf49fc6f4 -r aa4bb7a5514e system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Oct 31 18:20:09 2009 +0100
+++ b/system/classes/search.class.php	Sat Oct 31 18:34:19 2009 +0100
@@ -940,6 +940,8 @@
     {
         if (function_exists('stripos')) {
             return stripos($haystack, $needle);
+        } elseif (empty($needle)) {
+            return false;
         } else {
             return strpos(strtolower($haystack), strtolower($needle));
         }

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:50:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:50:02 -0400
Subject: [geeklog-cvs] geeklog: Synced language files with their English
	equivalents
Message-ID: <hg.1c37ae225954.1257022203.1485632861@qs1489.pair.com>

changeset 7421:1c37ae225954
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1c37ae225954
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 19:07:14 2009 +0100
description:
Synced language files with their English equivalents

diffstat:

 language/afrikaans.php                 |  27 ++++++++++++++++++++++++---
 language/afrikaans_utf-8.php           |  27 ++++++++++++++++++++++++---
 language/bosnian.php                   |  27 ++++++++++++++++++++++++---
 language/bosnian_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/bulgarian.php                 |  27 ++++++++++++++++++++++++---
 language/bulgarian_utf-8.php           |  27 ++++++++++++++++++++++++---
 language/catalan.php                   |  27 ++++++++++++++++++++++++---
 language/catalan_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/chinese_simplified_utf-8.php  |  27 ++++++++++++++++++++++++---
 language/chinese_traditional_utf-8.php |  27 ++++++++++++++++++++++++---
 language/croatian.php                  |  27 ++++++++++++++++++++++++---
 language/croatian_utf-8.php            |  27 ++++++++++++++++++++++++---
 language/czech.php                     |  27 ++++++++++++++++++++++++---
 language/czech_utf-8.php               |  27 ++++++++++++++++++++++++---
 language/danish.php                    |  27 ++++++++++++++++++++++++---
 language/danish_utf-8.php              |  27 ++++++++++++++++++++++++---
 language/dutch.php                     |  27 ++++++++++++++++++++++++---
 language/dutch_utf-8.php               |  27 ++++++++++++++++++++++++---
 language/estonian.php                  |  27 ++++++++++++++++++++++++---
 language/estonian_utf-8.php            |  27 ++++++++++++++++++++++++---
 language/farsi_utf-8.php               |  27 ++++++++++++++++++++++++---
 language/finnish.php                   |  27 ++++++++++++++++++++++++---
 language/finnish_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/french_canada.php             |  27 ++++++++++++++++++++++++---
 language/french_canada_utf-8.php       |  27 ++++++++++++++++++++++++---
 language/french_france.php             |  27 ++++++++++++++++++++++++---
 language/french_france_utf-8.php       |  27 ++++++++++++++++++++++++---
 language/german.php                    |  29 +++++++++++++++++++++++++----
 language/german_formal.php             |  29 +++++++++++++++++++++++++----
 language/german_formal_utf-8.php       |  29 +++++++++++++++++++++++++----
 language/german_utf-8.php              |  29 +++++++++++++++++++++++++----
 language/hebrew_utf-8.php              |  27 ++++++++++++++++++++++++---
 language/hellenic.php                  |  27 ++++++++++++++++++++++++---
 language/hellenic_utf-8.php            |  27 ++++++++++++++++++++++++---
 language/indonesian.php                |  27 ++++++++++++++++++++++++---
 language/indonesian_utf-8.php          |  27 ++++++++++++++++++++++++---
 language/italian.php                   |  27 ++++++++++++++++++++++++---
 language/italian_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/japanese_utf-8.php            |  27 ++++++++++++++++++++++++---
 language/korean.php                    |  27 ++++++++++++++++++++++++---
 language/korean_utf-8.php              |  27 ++++++++++++++++++++++++---
 language/norwegian.php                 |  27 ++++++++++++++++++++++++---
 language/norwegian_utf-8.php           |  27 ++++++++++++++++++++++++---
 language/polish.php                    |  27 ++++++++++++++++++++++++---
 language/polish_utf-8.php              |  27 ++++++++++++++++++++++++---
 language/portuguese.php                |  27 ++++++++++++++++++++++++---
 language/portuguese_brazil.php         |  27 ++++++++++++++++++++++++---
 language/portuguese_brazil_utf-8.php   |  27 ++++++++++++++++++++++++---
 language/portuguese_utf-8.php          |  27 ++++++++++++++++++++++++---
 language/romanian.php                  |  27 ++++++++++++++++++++++++---
 language/romanian_utf-8.php            |  27 ++++++++++++++++++++++++---
 language/russian.php                   |  27 ++++++++++++++++++++++++---
 language/russian_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/serbian.php                   |  27 ++++++++++++++++++++++++---
 language/serbian_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/slovak.php                    |  27 ++++++++++++++++++++++++---
 language/slovak_utf-8.php              |  27 ++++++++++++++++++++++++---
 language/slovenian.php                 |  27 ++++++++++++++++++++++++---
 language/slovenian_utf-8.php           |  27 ++++++++++++++++++++++++---
 language/spanish.php                   |  27 ++++++++++++++++++++++++---
 language/spanish_argentina.php         |  27 ++++++++++++++++++++++++---
 language/spanish_argentina_utf-8.php   |  27 ++++++++++++++++++++++++---
 language/spanish_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/swedish.php                   |  27 ++++++++++++++++++++++++---
 language/swedish_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/turkish.php                   |  27 ++++++++++++++++++++++++---
 language/turkish_utf-8.php             |  27 ++++++++++++++++++++++++---
 language/ukrainian.php                 |  27 ++++++++++++++++++++++++---
 language/ukrainian_koi8-u.php          |  27 ++++++++++++++++++++++++---
 language/ukrainian_utf-8.php           |  27 ++++++++++++++++++++++++---
 70 files changed, 1684 insertions(+), 214 deletions(-)

diffs (truncated from 3582 to 300 lines):

diff -r aa4bb7a5514e -r 1c37ae225954 language/afrikaans.php
--- a/language/afrikaans.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/afrikaans.php	Sat Oct 31 19:07:14 2009 +0100
@@ -826,7 +826,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1326,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.'
 );
 
 ###############################################################################
@@ -1577,7 +1597,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A'
+    '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
diff -r aa4bb7a5514e -r 1c37ae225954 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/afrikaans_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
@@ -826,7 +826,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1326,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.'
 );
 
 ###############################################################################
@@ -1577,7 +1597,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A'
+    '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
diff -r aa4bb7a5514e -r 1c37ae225954 language/bosnian.php
--- a/language/bosnian.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/bosnian.php	Sat Oct 31 19:07:14 2009 +0100
@@ -830,7 +830,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1330,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.'
 );
 
 ###############################################################################
@@ -1581,7 +1601,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A'
+    '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
diff -r aa4bb7a5514e -r 1c37ae225954 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/bosnian_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
@@ -830,7 +830,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1330,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.'
 );
 
 ###############################################################################
@@ -1581,7 +1601,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A'
+    '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
diff -r aa4bb7a5514e -r 1c37ae225954 language/bulgarian.php
--- a/language/bulgarian.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/bulgarian.php	Sat Oct 31 19:07:14 2009 +0100
@@ -826,7 +826,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1326,7 +1327,26 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
@@ -1577,7 +1597,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',
-    'na' => 'N/A'
+    '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
diff -r aa4bb7a5514e -r 1c37ae225954 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Sat Oct 31 18:34:19 2009 +0100
+++ b/language/bulgarian_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
@@ -826,7 +826,8 @@
     87 => 'Story Stats',
     88 => 'Wiki-style format',
     89 => 'Meta Description',
-    90 => 'Meta Keywords'
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -1326,7 +1327,26 @@
     'size' => 'Size',
     'bytes' => 'Bytes',
     'total_number' => 'Total number of backups: %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.'
 );
 
 ###############################################################################
@@ -1577,7 +1597,8 @@
     'list_all' => 'List all',
     'meta_description' => 'Meta Description',
     'meta_keywords' => 'Meta Keywords',

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:50:03 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:50:03 -0400
Subject: [geeklog-cvs] geeklog: Synced Static Pages language files with
	their English e...
Message-ID: <hg.570b215d953d.1257022203.1485632861@qs1489.pair.com>

changeset 7422:570b215d953d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/570b215d953d
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 19:09:16 2009 +0100
description:
Synced Static Pages language files with their English equivalents

diffstat:

 plugins/staticpages/language/chinese_simplified_utf-8.php  |  16 ++++++++++++++--
 plugins/staticpages/language/chinese_traditional_utf-8.php |  16 ++++++++++++++--
 plugins/staticpages/language/czech.php                     |  16 ++++++++++++++--
 plugins/staticpages/language/czech_utf-8.php               |  16 ++++++++++++++--
 plugins/staticpages/language/danish.php                    |  16 ++++++++++++++--
 plugins/staticpages/language/danish_utf-8.php              |  16 ++++++++++++++--
 plugins/staticpages/language/dutch.php                     |  16 ++++++++++++++--
 plugins/staticpages/language/dutch_utf-8.php               |  16 ++++++++++++++--
 plugins/staticpages/language/estonian.php                  |  16 ++++++++++++++--
 plugins/staticpages/language/estonian_utf-8.php            |  16 ++++++++++++++--
 plugins/staticpages/language/farsi_utf-8.php               |  16 ++++++++++++++--
 plugins/staticpages/language/french_canada.php             |  16 ++++++++++++++--
 plugins/staticpages/language/french_canada_utf-8.php       |  16 ++++++++++++++--
 plugins/staticpages/language/german.php                    |  16 ++++++++++++++--
 plugins/staticpages/language/german_formal.php             |  16 ++++++++++++++--
 plugins/staticpages/language/german_formal_utf-8.php       |  16 ++++++++++++++--
 plugins/staticpages/language/german_utf-8.php              |  16 ++++++++++++++--
 plugins/staticpages/language/hebrew_utf-8.php              |  16 ++++++++++++++--
 plugins/staticpages/language/italian.php                   |  16 ++++++++++++++--
 plugins/staticpages/language/italian_utf-8.php             |  16 ++++++++++++++--
 plugins/staticpages/language/japanese_utf-8.php            |  16 ++++++++++++++--
 plugins/staticpages/language/korean.php                    |  16 ++++++++++++++--
 plugins/staticpages/language/korean_utf-8.php              |  16 ++++++++++++++--
 plugins/staticpages/language/polish.php                    |  16 ++++++++++++++--
 plugins/staticpages/language/polish_utf-8.php              |  16 ++++++++++++++--
 plugins/staticpages/language/portuguese_brazil.php         |  16 ++++++++++++++--
 plugins/staticpages/language/portuguese_brazil_utf-8.php   |  16 ++++++++++++++--
 plugins/staticpages/language/slovenian.php                 |  16 ++++++++++++++--
 plugins/staticpages/language/slovenian_utf-8.php           |  16 ++++++++++++++--
 plugins/staticpages/language/spanish.php                   |  16 ++++++++++++++--
 plugins/staticpages/language/spanish_utf-8.php             |  16 ++++++++++++++--
 plugins/staticpages/language/swedish.php                   |  16 ++++++++++++++--
 plugins/staticpages/language/swedish_utf-8.php             |  16 ++++++++++++++--
 plugins/staticpages/language/turkish.php                   |  16 ++++++++++++++--
 plugins/staticpages/language/turkish_utf-8.php             |  16 ++++++++++++++--
 plugins/staticpages/language/ukrainian.php                 |  16 ++++++++++++++--
 plugins/staticpages/language/ukrainian_koi8-u.php          |  16 ++++++++++++++--
 plugins/staticpages/language/ukrainian_utf-8.php           |  16 ++++++++++++++--
 38 files changed, 532 insertions(+), 76 deletions(-)

diffs (truncated from 1520 to 300 lines):

diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/chinese_simplified_utf-8.php
--- a/plugins/staticpages/language/chinese_simplified_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/chinese_simplified_utf-8.php	Sat Oct 31 19:09:16 2009 +0100
@@ -110,7 +110,9 @@
     'copy' => '??????',
     'limit_results' => '????????????',
     'search' => '??????',
-    'submit' => '??????'
+    'submit' => '??????',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -140,7 +142,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -149,6 +159,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/chinese_traditional_utf-8.php
--- a/plugins/staticpages/language/chinese_traditional_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/chinese_traditional_utf-8.php	Sat Oct 31 19:09:16 2009 +0100
@@ -110,7 +110,9 @@
     'copy' => '??????',
     'limit_results' => '????????????',
     'search' => '??????',
-    'submit' => '??????'
+    'submit' => '??????',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -140,7 +142,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -149,6 +159,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/czech.php
--- a/plugins/staticpages/language/czech.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/czech.php	Sat Oct 31 19:09:16 2009 +0100
@@ -107,7 +107,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -137,7 +139,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -146,6 +156,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/czech_utf-8.php
--- a/plugins/staticpages/language/czech_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/czech_utf-8.php	Sat Oct 31 19:09:16 2009 +0100
@@ -107,7 +107,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -137,7 +139,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -146,6 +156,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/danish.php
--- a/plugins/staticpages/language/danish.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/danish.php	Sat Oct 31 19:09:16 2009 +0100
@@ -108,7 +108,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -138,7 +140,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -147,6 +157,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/danish_utf-8.php
--- a/plugins/staticpages/language/danish_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/danish_utf-8.php	Sat Oct 31 19:09:16 2009 +0100
@@ -108,7 +108,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -138,7 +140,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -147,6 +157,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/dutch.php
--- a/plugins/staticpages/language/dutch.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/dutch.php	Sat Oct 31 19:09:16 2009 +0100
@@ -109,7 +109,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -139,7 +141,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    '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'
 );
 
 $LANG_configsubgroups['staticpages'] = array(
@@ -148,6 +158,8 @@
 
 $LANG_fs['staticpages'] = array(
     'fs_main' => 'Static Pages Main Settings',
+    'fs_whatsnew' => 'What\'s New Block',
+    'fs_search' => 'Search Results',
     'fs_permissions' => 'Default Permissions'
 );
 
diff -r 1c37ae225954 -r 570b215d953d plugins/staticpages/language/dutch_utf-8.php
--- a/plugins/staticpages/language/dutch_utf-8.php	Sat Oct 31 19:07:14 2009 +0100
+++ b/plugins/staticpages/language/dutch_utf-8.php	Sat Oct 31 19:09:16 2009 +0100
@@ -109,7 +109,9 @@
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
-    'submit' => 'Submit'
+    'submit' => 'Submit',
+    'no_new_pages' => 'No new pages',
+    'pages' => 'Pages'
 );
 
 $PLG_staticpages_MESSAGE15 = 'Your comment has been submitted for review and will be published when approved by a moderator.';
@@ -139,7 +141,15 @@
     'default_permissions' => 'Page Default Permissions',
     'aftersave' => 'After Saving Page',
     'atom_max_items' => 'Max. Pages in Webservices Feed',
-    'meta_tags' => 'Enable Meta Tags'
+    'meta_tags' => 'Enable Meta Tags',

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:50:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:50:04 -0400
Subject: [geeklog-cvs] geeklog: Typo
Message-ID: <hg.1c569ec0827b.1257022205.1485632861@qs1489.pair.com>

changeset 7423:1c569ec0827b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1c569ec0827b
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 20:25:53 2009 +0100
description:
Typo

diffstat:

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

diffs (12 lines):

diff -r 570b215d953d -r 1c569ec0827b public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sat Oct 31 19:09:16 2009 +0100
+++ b/public_html/docs/english/config.html	Sat Oct 31 20:25:53 2009 +0100
@@ -288,7 +288,7 @@
 <tr>
   <td valign="top"><a name="desc_search_limits">search_limits</a></td>
   <td valign="top">10,15,25,30</td>
-  <td valign="top">The result limits a user can select. Each value <b>must</b> be seperated with a comma.</td></tr>
+  <td valign="top">The result limits a user can select. Each value <b>must</b> be separated with a comma.</td></tr>
 <tr>
   <td valign="top"><a name="desc_num_search_results">num_search_results</a></td>
   <td valign="top">30</td>

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 16:50:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 16:50:06 -0400
Subject: [geeklog-cvs] geeklog: Just some simple German translations
Message-ID: <hg.71995bafe629.1257022206.1485632861@qs1489.pair.com>

changeset 7424:71995bafe629
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/71995bafe629
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 20:31:02 2009 +0100
description:
Just some simple German translations

diffstat:

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

diffs (164 lines):

diff -r 1c569ec0827b -r 71995bafe629 language/german.php
--- a/language/german.php	Sat Oct 31 20:25:53 2009 +0100
+++ b/language/german.php	Sat Oct 31 20:31:02 2009 +0100
@@ -831,7 +831,7 @@
     88 => 'Format im Wiki-Stil',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => 'You can always hit "Preview" to extend the expiry time.'
+    91 => 'Du kannst aber jederzeit auf "Vorschau" klicken, um diese Zeit zu verl?ngern.'
 );
 
 ###############################################################################
@@ -1344,13 +1344,13 @@
     '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_menu' => 'Tabellen optimieren',
+    'optimize_title' => 'Tabellen Optimieren',
+    'optimize_button' => 'Optimieren',
     '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.'
+    'last_optimization' => 'Letzte Optimierung',
+    'optimization_patience' => 'Hinweis: Die Optimierung kann etwas Zeit in Anspruch nehmen. Bitte etwas Geduld.',
+    'optimize_success' => 'Tabellen wurden erfolgreich optimiert.'
 );
 
 ###############################################################################
@@ -1602,7 +1602,7 @@
     '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.'
+    '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
diff -r 1c569ec0827b -r 71995bafe629 language/german_formal.php
--- a/language/german_formal.php	Sat Oct 31 20:25:53 2009 +0100
+++ b/language/german_formal.php	Sat Oct 31 20:31:02 2009 +0100
@@ -832,7 +832,7 @@
     88 => 'Format im Wiki-Stil',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => 'You can always hit "Preview" to extend the expiry time.'
+    91 => 'Sie k?nnen aber jederzeit auf "Vorschau" klicken, um diese Zeit zu verl?ngern.'
 );
 
 ###############################################################################
@@ -1345,13 +1345,13 @@
     '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_menu' => 'Tabellen optimieren',
+    'optimize_title' => 'Tabellen Optimieren',
+    'optimize_button' => 'Optimieren',
     '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.'
+    'last_optimization' => 'Letzte Optimierung',
+    'optimization_patience' => 'Hinweis: Die Optimierung kann etwas Zeit in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
+    'optimize_success' => 'Tabellen wurden erfolgreich optimiert.'
 );
 
 ###############################################################################
@@ -1603,7 +1603,7 @@
     '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.'
+    '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
diff -r 1c569ec0827b -r 71995bafe629 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Oct 31 20:25:53 2009 +0100
+++ b/language/german_formal_utf-8.php	Sat Oct 31 20:31:02 2009 +0100
@@ -832,7 +832,7 @@
     88 => 'Format im Wiki-Stil',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => 'You can always hit "Preview" to extend the expiry time.'
+    91 => 'Sie k??nnen aber jederzeit auf "Vorschau" klicken, um diese Zeit zu verl??ngern.'
 );
 
 ###############################################################################
@@ -1345,13 +1345,13 @@
     '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_menu' => 'Tabellen optimieren',
+    'optimize_title' => 'Tabellen Optimieren',
+    'optimize_button' => 'Optimieren',
     '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.'
+    'last_optimization' => 'Letzte Optimierung',
+    'optimization_patience' => 'Hinweis: Die Optimierung kann etwas Zeit in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
+    'optimize_success' => 'Tabellen wurden erfolgreich optimiert.'
 );
 
 ###############################################################################
@@ -1603,7 +1603,7 @@
     '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.'
+    '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
diff -r 1c569ec0827b -r 71995bafe629 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Oct 31 20:25:53 2009 +0100
+++ b/language/german_utf-8.php	Sat Oct 31 20:31:02 2009 +0100
@@ -831,7 +831,7 @@
     88 => 'Format im Wiki-Stil',
     89 => 'Meta Description',
     90 => 'Meta Keywords',
-    91 => 'You can always hit "Preview" to extend the expiry time.'
+    91 => 'Du kannst aber jederzeit auf "Vorschau" klicken, um diese Zeit zu verl??ngern.'
 );
 
 ###############################################################################
@@ -1344,13 +1344,13 @@
     '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_menu' => 'Tabellen optimieren',
+    'optimize_title' => 'Tabellen Optimieren',
+    'optimize_button' => 'Optimieren',
     '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.'
+    'last_optimization' => 'Letzte Optimierung',
+    'optimization_patience' => 'Hinweis: Die Optimierung kann etwas Zeit in Anspruch nehmen. Bitte etwas Geduld.',
+    'optimize_success' => 'Tabellen wurden erfolgreich optimiert.'
 );
 
 ###############################################################################
@@ -1602,7 +1602,7 @@
     '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.'
+    '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually

From geeklog-cvs at lists.geeklog.net  Sat Oct 31 18:45:30 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 31 Oct 2009 18:45:30 -0400
Subject: [geeklog-cvs] geeklog: Fixed storing the user's "boxes" selection
	which caused...
Message-ID: <hg.7fcb2cf3765b.1257029130.1485632861@qs1489.pair.com>

changeset 7425:7fcb2cf3765b
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7fcb2cf3765b
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 31 23:30:59 2009 +0100
description:
Fixed storing the user's "boxes" selection which caused an SQL error in some configurations

diffstat:

 public_html/usersettings.php |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 71995bafe629 -r 7fcb2cf3765b public_html/usersettings.php
--- a/public_html/usersettings.php	Sat Oct 31 20:31:02 2009 +0100
+++ b/public_html/usersettings.php	Sat Oct 31 23:30:59 2009 +0100
@@ -1412,6 +1412,7 @@
             }
         }
     }
+    $selectedblocks = trim($selectedblocks);
 
     $etids = '';
     if (($_CONF['emailstories'] == 1) && (count($ETIDS) > 0)) {