From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:16:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:16:25 -0500
Subject: [geeklog-cvs] bad_behavior2: Added tag bad_behavior2_0_25 for
	changeset f3d741...
Message-ID: <hg.52aaf58fe42f.1233476185.98919301@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/52aaf58fe42f
changeset: 7:52aaf58fe42f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 09:16:11 2009 +0100
description:
Added tag bad_behavior2_0_25 for changeset f3d741c1b860

diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r f3d741c1b860 -r 52aaf58fe42f .hgtags
--- a/.hgtags	Fri Nov 21 13:11:20 2008 +0100
+++ b/.hgtags	Sun Feb 01 09:16:11 2009 +0100
@@ -1,3 +1,4 @@
 0000000000000000000000000000000000000000 bad_behavior2_0_23
 2a0f46e172cf283f5e5eb3ad8e40bc6eb4e9bdce bad_behavior2_0_23
 295e0e69e02339db41ea1d5f5e8ca2693131e4f6 bad_behavior2_0_24
+f3d741c1b8604cc5f669b2a1cfbb2d12c567d7b2 bad_behavior2_0_25

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:18:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:18:25 -0500
Subject: [geeklog-cvs] bad_behavior2: Added tag bad_behavior2_0_26 for
	changeset 3cf973...
Message-ID: <hg.af66f081058a.1233476305.98919301@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/af66f081058a
changeset: 9:af66f081058a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 09:18:15 2009 +0100
description:
Added tag bad_behavior2_0_26 for changeset 3cf973786d8b

diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r 3cf973786d8b -r af66f081058a .hgtags
--- a/.hgtags	Sun Feb 01 09:17:55 2009 +0100
+++ b/.hgtags	Sun Feb 01 09:18:15 2009 +0100
@@ -2,3 +2,4 @@
 2a0f46e172cf283f5e5eb3ad8e40bc6eb4e9bdce bad_behavior2_0_23
 295e0e69e02339db41ea1d5f5e8ca2693131e4f6 bad_behavior2_0_24
 f3d741c1b8604cc5f669b2a1cfbb2d12c567d7b2 bad_behavior2_0_25
+3cf973786d8b661642017112ebfc00ff2c17c054 bad_behavior2_0_26

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:18:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:18:25 -0500
Subject: [geeklog-cvs] bad_behavior2: Upgraded to Bad Behavior 2.0.26
Message-ID: <hg.3cf973786d8b.1233476305.98919301@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3cf973786d8b
changeset: 8:3cf973786d8b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 09:17:55 2009 +0100
description:
Upgraded to Bad Behavior 2.0.26

diffstat:

7 files changed, 23 insertions(+), 11 deletions(-)
INSTALL.txt                                  |   10 +++++-----
public_html/README.txt                       |    4 ++--
public_html/bad-behavior-wordpress-admin.php |    2 +-
public_html/bad-behavior-wordpress.php       |    2 +-
public_html/bad-behavior/blackhole.inc.php   |   11 +++++++++++
public_html/bad-behavior/msie.inc.php        |    3 ++-
public_html/bad-behavior/version.inc.php     |    2 +-

diffs (127 lines):

diff -r 52aaf58fe42f -r 3cf973786d8b INSTALL.txt
--- a/INSTALL.txt	Sun Feb 01 09:16:11 2009 +0100
+++ b/INSTALL.txt	Sun Feb 01 09:17:55 2009 +0100
@@ -1,4 +1,4 @@
-Bad Behavior2 Plugin v2.0.25 for Geeklog v1.4.1 and later
+Bad Behavior2 Plugin v2.0.26 for Geeklog v1.4.1 and later
  - Bad Behavior 2 is Copyright (c) 2005-2008 Michael Hampton.
                                              All rights reserved.
    Original Geeklog Plugin by Dirk Haun
@@ -18,7 +18,7 @@
 With one exception (see step 5), this plugin installs like any other Geeklog
 plugin:
 
-1) Unpack bad_behavior2_2.0.25-1.4.1.tar.gz
+1) Unpack bad_behavior2_2.0.26-1.4.1.tar.gz
 2) Upload the contents of the public_html directory into
    /path/to/geeklog/public_html/bad_behavior2
 3) Upload the contents of the admin directory into
@@ -47,7 +47,7 @@
 UPGRADING
 
 If you are upgrading from v1.2.4-1 you must first uninstall the existing
-plugin before you install v2.0.25.
+plugin before you install v2.0.26.
 
   - Perform a standard plugin uninstall - Plugins -> Bad Behavior - Delete
   - Do not forget to remove the Bad Behavior 1 lib-common.php entry
@@ -132,8 +132,8 @@
 
 Copyright
 
-Bad Behavior is (c) 2005-2008 by Michael Hampton and released under the GPL
-The Geeklog plugin is (c) 2005-2008 Dirk Haun and also released under the GPL
+Bad Behavior is (c) 2005-2009 by Michael Hampton and released under the GPL
+The Geeklog plugin is (c) 2005-2009 Dirk Haun and also released under the GPL
 Original upgrade to Bad Behavior v2.0.x by Mark Evans - GPL'ed of course...
 
 Please see the included file COPYING (in public_html) for license details.
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/README.txt
--- a/public_html/README.txt	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/README.txt	Sun Feb 01 09:17:55 2009 +0100
@@ -3,8 +3,8 @@
 Contributors: error, MarkJaquith, Firas, skeltoac
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=error%40ioerror%2eus&item_name=Bad%20Behavior%20%28From%20WordPress%20Page%29&no_shipping=1&cn=Comments%20about%20Bad%20Behavior&tax=0&currency_code=USD&bn=PP%2dDonationsBF&charset=UTF%2d8
 Requires at least: 1.2
-Tested up to: 2.7
-Stable tag: 2.0.25
+Tested up to: 2.8
+Stable tag: 2.0.26
 
 Welcome to a whole new way of keeping your blog, forum, guestbook, wiki or
 content management system free of link spam. Bad Behavior is a PHP-based
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/bad-behavior-wordpress-admin.php
--- a/public_html/bad-behavior-wordpress-admin.php	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/bad-behavior-wordpress-admin.php	Sun Feb 01 09:17:55 2009 +0100
@@ -167,7 +167,7 @@
 		echo "</td>\n";
 		$headers = str_replace("\n", "<br/>\n", htmlspecialchars($result['http_headers']));
 		if (@strpos($headers, $result['user_agent']) !== FALSE) $headers = substr_replace($headers, "<a href=\"" . add_query_arg("user_agent", rawurlencode($result["user_agent"]), remove_query_arg("paged", $request_uri)) . "\">" . $result['user_agent'] . "</a>", strpos($headers, $result['user_agent']), strlen($result['user_agent']));
-		if (strpos($headers, $result['request_method']) !== FALSE) $headers = substr_replace($headers, "<a href=\"" . add_query_arg("request_method", rawurlencode($result["request_method"]), remove_query_arg("paged", $request_uri)) . "\">" . $result['request_method'] . "</a>", strpos($headers, $result['request_method']), strlen($result['request_method']));
+		if (@strpos($headers, $result['request_method']) !== FALSE) $headers = substr_replace($headers, "<a href=\"" . add_query_arg("request_method", rawurlencode($result["request_method"]), remove_query_arg("paged", $request_uri)) . "\">" . $result['request_method'] . "</a>", strpos($headers, $result['request_method']), strlen($result['request_method']));
 		echo "<td>$headers</td>\n";
 		echo "<td>" . str_replace("\n", "<br/>\n", htmlspecialchars($result["request_entity"])) . "</td>\n";
 		echo "</tr>\n";
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/bad-behavior-wordpress.php
--- a/public_html/bad-behavior-wordpress.php	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/bad-behavior-wordpress.php	Sun Feb 01 09:17:55 2009 +0100
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Bad Behavior
-Version: 2.0.25
+Version: 2.0.26
 Description: Deny automated spambots access to your PHP-based Web site.
 Plugin URI: http://www.bad-behavior.ioerror.us/
 Author: Michael Hampton
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/bad-behavior/blackhole.inc.php
--- a/public_html/bad-behavior/blackhole.inc.php	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/bad-behavior/blackhole.inc.php	Sun Feb 01 09:17:55 2009 +0100
@@ -1,8 +1,16 @@
 <?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Quick and dirty check for an IPv6 address
+function is_ipv6($address) {
+	return (strpos($address, ":")) ? TRUE : FALSE;
+}
 
 // Look up address on various blackhole lists.
 // These cannot be used for GET requests under any circumstances!
 function bb2_blackhole($package) {
+	// Can't use IPv6 addresses yet
+	if (is_ipv6($package['REMOTE_ADDR'])) return;
+
 	// Only conservative lists
 	$bb2_blackhole_lists = array(
 		"sbl-xbl.spamhaus.org",	// All around nasties
@@ -36,6 +44,9 @@
 }
 
 function bb2_httpbl($settings, $package) {
+	// Can't use IPv6 addresses yet
+	if (is_ipv6($package['REMOTE_ADDR'])) return;
+
 	if (!$settings['httpbl_key']) return false;
 
 	$find = implode('.', array_reverse(explode('.', $package['ip'])));
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/bad-behavior/msie.inc.php
--- a/public_html/bad-behavior/msie.inc.php	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/bad-behavior/msie.inc.php	Sun Feb 01 09:17:55 2009 +0100
@@ -15,7 +15,8 @@
 
 	// MSIE does NOT send Connection: TE but Akamai does
 	// Bypass this test when Akamai detected
-	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+	// The latest version of IE for Windows CE also uses Connection: TE
+	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
 		return "2b90f772";
 	}
 
diff -r 52aaf58fe42f -r 3cf973786d8b public_html/bad-behavior/version.inc.php
--- a/public_html/bad-behavior/version.inc.php	Sun Feb 01 09:16:11 2009 +0100
+++ b/public_html/bad-behavior/version.inc.php	Sun Feb 01 09:17:55 2009 +0100
@@ -1,3 +1,3 @@
 <?php if (!defined('BB2_CWD')) die("I said no cheating!");
-define('BB2_VERSION', "2.0.25");
+define('BB2_VERSION', "2.0.26");
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:49:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:49:16 -0500
Subject: [geeklog-cvs] geeklog: Forgot to check group membership again when
	sending the...
Message-ID: <hg.99c4995f2ef1.1233478156.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/99c4995f2ef1
changeset: 6743:99c4995f2ef1
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 09:49:03 2009 +0100
description:
Forgot to check group membership again when sending the emails

diffstat:

1 file changed, 20 insertions(+), 12 deletions(-)
public_html/admin/mail.php |   32 ++++++++++++++++++++------------

diffs (64 lines):

diff -r 3ccf161b2de2 -r 99c4995f2ef1 public_html/admin/mail.php
--- a/public_html/admin/mail.php	Sat Jan 31 22:44:58 2009 +0100
+++ b/public_html/admin/mail.php	Sun Feb 01 09:49:03 2009 +0100
@@ -114,23 +114,31 @@
 * @return   string          HTML with success or error message
 *
 */
-function send_messages ($vars)
+function send_messages($vars)
 {
     global $_CONF, $_TABLES, $LANG31;
 
-    require_once($_CONF['path_system'] . 'lib-user.php');
+    require_once $_CONF['path_system'] . 'lib-user.php';
 
     $retval = '';
 
-    if (empty ($vars['fra']) OR empty ($vars['fraepost']) OR
-            empty ($vars['subject']) OR empty ($vars['message']) OR
-            empty ($vars['to_group'])) {
-        $retval .= COM_startBlock ($LANG31[1], '',
-                        COM_getBlockTemplate ('_msg_block', 'header'));
-        $retval .= $LANG31[26];
-        $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+    if (empty($vars['fra']) OR empty($vars['fraepost']) OR
+            empty($vars['subject']) OR empty($vars['message']) OR
+            empty($vars['to_group'])) {
+        $retval .= COM_showMessageText($LANG31[26]);
 
         return $retval;
+    }
+
+    $to_group = COM_applyFilter($vars['to_group'], true);
+    if ($to_group > 0) {
+        $group_name = DB_getItem($_TABLES['groups'], 'grp_name',
+                                 "grp_id = $to_group");
+        if (! SEC_inGroup($group_name)) {
+            return COM_refresh($_CONF['site_admin_url'] . '/mail.php');
+        }
+    } else {
+        return COM_refresh($_CONF['site_admin_url'] . '/mail.php');
     }
 
     // Urgent message!
@@ -147,16 +155,16 @@
         $html = false;
     }
 
-    $groupList = implode (',', USER_getChildGroups($vars['to_group']));
+    $groupList = implode(',', USER_getChildGroups($to_group));
 
     // and now mail it
     if (isset ($vars['overstyr'])) {
         $sql = "SELECT DISTINCT username,fullname,email FROM {$_TABLES['users']},{$_TABLES['group_assignments']} WHERE uid > 1";
-        $sql .= " AND {$_TABLES['users']}.status = 3 AND ((email is not null) and (email != ''))";
+        $sql .= " AND {$_TABLES['users']}.status = 3 AND ((email IS NOT NULL) and (email != ''))";
         $sql .= " AND {$_TABLES['users']}.uid = ug_uid AND ug_main_grp_id IN ({$groupList})";
     } else {
         $sql = "SELECT DISTINCT username,fullname,email,emailfromadmin FROM {$_TABLES['users']},{$_TABLES['userprefs']},{$_TABLES['group_assignments']} WHERE {$_TABLES['users']}.uid > 1";
-        $sql .= " AND {$_TABLES['users']}.status = 3 AND ((email is not null) and (email != ''))";
+        $sql .= " AND {$_TABLES['users']}.status = 3 AND ((email IS NOT NULL) and (email != ''))";
         $sql .= " AND {$_TABLES['users']}.uid = {$_TABLES['userprefs']}.uid AND emailfromadmin = 1";
         $sql .= " AND ug_uid = {$_TABLES['users']}.uid AND ug_main_grp_id IN ({$groupList})";
     }

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:49:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:49:16 -0500
Subject: [geeklog-cvs] geeklog: Let users with user.mail permissions only
	email groups ...
Message-ID: <hg.3ccf161b2de2.1233478156.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3ccf161b2de2
changeset: 6742:3ccf161b2de2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jan 31 22:44:58 2009 +0100
description:
Let users with user.mail permissions only email groups that they are in themselves

diffstat:

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

diffs (69 lines):

diff -r 39b5799ac006 -r 3ccf161b2de2 public_html/admin/mail.php
--- a/public_html/admin/mail.php	Sat Jan 31 22:17:59 2009 +0100
+++ b/public_html/admin/mail.php	Sat Jan 31 22:44:58 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | mail.php                                                                  |
 // |                                                                           |
 // | Geeklog mail administration page.                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2001-2008 by the following authors:                         |
+// | Copyright (C) 2001-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs - tony AT tonybibbs DOT com                           |
 // |          Dirk Haun  - dirk AT haun-online DOT de                          |
@@ -29,8 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mail.php,v 1.37 2008/05/27 20:53:10 dhaun Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -72,19 +70,17 @@
     $mail_templates->set_var ('lang_note', $LANG31[19]);
     $mail_templates->set_var ('lang_to', $LANG31[18]);
     $mail_templates->set_var ('lang_selectgroup', $LANG31[25]);
+
+    $thisUsersGroups = SEC_getUserGroups();
+    uksort($thisUsersGroups, 'strcasecmp');
     $group_options = '';
-    $result = DB_query("SELECT grp_id, grp_name FROM {$_TABLES['groups']} WHERE grp_name <> 'All Users'");
-    $nrows = DB_numRows ($result);
-    $groups = array ();
-    for ($i = 0; $i < $nrows; $i++) {
-        $A = DB_fetchArray ($result);
-        $groups[$A['grp_id']] = ucwords ($A['grp_name']);
+    foreach ($thisUsersGroups as $groupName => $groupID) {
+        if ($groupName != 'All Users') {
+            $group_options .= '<option value="' . $groupID . '">' . $groupName
+                           . '</option>';
+        }
     }
-    asort ($groups);
-    foreach ($groups as $groupID => $groupName) {
-        $group_options .= '<option value="' . $groupID . '">' . $groupName
-                       . '</option>';
-    }
+
     $mail_templates->set_var ('group_options', $group_options);
     $mail_templates->set_var ('lang_from', $LANG31[2]);
     $mail_templates->set_var ('site_name', $_CONF['site_name']);
diff -r 39b5799ac006 -r 3ccf161b2de2 public_html/docs/history
--- a/public_html/docs/history	Sat Jan 31 22:17:59 2009 +0100
+++ b/public_html/docs/history	Sat Jan 31 22:44:58 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Let users with user.mail permissions only email groups that they are in
+  themselves [Dirk]
 - Gave the Groups and User editors a facelift. Requires a new template file,
   admin/lists/inline.thtml [Dirk]
 - Add new permissions plugin.install and plugin.upload for more fine-grained

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 03:49:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 03:49:16 -0500
Subject: [geeklog-cvs] geeklog: Let users with user.mail permissions only
	email groups ...
Message-ID: <hg.3ccf161b2de2.1233478156.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3ccf161b2de2
changeset: 6742:3ccf161b2de2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jan 31 22:44:58 2009 +0100
description:
Let users with user.mail permissions only email groups that they are in themselves

diffstat:

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

diffs (69 lines):

diff -r 39b5799ac006 -r 3ccf161b2de2 public_html/admin/mail.php
--- a/public_html/admin/mail.php	Sat Jan 31 22:17:59 2009 +0100
+++ b/public_html/admin/mail.php	Sat Jan 31 22:44:58 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | mail.php                                                                  |
 // |                                                                           |
 // | Geeklog mail administration page.                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2001-2008 by the following authors:                         |
+// | Copyright (C) 2001-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs - tony AT tonybibbs DOT com                           |
 // |          Dirk Haun  - dirk AT haun-online DOT de                          |
@@ -29,8 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mail.php,v 1.37 2008/05/27 20:53:10 dhaun Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -72,19 +70,17 @@
     $mail_templates->set_var ('lang_note', $LANG31[19]);
     $mail_templates->set_var ('lang_to', $LANG31[18]);
     $mail_templates->set_var ('lang_selectgroup', $LANG31[25]);
+
+    $thisUsersGroups = SEC_getUserGroups();
+    uksort($thisUsersGroups, 'strcasecmp');
     $group_options = '';
-    $result = DB_query("SELECT grp_id, grp_name FROM {$_TABLES['groups']} WHERE grp_name <> 'All Users'");
-    $nrows = DB_numRows ($result);
-    $groups = array ();
-    for ($i = 0; $i < $nrows; $i++) {
-        $A = DB_fetchArray ($result);
-        $groups[$A['grp_id']] = ucwords ($A['grp_name']);
+    foreach ($thisUsersGroups as $groupName => $groupID) {
+        if ($groupName != 'All Users') {
+            $group_options .= '<option value="' . $groupID . '">' . $groupName
+                           . '</option>';
+        }
     }
-    asort ($groups);
-    foreach ($groups as $groupID => $groupName) {
-        $group_options .= '<option value="' . $groupID . '">' . $groupName
-                       . '</option>';
-    }
+
     $mail_templates->set_var ('group_options', $group_options);
     $mail_templates->set_var ('lang_from', $LANG31[2]);
     $mail_templates->set_var ('site_name', $_CONF['site_name']);
diff -r 39b5799ac006 -r 3ccf161b2de2 public_html/docs/history
--- a/public_html/docs/history	Sat Jan 31 22:17:59 2009 +0100
+++ b/public_html/docs/history	Sat Jan 31 22:44:58 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Let users with user.mail permissions only email groups that they are in
+  themselves [Dirk]
 - Gave the Groups and User editors a facelift. Requires a new template file,
   admin/lists/inline.thtml [Dirk]
 - Add new permissions plugin.install and plugin.upload for more fine-grained

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 07:35:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 07:35:08 -0500
Subject: [geeklog-cvs] geeklog: Added an ISO 8601-ish format to the
	gl_dateformats table
Message-ID: <hg.29e633449941.1233491708.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/29e633449941
changeset: 6744:29e633449941
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 10:57:08 2009 +0100
description:
Added an ISO 8601-ish format to the gl_dateformats table

diffstat:

6 files changed, 32 insertions(+)
public_html/admin/install/lib-upgrade.php |    1 +
public_html/docs/history                  |    1 +
sql/mssql_tableanddata.php                |    1 +
sql/mysql_tableanddata.php                |    1 +
sql/updates/mssql_1.5.2_to_1.6.0.php      |   14 ++++++++++++++
sql/updates/mysql_1.5.2_to_1.6.0.php      |   14 ++++++++++++++

diffs (88 lines):

diff -r 99c4995f2ef1 -r 29e633449941 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sun Feb 01 09:49:03 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php	Sun Feb 01 10:57:08 2009 +0100
@@ -465,6 +465,7 @@
 
             update_ConfValues();
             upgrade_addPluginPermissions();
+            upgrade_addIsoFormat();
 
             $current_gl_version = '1.6.0';
             $_SQL = '';
diff -r 99c4995f2ef1 -r 29e633449941 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 09:49:03 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 10:57:08 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Added an ISO 8601-ish format to the gl_dateformats table [Dirk]
 - Let users with user.mail permissions only email groups that they are in
   themselves [Dirk]
 - Gave the Groups and User editors a facelift. Requires a new template file,
diff -r 99c4995f2ef1 -r 29e633449941 sql/mssql_tableanddata.php
--- a/sql/mssql_tableanddata.php	Sun Feb 01 09:49:03 2009 +0100
+++ b/sql/mssql_tableanddata.php	Sun Feb 01 10:57:08 2009 +0100
@@ -1234,6 +1234,7 @@
 $_SQL[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (16,'%y-%m-%d %I:%M','99-03-21 10:00')";
 $_SQL[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (17,'%d/%m/%y %H:%M','21/03/99 22:00')";
 $_SQL[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (18,'%a %d %b %I:%M%p','Sun 21 Mar 10:00PM')";
+$_SQL[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (19,'%Y-%m-%d %H:%M','1999-03-21 22:00')";
 
 $_SQL[] = "INSERT INTO {$_TABLES['featurecodes']} (code, name) VALUES (0,'Not Featured')";
 $_SQL[] = "INSERT INTO {$_TABLES['featurecodes']} (code, name) VALUES (1,'Featured')";
diff -r 99c4995f2ef1 -r 29e633449941 sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php	Sun Feb 01 09:49:03 2009 +0100
+++ b/sql/mysql_tableanddata.php	Sun Feb 01 10:57:08 2009 +0100
@@ -553,6 +553,7 @@
 $_DATA[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (16,'%y-%m-%d %I:%M','99-03-21 10:00') ";
 $_DATA[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (17,'%d/%m/%y %H:%M','21/03/99 22:00') ";
 $_DATA[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (18,'%a %d %b %I:%M%p','Sun 21 Mar 10:00PM') ";
+$_DATA[] = "INSERT INTO {$_TABLES['dateformats']} (dfid, format, description) VALUES (19,'%Y-%m-%d %H:%M','1999-03-21 22:00') ";
 
 $_DATA[] = "INSERT INTO {$_TABLES['featurecodes']} (code, name) VALUES (0,'Not Featured') ";
 $_DATA[] = "INSERT INTO {$_TABLES['featurecodes']} (code, name) VALUES (1,'Featured') ";
diff -r 99c4995f2ef1 -r 29e633449941 sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Sun Feb 01 09:49:03 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Sun Feb 01 10:57:08 2009 +0100
@@ -48,4 +48,18 @@
     }
 }
 
+/**
+ * Add ISO 8601-ish date/time format
+ *
+ */
+function upgrade_addIsoFormat()
+{
+    global $_TABLES;
+
+    $maxid = DB_getItem($_TABLES['dateformats'], 'MAX(dfid)');
+    $maxid++;
+    DB_save($_TABLES['dateformats'], 'dfid,format,description',
+            "$maxid,'%Y-%m-%d %H:%M','1999-03-21 22:00'");
+}
+
 ?>
diff -r 99c4995f2ef1 -r 29e633449941 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Sun Feb 01 09:49:03 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Sun Feb 01 10:57:08 2009 +0100
@@ -49,4 +49,18 @@
     }
 }
 
+/**
+ * Add ISO 8601-ish date/time format
+ *
+ */
+function upgrade_addIsoFormat()
+{
+    global $_TABLES;
+
+    $maxid = DB_getItem($_TABLES['dateformats'], 'MAX(dfid)');
+    $maxid++;
+    DB_save($_TABLES['dateformats'], 'dfid,format,description',
+            "$maxid,'%Y-%m-%d %H:%M','1999-03-21 22:00'");
+}
+
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 07:35:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 07:35:09 -0500
Subject: [geeklog-cvs] geeklog: Sort groups non-case sensitive
Message-ID: <hg.d3f66f393a12.1233491709.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d3f66f393a12
changeset: 6745:d3f66f393a12
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 11:26:53 2009 +0100
description:
Sort groups non-case sensitive

diffstat:

1 file changed, 3 insertions(+), 5 deletions(-)
system/lib-security.php |    8 +++-----

diffs (37 lines):

diff -r 29e633449941 -r d3f66f393a12 system/lib-security.php
--- a/system/lib-security.php	Sun Feb 01 10:57:08 2009 +0100
+++ b/system/lib-security.php	Sun Feb 01 11:26:53 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | lib-security.php                                                          |
 // |                                                                           |
 // | Geeklog security library.                                                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Mark Limburg     - mlimburg AT users DOT sourceforge DOT net     |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-security.php,v 1.75 2008/09/21 08:37:11 dhaun Exp $
 
 /**
 * This is the security library for Geeklog.  This is used to implement Geeklog's
@@ -151,7 +149,7 @@
         }
     }
 
-    ksort($groups);
+    uksort($groups, 'strcasecmp');
 
     if ($_SEC_VERBOSE) {
         COM_errorLog("****************leaving getusergroups(uid=$uid)***************",1);

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 07:35:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 07:35:10 -0500
Subject: [geeklog-cvs] geeklog: Some comments ...
Message-ID: <hg.ae2e81cceb5c.1233491710.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ae2e81cceb5c
changeset: 6746:ae2e81cceb5c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 13:19:00 2009 +0100
description:
Some comments ...

diffstat:

1 file changed, 43 insertions(+)
system/lib-admin.php |   43 +++++++++++++++++++++++++++++++++++++++++++

diffs (109 lines):

diff -r d3f66f393a12 -r ae2e81cceb5c system/lib-admin.php
--- a/system/lib-admin.php	Sun Feb 01 11:26:53 2009 +0100
+++ b/system/lib-admin.php	Sun Feb 01 13:19:00 2009 +0100
@@ -602,6 +602,17 @@
 }
 
 
+/**
+ * The following functions are helper functions used as $fieldfunction with
+ * ADMIN_list and ADMIN_simpleList (see above)
+ *
+ */
+
+
+/**
+ * used for the list of blocks in admin/block.php
+ *
+ */
 function ADMIN_getListField_blocks($fieldname, $fieldvalue, $A, $icon_arr, $token)
 {
     global $_CONF, $LANG_ADMIN, $LANG21, $_IMAGE_TYPE;
@@ -667,6 +678,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of groups and in the group editor in admin/group.php
+ *
+ */
 function ADMIN_getListField_groups($fieldname, $fieldvalue, $A, $icon_arr, $selected = '')
 {
     global $_CONF, $LANG_ACCESS, $LANG_ADMIN, $thisUsersGroups;
@@ -739,6 +754,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of users in admin/user.php
+ *
+ */
 function ADMIN_getListField_users($fieldname, $fieldvalue, $A, $icon_arr)
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG04, $LANG28, $_IMAGE_TYPE;
@@ -818,6 +837,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of stories in admin/story.php
+ *
+ */
 function ADMIN_getListField_stories($fieldname, $fieldvalue, $A, $icon_arr)
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG24, $LANG_ACCESS, $_IMAGE_TYPE;
@@ -912,6 +935,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of feeds in admin/syndication.php
+ *
+ */
 function ADMIN_getListField_syndication($fieldname, $fieldvalue, $A, $icon_arr, $token)
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG33, $_IMAGE_TYPE;
@@ -967,6 +994,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of plugins in admin/plugins.php
+ *
+ */
 function ADMIN_getListField_plugins($fieldname, $fieldvalue, $A, $icon_arr, $token)
 {
     global $_CONF, $LANG_ADMIN, $LANG32;
@@ -1028,6 +1059,10 @@
     return $retval;
 }
 
+/**
+ * used for the lists of submissions and draft stories in admin/moderation.php
+ *
+ */
 function ADMIN_getListField_moderation($fieldname, $fieldvalue, $A, $icon_arr)
 {
     global $_CONF, $_TABLES, $LANG_ADMIN;
@@ -1069,6 +1104,10 @@
     return $retval;
 }
 
+/**
+ * used for the list of ping services in admin/trackback.php
+ *
+ */
 function ADMIN_getListField_trackback($fieldname, $fieldvalue, $A, $icon_arr, $token)
 {
     global $_CONF, $LANG_TRB;
@@ -1112,6 +1151,10 @@
     return $retval;
 }
 
+/**
+ * used in the user editor in admin/user.php
+ *
+ */
 function ADMIN_getListField_usergroups($fieldname, $fieldvalue, $A, $icon_arr, $selected = '')
 {
     global $thisUsersGroups;

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 07:35:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 07:35:09 -0500
Subject: [geeklog-cvs] geeklog: Sort groups non-case sensitive
Message-ID: <hg.d3f66f393a12.1233491709.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d3f66f393a12
changeset: 6745:d3f66f393a12
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 11:26:53 2009 +0100
description:
Sort groups non-case sensitive

diffstat:

1 file changed, 3 insertions(+), 5 deletions(-)
system/lib-security.php |    8 +++-----

diffs (37 lines):

diff -r 29e633449941 -r d3f66f393a12 system/lib-security.php
--- a/system/lib-security.php	Sun Feb 01 10:57:08 2009 +0100
+++ b/system/lib-security.php	Sun Feb 01 11:26:53 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | lib-security.php                                                          |
 // |                                                                           |
 // | Geeklog security library.                                                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Mark Limburg     - mlimburg AT users DOT sourceforge DOT net     |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-security.php,v 1.75 2008/09/21 08:37:11 dhaun Exp $
 
 /**
 * This is the security library for Geeklog.  This is used to implement Geeklog's
@@ -151,7 +149,7 @@
         }
     }
 
-    ksort($groups);
+    uksort($groups, 'strcasecmp');
 
     if ($_SEC_VERBOSE) {
         COM_errorLog("****************leaving getusergroups(uid=$uid)***************",1);

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 07:35:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 07:35:11 -0500
Subject: [geeklog-cvs] geeklog: Display group names with an uppercase first
	letter ever...
Message-ID: <hg.3e15885d32b4.1233491711.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3e15885d32b4
changeset: 6747:3e15885d32b4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 13:34:44 2009 +0100
description:
Display group names with an uppercase first letter everywhere

diffstat:

4 files changed, 11 insertions(+), 3 deletions(-)
public_html/admin/mail.php |    4 ++--
public_html/docs/history   |    1 +
system/lib-admin.php       |    7 +++++++
system/lib-security.php    |    2 +-

diffs (61 lines):

diff -r ae2e81cceb5c -r 3e15885d32b4 public_html/admin/mail.php
--- a/public_html/admin/mail.php	Sun Feb 01 13:19:00 2009 +0100
+++ b/public_html/admin/mail.php	Sun Feb 01 13:34:44 2009 +0100
@@ -76,8 +76,8 @@
     $group_options = '';
     foreach ($thisUsersGroups as $groupName => $groupID) {
         if ($groupName != 'All Users') {
-            $group_options .= '<option value="' . $groupID . '">' . $groupName
-                           . '</option>';
+            $group_options .= '<option value="' . $groupID . '">'
+                           . ucwords($groupName) . '</option>';
         }
     }
 
diff -r ae2e81cceb5c -r 3e15885d32b4 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 13:19:00 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 13:34:44 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Display group names with an uppercase first letter everywhere [Dirk]
 - Added an ISO 8601-ish format to the gl_dateformats table [Dirk]
 - Let users with user.mail permissions only email groups that they are in
   themselves [Dirk]
diff -r ae2e81cceb5c -r 3e15885d32b4 system/lib-admin.php
--- a/system/lib-admin.php	Sun Feb 01 13:19:00 2009 +0100
+++ b/system/lib-admin.php	Sun Feb 01 13:34:44 2009 +0100
@@ -745,6 +745,9 @@
                         . '<input type="hidden" name="groups[]" value="'
                         . $A['grp_id'] . '"' . XHTML . '>';
                 break;
+            case 'grp_name':
+                $retval = ucwords($fieldvalue);
+                break;
             default:
                 $retval = $fieldvalue;
                 break;
@@ -1186,6 +1189,10 @@
             }
             break;
 
+        case 'grp_name':
+            $retval = ucwords($fieldvalue);
+            break;
+
         default:
             $retval = $fieldvalue;
             break;
diff -r ae2e81cceb5c -r 3e15885d32b4 system/lib-security.php
--- a/system/lib-security.php	Sun Feb 01 13:19:00 2009 +0100
+++ b/system/lib-security.php	Sun Feb 01 13:34:44 2009 +0100
@@ -1031,7 +1031,7 @@
             if ($group_id == $ug_id) {
                 $groupdd .= ' selected="selected"';
             }
-            $groupdd .= '>' . $ug_name . '</option>' . LB;
+            $groupdd .= '>' . ucwords($ug_name) . '</option>' . LB;
         }
         $groupdd .= '</select>' . LB;
     } else {

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:12 -0500
Subject: [geeklog-cvs] geeklog: Let USER_sendNotification return the result
	of COM_mail
Message-ID: <hg.063645a4564f.1233507552.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/063645a4564f
changeset: 6748:063645a4564f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:18:07 2009 +0100
description:
Let USER_sendNotification return the result of COM_mail

diffstat:

1 file changed, 3 insertions(+), 1 deletion(-)
system/lib-user.php |    4 +++-

diffs (21 lines):

diff -r 3e15885d32b4 -r 063645a4564f system/lib-user.php
--- a/system/lib-user.php	Sun Feb 01 13:34:44 2009 +0100
+++ b/system/lib-user.php	Sun Feb 01 17:18:07 2009 +0100
@@ -345,6 +345,7 @@
 * @param email    string      Email address of the new user
 * @param uid      int         User id of the new user
 * @param mode     string      Mode user was added at.
+* @return         bool        true = success, false = an error occured
 *
 */
 function USER_sendNotification ($username, $email, $uid, $mode='inactive')
@@ -367,7 +368,8 @@
     $mailbody .= "\n------------------------------\n";
 
     $mailsubject = $_CONF['site_name'] . ' ' . $LANG29[40];
-    COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+
+    return COM_mail($_CONF['site_mail'], $mailsubject, $mailbody);
 }
 
 /**

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:12 -0500
Subject: [geeklog-cvs] geeklog: Display a message when sending the email for
	a new pass...
Message-ID: <hg.6d6e4b21742a.1233507552.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6d6e4b21742a
changeset: 6749:6d6e4b21742a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:46:47 2009 +0100
description:
Display a message when sending the email for a new password failed

diffstat:

2 files changed, 11 insertions(+), 12 deletions(-)
public_html/docs/history |    2 ++
public_html/users.php    |   21 +++++++++------------

diffs (75 lines):

diff -r 81e157f9d3fb -r 6d6e4b21742a public_html/docs/history
--- a/public_html/docs/history	Sat Jan 31 22:15:27 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 17:46:47 2009 +0100
@@ -2,6 +2,8 @@
 
 Feb ??, 2009 (1.5.2)
 ------------
+
+- Display a message when sending the email for a new password failed [Dirk]
 
 - Updated Japanese language file, provided by the Geeklog.jp group
 
diff -r 81e157f9d3fb -r 6d6e4b21742a public_html/users.php
--- a/public_html/users.php	Sat Jan 31 22:15:27 2009 +0100
+++ b/public_html/users.php	Sun Feb 01 17:46:47 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | User authentication module.                                               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: users.php,v 1.170 2008/09/15 18:26:17 mjervis Exp $
 
 /**
 * This file handles user authentication
@@ -376,11 +374,10 @@
 * User request for a new password - send email with a link and request id
 *
 * @param username string   name of user who requested the new password
-* @param msg      int      index of message to display (if any)
 * @return         string   form or meta redirect
 *
 */
-function requestpassword ($username, $msg = 0)
+function requestpassword($username)
 {
     global $_CONF, $_TABLES, $LANG04;
 
@@ -412,13 +409,13 @@
         } else {
             $mailfrom = $_CONF['site_mail'];
         }
-        COM_mail ($A['email'], $subject, $mailtext, $mailfrom);
+        if (COM_mail ($A['email'], $subject, $mailtext, $mailfrom)) {
+            $msg = 55; // message sent
+        } else {
+            $msg = 85; // problem sending the email
+        }
 
-        if ($msg) {
-            $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
-        } else {
-            $retval .= COM_refresh ($_CONF['site_url'] . '/index.php');
-        }
+        $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
         COM_updateSpeedlimit ('password');
     } else {
         $retval .= COM_siteHeader ('menu', $LANG04[17])
@@ -1007,7 +1004,7 @@
                                     "email = '$email' AND ((remoteservice IS NULL) OR (remoteservice = ''))");
         }
         if (!empty ($username)) {
-            $display .= requestpassword ($username, 55);
+            $display .= requestpassword($username);
         } else {
             $display = COM_refresh ($_CONF['site_url']
                                     . '/users.php?mode=getpassword');

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:13 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:13 -0500
Subject: [geeklog-cvs] geeklog: Display a message when sending the email for
	a new pass...
Message-ID: <hg.60e7e87f1934.1233507553.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/60e7e87f1934
changeset: 6750:60e7e87f1934
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:46:47 2009 +0100
description:
Display a message when sending the email for a new password failed

diffstat:

2 files changed, 10 insertions(+), 9 deletions(-)
public_html/docs/history |    2 ++
public_html/users.php    |   17 ++++++++---------

diffs (57 lines):

diff -r 063645a4564f -r 60e7e87f1934 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 17:18:07 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 17:46:47 2009 +0100
@@ -76,6 +76,8 @@
 
 Feb ??, 2009 (1.5.2)
 ------------
+
+- Display a message when sending the email for a new password failed [Dirk]
 
 - Updated Japanese language file, provided by the Geeklog.jp group
 
diff -r 063645a4564f -r 60e7e87f1934 public_html/users.php
--- a/public_html/users.php	Sun Feb 01 17:18:07 2009 +0100
+++ b/public_html/users.php	Sun Feb 01 17:46:47 2009 +0100
@@ -374,11 +374,10 @@
 * User request for a new password - send email with a link and request id
 *
 * @param username string   name of user who requested the new password
-* @param msg      int      index of message to display (if any)
 * @return         string   form or meta redirect
 *
 */
-function requestpassword ($username, $msg = 0)
+function requestpassword($username)
 {
     global $_CONF, $_TABLES, $LANG04;
 
@@ -409,13 +408,13 @@
         } else {
             $mailfrom = $_CONF['site_mail'];
         }
-        COM_mail ($A['email'], $subject, $mailtext, $mailfrom);
+        if (COM_mail ($A['email'], $subject, $mailtext, $mailfrom)) {
+            $msg = 55; // message sent
+        } else {
+            $msg = 85; // problem sending the email
+        }
 
-        if ($msg) {
-            $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
-        } else {
-            $retval .= COM_refresh ($_CONF['site_url'] . '/index.php');
-        }
+        $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
         COM_updateSpeedlimit ('password');
     } else {
         $retval .= COM_siteHeader ('menu', $LANG04[17])
@@ -1004,7 +1003,7 @@
                                     "email = '$email' AND ((remoteservice IS NULL) OR (remoteservice = ''))");
         }
         if (!empty ($username)) {
-            $display .= requestpassword ($username, 55);
+            $display .= requestpassword($username);
         } else {
             $display = COM_refresh ($_CONF['site_url']
                                     . '/users.php?mode=getpassword');

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:14 -0500
Subject: [geeklog-cvs] geeklog: Display a message when sending the email to
	report an a...
Message-ID: <hg.f0a1e033383a.1233507554.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f0a1e033383a
changeset: 6751:f0a1e033383a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:56:06 2009 +0100
description:
Display a message when sending the email to report an abusive comment failed

diffstat:

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

diffs (32 lines):

diff -r 6d6e4b21742a -r f0a1e033383a public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 17:46:47 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 17:56:06 2009 +0100
@@ -3,6 +3,8 @@
 Feb ??, 2009 (1.5.2)
 ------------
 
+- Display a message when sending the email to report an abusive comment failed
+  [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]
 
 - Updated Japanese language file, provided by the Geeklog.jp group
diff -r 6d6e4b21742a -r f0a1e033383a system/lib-comment.php
--- a/system/lib-comment.php	Sun Feb 01 17:46:47 2009 +0100
+++ b/system/lib-comment.php	Sun Feb 01 17:56:06 2009 +0100
@@ -1268,10 +1268,14 @@
 
     $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[27];
 
-    COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+    if (COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody)) {
+        $msg = 27; // message sent
+    } else {
+        $msg = 85; // problem sending the email
+    }
     COM_updateSpeedlimit ('mail');
 
-    return COM_refresh ($_CONF['site_url'] . '/index.php?msg=27');
+    return COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
 }
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:14 -0500
Subject: [geeklog-cvs] geeklog: Display a message when sending the email to
	report an a...
Message-ID: <hg.3196aac35129.1233507554.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3196aac35129
changeset: 6752:3196aac35129
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:56:06 2009 +0100
description:
Display a message when sending the email to report an abusive comment failed

diffstat:

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

diffs (32 lines):

diff -r 60e7e87f1934 -r 3196aac35129 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 17:46:47 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 17:56:06 2009 +0100
@@ -77,6 +77,8 @@
 Feb ??, 2009 (1.5.2)
 ------------
 
+- Display a message when sending the email to report an abusive comment failed
+  [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]
 
 - Updated Japanese language file, provided by the Geeklog.jp group
diff -r 60e7e87f1934 -r 3196aac35129 system/lib-comment.php
--- a/system/lib-comment.php	Sun Feb 01 17:46:47 2009 +0100
+++ b/system/lib-comment.php	Sun Feb 01 17:56:06 2009 +0100
@@ -1268,10 +1268,14 @@
 
     $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[27];
 
-    COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+    if (COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody)) {
+        $msg = 27; // message sent
+    } else {
+        $msg = 85; // problem sending the email
+    }
     COM_updateSpeedlimit ('mail');
 
-    return COM_refresh ($_CONF['site_url'] . '/index.php?msg=27');
+    return COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
 }
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Feb  1 11:59:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Feb 2009 11:59:12 -0500
Subject: [geeklog-cvs] geeklog: Display a message when sending the email for
	a new pass...
Message-ID: <hg.6d6e4b21742a.1233507552.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6d6e4b21742a
changeset: 6749:6d6e4b21742a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 17:46:47 2009 +0100
description:
Display a message when sending the email for a new password failed

diffstat:

2 files changed, 11 insertions(+), 12 deletions(-)
public_html/docs/history |    2 ++
public_html/users.php    |   21 +++++++++------------

diffs (75 lines):

diff -r 81e157f9d3fb -r 6d6e4b21742a public_html/docs/history
--- a/public_html/docs/history	Sat Jan 31 22:15:27 2009 +0100
+++ b/public_html/docs/history	Sun Feb 01 17:46:47 2009 +0100
@@ -2,6 +2,8 @@
 
 Feb ??, 2009 (1.5.2)
 ------------
+
+- Display a message when sending the email for a new password failed [Dirk]
 
 - Updated Japanese language file, provided by the Geeklog.jp group
 
diff -r 81e157f9d3fb -r 6d6e4b21742a public_html/users.php
--- a/public_html/users.php	Sat Jan 31 22:15:27 2009 +0100
+++ b/public_html/users.php	Sun Feb 01 17:46:47 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | User authentication module.                                               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: users.php,v 1.170 2008/09/15 18:26:17 mjervis Exp $
 
 /**
 * This file handles user authentication
@@ -376,11 +374,10 @@
 * User request for a new password - send email with a link and request id
 *
 * @param username string   name of user who requested the new password
-* @param msg      int      index of message to display (if any)
 * @return         string   form or meta redirect
 *
 */
-function requestpassword ($username, $msg = 0)
+function requestpassword($username)
 {
     global $_CONF, $_TABLES, $LANG04;
 
@@ -412,13 +409,13 @@
         } else {
             $mailfrom = $_CONF['site_mail'];
         }
-        COM_mail ($A['email'], $subject, $mailtext, $mailfrom);
+        if (COM_mail ($A['email'], $subject, $mailtext, $mailfrom)) {
+            $msg = 55; // message sent
+        } else {
+            $msg = 85; // problem sending the email
+        }
 
-        if ($msg) {
-            $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
-        } else {
-            $retval .= COM_refresh ($_CONF['site_url'] . '/index.php');
-        }
+        $retval .= COM_refresh ($_CONF['site_url'] . "/index.php?msg=$msg");
         COM_updateSpeedlimit ('password');
     } else {
         $retval .= COM_siteHeader ('menu', $LANG04[17])
@@ -1007,7 +1004,7 @@
                                     "email = '$email' AND ((remoteservice IS NULL) OR (remoteservice = ''))");
         }
         if (!empty ($username)) {
-            $display .= requestpassword ($username, 55);
+            $display .= requestpassword($username);
         } else {
             $display = COM_refresh ($_CONF['site_url']
                                     . '/users.php?mode=getpassword');

From geeklog-cvs at lists.geeklog.net  Mon Feb  2 03:27:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 02 Feb 2009 03:27:22 -0500
Subject: [geeklog-cvs] geeklog: Sort groups non-case sensitive
Message-ID: <hg.e7ac7e1d805a.1233563242.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e7ac7e1d805a
changeset: 6753:e7ac7e1d805a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 01 11:26:53 2009 +0100
description:
Sort groups non-case sensitive

diffstat:

1 file changed, 2 insertions(+), 4 deletions(-)
system/lib-security.php |    6 ++----

diffs (30 lines):

diff -r f0a1e033383a -r e7ac7e1d805a system/lib-security.php
--- a/system/lib-security.php	Sun Feb 01 17:56:06 2009 +0100
+++ b/system/lib-security.php	Sun Feb 01 11:26:53 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Geeklog security library.                                                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Mark Limburg     - mlimburg AT users DOT sourceforge DOT net     |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-security.php,v 1.75 2008/09/21 08:37:11 dhaun Exp $
 
 /**
 * This is the security library for Geeklog.  This is used to implement Geeklog's
@@ -151,7 +149,7 @@
         }
     }
 
-    ksort($groups);
+    uksort($groups, 'strcasecmp');
 
     if ($_SEC_VERBOSE) {
         COM_errorLog("****************leaving getusergroups(uid=$uid)***************",1);

From geeklog-cvs at lists.geeklog.net  Mon Feb  2 03:45:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 02 Feb 2009 03:45:38 -0500
Subject: [geeklog-cvs] geeklog: Added missing page title when viewing a
	single comment
Message-ID: <hg.13f6803831ed.1233564338.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/13f6803831ed
changeset: 6754:13f6803831ed
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Feb 02 09:41:18 2009 +0100
description:
Added missing page title when viewing a single comment

diffstat:

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

diffs (42 lines):

diff -r e7ac7e1d805a -r 13f6803831ed public_html/comment.php
--- a/public_html/comment.php	Sun Feb 01 11:26:53 2009 +0100
+++ b/public_html/comment.php	Mon Feb 02 09:41:18 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Let user comment on a story or plugin.                                    |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -32,8 +32,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: comment.php,v 1.116 2008/08/12 19:15:36 mjervis Exp $
 
 /**
 * This file is responsible for letting user enter a comment and saving the
@@ -250,7 +248,7 @@
             break;
     }
 
-    return COM_siteHeader() . $display . COM_siteFooter();
+    return COM_siteHeader('menu', $title) . $display . COM_siteFooter();
 }
 
 // MAIN
diff -r e7ac7e1d805a -r 13f6803831ed public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 11:26:53 2009 +0100
+++ b/public_html/docs/history	Mon Feb 02 09:41:18 2009 +0100
@@ -3,6 +3,8 @@
 Feb ??, 2009 (1.5.2)
 ------------
 
+- Added missing page title when viewing a single comment [Dirk]
+- Sort groups in the group dropdowns non-case sensitive [Dirk]
 - Display a message when sending the email to report an abusive comment failed
   [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]

From geeklog-cvs at lists.geeklog.net  Mon Feb  2 03:45:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 02 Feb 2009 03:45:38 -0500
Subject: [geeklog-cvs] geeklog: Added missing page title when viewing a
	single comment
Message-ID: <hg.e919cddc9187.1233564338.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e919cddc9187
changeset: 6755:e919cddc9187
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Feb 02 09:41:18 2009 +0100
description:
Added missing page title when viewing a single comment

diffstat:

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

diffs (42 lines):

diff -r 3196aac35129 -r e919cddc9187 public_html/comment.php
--- a/public_html/comment.php	Sun Feb 01 17:56:06 2009 +0100
+++ b/public_html/comment.php	Mon Feb 02 09:41:18 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Let user comment on a story or plugin.                                    |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -32,8 +32,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: comment.php,v 1.116 2008/08/12 19:15:36 mjervis Exp $
 
 /**
 * This file is responsible for letting user enter a comment and saving the
@@ -250,7 +248,7 @@
             break;
     }
 
-    return COM_siteHeader() . $display . COM_siteFooter();
+    return COM_siteHeader('menu', $title) . $display . COM_siteFooter();
 }
 
 // MAIN
diff -r 3196aac35129 -r e919cddc9187 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 01 17:56:06 2009 +0100
+++ b/public_html/docs/history	Mon Feb 02 09:41:18 2009 +0100
@@ -77,6 +77,8 @@
 Feb ??, 2009 (1.5.2)
 ------------
 
+- Added missing page title when viewing a single comment [Dirk]
+- Sort groups in the group dropdowns non-case sensitive [Dirk]
 - Display a message when sending the email to report an abusive comment failed
   [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]

From geeklog-cvs at lists.geeklog.net  Mon Feb  2 13:58:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 02 Feb 2009 13:58:37 -0500
Subject: [geeklog-cvs] geeklog: Added the topic name to the page title
Message-ID: <hg.fcc8b4ab664b.1233601117.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fcc8b4ab664b
changeset: 6756:fcc8b4ab664b
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Feb 02 10:52:36 2009 +0100
description:
Added the topic name to the page title

diffstat:

1 file changed, 11 insertions(+), 7 deletions(-)
public_html/directory.php |   18 +++++++++++-------

diffs (48 lines):

diff -r e919cddc9187 -r fcc8b4ab664b public_html/directory.php
--- a/public_html/directory.php	Mon Feb 02 09:41:18 2009 +0100
+++ b/public_html/directory.php	Mon Feb 02 10:52:36 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | directory.php                                                             |
 // |                                                                           |
 // | Directory of all the stories on a Geeklog site.                           |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -28,10 +28,8 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: directory.php,v 1.19 2008/06/20 19:12:56 dhaun Exp $
 
-require_once ('lib-common.php');
+require_once 'lib-common.php';
 
 // configuration option:
 // List stories for the current month on top of the overview page
@@ -487,8 +485,14 @@
     $display .= DIR_displayYear ($topic, $year, true);
     $display .= DIR_navBar ($topic, $year);
 } else {
-    $display .= COM_siteHeader ('menu', $LANG_DIR['title']);
-    $display .= DIR_displayAll ($topic, $conf_list_current_month);
+    $title = $LANG_DIR['title'];
+    if ($topic != 'all') {
+        $topicName = DB_getItem($_TABLES['topics'], 'topic',
+                                "tid = '" . addslashes($topic) . "'");
+        $title .= ': ' . $topicName;
+    }
+    $display .= COM_siteHeader('menu', $title);
+    $display .= DIR_displayAll($topic, $conf_list_current_month);
 }
 
 $display .= COM_siteFooter (true);

From geeklog-cvs at lists.geeklog.net  Mon Feb  2 18:07:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 02 Feb 2009 18:07:34 -0500
Subject: [geeklog-cvs] geeklog: Implemented Search Improvements
Message-ID: <hg.6db77ef26a37.1233616054.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6db77ef26a37
changeset: 6757:6db77ef26a37
user:      Sami Barakat
date:      Mon Feb 02 23:04:14 2009 +0000
description:
Implemented Search Improvements

diffstat:

18 files changed, 1544 insertions(+), 735 deletions(-)
language/english.php                                          |   26 
public_html/admin/install/config-install.php                  |   14 
public_html/docs/config.html                                  |   52 
public_html/layout/professional/lists/inline/item_field.thtml |    1 
public_html/layout/professional/lists/inline/item_row.thtml   |    4 
public_html/layout/professional/lists/inline/list.thtml       |   14 
public_html/layout/professional/lists/inline/page_limit.thtml |    1 
public_html/layout/professional/lists/inline/page_sort.thtml  |    1 
public_html/layout/professional/lists/table/item_field.thtml  |    1 
public_html/layout/professional/lists/table/item_row.thtml    |    3 
public_html/layout/professional/lists/table/list.thtml        |   16 
public_html/layout/professional/lists/table/page_limit.thtml  |    1 
public_html/layout/professional/lists/table/page_sort.thtml   |    1 
public_html/lib-common.php                                    |    5 
system/classes/listfactory.class.php                          |  652 +++++
system/classes/search.class.php                               | 1278 ++++------
system/classes/searchcriteria.class.php                       |  164 +
system/lib-plugins.php                                        |   45 

diffs (truncated from 2591 to 300 lines):

diff -r fcc8b4ab664b -r 6db77ef26a37 language/english.php
--- a/language/english.php	Mon Feb 02 10:52:36 2009 +0100
+++ b/language/english.php	Mon Feb 02 23:04:14 2009 +0000
@@ -502,7 +502,14 @@
     58 => 'More results &gt;&gt;',
     59 => 'Results',
     60 => 'per page',
-    61 => 'Refine search'
+    61 => 'Refine search',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1801,7 +1808,18 @@
     'default_permissions_topic' => "Topic Default Permissions",
     'atom_max_stories' => "Max. Stories in Webservices Feed",
     'disable_webservices' => 'Disable Webservices?',
-    'restrict_webservices' => 'Restrict Webservices?'
+    'restrict_webservices' => 'Restrict Webservices?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1885,7 +1903,9 @@
     15 => array('By Number' => 'sortnum', 'Alphabetically' => 'alpha'),
     16 => array('No Login required' => 0, 'Advanced Search only' => 1, 'Simple + Advanced Search' => 2),
     17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
-    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3)
+    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Mon Feb 02 10:52:36 2009 +0100
+++ b/public_html/admin/install/config-install.php	Mon Feb 02 23:04:14 2009 +0000
@@ -83,7 +83,19 @@
     $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
 
     $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
-    $c->add('num_search_results',10,'text',0,6,NULL,670,TRUE);
+    $c->add('search_style','google','select',0,6,19,650,TRUE);
+    $c->add('search_limits','10,15,25,30','text',0,6,NULL,660,TRUE);
+    $c->add('num_search_results',30,'text',0,6,NULL,670,TRUE);
+    $c->add('search_show_limit',TRUE,'select',0,6,1,680,TRUE);
+    $c->add('search_show_sort',TRUE,'select',0,6,1,690,TRUE);
+    $c->add('search_show_num',TRUE,'select',0,6,1,700,TRUE);
+    $c->add('search_show_type',TRUE,'select',0,6,1,710,TRUE);
+    $c->add('search_show_user',TRUE,'select',0,6,1,720,TRUE);
+    $c->add('search_show_hits',TRUE,'select',0,6,1,730,TRUE);
+    $c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,740,TRUE);
+    $c->add('search_separator',' &gt; ','text',0,6,NULL,750,TRUE);
+    $c->add('search_def_keytype','phrase','select',0,6,20,760,TRUE);
+    $c->add('search_use_fulltext',FALSE,'hidden',0,6);
 
     // Subgroup: Stories and Trackback
     $c->add('sg_stories', NULL, 'subgroup', 1, 0, NULL, 0, TRUE);
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/docs/config.html
--- a/public_html/docs/config.html	Mon Feb 02 10:52:36 2009 +0100
+++ b/public_html/docs/config.html	Mon Feb 02 23:04:14 2009 +0000
@@ -263,9 +263,57 @@
     <th style="width:29%">Default Value</th>
     <th style="width:63%">Description</th></tr>
 <tr>
+  <td valign="top"><a name="desc_search_style">search_style</a></td>
+  <td valign="top">'google'</td>
+  <td valign="top">Sets the style of the results page. Can be either 'google' or 'table'</td></tr>
+<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>
+<tr>
   <td valign="top"><a name="desc_num_search_results">num_search_results</a></td>
-  <td valign="top">10</td>
-  <td valign="top">Number of search results per page (and per type).</td></tr>
+  <td valign="top">30</td>
+  <td valign="top">The default number of results per page. Should be a value from 'search_limits' above.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_limit">search_show_limit</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the page limits selection box.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_sort">search_show_sort</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the 'Sort By' selection box. (When using the table style it will enable/disable column sorting)</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_num">search_show_num</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the result number.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_type">search_show_type</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the plugin name the result came from.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_user">search_show_user</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the author of a result.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_show_hits">search_show_hits</a></td>
+  <td valign="top">true</td>
+  <td valign="top">Shows (= true) or hides (= false) the number of hits a result has received.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_no_data">search_no_data</a></td>
+  <td valign="top">&lt;i&gt;Not available...&lt;/i&gt;</td>
+  <td valign="top">When there is an incompatibility between plugin and Geeklog display this string.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_separator">search_separator</a></td>
+  <td valign="top"> &amp;gt; (Space before and after character)</td>
+  <td valign="top">The character to display between result type sub groups.</td></tr>
+<tr>
+  <td valign="top"><a name="desc_search_def_keytype">search_def_keytype</a></td>
+  <td valign="top">'phrase'</td>
+  <td valign="top">Default to one of these search methods:<ul>
+    <li>'all': results must contain all of the search terms.</li>
+    <li>'any': results may contain any of the search terms.</li>
+    <li>'phrase': search for the exact phrase as entered. (default)</li>
+    </ul></td></tr>
 </table>
 
 
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/inline/item_field.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/inline/item_field.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+                                    {field_text}
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/inline/item_row.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/inline/item_row.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,4 @@
+                                <div>
+                                    {item_field}
+                                </div>
+                                <br>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/inline/list.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/inline/list.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,14 @@
+                            {list_top}
+                            <div class="admin-list-search">
+                                <select name="page_limit" style="{show_limit}">
+                                    {page_limit}
+                                </select>
+                                <select name="page_sort" style="{show_sort}">
+                                    {page_sort}
+                                </select>
+                            </div>
+                            {item_row}
+                            <p class="aligncenter" style="{show_message}"><b>{message}</b></p>
+                            <br{xhtml}>
+                            {google_paging}
+                            {list_bottom}
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/inline/page_limit.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/inline/page_limit.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+<option{limit_selected}{limit_subtags}>{limit_text}</option>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/inline/page_sort.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/inline/page_sort.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+<option{sort_selected}{sort_subtags}>{sort_text}</option>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/table/item_field.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/table/item_field.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+                                    <td>{field_text}</td>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/table/item_row.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/table/item_row.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,3 @@
+                                <tr class="pluginRow{cssid}" onmouseover="className='pluginRollOver';" onmouseout="className='pluginRow{cssid}';">
+                                    {item_field}
+                                </tr>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/table/list.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/table/list.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,16 @@
+                            {list_top}
+                            <div class="admin-list-search">
+                                <select name="page_limit" style="{show_limit}">
+                                    {page_limit}
+                                </select>
+                            </div>
+                            <table class="admin-list-table" style="{show_sort}">
+                                <tr style="background:#FFFFFF;">
+                                    {page_sort}
+                                </tr>
+                                {item_row}
+                            </table>
+                            <p class="aligncenter" style="{show_message}"><b>{message}</b></p>
+                            <br{xhtml}>
+                            {google_paging}
+                            {list_bottom}
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/table/page_limit.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/table/page_limit.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+<option{limit_selected}{limit_subtags}>{limit_text}</option>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/layout/professional/lists/table/page_sort.thtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/lists/table/page_sort.thtml	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,1 @@
+<th class="admin-list-headerfield"{sort_subtags}>{sort_text}{sort_selected}</th>
diff -r fcc8b4ab664b -r 6db77ef26a37 public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Feb 02 10:52:36 2009 +0100
+++ b/public_html/lib-common.php	Mon Feb 02 23:04:14 2009 +0000
@@ -5759,10 +5759,11 @@
 *
 * @param    string  $text   the text
 * @param    string  $query  the search query
+* @param    string  $class  html class to use to highlight
 * @return   string          the text with highlighted search words
 *
 */
-function COM_highlightQuery( $text, $query )
+function COM_highlightQuery( $text, $query, $class = 'highlight' )
 {
     $query = str_replace( '+', ' ', $query );
 
@@ -5783,7 +5784,7 @@
         {
             $searchword = preg_quote( str_replace( "'", "\'", $searchword ));
             $searchword = str_replace('/', '\\/', $searchword);
-            $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','<span class=\"highlight\">\\\\0</span>','\\0')", '<!-- x -->' . $text . '<!-- x -->' );
+            $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','<span class=\"$class\">\\\\0</span>','\\0')", '<!-- x -->' . $text . '<!-- x -->' );
         }
     }
 
diff -r fcc8b4ab664b -r 6db77ef26a37 system/classes/listfactory.class.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/classes/listfactory.class.php	Mon Feb 02 23:04:14 2009 +0000
@@ -0,0 +1,652 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | listfactory.class.php                                                     |
+// |                                                                           |
+// | This class allows personalised lists or tables to be easily generated     |
+// | from arrays or SQL statements. It will also supports the sorting and      |
+// | paging of results.                                                        |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2000-2009 by the following authors:                         |
+// |                                                                           |
+// | Authors: Sami Barakat     - s.m.barakat AT gmail DOT com                  |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'listfactory.class.php') !== false) {
+    die('This file can not be used on its own.');
+}
+
+/* Example Use
+
+    // Initiate an instance of the class with the URL of the current page
+    $url = $_SERVER['PHP_SELF'];
+    $obj = new ListFactory($url);
+
+    // Set up some hidden fields that will be used to help format the data later on
+    $obj->setField('ID', 'id', false);
+
+    // 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

From geeklog-cvs at lists.geeklog.net  Tue Feb  3 05:13:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 03 Feb 2009 05:13:55 -0500
Subject: [geeklog-cvs] geeklog: Removed undefined variable and fixed a typo
Message-ID: <hg.4a25081c5db9.1233656035.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4a25081c5db9
changeset: 6759:4a25081c5db9
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Feb 03 10:00:40 2009 +0100
description:
Removed undefined variable and fixed a typo

diffstat:

1 file changed, 1 insertion(+), 2 deletions(-)
system/classes/searchcriteria.class.php |    3 +--

diffs (20 lines):

diff -r 60994cd85ddd -r 4a25081c5db9 system/classes/searchcriteria.class.php
--- a/system/classes/searchcriteria.class.php	Tue Feb 03 09:50:37 2009 +0100
+++ b/system/classes/searchcriteria.class.php	Tue Feb 03 10:00:40 2009 +0100
@@ -44,7 +44,6 @@
     {
         $this->_pluginName = $pluginName;
         $this->_pluginLabel = $pluginLabel;
-        $this->_rank = $rank;
         $this->_url_rewrite = false;
         $this->_rank = 3;
     }
@@ -103,7 +102,7 @@
 
     function UrlRewriteEnable()
     {
-        return $this->_url_rewite;
+        return $this->_url_rewrite;
     }
 
     function buildSearchSQL( $keyType, $query, $columns, $sql = '' )

From geeklog-cvs at lists.geeklog.net  Tue Feb  3 05:13:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 03 Feb 2009 05:13:55 -0500
Subject: [geeklog-cvs] geeklog: Synced with english.php
Message-ID: <hg.60994cd85ddd.1233656035.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/60994cd85ddd
changeset: 6758:60994cd85ddd
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Feb 03 09:50:37 2009 +0100
description:
Synced with english.php

diffstat:

5 files changed, 117 insertions(+), 18 deletions(-)
language/english_utf-8.php       |   31 +++++++++++++++++++++++++------
language/german.php              |   26 +++++++++++++++++++++++---
language/german_formal.php       |   26 +++++++++++++++++++++++---
language/german_formal_utf-8.php |   26 +++++++++++++++++++++++---
language/german_utf-8.php        |   26 +++++++++++++++++++++++---

diffs (269 lines):

diff -r 6db77ef26a37 -r 60994cd85ddd language/english_utf-8.php
--- a/language/english_utf-8.php	Mon Feb 02 23:04:14 2009 +0000
+++ b/language/english_utf-8.php	Tue Feb 03 09:50:37 2009 +0100
@@ -502,7 +502,14 @@
     58 => 'More results &gt;&gt;',
     59 => 'Results',
     60 => 'per page',
-    61 => 'Refine search'
+    61 => 'Refine search',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1148,8 +1155,8 @@
     39 => '',
     40 => 'System Message',
     41 => '',
-    42 => 'Your word has been successfully saved.',
-    43 => 'The word has been successfully deleted.',
+    42 => '',
+    43 => '',
     44 => 'The plugin was successfully installed!',
     45 => 'The plugin was successfully deleted.',
     46 => '',
@@ -1210,7 +1217,6 @@
     101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.',
     400 => 'Not all required fields have been passed validation', // Error codes in the 400 range reserved for CUSTOM membership
     401 => 'Please enter Fullname'
-
 );
 
 ###############################################################################
@@ -1802,7 +1808,18 @@
     'default_permissions_topic' => "Topic Default Permissions",
     'atom_max_stories' => "Max. Stories in Webservices Feed",
     'disable_webservices' => 'Disable Webservices?',
-    'restrict_webservices' => 'Restrict Webservices?'
+    'restrict_webservices' => 'Restrict Webservices?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1886,7 +1903,9 @@
     15 => array('By Number' => 'sortnum', 'Alphabetically' => 'alpha'),
     16 => array('No Login required' => 0, 'Advanced Search only' => 1, 'Simple + Advanced Search' => 2),
     17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
-    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3)
+    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
diff -r 6db77ef26a37 -r 60994cd85ddd language/german.php
--- a/language/german.php	Mon Feb 02 23:04:14 2009 +0000
+++ b/language/german.php	Tue Feb 03 09:50:37 2009 +0100
@@ -505,7 +505,14 @@
     58 => 'Weitere Ergebnisse &gt;&gt;',
     59 => 'Ergebnisse',
     60 => 'pro Seite',
-    61 => 'Suche korrigieren'
+    61 => 'Suche korrigieren',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1808,7 +1815,18 @@
     'default_permissions_topic' => 'Grundeinstellung Kategorierechte',
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
-    'restrict_webservices' => 'Webservices beschr?nken?'
+    'restrict_webservices' => 'Webservices beschr?nken?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1885,7 +1903,9 @@
     15 => array('Nummerisch' => 'sortnum', 'Alphabetisch' => 'alpha'),
     16 => array('Kein Login ben?tigt' => 0, 'Nur erweiterte Suche' => 1, 'Einfache und erweiterte Suche' => 2),
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
-    18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3)
+    18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
diff -r 6db77ef26a37 -r 60994cd85ddd language/german_formal.php
--- a/language/german_formal.php	Mon Feb 02 23:04:14 2009 +0000
+++ b/language/german_formal.php	Tue Feb 03 09:50:37 2009 +0100
@@ -506,7 +506,14 @@
     58 => 'Weitere Ergebnisse &gt;&gt;',
     59 => 'Ergebnisse',
     60 => 'pro Seite',
-    61 => 'Suche korrigieren'
+    61 => 'Suche korrigieren',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1809,7 +1816,18 @@
     'default_permissions_topic' => 'Grundeinstellung Kategorierechte',
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
-    'restrict_webservices' => 'Webservices beschr?nken?'
+    'restrict_webservices' => 'Webservices beschr?nken?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1886,7 +1904,9 @@
     15 => array('Nummerisch' => 'sortnum', 'Alphabetisch' => 'alpha'),
     16 => array('Kein Login ben?tigt' => 0, 'Nur erweiterte Suche' => 1, 'Einfache und erweiterte Suche' => 2),
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
-    18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3)
+    18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
diff -r 6db77ef26a37 -r 60994cd85ddd language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Mon Feb 02 23:04:14 2009 +0000
+++ b/language/german_formal_utf-8.php	Tue Feb 03 09:50:37 2009 +0100
@@ -506,7 +506,14 @@
     58 => 'Weitere Ergebnisse &gt;&gt;',
     59 => 'Ergebnisse',
     60 => 'pro Seite',
-    61 => 'Suche korrigieren'
+    61 => 'Suche korrigieren',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1809,7 +1816,18 @@
     'default_permissions_topic' => 'Grundeinstellung Kategorierechte',
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
-    'restrict_webservices' => 'Webservices beschr??nken?'
+    'restrict_webservices' => 'Webservices beschr??nken?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1886,7 +1904,9 @@
     15 => array('Nummerisch' => 'sortnum', 'Alphabetisch' => 'alpha'),
     16 => array('Kein Login ben??tigt' => 0, 'Nur erweiterte Suche' => 1, 'Einfache und erweiterte Suche' => 2),
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
-    18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3)
+    18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
diff -r 6db77ef26a37 -r 60994cd85ddd language/german_utf-8.php
--- a/language/german_utf-8.php	Mon Feb 02 23:04:14 2009 +0000
+++ b/language/german_utf-8.php	Tue Feb 03 09:50:37 2009 +0100
@@ -505,7 +505,14 @@
     58 => 'Weitere Ergebnisse &gt;&gt;',
     59 => 'Ergebnisse',
     60 => 'pro Seite',
-    61 => 'Suche korrigieren'
+    61 => 'Suche korrigieren',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -1808,7 +1815,18 @@
     'default_permissions_topic' => 'Grundeinstellung Kategorierechte',
     'atom_max_stories' => 'Max. Artikel im Webservices-Feed',
     'disable_webservices' => 'Webservices ausschalten?',
-    'restrict_webservices' => 'Webservices beschr??nken?'
+    'restrict_webservices' => 'Webservices beschr??nken?',
+    'search_style' => "Results List Style",
+    'search_limits' => "Page Limits",
+    'search_show_num' => "Show Result Number?",
+    'search_show_type' => "Show Result Type?",
+    'search_show_user' => "Show Author?",
+    'search_show_hits' => "Show Number of Hits?",
+    'search_show_sort' => "Allow User to Sort Results?",
+    'search_show_limit' => "Show Page Limits?",
+    'search_no_data' => "If No Data is Avaliable, Display",
+    'search_separator' => "Group Separator",
+    'search_def_keytype' => "Default Search Method"
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1885,7 +1903,9 @@
     15 => array('Nummerisch' => 'sortnum', 'Alphabetisch' => 'alpha'),
     16 => array('Kein Login ben??tigt' => 0, 'Nur erweiterte Suche' => 1, 'Einfache und erweiterte Suche' => 2),
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
-    18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3)
+    18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>

From geeklog-cvs at lists.geeklog.net  Tue Feb  3 05:13:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 03 Feb 2009 05:13:57 -0500
Subject: [geeklog-cvs] geeklog: strftime needs a long as the second parameter
Message-ID: <hg.47b8386f2e94.1233656037.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/47b8386f2e94
changeset: 6761:47b8386f2e94
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Feb 03 11:13:26 2009 +0100
description:
strftime needs a long as the second parameter

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
system/classes/search.class.php |    2 +-

diffs (12 lines):

diff -r 237435f67e18 -r 47b8386f2e94 system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Feb 03 11:11:23 2009 +0100
+++ b/system/classes/search.class.php	Tue Feb 03 11:13:26 2009 +0100
@@ -731,7 +731,7 @@
                 $row['description'] = stripslashes($this->_shortenText($this->_query, $row['description'], $this->_wordlength));
             }
 
-            $row['date'] = strftime($_CONF['daytime'], $row['date']);
+            $row['date'] = strftime($_CONF['daytime'], intval($row['date']));
             $row['hits'] = COM_NumberFormat($row['hits']) . ' '; // simple solution to a silly problem!
         }
 

From geeklog-cvs at lists.geeklog.net  Tue Feb  3 05:13:56 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 03 Feb 2009 05:13:56 -0500
Subject: [geeklog-cvs] geeklog: Changed sort_order for the search options
	and added the...
Message-ID: <hg.237435f67e18.1233656036.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/237435f67e18
changeset: 6760:237435f67e18
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Feb 03 11:11:23 2009 +0100
description:
Changed sort_order for the search options and added them to the update

diffstat:

3 files changed, 67 insertions(+), 18 deletions(-)
public_html/admin/install/config-install.php |   29 +++++++++++++-------------
sql/updates/mssql_1.5.2_to_1.6.0.php         |   28 +++++++++++++++++++++++--
sql/updates/mysql_1.5.2_to_1.6.0.php         |   28 +++++++++++++++++++++++--

diffs (137 lines):

diff -r 4a25081c5db9 -r 237435f67e18 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Tue Feb 03 10:00:40 2009 +0100
+++ b/public_html/admin/install/config-install.php	Tue Feb 03 11:11:23 2009 +0100
@@ -82,20 +82,21 @@
     $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
     $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
 
+    // squeeze search options between 640 (lastlogin) and 680 (loginrequired)
     $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
-    $c->add('search_style','google','select',0,6,19,650,TRUE);
-    $c->add('search_limits','10,15,25,30','text',0,6,NULL,660,TRUE);
-    $c->add('num_search_results',30,'text',0,6,NULL,670,TRUE);
-    $c->add('search_show_limit',TRUE,'select',0,6,1,680,TRUE);
-    $c->add('search_show_sort',TRUE,'select',0,6,1,690,TRUE);
-    $c->add('search_show_num',TRUE,'select',0,6,1,700,TRUE);
-    $c->add('search_show_type',TRUE,'select',0,6,1,710,TRUE);
-    $c->add('search_show_user',TRUE,'select',0,6,1,720,TRUE);
-    $c->add('search_show_hits',TRUE,'select',0,6,1,730,TRUE);
-    $c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,740,TRUE);
-    $c->add('search_separator',' &gt; ','text',0,6,NULL,750,TRUE);
-    $c->add('search_def_keytype','phrase','select',0,6,20,760,TRUE);
-    $c->add('search_use_fulltext',FALSE,'hidden',0,6);
+    $c->add('search_style','google','select',0,6,19,642,TRUE);
+    $c->add('search_limits','10,15,25,30','text',0,6,NULL,645,TRUE);
+    $c->add('num_search_results',30,'text',0,6,NULL,648,TRUE);
+    $c->add('search_show_limit',TRUE,'select',0,6,1,651,TRUE);
+    $c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
+    $c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
+    $c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
+    $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
+    $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
+    $c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
+    $c->add('search_separator',' &gt; ','text',0,6,NULL,672,TRUE);
+    $c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
+    $c->add('search_use_fulltext',FALSE,'hidden',0,6); // 678
 
     // Subgroup: Stories and Trackback
     $c->add('sg_stories', NULL, 'subgroup', 1, 0, NULL, 0, TRUE);
@@ -302,7 +303,7 @@
     $c->add('cookiesecure',FALSE,'select',7,30,1,630,TRUE);
 
     $c->add('fs_misc', NULL, 'fieldset', 7, 31, NULL, 0, TRUE);
-    $c->add('pdf_enabled',0,'select',7,31,0,660,TRUE);
+    $c->add('pdf_enabled',0,'select',7,31,0,795,TRUE);
     $c->add('notification',array(),'%text',7,31,NULL,800,TRUE);
     $c->add('cron_schedule_interval',86400,'text',7,31,NULL,860,TRUE);
     $c->add('disable_autolinks',0,'select',7,31,0,1750,TRUE);
diff -r 4a25081c5db9 -r 237435f67e18 sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Tue Feb 03 10:00:40 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Tue Feb 03 11:11:23 2009 +0100
@@ -14,15 +14,39 @@
  */
 function update_ConfValues()
 {
-    global $_CONF;
+    global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    // move pdf_enabled option to make room for new search options
+    DB_query("UPDATE {$_TABLES['conf_values']} SET sort_order = 795 WHERE sort_order = 660");
+    // move num_search_results options
+    DB_query("UPDATE {$_TABLES['conf_values']} SET sort_order = 648 WHERE sort_order = 670");
+    // change default for num_search_results
+    $thirty = addslashes(serialize(30));
+    DB_query("UPDATE {$_TABLES['conf_values']} SET value = '$thirty', default_value = '$thirty' WHERE name = 'num_search_results'");
+
     $c = config::get_instance();
 
-    // new option
+    // new options
     $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
     $c->add('advanced_html',array ('img' => array('width' => 1, 'height' => 1, 'src' => 1, 'align' => 1, 'valign' => 1, 'border' => 1, 'alt' => 1)),'**placeholder',7,34,NULL,1721,TRUE);
+
+    // squeeze search options between 640 (lastlogin) and 680 (loginrequired)
+    $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
+    $c->add('search_style','google','select',0,6,19,642,TRUE);
+    $c->add('search_limits','10,15,25,30','text',0,6,NULL,645,TRUE);
+    // see above: $c->add('num_search_results',30,'text',0,6,NULL,648,TRUE);
+    $c->add('search_show_limit',TRUE,'select',0,6,1,651,TRUE);
+    $c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
+    $c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
+    $c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
+    $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
+    $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
+    $c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
+    $c->add('search_separator',' &gt; ','text',0,6,NULL,672,TRUE);
+    $c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
+    $c->add('search_use_fulltext',FALSE,'hidden',0,6); // 678
 
     return true;
 }
diff -r 4a25081c5db9 -r 237435f67e18 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Tue Feb 03 10:00:40 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Tue Feb 03 11:11:23 2009 +0100
@@ -15,15 +15,39 @@
  */
 function update_ConfValues()
 {
-    global $_CONF;
+    global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    // move pdf_enabled option to make room for new search options
+    DB_query("UPDATE {$_TABLES['conf_values']} SET sort_order = 795 WHERE sort_order = 660");
+    // move num_search_results options
+    DB_query("UPDATE {$_TABLES['conf_values']} SET sort_order = 648 WHERE sort_order = 670");
+    // change default for num_search_results
+    $thirty = addslashes(serialize(30));
+    DB_query("UPDATE {$_TABLES['conf_values']} SET value = '$thirty', default_value = '$thirty' WHERE name = 'num_search_results'");
+
     $c = config::get_instance();
 
-    // new option
+    // new options
     $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
     $c->add('advanced_html',array ('img' => array('width' => 1, 'height' => 1, 'src' => 1, 'align' => 1, 'valign' => 1, 'border' => 1, 'alt' => 1)),'**placeholder',7,34,NULL,1721,TRUE);
+
+    // squeeze search options between 640 (lastlogin) and 680 (loginrequired)
+    $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
+    $c->add('search_style','google','select',0,6,19,642,TRUE);
+    $c->add('search_limits','10,15,25,30','text',0,6,NULL,645,TRUE);
+    // see above: $c->add('num_search_results',30,'text',0,6,NULL,648,TRUE);
+    $c->add('search_show_limit',TRUE,'select',0,6,1,651,TRUE);
+    $c->add('search_show_sort',TRUE,'select',0,6,1,654,TRUE);
+    $c->add('search_show_num',TRUE,'select',0,6,1,657,TRUE);
+    $c->add('search_show_type',TRUE,'select',0,6,1,660,TRUE);
+    $c->add('search_show_user',TRUE,'select',0,6,1,663,TRUE);
+    $c->add('search_show_hits',TRUE,'select',0,6,1,666,TRUE);
+    $c->add('search_no_data','<i>Not available...</i>','text',0,6,NULL,669,TRUE);
+    $c->add('search_separator',' &gt; ','text',0,6,NULL,672,TRUE);
+    $c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
+    $c->add('search_use_fulltext',FALSE,'hidden',0,6); // 678
 
     return true;
 }

From geeklog-cvs at lists.geeklog.net  Wed Feb  4 07:48:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Feb 2009 07:48:18 -0500
Subject: [geeklog-cvs] geeklog: Fixed preg_match overwriting $result variable
Message-ID: <hg.f2c9ffac0fbc.1233751698.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f2c9ffac0fbc
changeset: 6762:f2c9ffac0fbc
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Feb 04 13:48:07 2009 +0100
description:
Fixed preg_match overwriting $result variable

diffstat:

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

diffs (14 lines):

diff -r 47b8386f2e94 -r f2c9ffac0fbc system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Feb 03 11:13:26 2009 +0100
+++ b/system/classes/search.class.php	Wed Feb 04 13:48:07 2009 +0100
@@ -621,8 +621,8 @@
                                 'uid' =>          $col_user == -1 ? '&nbsp;' : $old_row[$col_user],
                                 'hits' =>         $col_hits == -1 ? '0' : str_replace(',', '', $old_row[$col_hits])
                             );
-                    preg_match('/href="([^"]+)"/i', $api_results['title'], $result);
-                    $api_results['url'] = empty($result) ? '#' : $result[1];
+                    preg_match('/href="([^"]+)"/i', $api_results['title'], $links);
+                    $api_results['url'] = empty($links) ? '#' : $links[1];
 
                     $obj->addResult($api_results);
                 }

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 09:59:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 09:59:40 -0500
Subject: [geeklog-cvs] geeklog: Check if variables are set before using them
Message-ID: <hg.f3c8c971e6b6.1234018780.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f3c8c971e6b6
changeset: 6763:f3c8c971e6b6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 15:20:13 2009 +0100
description:
Check if variables are set before using them

diffstat:

1 file changed, 11 insertions(+), 3 deletions(-)
system/classes/config.class.php |   14 +++++++++++---

diffs (28 lines):

diff -r f2c9ffac0fbc -r f3c8c971e6b6 system/classes/config.class.php
--- a/system/classes/config.class.php	Wed Feb 04 13:48:07 2009 +0100
+++ b/system/classes/config.class.php	Sat Feb 07 15:20:13 2009 +0100
@@ -373,13 +373,21 @@
         global $_USER;
 
         if (empty($_USER['theme'])) {
-            $theme = $this->config_array['Core']['theme'];
+            if (! empty($this->config_array['Core']['theme'])) {
+                $theme = $this->config_array['Core']['theme'];
+            }
         } else {
             $theme = $_USER['theme'];
         }
 
-        $this->config_array['Core']['path_layout'] = $this->config_array['Core']['path_themes'] . $theme . '/';
-        $this->config_array['Core']['layout_url'] = $this->config_array['Core']['site_url'] . '/layout/' . $theme;
+        if (! empty($theme)) {
+            if (! empty($this->config_array['Core']['path_themes'])) {
+                $this->config_array['Core']['path_layout'] = $this->config_array['Core']['path_themes'] . $theme . '/';
+            }
+            if (! empty($this->config_array['Core']['site_url'])) {
+                $this->config_array['Core']['layout_url'] = $this->config_array['Core']['site_url'] . '/layout/' . $theme;
+            }
+        }
     }
 
     function _get_groups()

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 09:59:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 09:59:41 -0500
Subject: [geeklog-cvs] geeklog: Fixed problem with backslashes appearing in
	the story t...
Message-ID: <hg.87aabd060f27.1234018781.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/87aabd060f27
changeset: 6765:87aabd060f27
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 15:59:21 2009 +0100
description:
Fixed problem with backslashes appearing in the story title when previewing with magic_quotes_gpc = On (bug #0000790)

diffstat:

1 file changed, 11 insertions(+), 2 deletions(-)
public_html/admin/story.php |   13 +++++++++++--

diffs (23 lines):

diff -r d1add93e44bf -r 87aabd060f27 public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Feb 07 15:34:04 2009 +0100
+++ b/public_html/admin/story.php	Sat Feb 07 15:59:21 2009 +0100
@@ -262,8 +262,17 @@
     }
 
     $story = new Story();
-    if($mode == 'preview')
-    {
+    if ($mode == 'preview') {
+        // Handle Magic GPC Garbage:
+        while (list($key, $value) = each($_POST)) {
+            if (!is_array($value)) {
+                $_POST[$key] = COM_stripslashes($value);
+            } else {
+                while (list($subkey, $subvalue) = each($value)) {
+                    $value[$subkey] = COM_stripslashes($subvalue);
+                }
+            }
+        }
         $result = $story->loadFromArgsArray($_POST);
     } else {
         $result = $story->loadFromDatabase($sid, $mode);

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 09:59:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 09:59:41 -0500
Subject: [geeklog-cvs] geeklog: Make the logo link to geeklog.net
Message-ID: <hg.d1add93e44bf.1234018781.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d1add93e44bf
changeset: 6764:d1add93e44bf
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 15:34:04 2009 +0100
description:
Make the logo link to geeklog.net

diffstat:

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

diffs (168 lines):

diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/calendar.html
--- a/public_html/docs/calendar.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/calendar.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Calendar Plugin</div>
 
 <h1>Calendar Plugin</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/changes.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Changes</div>
 
 <h1>Changes</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/config.html
--- a/public_html/docs/config.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/config.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Configuration</div>
 
 <h1>Geeklog Configuration</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/index.html
--- a/public_html/docs/index.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/index.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu">Geeklog Documentation</div>
 
 <h1>Thank You!</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/install.html
--- a/public_html/docs/install.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/install.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Installation Instructions</div>
 
 <h1>Installing Geeklog</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/links.html
--- a/public_html/docs/links.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/links.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Links Plugin</div>
 
 <h1>Links Plugin</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/plugin.html
--- a/public_html/docs/plugin.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/plugin.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Plugin Development</div>
 
 <h1>Plugin Development</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/polls.html
--- a/public_html/docs/polls.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/polls.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Polls Plugin</div>
 
 <h1>Polls Plugin</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/spamx.html
--- a/public_html/docs/spamx.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/spamx.html	Sat Feb 07 15:34:04 2009 +0100
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Geeklog Spam-X Plugin</div>
 
 <h1>Geeklog Spam-X Plugin</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/staticpages.html
--- a/public_html/docs/staticpages.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/staticpages.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Static Pages Plugin</div>
 
 <h1>Static Pages plugin</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/support.html
--- a/public_html/docs/support.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/support.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Support</div>
 
 <h1>Support options</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/theme.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Theme How-To</div>
 
 <p><small>(see below for a list of <a href="#changes">theme changes</a> in
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/themevars.html
--- a/public_html/docs/themevars.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/themevars.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Variables in Themes</div>
 
 <h1>Variables in Themes</h1>
diff -r f3c8c971e6b6 -r d1add93e44bf public_html/docs/trackback.html
--- a/public_html/docs/trackback.html	Sat Feb 07 15:20:13 2009 +0100
+++ b/public_html/docs/trackback.html	Sat Feb 07 15:34:04 2009 +0100
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<p><a href="index.html" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog Documentation" width="243" height="90"></a></p>
+<p><a href="http://www.geeklog.net/" style="background:transparent"><img src="images/newlogo.gif" alt="Geeklog" width="243" height="90"></a></p>
 <div class="menu"><a href="index.html">Geeklog Documentation</a> - Trackback, Pingback, Ping</div>
 
 <h1>Trackback, Pingback, Ping</h1>

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 10:08:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 10:08:57 -0500
Subject: [geeklog-cvs] geeklog: Fixed problem with backslashes appearing in
	the story t...
Message-ID: <hg.6b5facf000ee.1234019337.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6b5facf000ee
changeset: 6766:6b5facf000ee
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 15:59:21 2009 +0100
description:
Fixed problem with backslashes appearing in the story title when previewing with magic_quotes_gpc = On (bug #0000790)

diffstat:

1 file changed, 11 insertions(+), 2 deletions(-)
public_html/admin/story.php |   13 +++++++++++--

diffs (23 lines):

diff -r 13f6803831ed -r 6b5facf000ee public_html/admin/story.php
--- a/public_html/admin/story.php	Mon Feb 02 09:41:18 2009 +0100
+++ b/public_html/admin/story.php	Sat Feb 07 15:59:21 2009 +0100
@@ -258,8 +258,17 @@
     }
 
     $story = new Story();
-    if($mode == 'preview')
-    {
+    if ($mode == 'preview') {
+        // Handle Magic GPC Garbage:
+        while (list($key, $value) = each($_POST)) {
+            if (!is_array($value)) {
+                $_POST[$key] = COM_stripslashes($value);
+            } else {
+                while (list($subkey, $subvalue) = each($value)) {
+                    $value[$subkey] = COM_stripslashes($subvalue);
+                }
+            }
+        }
         $result = $story->loadFromArgsArray($_POST);
     } else {
         $result = $story->loadFromDatabase($sid, $mode);

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 10:08:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 10:08:58 -0500
Subject: [geeklog-cvs] geeklog: Updated list of changes
Message-ID: <hg.bde76ed5a488.1234019338.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bde76ed5a488
changeset: 6767:bde76ed5a488
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 16:07:05 2009 +0100
description:
Updated list of changes

diffstat:

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

diffs (39 lines):

diff -r 6b5facf000ee -r bde76ed5a488 public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sat Feb 07 15:59:21 2009 +0100
+++ b/public_html/docs/changes.html	Sat Feb 07 16:07:05 2009 +0100
@@ -23,6 +23,8 @@
 <ul>
 <li>Fixed a bug in the story preview where the story content was lost when
     previewing a story with a duplicate story ID.</li>
+<li>Fixed another bug in the story preview that caused extra backslashes to
+    appear in the story's title.</li>
 <li>The Trackback editor didn't work since the security token was missing from
     the editor template.</li>
 <li>Fixed issues with clickable links in plain text postings.</li>
diff -r 6b5facf000ee -r bde76ed5a488 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 15:59:21 2009 +0100
+++ b/public_html/docs/history	Sat Feb 07 16:07:05 2009 +0100
@@ -1,8 +1,10 @@
 Geeklog History/Changes:
 
-Feb ??, 2009 (1.5.2)
-------------
-
+Feb 8, 2009 (1.5.2)
+-----------
+
+- Fixed problem with extra backslashes appearing in a story's title during the
+  story preview when magic_quotes_gpc = On (bug #0000790) [Mike, Dirk]
 - Added missing page title when viewing a single comment [Dirk]
 - Sort groups in the group dropdowns non-case sensitive [Dirk]
 - Display a message when sending the email to report an abusive comment failed
@@ -13,7 +15,8 @@
 
 Static Pages plugin
 -------------------
-- Fixed parse error when saving a static page (reported by greenteagod) [Dirk]
+- Fixed parse error when saving a static page (reported by greenteagod). This
+  problem was only introduced in 1.5.2rc1 [Dirk]
 
 
 Jan 24, 2009 (1.5.2rc1)

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 10:08:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 10:08:59 -0500
Subject: [geeklog-cvs] geeklog: Updated list of changes
Message-ID: <hg.d67652fb5e73.1234019339.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d67652fb5e73
changeset: 6769:d67652fb5e73
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 16:07:05 2009 +0100
description:
Updated list of changes

diffstat:

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

diffs (40 lines):

diff -r 87aabd060f27 -r d67652fb5e73 public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sat Feb 07 15:59:21 2009 +0100
+++ b/public_html/docs/changes.html	Sat Feb 07 16:07:05 2009 +0100
@@ -23,6 +23,8 @@
 <ul>
 <li>Fixed a bug in the story preview where the story content was lost when
     previewing a story with a duplicate story ID.</li>
+<li>Fixed another bug in the story preview that caused extra backslashes to
+    appear in the story's title.</li>
 <li>The Trackback editor didn't work since the security token was missing from
     the editor template.</li>
 <li>Fixed issues with clickable links in plain text postings.</li>
diff -r 87aabd060f27 -r d67652fb5e73 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 15:59:21 2009 +0100
+++ b/public_html/docs/history	Sat Feb 07 16:07:05 2009 +0100
@@ -74,9 +74,11 @@
   every other plugin and built-in function does (bug #0000644) [Dirk]
 
 
-Feb ??, 2009 (1.5.2)
-------------
-
+Feb 8, 2009 (1.5.2)
+-----------
+
+- Fixed problem with extra backslashes appearing in a story's title during the
+  story preview when magic_quotes_gpc = On (bug #0000790) [Mike, Dirk]
 - Added missing page title when viewing a single comment [Dirk]
 - Sort groups in the group dropdowns non-case sensitive [Dirk]
 - Display a message when sending the email to report an abusive comment failed
@@ -87,7 +89,8 @@
 
 Static Pages plugin
 -------------------
-- Fixed parse error when saving a static page (reported by greenteagod) [Dirk]
+- Fixed parse error when saving a static page (reported by greenteagod). This
+  problem was only introduced in 1.5.2rc1 [Dirk]
 
 
 Jan 24, 2009 (1.5.2rc1)

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 10:08:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 10:08:58 -0500
Subject: [geeklog-cvs] geeklog: Updated version number
Message-ID: <hg.d100539bbfc6.1234019338.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d100539bbfc6
changeset: 6768:d100539bbfc6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 16:07:22 2009 +0100
description:
Updated version number

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
public_html/siteconfig.php.dist |    2 +-

diffs (12 lines):

diff -r bde76ed5a488 -r d100539bbfc6 public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist	Sat Feb 07 16:07:05 2009 +0100
+++ b/public_html/siteconfig.php.dist	Sat Feb 07 16:07:22 2009 +0100
@@ -38,7 +38,7 @@
   define('LB',"\n");
 }
 if (!defined('VERSION')) {
-  define('VERSION', '1.5.2rc1');
+  define('VERSION', '1.5.2');
 }
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 12:33:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 12:33:17 -0500
Subject: [geeklog-cvs] geeklog: Fixed $_POST index name
Message-ID: <hg.fe6b16c494e7.1234027997.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fe6b16c494e7
changeset: 6770:fe6b16c494e7
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 17:57:40 2009 +0100
description:
Fixed $_POST index name

diffstat:

1 file changed, 1 insertion(+), 2 deletions(-)
public_html/admin/user.php |    3 +--

diffs (13 lines):

diff -r d67652fb5e73 -r fe6b16c494e7 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Feb 07 16:07:05 2009 +0100
+++ b/public_html/admin/user.php	Sat Feb 07 17:57:40 2009 +0100
@@ -1172,8 +1172,7 @@
     $display = saveusers (COM_applyFilter ($_POST['uid'], true),
             $_POST['username'], $_POST['fullname'],
             $_POST['passwd'], $_POST['passwd_conf'], $_POST['email'],
-            $_POST['regdate'], $_POST['homepage'],
-            $_POST[$_TABLES['groups']],
+            $_POST['regdate'], $_POST['homepage'], $_POST['groups'],
             $delphoto, $_POST['userstatus'], $_POST['oldstatus']);
     if (!empty($display)) {
         $tmp = COM_siteHeader('menu', $LANG28[22]);

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 12:47:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 12:47:58 -0500
Subject: [geeklog-cvs] geeklog: The default replacement text for censored
	text was supp...
Message-ID: <hg.646c32d0878a.1234028878.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/646c32d0878a
changeset: 6771:646c32d0878a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 18:46:54 2009 +0100
description:
The default replacement text for censored text was supposed to read "censored", not "censormode"

diffstat:

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

diffs (24 lines):

diff -r d100539bbfc6 -r 646c32d0878a public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sat Feb 07 16:07:22 2009 +0100
+++ b/public_html/admin/install/config-install.php	Sat Feb 07 18:46:54 2009 +0100
@@ -312,7 +312,7 @@
 
     $c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
     $c->add('censormode',1,'select',7,35,0,1760,TRUE);
-    $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
+    $c->add('censorreplace','*censored*','text',7,35,NULL,1770,TRUE);
     $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
 
     $c->add('fs_iplookup', NULL, 'fieldset', 7, 36, NULL, 0, TRUE);
diff -r d100539bbfc6 -r 646c32d0878a public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 16:07:22 2009 +0100
+++ b/public_html/docs/history	Sat Feb 07 18:46:54 2009 +0100
@@ -3,6 +3,8 @@
 Feb 8, 2009 (1.5.2)
 -----------
 
+- The default replacement text for censored text was supposed to read
+  "censored", not "censormode" [Dirk]
 - Fixed problem with extra backslashes appearing in a story's title during the
   story preview when magic_quotes_gpc = On (bug #0000790) [Mike, Dirk]
 - Added missing page title when viewing a single comment [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 12:47:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 12:47:58 -0500
Subject: [geeklog-cvs] geeklog: The default replacement text for censored
	text was supp...
Message-ID: <hg.b71bb6309c6c.1234028878.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b71bb6309c6c
changeset: 6772:b71bb6309c6c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 18:46:54 2009 +0100
description:
The default replacement text for censored text was supposed to read "censored", not "censormode"

diffstat:

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

diffs (24 lines):

diff -r fe6b16c494e7 -r b71bb6309c6c public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sat Feb 07 17:57:40 2009 +0100
+++ b/public_html/admin/install/config-install.php	Sat Feb 07 18:46:54 2009 +0100
@@ -326,7 +326,7 @@
 
     $c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
     $c->add('censormode',1,'select',7,35,0,1760,TRUE);
-    $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
+    $c->add('censorreplace','*censored*','text',7,35,NULL,1770,TRUE);
     $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
 
     $c->add('fs_iplookup', NULL, 'fieldset', 7, 36, NULL, 0, TRUE);
diff -r fe6b16c494e7 -r b71bb6309c6c public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 17:57:40 2009 +0100
+++ b/public_html/docs/history	Sat Feb 07 18:46:54 2009 +0100
@@ -77,6 +77,8 @@
 Feb 8, 2009 (1.5.2)
 -----------
 
+- The default replacement text for censored text was supposed to read
+  "censored", not "censormode" [Dirk]
 - Fixed problem with extra backslashes appearing in a story's title during the
   story preview when magic_quotes_gpc = On (bug #0000790) [Mike, Dirk]
 - Added missing page title when viewing a single comment [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Feb  7 16:49:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Feb 2009 16:49:58 -0500
Subject: [geeklog-cvs] geeklog: Hide archive option radiobutton from the
	story editor w...
Message-ID: <hg.48f1098d5218.1234043398.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/48f1098d5218
changeset: 6773:48f1098d5218
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 07 21:39:46 2009 +0100
description:
Hide archive option radiobutton from the story editor when no archive topic is defined (feature request #0000807)

diffstat:

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

diffs (63 lines):

diff -r b71bb6309c6c -r 48f1098d5218 public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Feb 07 18:46:54 2009 +0100
+++ b/public_html/admin/story.php	Sat Feb 07 21:39:46 2009 +0100
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | story.php                                                                 |
 // |                                                                           |
@@ -506,22 +506,37 @@
 
     $story_templates->set_var('expire_date_explanation', $LANG24[46]);
     $story_templates->set_var('story_unixstamp', $story->EditElements('expirestamp'));
+
+    $atopic = DB_getItem($_TABLES['topics'], 'tid', "archive_flag = 1");
+    $have_archive_topic = (empty($atopic) ? false : true);
+
     if ($story->EditElements('statuscode') == STORY_ARCHIVE_ON_EXPIRE) {
         $story_templates->set_var('is_checked2', 'checked="checked"');
         $story_templates->set_var('is_checked3', 'checked="checked"');
         $story_templates->set_var('showarchivedisabled', 'false');
+        $have_archive_topic = true; // force display of auto archive option
     } elseif ($story->EditElements('statuscode') == STORY_DELETE_ON_EXPIRE) {
         $story_templates->set_var('is_checked2', 'checked="checked"');
         $story_templates->set_var('is_checked4', 'checked="checked"');
+        if (! $have_archive_topic) {
+            $story_templates->set_var('is_checked3', 'style="display:none;"');
+        }
         $story_templates->set_var('showarchivedisabled', 'false');
     } else {
+        if (! $have_archive_topic) {
+            $story_templates->set_var('is_checked3', 'style="display:none;"');
+        }
         $story_templates->set_var('showarchivedisabled', 'true');
     }
     $story_templates->set_var('lang_archivetitle', $LANG24[58]);
     $story_templates->set_var('lang_option', $LANG24[59]);
     $story_templates->set_var('lang_enabled', $LANG_ADMIN['enabled']);
     $story_templates->set_var('lang_story_stats', $LANG24[87]);
-    $story_templates->set_var('lang_optionarchive', $LANG24[61]);
+    if ($have_archive_topic) {
+        $story_templates->set_var('lang_optionarchive', $LANG24[61]);
+    } else {
+        $story_templates->set_var('lang_optionarchive', '');
+    }
     $story_templates->set_var('lang_optiondelete', $LANG24[62]);
     $story_templates->set_var('lang_title', $LANG_ADMIN['title']);
     $story_templates->set_var('story_title', $story->EditElements('title'));
diff -r b71bb6309c6c -r 48f1098d5218 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 18:46:54 2009 +0100
+++ b/public_html/docs/history	Sat Feb 07 21:39:46 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Hide archive option radiobutton from the story editor when no archive topic
+  is defined (feature request #0000807) [Dirk]
 - Display group names with an uppercase first letter everywhere [Dirk]
 - Added an ISO 8601-ish format to the gl_dateformats table [Dirk]
 - Let users with user.mail permissions only email groups that they are in

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 04:50:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 04:50:20 -0500
Subject: [geeklog-cvs] geeklog: Updated Estonian language file for the
	Calendar plugin, ...
Message-ID: <hg.e075a7435782.1234086620.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e075a7435782
changeset: 6775:e075a7435782
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 08 10:49:22 2009 +0100
description:
Updated Estonian language file for the Calendar plugin, provided by Artur R?pp

diffstat:

3 files changed, 3 insertions(+), 2 deletions(-)
plugins/calendar/language/estonian.php       |    2 +-
plugins/calendar/language/estonian_utf-8.php |    2 +-
public_html/docs/history                     |    1 +

diffs (35 lines):

diff -r 48f1098d5218 -r e075a7435782 plugins/calendar/language/estonian.php
--- a/plugins/calendar/language/estonian.php	Sat Feb 07 21:39:46 2009 +0100
+++ b/plugins/calendar/language/estonian.php	Sun Feb 08 10:49:22 2009 +0100
@@ -109,7 +109,7 @@
     11 => 'Peakalender',
     12 => 'Minu kalender',
     25 => 'tagasi ',
-    26 => 'K?ik p?evad',
+    26 => 'Kogu p?ev',
     27 => 'N?dal',
     28 => 'Isiklik kalender, kasutaja',
     29 => 'Avalik kalender',
diff -r 48f1098d5218 -r e075a7435782 plugins/calendar/language/estonian_utf-8.php
--- a/plugins/calendar/language/estonian_utf-8.php	Sat Feb 07 21:39:46 2009 +0100
+++ b/plugins/calendar/language/estonian_utf-8.php	Sun Feb 08 10:49:22 2009 +0100
@@ -109,7 +109,7 @@
     11 => 'Peakalender',
     12 => 'Minu kalender',
     25 => 'tagasi ',
-    26 => 'K??ik p??evad',
+    26 => 'Kogu p??ev',
     27 => 'N??dal',
     28 => 'Isiklik kalender, kasutaja',
     29 => 'Avalik kalender',
diff -r 48f1098d5218 -r e075a7435782 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 21:39:46 2009 +0100
+++ b/public_html/docs/history	Sun Feb 08 10:49:22 2009 +0100
@@ -89,6 +89,7 @@
   [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]
 
+- Updated Estonian language file for the Calendar plugin, provided by Artur R?pp
 - Updated Japanese language file, provided by the Geeklog.jp group
 
 Static Pages plugin

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 04:50:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 04:50:19 -0500
Subject: [geeklog-cvs] geeklog: Updated Estonian language file for the
	Calendar plugin, ...
Message-ID: <hg.70c2ed57cfa5.1234086619.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/70c2ed57cfa5
changeset: 6774:70c2ed57cfa5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 08 10:49:22 2009 +0100
description:
Updated Estonian language file for the Calendar plugin, provided by Artur R?pp

diffstat:

3 files changed, 3 insertions(+), 2 deletions(-)
plugins/calendar/language/estonian.php       |    2 +-
plugins/calendar/language/estonian_utf-8.php |    2 +-
public_html/docs/history                     |    1 +

diffs (35 lines):

diff -r 646c32d0878a -r 70c2ed57cfa5 plugins/calendar/language/estonian.php
--- a/plugins/calendar/language/estonian.php	Sat Feb 07 18:46:54 2009 +0100
+++ b/plugins/calendar/language/estonian.php	Sun Feb 08 10:49:22 2009 +0100
@@ -109,7 +109,7 @@
     11 => 'Peakalender',
     12 => 'Minu kalender',
     25 => 'tagasi ',
-    26 => 'K?ik p?evad',
+    26 => 'Kogu p?ev',
     27 => 'N?dal',
     28 => 'Isiklik kalender, kasutaja',
     29 => 'Avalik kalender',
diff -r 646c32d0878a -r 70c2ed57cfa5 plugins/calendar/language/estonian_utf-8.php
--- a/plugins/calendar/language/estonian_utf-8.php	Sat Feb 07 18:46:54 2009 +0100
+++ b/plugins/calendar/language/estonian_utf-8.php	Sun Feb 08 10:49:22 2009 +0100
@@ -109,7 +109,7 @@
     11 => 'Peakalender',
     12 => 'Minu kalender',
     25 => 'tagasi ',
-    26 => 'K??ik p??evad',
+    26 => 'Kogu p??ev',
     27 => 'N??dal',
     28 => 'Isiklik kalender, kasutaja',
     29 => 'Avalik kalender',
diff -r 646c32d0878a -r 70c2ed57cfa5 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 07 18:46:54 2009 +0100
+++ b/public_html/docs/history	Sun Feb 08 10:49:22 2009 +0100
@@ -13,6 +13,7 @@
   [Dirk]
 - Display a message when sending the email for a new password failed [Dirk]
 
+- Updated Estonian language file for the Calendar plugin, provided by Artur R?pp
 - Updated Japanese language file, provided by the Geeklog.jp group
 
 Static Pages plugin

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 12:04:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 12:04:46 -0500
Subject: [geeklog-cvs] geeklog: Updated Search API for Links plugin
Message-ID: <hg.9e74946957b9.1234112686.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9e74946957b9
changeset: 6777:9e74946957b9
user:      Sami Barakat
date:      Sun Feb 08 17:03:14 2009 +0000
description:
Updated Search API for Links plugin

diffstat:

1 file changed, 32 insertions(+), 120 deletions(-)
plugins/links/functions.inc |  152 +++++++++----------------------------------

diffs (173 lines):

diff -r b6ad992926a3 -r 9e74946957b9 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Feb 08 17:02:59 2009 +0000
+++ b/plugins/links/functions.inc	Sun Feb 08 17:03:14 2009 +0000
@@ -337,137 +337,49 @@
 * @param    date    $datestart  Start date to get results for
 * @param    date    $dateend    End date to get results for
 * @param    string  $topic      The topic they were searching in
-* @param    string  $type       Type of items they are searching, or 'all'
+* @param    string  $type       Type of items they are searching, or 'all' (deprecated)
 * @param    int     $author     Get all results by this author
 * @param    string  $keyType    search key type: 'all', 'phrase', 'any'
-* @param    int     $page       page number of current search
-* @param    int     $perpage    number of results per page
+* @param    int     $page       page number of current search (deprecated)
+* @param    int     $perpage    number of results per page (deprecated)
 * @return   object              search result object
 *
 */
 function plugin_dopluginsearch_links($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
-    global $_CONF, $_TABLES, $LANG_LINKS_SEARCH;
+    global $_TABLES, $LANG_LINKS;
 
-    if (empty ($type)) {
-        $type = 'all';
+    // Make sure the query is SQL safe
+    $query = trim(addslashes($query));
+
+    $sql = "SELECT lid AS id, title, description, UNIX_TIMESTAMP(date) AS date, owner_id AS uid, hits, url ";
+    $sql .= "FROM {$_TABLES['links']} WHERE date <> 1 ";
+    $sql .= COM_getPermSQL('AND') . ' ';
+
+    if (!empty($datestart) && !empty($dateend))
+    {
+        $delim = substr($datestart, 4, 1);
+        if (!empty($delim))
+        {
+            $DS = explode($delim, $datestart);
+            $DE = explode($delim, $dateend);
+            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
+            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
+            $sql .= "AND (UNIX_TIMESTAMP(date) BETWEEN '$startdate' AND '$enddate') ";
+        }
+    }
+    if (!empty ($author)) {
+        $sql .= "AND (owner_id = '$author') ";
     }
 
-    // Bail if we aren't supppose to do our search
-    if ($type <> 'all' AND $type <> 'links') {
-        $plugin_results = new Plugin();
-        $plugin_results->plugin_name = 'links';
-        $plugin_results->searchlabel = $LANG_LINKS_SEARCH['results'];
+    $search = new SearchCriteria('links', $LANG_LINKS[14]);
+    $columns = array('description','title');
+    list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+    $search->setSQL($sql);
+    $search->setFTSQL($ftsql);
+    $search->setRank(3);
 
-        return $plugin_results;
-    }
-
-    // link search
-    $select = 'SELECT lid,title,url,owner_id,hits,UNIX_TIMESTAMP(date) AS day';
-    $sql = " FROM {$_TABLES['links']} WHERE date <> 1";
-
-    if (!empty ($query)) {
-        if ($keyType == 'phrase') {
-            $mysearchterm = addslashes ($query);
-            $sql .= " AND ((description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%'))";
-        } else if ($keyType == 'all') {
-            $mywords = explode (' ', $query);
-            $sql .= ' AND (';
-            $tmp = '';
-            foreach ($mywords AS $mysearchterm) {
-                $mysearchterm = addslashes (trim ($mysearchterm));
-                if (!empty ($mysearchterm)) {
-                    $tmp .= "((description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%')) AND ";
-                }
-            }
-            $tmp = substr ($tmp, 0, strlen ($tmp) - 5);
-            $sql .= $tmp . ')';
-        } else if ($keyType == 'any') {
-            $mywords = explode (' ', $query);
-            $sql .= ' AND (';
-            $tmp = '';
-            foreach ($mywords AS $mysearchterm) {
-                $mysearchterm = addslashes (trim ($mysearchterm));
-                if (!empty ($mysearchterm)) {
-                    $tmp .= "((description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%')) OR ";
-                }
-            }
-            $tmp = substr ($tmp, 0, strlen ($tmp) - 4);
-            $sql .= $tmp . ')';
-        } else {  // quick search
-            $mysearchterm = addslashes ($query);
-            $sql .= " AND ((description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%'))";
-        }
-    }
-
-    if (!empty ($datestart) && !empty ($dateend)) {
-        $delim = substr ($datestart, 4, 1);
-        if (!empty($delim)) {
-            $DS = explode ($delim, $datestart);
-            $DE = explode ($delim, $dateend);
-            $startdate = mktime (0, 0, 0, $DS[1], $DS[2], $DS[0]);
-            $enddate = mktime (23, 59, 59, $DE[1], $DE[2], $DE[0]);
-            $sql .= " AND (UNIX_TIMESTAMP(date) BETWEEN '$startdate' AND '$enddate')";
-        }
-    }
-
-    if (!empty ($author)) {
-        $sql .= " AND (owner_id = '$author')";
-    }
-    $sql .= COM_getPermSQL('AND') . LINKS_getCategorySQL('AND');
-    $sql .= ' GROUP BY date, lid, cid, url, description, title, hits, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon ORDER BY date DESC';
-    $l = ($perpage * $page) - $perpage;
-    $sql .= ' LIMIT ' . $l . ',' . $perpage;
-
-    // Perform search
-    $result = DB_query ($select . $sql);
-    $mycount = DB_numRows ($result);
-    $result_count = DB_query ('SELECT COUNT(*)' . $sql);
-    $B = DB_fetchArray ($result_count, true);
-
-    $plugin_results = new Plugin();
-    $plugin_results->plugin_name = 'links';
-    $plugin_results->searchlabel = $LANG_LINKS_SEARCH['results'];
-    $plugin_results->addSearchHeading ($LANG_LINKS_SEARCH['title']);
-    $plugin_results->addSearchHeading ($LANG_LINKS_SEARCH['date']);
-    $plugin_results->addSearchHeading ($LANG_LINKS_SEARCH['author']);
-    $plugin_results->addSearchHeading ($LANG_LINKS_SEARCH['hits']);
-    $plugin_results->num_searchresults = 0;
-    $plugin_results->num_itemssearched = $B[0];
-    $plugin_results->supports_paging = true;
-
-    // NOTE if any of your data items need to be links then add them here!
-    // make sure data elements are in an array and in the same order as your
-    // headings above!
-    for ($i = 0; $i < $mycount; $i++) {
-        $A = DB_fetchArray ($result);
-
-        $thetime = COM_getUserDateTimeFormat ($A['day']);
-        $A['title'] = stripslashes ($A['title']);
-        $submitter = COM_getDisplayName ($A['owner_id']);
-        if ($A['owner_id'] > 1) {
-            $profile_url = $_CONF['site_url']
-                     . '/users.php?mode=profile&amp;uid=' . $A['owner_id'];
-            $profile = COM_createLink($submitter, $profile_url);
-        } else {
-            $profile = $submitter;
-        }
-        $linkUrl = COM_buildUrl($_CONF['site_url']
-                                . '/links/portal.php?what=link&amp;item='
-                                . $A['lid']);
-        $anchor = COM_createLink($A['title'], $linkUrl,
-                                 array('title' => $A['url']));
-        $row = array ($anchor, $thetime[0], $profile,
-                      COM_NumberFormat ($A['hits']));
-        $plugin_results->addSearchResult ($row);
-        $plugin_results->num_searchresults++;
-    }
-
-    return $plugin_results;
+    return $search;
 }
 
 

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 12:04:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 12:04:47 -0500
Subject: [geeklog-cvs] geeklog: Updated Search API for Staticpages plugin
Message-ID: <hg.44c2dab884c9.1234112687.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/44c2dab884c9
changeset: 6778:44c2dab884c9
user:      Sami Barakat
date:      Sun Feb 08 17:03:27 2009 +0000
description:
Updated Search API for Staticpages plugin

diffstat:

1 file changed, 33 insertions(+), 119 deletions(-)
plugins/staticpages/functions.inc |  152 ++++++++-----------------------------

diffs (172 lines):

diff -r 9e74946957b9 -r 44c2dab884c9 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Feb 08 17:03:14 2009 +0000
+++ b/plugins/staticpages/functions.inc	Sun Feb 08 17:03:27 2009 +0000
@@ -566,135 +566,49 @@
 * @param    date    $datestart  Start date to get results for
 * @param    date    $dateend    End date to get results for
 * @param    string  $topic      The topic they were searching in
-* @param    string  $type       Type of items they are searching, or 'all'
+* @param    string  $type       Type of items they are searching, or 'all' (deprecated)
 * @param    int     $author     Get all results by this author
 * @param    string  $keyType    search key type: 'all', 'phrase', 'any'
-* @param    int     $page       page number of current search
-* @param    int     $perpage    number of results per page
+* @param    int     $page       page number of current search (deprecated)
+* @param    int     $perpage    number of results per page (deprecated)
 *
 */
 function plugin_dopluginsearch_staticpages($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
-    global $_CONF, $_TABLES, $LANG_STATIC;
+    global $_TABLES, $LANG_STATIC;
 
-    if (empty ($type)) {
-        $type = 'all';
+    // Make sure the query is SQL safe
+    $query = trim(addslashes($query));
+
+    $sql = "SELECT sp.sp_id AS id, sp.sp_title AS title, sp.sp_content AS description, UNIX_TIMESTAMP(sp.sp_date) AS date, sp.sp_uid AS uid, sp.sp_hits AS hits, CONCAT('/staticpages/index.php?page=', sp.sp_id) AS url ";
+    $sql .= "FROM {$_TABLES['staticpage']} AS sp,{$_TABLES['users']} AS u ";
+    $sql .= "WHERE (sp.sp_uid = u.uid) AND (sp_php <> 1) ";
+    $sql .= COM_getPermSQL('AND') . COM_getLangSQL('sp_id', 'AND', 'sp') . ' ';
+
+    if (!empty($datestart) && !empty($dateend))
+    {
+        $delim = substr($datestart, 4, 1);
+        if (!empty($delim))
+        {
+            $DS = explode($delim, $datestart);
+            $DE = explode($delim, $dateend);
+            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
+            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
+            $sql .= "AND (UNIX_TIMESTAMP(sp_date) BETWEEN '$startdate' AND '$enddate') ";
+        }
+    }
+    if (!empty ($author)) {
+        $sql .= "AND (sp_uid = '$author') ";
     }
 
-    // Bail if we aren't supppose to do our search
-    if ($type <> 'all' AND $type <> 'staticpages') {
-        $plugin_results = new Plugin();
-        $plugin_results->plugin_name = 'staticpages';
-        $plugin_results->searchlabel = $LANG_STATIC['results'];
+    $search = new SearchCriteria('staticpages', $LANG_STATIC['staticpages']);
+    $columns = array('sp_content','sp_title');
+    list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+    $search->setSQL($sql);
+    $search->setFTSQL($ftsql);
+    $search->setRank(3);
 
-        return $plugin_results;
-    }
-
-    // Build search SQL - exclude static PHP pages from search.
-    $select = "SELECT u.username,u.fullname,sp.sp_id,sp.sp_title,sp.sp_hits,sp.sp_uid,UNIX_TIMESTAMP(sp.sp_date) AS day";
-    $sql = " FROM {$_TABLES['staticpage']} AS sp,{$_TABLES['users']} AS u WHERE (sp.sp_uid = u.uid) AND (sp_php <> 1)" . COM_getPermSQL ('AND') . COM_getLangSql ('sp_id', 'AND', 'sp');
-
-    if (!empty ($query)) {
-        if ($keyType == 'phrase') {
-            $mysearchterm = addslashes ($query);
-            $sql .= " AND ((sp_content LIKE '%$mysearchterm%')"
-                 . " OR (sp_title LIKE '%$mysearchterm%'))";
-        } else if ($keyType == 'all') {
-            $mywords = explode (' ', $query);
-            $sql .= ' AND (';
-            $tmp = '';
-            foreach ($mywords AS $mysearchterm) {
-                $mysearchterm = addslashes (trim ($mysearchterm));
-                if (!empty ($mysearchterm)) {
-                    $tmp .= "(sp_content LIKE '%$mysearchterm%')"
-                         . " OR (sp_title LIKE '%$mysearchterm%') AND ";
-                }
-            }
-            $tmp = substr ($tmp, 0, strlen ($tmp) - 5);
-            $sql .= $tmp . ')';
-        } else if ($keyType == 'any') {
-            $mywords = explode (' ', $query);
-            $sql .= ' AND (';
-            $tmp = '';
-            foreach ($mywords AS $mysearchterm) {
-                $mysearchterm = addslashes (trim ($mysearchterm));
-                if (!empty ($mysearchterm)) {
-                    $tmp .= "(sp_content LIKE '%$mysearchterm%')"
-                         . " OR (sp_title LIKE '%$mysearchterm%') OR ";
-                }
-            }
-            $tmp = substr ($tmp, 0, strlen ($tmp) - 4);
-            $sql .= $tmp . ')';
-        } else {
-            $mysearchterm = addslashes ($query);
-            $sql .= " AND ((sp_content LIKE '%$mysearchterm%')"
-                 . " OR (sp_title LIKE '%$mysearchterm%'))";
-        }
-    }
-
-    if (!empty ($datestart) && !empty ($dateend)) {
-        $delim = substr ($datestart, 4, 1);
-        if (!empty($delim)) {
-            $DS = explode ($delim, $datestart);
-            $DE = explode ($delim, $dateend);
-            $startdate = mktime (0, 0, 0, $DS[1], $DS[2], $DS[0]);
-            $enddate = mktime (23, 59, 59, $DE[1], $DE[2], $DE[0]);
-            $sql .= " AND (UNIX_TIMESTAMP(sp_date) BETWEEN '$startdate' AND '$enddate')";
-        }
-    }
-
-    if (!empty ($author)) {
-        $sql .= "AND (sp_uid = '$author')";
-    }
-    $sql    .= " GROUP BY sp_date, u.username, u.fullname, sp.sp_id, sp.sp_title, sp.sp_hits, sp.sp_uid ORDER BY sp_date DESC ";
-    $l = ($perpage * $page) - $perpage;
-    $sql .= 'LIMIT ' . $l . ',' . $perpage;
-
-    // Perform search
-    $result = DB_query ($select . $sql);
-    $mycount = DB_numRows ($result);
-    $result_count = DB_query ('SELECT COUNT(*)' . $sql);
-    $B = DB_fetchArray ($result_count, true);
-
-    // OK, now return table header labels
-    $plugin_results = new Plugin();
-    $plugin_results->plugin_name = 'staticpages';
-    $plugin_results->searchlabel = $LANG_STATIC['results'];
-    $plugin_results->addSearchHeading ($LANG_STATIC['title']);
-    $plugin_results->addSearchHeading ($LANG_STATIC['date']);
-    $plugin_results->addSearchHeading ($LANG_STATIC['author']);
-    $plugin_results->addSearchHeading ($LANG_STATIC['hits']);
-    $plugin_results->num_searchresults = 0;
-    $plugin_results->num_itemssearched = $B[0];
-    $plugin_results->supports_paging = true;
-
-    // NOTE if any of your data items need to be links then add them here!
-    // make sure data elements are in an array and in the same order as your
-    // headings above!
-    for ($i = 0; $i < $mycount; $i++) {
-        $A = DB_fetchArray ($result);
-
-        $thetime = COM_getUserDateTimeFormat ($A['day']);
-        $A['sp_title'] = stripslashes ($A['sp_title']);
-        $pageurl = COM_buildURL ($_CONF['site_url']
-                        . '/staticpages/index.php?page=' . $A['sp_id']);
-        if (isset ($_CONF['show_fullname']) && ($_CONF['show_fullname'] == 1) &&
-                !empty ($A['fullname'])) {
-            $author = $A['fullname'];
-        } else {
-            $author = $A['username'];
-        }
-        $profile = $_CONF['site_url'] . '/users.php?mode=profile&amp;uid='
-                 . $A['sp_uid'];
-        $row = array (COM_createLink($A['sp_title'], $pageurl),
-                      $thetime[0],
-                      COM_createLink($author, $profile),
-                      COM_NumberFormat ($A['sp_hits']));
-        $plugin_results->addSearchResult ($row);
-        $plugin_results->num_searchresults++;
-    }
-
-    return $plugin_results;
+    return $search;
 }
 
 

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 12:04:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 12:04:46 -0500
Subject: [geeklog-cvs] geeklog: Updated Search API for Calendar plugin
Message-ID: <hg.b6ad992926a3.1234112686.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b6ad992926a3
changeset: 6776:b6ad992926a3
user:      Sami Barakat
date:      Sun Feb 08 17:02:59 2009 +0000
description:
Updated Search API for Calendar plugin

diffstat:

1 file changed, 36 insertions(+), 120 deletions(-)
plugins/calendar/functions.inc |  156 +++++++++-------------------------------

diffs (186 lines):

diff -r e075a7435782 -r b6ad992926a3 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Feb 08 10:49:22 2009 +0100
+++ b/plugins/calendar/functions.inc	Sun Feb 08 17:02:59 2009 +0000
@@ -1578,146 +1578,62 @@
 * @param    date    $datestart  Start date to get results for
 * @param    date    $dateend    End date to get results for
 * @param    string  $topic      The topic they were searching in
-* @param    string  $type       Type of items they are searching, or 'all'
+* @param    string  $type       Type of items they are searching, or 'all' (deprecated)
 * @param    int     $author     Get all results by this author
 * @param    string  $keyType    search key type: 'all', 'phrase', 'any'
-* @param    int     $page       page number of current search
-* @param    int     $perpage    number of results per page
+* @param    int     $page       page number of current search (deprecated)
+* @param    int     $perpage    number of results per page (deprecated)
 * @return   object              search result object
 *
 */
 function plugin_dopluginsearch_calendar($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage)
 {
-    global $_CONF, $_TABLES, $LANG09, $LANG_CAL_1, $_LANG_CAL_SEARCH;
+    global $_TABLES, $LANG_CAL_1;
 
-    if (empty ($type)) {
-        $type = 'all';
-    }
+    // Make sure the query is SQL safe
+    $query = trim(addslashes($query));
 
-    // Bail if we aren't supppose to do our search
-    if ($type <> 'all' AND $type <> 'calendar') {
-        $event_results = new Plugin();
-        $event_results->plugin_name = 'calendar';
-        $event_results->num_itemssearched = 0;
-        $event_results->searchlabel = $_LANG_CAL_SEARCH['results'];
+    $sql_e = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, hits, CONCAT('/calendar/event.php?eid=',eid) AS url ";
+    $sql_e .= "FROM {$_TABLES['events']} WHERE 1=1 ";
 
-        return $event_results;
-    }
+    $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, '0' AS hits, CONCAT('/calendar/event.php?eid=',eid) AS url ";
+    $sql_p .= "FROM {$_TABLES['personal_events']} WHERE 1=1 ";
 
-    $select = "SELECT eid,title,location,event_type,datestart,dateend,timestart,timeend,allday,UNIX_TIMESTAMP(datestart) AS day";
-    $sql = " FROM {$_TABLES['events']} WHERE ";
+    $sql = COM_getPermSQL('AND') . ' ';
 
-    if($keyType == 'phrase') {
-        // do an exact phrase search (default)
-        $mywords[] = $query;
-        $mysearchterm = addslashes ($query);
-        $sql .= "(location LIKE '%$mysearchterm%'  ";
-        $sql .= "OR description LIKE '%$mysearchterm%' ";
-        $sql .= "OR title LIKE '%$mysearchterm%') ";
-    } else if ($keyType == 'all') {
-        //must contain ALL of the keywords
-        $mywords = explode(' ', $query);
-        $tmp = '';
-        foreach ($mywords AS $mysearchterm) {
-            $mysearchterm = addslashes (trim ($mysearchterm));
-            $tmp .= "(location LIKE '%$mysearchterm%' OR ";
-            $tmp .= "description LIKE '%$mysearchterm%' OR ";
-            $tmp .= "title LIKE '%$mysearchterm%') AND ";
-        }
-        $tmp = substr($tmp, 0, strlen($tmp) - 4);
-        $sql .= $tmp;
-    } else if ($keyType == 'any') {
-        //must contain ANY of the keywords
-        $mywords = explode(' ', $query);
-        $tmp = '';
-        foreach ($mywords AS $mysearchterm) {
-            $mysearchterm = addslashes (trim ($mysearchterm));
-            $tmp .= "(location LIKE '%$mysearchterm%' OR ";
-            $tmp .= "description LIKE '%$mysearchterm%' OR ";
-            $tmp .= "title LIKE '%$mysearchterm%') OR ";
-        }
-        $tmp = substr($tmp, 0, strlen($tmp) - 3);
-        $sql .= "($tmp)";
-    } else {
-        $mywords[] = $query;
-        $mysearchterm = addslashes ($query);
-        $sql .= "(location LIKE '%$mysearchterm%' ";
-        $sql .= "OR description LIKE '%$mysearchterm%' ";
-        $sql .= "OR title LIKE '%$mysearchterm%') ";
-    }
-
-    if (!empty($datestart) AND !empty($dateend)) {
+    if (!empty($datestart) && !empty($dateend))
+    {
         $delim = substr($datestart, 4, 1);
-        if (!empty($delim)) {
+        if (!empty($delim))
+        {
             $DS = explode($delim, $datestart);
             $DE = explode($delim, $dateend);
-            $startdate = mktime(0, 0, 0, $DS[1], $DS[2], $DS[0]);
-            $enddate = mktime(23, 59, 59, $DE[1], $DE[2], $DE[0]);
+            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
+            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
             $sql .= "AND (UNIX_TIMESTAMP(datestart) BETWEEN '$startdate' AND '$enddate') ";
         }
     }
-    if (!empty($author)) {
-        $sql .= "AND (owner_id = '$author')";
-    }
-    $sql .= COM_getPermSQL ('AND');
-    $sql .= ' GROUP BY datestart, eid, title, description, location, dateend, timestart, timeend, allday, event_type ORDER BY datestart DESC ';
-    $l = ($perpage * $page) - $perpage;
-    $sql .= 'LIMIT ' . $l . ',' . $perpage;
-
-    $result_events = DB_query ($select . $sql);
-    $result_count = DB_query ('SELECT COUNT(*)' . $sql);
-    $B = DB_fetchArray ($result_count, true);
-
-    $event_results = new Plugin();
-    $event_results->searchresults = array();
-    $event_results->searchlabel = $_LANG_CAL_SEARCH['results'];
-    $event_results->addSearchHeading ($_LANG_CAL_SEARCH['title']);
-    $event_results->addSearchHeading ($_LANG_CAL_SEARCH['date_time']);
-    if (empty ($_LANG_CAL_SEARCH['event_type'])) {
-        $event_results->addSearchHeading ($LANG_CAL_1[37]);
-    } else {
-        $event_results->addSearchHeading ($_LANG_CAL_SEARCH['event_type']);
-    }
-    $event_results->num_searchresults = 0;
-    $event_results->num_itemssearched = $B[0];
-    $event_results->supports_paging = true;
-
-    // NOTE if any of your data items need to be events then add them
-    // here! Make sure data elements are in an array and in the same
-    // order as your headings above!
-    while ($A = DB_fetchArray ($result_events)) {
-        if ($A['allday'] == 0) {
-            if ($A['datestart'] == $A['dateend']) {
-                $fulldate = $A['datestart'] . ' ' . $A['timestart'];
-                if ($A['timestart'] != $A['timeend']) {
-                    $fulldate .= ' - ' . $A['timeend'];
-                }
-            } else {
-                $fulldate = $A['datestart'] . ' ' . $A['timestart'] . ' - '
-                            . $A['dateend'] . ' ' . $A['timeend'];
-            }
-        } else {
-            if ($A['datestart'] <> $A['dateend']) {
-                $fulldate = $A['datestart'] . ' - ' . $A['dateend']
-                                  . ' ' . $LANG09[35];
-            } else {
-                $fulldate = $A['datestart'] . ' ' . $LANG09[35];
-            }
-        }
-        $thetime = COM_getUserDateTimeFormat ($A['day']);
-        $A['title'] = stripslashes ($A['title']);
-        $A['title'] = str_replace ('$', '&#36;', $A['title']);
-        $url = $_CONF['site_url'] . '/calendar/event.php?eid=' . $A['eid'];
-        if (!empty($query)) {
-            $url .= '&amp;query=' . urlencode($query);
-        }
-        $link = COM_createLink($A['title'], $url);
-        $row = array ($link, $fulldate, stripslashes ($A['event_type']));
-        $event_results->addSearchResult($row);
-        $event_results->num_searchresults++;
+    if (!empty ($author)) {
+        $sql .= "AND (owner_id = '$author') ";
     }
 
-    return $event_results;
+    // Search the public events
+    $search_e = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[24]));
+    $columns = array('location','description','title');
+    list($sql_tmp,$ftsql_tmp) = $search_e->buildSearchSQL($keyType, $query, $columns, $sql_e . $sql);
+    $search_e->setSQL($sql_tmp);
+    $search_e->setFTSQL($ftsql_tmp);
+    $search_e->setRank(2);
+
+    // Search personal events
+    $search_p = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[23]));
+    $columns = array('location','description','title');
+    list($sql_tmp,$ftsql_tmp) = $search_p->buildSearchSQL($keyType, $query, $columns, $sql_p . $sql);
+    $search_p->setSQL($sql_tmp);
+    $search_p->setFTSQL($ftsql_tmp);
+    $search_p->setRank(2);
+
+    return array($search_e,$search_p);
 }
 
 

From geeklog-cvs at lists.geeklog.net  Sun Feb  8 12:28:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Feb 2009 12:28:20 -0500
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_5_2_stable for changeset
	70c2ed57cfa5
Message-ID: <hg.f8fe2b0d0c69.1234114100.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f8fe2b0d0c69
changeset: 6779:f8fe2b0d0c69
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 08 18:28:01 2009 +0100
description:
Added tag geeklog_1_5_2_stable for changeset 70c2ed57cfa5

diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r 70c2ed57cfa5 -r f8fe2b0d0c69 .hgtags
--- a/.hgtags	Sun Feb 08 10:49:22 2009 +0100
+++ b/.hgtags	Sun Feb 08 18:28:01 2009 +0100
@@ -1,3 +1,4 @@
 f51a1417bd7041bea96370434142498438d4e558 geeklog_1_5_0_stable
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
 b3eeb545eec477cc120336f895e31a34fd64a486 geeklog_1_5_2rc1
+70c2ed57cfa5808ee0859f113dfa77d867720b5c geeklog_1_5_2_stable

From geeklog-cvs at lists.geeklog.net  Thu Feb 12 06:22:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 12 Feb 2009 06:22:51 -0500
Subject: [geeklog-cvs] geeklog: How the f*** did that happen? (profanity
	intended)
Message-ID: <hg.035f447a8da7.1234437771.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/035f447a8da7
changeset: 6780:035f447a8da7
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Feb 12 12:22:39 2009 +0100
description:
How the f*** did that happen? (profanity intended)

diffstat:

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

diffs (14 lines):

diff -r 44c2dab884c9 -r 035f447a8da7 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Feb 08 17:03:27 2009 +0000
+++ b/public_html/lib-common.php	Thu Feb 12 12:22:39 2009 +0100
@@ -3674,8 +3674,8 @@
 /**
 * Syndication import function. Imports headline data to a portal block.
 *
-* Rewritten December 19th 2004 by Michael Jervis (mike@*censored*ingbrit.com). Now
-* utilises a Factory Pattern to open a URL and automaticaly retreive a feed
+* Rewritten December 19th 2004 by Michael Jervis (mike AT fuckingbrit DOT com).
+* Now utilises a Factory Pattern to open a URL and automaticaly retreive a feed
 * object populated with feed data. Then import it into the portal block.
 *
 * @param    string  $bid            Block ID

From geeklog-cvs at lists.geeklog.net  Sun Feb 15 14:14:33 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Feb 2009 14:14:33 -0500
Subject: [geeklog-cvs] geeklog: Set the page title when viewing a poll
Message-ID: <hg.9a83087b80b0.1234725273.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9a83087b80b0
changeset: 6781:9a83087b80b0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 14 17:02:00 2009 +0100
description:
Set the page title when viewing a poll

diffstat:

2 files changed, 6 insertions(+), 5 deletions(-)
public_html/docs/history    |    1 +
public_html/polls/index.php |   10 +++++-----

diffs (45 lines):

diff -r 035f447a8da7 -r 9a83087b80b0 public_html/docs/history
--- a/public_html/docs/history	Thu Feb 12 12:22:39 2009 +0100
+++ b/public_html/docs/history	Sat Feb 14 17:02:00 2009 +0100
@@ -58,6 +58,7 @@
 
 Polls plugin
 ------------
+- Set the page title when viewing a poll [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
 - Extended length of poll IDs to 40 characters (feature request #0000754) [Dirk]
diff -r 035f447a8da7 -r 9a83087b80b0 public_html/polls/index.php
--- a/public_html/polls/index.php	Thu Feb 12 12:22:39 2009 +0100
+++ b/public_html/polls/index.php	Sat Feb 14 17:02:00 2009 +0100
@@ -143,7 +143,7 @@
     $msg = COM_applyFilter($_REQUEST['msg'], true);
 }
 
-if (isset($pid)) {
+if (! empty($pid)) {
     $questions_sql = "SELECT question,qid FROM {$_TABLES['pollquestions']} "
     . "WHERE pid='$pid' ORDER BY qid";
     $questions = DB_query($questions_sql);
@@ -160,8 +160,9 @@
                $_CONF['cookie_path'], $_CONF['cookiedomain'],
                $_CONF['cookiesecure']);
     $display .= COM_siteHeader() . POLLS_pollsave($pid, $aid);
-} else if (isset($pid)) {
-    $display .= COM_siteHeader();
+} elseif (! empty($pid)) {
+    $topic = DB_getItem ($_TABLES['polltopics'], 'topic', "pid = '{$pid}'");
+    $display .= COM_siteHeader('menu', $topic);
     if ($msg > 0) {
         $display .= COM_showMessage($msg, 'polls');
     }
@@ -169,8 +170,7 @@
         $display .= COM_startBlock (
                 $LANG_POLLS['not_saved'], '',
                 COM_getBlockTemplate ('_msg_block', 'header'))
-            . $LANG_POLLS['answer_all'] . ' "'
-            . DB_getItem ($_TABLES['polltopics'], 'topic', "pid = '{$pid}'") . '"'
+            . $LANG_POLLS['answer_all'] . ' "' . $topic . '"'
             . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
     }
     if (DB_getItem($_TABLES['polltopics'], 'is_open', "pid = '$pid'") != 1) {

From geeklog-cvs at lists.geeklog.net  Sun Feb 15 14:14:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Feb 2009 14:14:34 -0500
Subject: [geeklog-cvs] geeklog: Use IN to exlude topics instead of a
	(possibly long) li...
Message-ID: <hg.3a3d0cd63d7b.1234725274.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3a3d0cd63d7b
changeset: 6782:3a3d0cd63d7b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 15 10:59:22 2009 +0100
description:
Use IN to exlude topics instead of a (possibly long) list of ORs

diffstat:

1 file changed, 14 insertions(+), 17 deletions(-)
public_html/admin/story.php |   31 ++++++++++++++-----------------

diffs (53 lines):

diff -r 9a83087b80b0 -r 3a3d0cd63d7b public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Feb 14 17:02:00 2009 +0100
+++ b/public_html/admin/story.php	Sun Feb 15 10:59:22 2009 +0100
@@ -116,35 +116,32 @@
         $current_topic = $LANG09[9];
     }
 
-    if ($current_topic == $LANG09[9]) {
+    if ($current_topic == $LANG09[9]) { // "All"
         $excludetopics = '';
         $seltopics = '';
-        $topicsql = "SELECT tid,topic FROM {$_TABLES['topics']}" . COM_getPermSQL ();
-        $tresult = DB_query( $topicsql );
-        $trows = DB_numRows( $tresult );
-        if( $trows > 0 )
-        {
-            $excludetopics .= ' (';
-            for( $i = 1; $i <= $trows; $i++ )  {
-                $T = DB_fetchArray ($tresult);
-                if ($i > 1)  {
-                    $excludetopics .= ' OR ';
-                }
-                $excludetopics .= "tid = '{$T['tid']}'";
-                $seltopics .= '<option value="' .$T['tid']. '"';
-                if ($current_topic == "{$T['tid']}") {
+        $topicsql = "SELECT tid,topic FROM {$_TABLES['topics']}"
+                  . COM_getPermSQL ();
+        $tresult = DB_query($topicsql);
+        $trows = DB_numRows($tresult);
+        if ($trows > 0) {
+            $exclude = array();
+            for ($i = 0; $i < $trows; $i++)  {
+                $T = DB_fetchArray($tresult);
+                $exclude[] = $T['tid'];
+                $seltopics .= '<option value="' . $T['tid'] . '"';
+                if ($current_topic == $T['tid']) {
                     $seltopics .= ' selected="selected"';
                 }
                 $seltopics .= '>' . $T['topic'] . '</option>' . LB;
             }
-            $excludetopics .= ') ';
+            $excludetopics = " (tid IN ('" . implode( "','", $exclude ) . "')) ";
         } else {
             $retval .= COM_showMessage(101);
             return $retval;
         }
     } else {
         $excludetopics = " tid = '$current_topic' ";
-        $seltopics = COM_topicList ('tid,topic', $current_topic, 1, true);
+        $seltopics = COM_topicList('tid,topic', $current_topic, 1, true);
         if (empty($seltopics)) {
             $retval .= COM_showMessage(101);
             return $retval;

From geeklog-cvs at lists.geeklog.net  Sun Feb 15 14:14:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Feb 2009 14:14:34 -0500
Subject: [geeklog-cvs] geeklog: Use IN to exlude topics instead of a
	(possibly long) li...
Message-ID: <hg.3a3d0cd63d7b.1234725274.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3a3d0cd63d7b
changeset: 6782:3a3d0cd63d7b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 15 10:59:22 2009 +0100
description:
Use IN to exlude topics instead of a (possibly long) list of ORs

diffstat:

1 file changed, 14 insertions(+), 17 deletions(-)
public_html/admin/story.php |   31 ++++++++++++++-----------------

diffs (53 lines):

diff -r 9a83087b80b0 -r 3a3d0cd63d7b public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Feb 14 17:02:00 2009 +0100
+++ b/public_html/admin/story.php	Sun Feb 15 10:59:22 2009 +0100
@@ -116,35 +116,32 @@
         $current_topic = $LANG09[9];
     }
 
-    if ($current_topic == $LANG09[9]) {
+    if ($current_topic == $LANG09[9]) { // "All"
         $excludetopics = '';
         $seltopics = '';
-        $topicsql = "SELECT tid,topic FROM {$_TABLES['topics']}" . COM_getPermSQL ();
-        $tresult = DB_query( $topicsql );
-        $trows = DB_numRows( $tresult );
-        if( $trows > 0 )
-        {
-            $excludetopics .= ' (';
-            for( $i = 1; $i <= $trows; $i++ )  {
-                $T = DB_fetchArray ($tresult);
-                if ($i > 1)  {
-                    $excludetopics .= ' OR ';
-                }
-                $excludetopics .= "tid = '{$T['tid']}'";
-                $seltopics .= '<option value="' .$T['tid']. '"';
-                if ($current_topic == "{$T['tid']}") {
+        $topicsql = "SELECT tid,topic FROM {$_TABLES['topics']}"
+                  . COM_getPermSQL ();
+        $tresult = DB_query($topicsql);
+        $trows = DB_numRows($tresult);
+        if ($trows > 0) {
+            $exclude = array();
+            for ($i = 0; $i < $trows; $i++)  {
+                $T = DB_fetchArray($tresult);
+                $exclude[] = $T['tid'];
+                $seltopics .= '<option value="' . $T['tid'] . '"';
+                if ($current_topic == $T['tid']) {
                     $seltopics .= ' selected="selected"';
                 }
                 $seltopics .= '>' . $T['topic'] . '</option>' . LB;
             }
-            $excludetopics .= ') ';
+            $excludetopics = " (tid IN ('" . implode( "','", $exclude ) . "')) ";
         } else {
             $retval .= COM_showMessage(101);
             return $retval;
         }
     } else {
         $excludetopics = " tid = '$current_topic' ";
-        $seltopics = COM_topicList ('tid,topic', $current_topic, 1, true);
+        $seltopics = COM_topicList('tid,topic', $current_topic, 1, true);
         if (empty($seltopics)) {
             $retval .= COM_showMessage(101);
             return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 04:35:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 04:35:11 -0500
Subject: [geeklog-cvs] geeklog: Added canonical link for articles
Message-ID: <hg.c019de3f112d.1235208911.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c019de3f112d
changeset: 6784:c019de3f112d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 10:35:01 2009 +0100
description:
Added canonical link for articles

diffstat:

2 files changed, 11 insertions(+), 8 deletions(-)
public_html/article.php  |   18 ++++++++++--------
public_html/docs/history |    1 +

diffs (46 lines):

diff -r 7a50517a4ecf -r c019de3f112d public_html/article.php
--- a/public_html/article.php	Sat Feb 21 09:47:56 2009 +0100
+++ b/public_html/article.php	Sat Feb 21 10:35:01 2009 +0100
@@ -197,21 +197,23 @@
         // Set page title
         $pagetitle = $story->DisplayElements('title');
 
-        $rdf = '';
+        $headercode = '';
+        $permalink = COM_buildUrl($_CONF['site_url'] . '/article.php?story='
+                                  . $story->getSid());
+        $headercode .= '<link rel="canonical" href="' . $permalink . '"'
+                    . XHTML . '>';
         if ($story->DisplayElements('trackbackcode') == 0) {
             if ($_CONF['trackback_enabled']) {
-                $permalink = COM_buildUrl ($_CONF['site_url']
-                                           . '/article.php?story=' . $story->getSid());
-                $trackbackurl = TRB_makeTrackbackUrl ($story->getSid());
-                $rdf = '<!--' . LB
-                     . TRB_trackbackRdf ($permalink, $pagetitle, $trackbackurl)
+                $trackbackurl = TRB_makeTrackbackUrl($story->getSid());
+                $headercode .= LB . '<!--' . LB
+                     . TRB_trackbackRdf($permalink, $pagetitle, $trackbackurl)
                      . LB . '-->' . LB;
             }
             if ($_CONF['pingback_enabled']) {
-                header ('X-Pingback: ' . $_CONF['site_url'] . '/pingback.php');
+                header('X-Pingback: ' . $_CONF['site_url'] . '/pingback.php');
             }
         }
-        $display .= COM_siteHeader ('menu', $pagetitle, $rdf);
+        $display .= COM_siteHeader('menu', $pagetitle, $headercode);
 
         if (isset($_GET['msg'])) {
             $msg = COM_applyFilter($_GET['msg'], true);
diff -r 7a50517a4ecf -r c019de3f112d public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 09:47:56 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 10:35:01 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Added canonical link for articles [Dirk]
 - Moved hard-coded "Reminders" column title to the language file (bug #0000817)
 - Hide archive option radiobutton from the story editor when no archive topic
   is defined (feature request #0000807) [Dirk]

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 09:53:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 09:53:22 -0500
Subject: [geeklog-cvs] geeklog: Removed $_CONF['pagetitle'] hack
Message-ID: <hg.d6c9bb40e6ff.1235228002.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d6c9bb40e6ff
changeset: 6785:d6c9bb40e6ff
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 11:55:21 2009 +0100
description:
Removed $_CONF['pagetitle'] hack

diffstat:

5 files changed, 5 insertions(+), 12 deletions(-)
plugins/staticpages/functions.inc    |    4 ++--
plugins/staticpages/services.inc.php |    3 +--
public_html/docs/history             |    2 ++
public_html/index.php                |    4 ----
public_html/lib-common.php           |    4 ----

diffs (70 lines):

diff -r c019de3f112d -r d6c9bb40e6ff plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Feb 21 10:35:01 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Feb 21 11:55:21 2009 +0100
@@ -273,10 +273,10 @@
     $retval = '';
 
     if ($A['sp_format'] == 'allblocks' OR $A['sp_format'] == 'leftblocks') {
-        $retval .= COM_siteHeader ('menu');
+        $retval .= COM_siteHeader('menu', $A['sp_title']);
     } else {
         if ($A['sp_format'] <> 'blankpage') {
-            $retval .= COM_siteHeader ('none');
+            $retval .= COM_siteHeader('none', $A['sp_title']);
         }
     }
     if ($msg > 0) {
diff -r c019de3f112d -r d6c9bb40e6ff plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/plugins/staticpages/services.inc.php	Sat Feb 21 11:55:21 2009 +0100
@@ -546,9 +546,8 @@
 
         if (!($error)) {
             $output = DB_fetchArray ($result, false);
+
             // WE ASSUME $output doesn't have any confidential fields 
-
-            $_CONF['pagetitle'] = stripslashes ($output['sp_title']);
 
         } else { // an error occured (page not found, access denied, ...)
             if (empty ($page)) {
diff -r c019de3f112d -r d6c9bb40e6ff public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 11:55:21 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Removed $_CONF['pagetitle'] hack. Use COM_siteHeader('menu', $pagetitle)
+  instead [Dirk]
 - Added canonical link for articles [Dirk]
 - Moved hard-coded "Reminders" column title to the language file (bug #0000817)
 - Hide archive option radiobutton from the story editor when no archive topic
diff -r c019de3f112d -r d6c9bb40e6ff public_html/index.php
--- a/public_html/index.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/index.php	Sat Feb 21 11:55:21 2009 +0100
@@ -89,10 +89,6 @@
     if ( $A = DB_fetchArray( $result ) ) {
         $pagetitle = $_CONF['microsummary_short'].$A['title'];
     } else {
-        if(isset( $_CONF['pagetitle'] ))
-        {
-            $pagetitle = $_CONF['pagetitle'];
-        }
         if( empty( $pagetitle ))
         {
             if( empty( $topic ))
diff -r c019de3f112d -r d6c9bb40e6ff public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Feb 21 10:35:01 2009 +0100
+++ b/public_html/lib-common.php	Sat Feb 21 11:55:21 2009 +0100
@@ -973,10 +973,6 @@
     // TBD: add a plugin API and a lib-custom.php function
     $header->set_var( 'rel_links', implode( LB, $relLinks ));
 
-    if( empty( $pagetitle ) && isset( $_CONF['pagetitle'] ))
-    {
-        $pagetitle = $_CONF['pagetitle'];
-    }
     if( empty( $pagetitle ))
     {
         if( empty( $topic ))

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 09:53:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 09:53:24 -0500
Subject: [geeklog-cvs] geeklog: Added a filename mask config option for the
	names of th...
Message-ID: <hg.6e9c261610c2.1235228004.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6e9c261610c2
changeset: 6789:6e9c261610c2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 15:07:45 2009 +0100
description:
Added a filename mask config option for the names of the database backups

diffstat:

8 files changed, 25 insertions(+), 6 deletions(-)
language/english.php                         |    1 +
language/english_utf-8.php                   |    1 +
public_html/admin/database.php               |   15 +++++++++------
public_html/admin/install/config-install.php |    1 +
public_html/docs/config.html                 |    5 +++++
public_html/docs/history                     |    2 ++
sql/updates/mssql_1.5.2_to_1.6.0.php         |    3 +++
sql/updates/mysql_1.5.2_to_1.6.0.php         |    3 +++

diffs (130 lines):

diff -r cd37daba7d4b -r 6e9c261610c2 language/english.php
--- a/language/english.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/language/english.php	Sat Feb 21 15:07:45 2009 +0100
@@ -1642,6 +1642,7 @@
     'allow_mysqldump' => "Allow MySQL Dump",
     'mysqldump_path' => 'Path of Executable',
     'mysqldump_options' => "MySQL Dump Options",
+    'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => "Theme",
     'menu_elements' => "Menu Elements",
     'path_themes' => "Themes Path",
diff -r cd37daba7d4b -r 6e9c261610c2 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/language/english_utf-8.php	Sat Feb 21 15:07:45 2009 +0100
@@ -1642,6 +1642,7 @@
     'allow_mysqldump' => "Allow MySQL Dump",
     'mysqldump_path' => 'Path of Executable',
     'mysqldump_options' => "MySQL Dump Options",
+    'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => "Theme",
     'menu_elements' => "Menu Elements",
     'path_themes' => "Themes Path",
diff -r cd37daba7d4b -r 6e9c261610c2 public_html/admin/database.php
--- a/public_html/admin/database.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/public_html/admin/database.php	Sat Feb 21 15:07:45 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | database.php                                                              |
 // |                                                                           |
 // | Geeklog database backup administration page.                              |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs         - tony AT tonybibbs DOT com                   |
 // |          Blaine Lang        - langmail AT sympatico DOT ca                |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: database.php,v 1.51 2008/08/30 06:50:22 mjervis Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -182,8 +180,13 @@
     $retval = '';
 
     if (is_dir($_CONF['backup_path'])) {
-        $curdatetime = date('Y_m_d_H_i_s');
-        $backupfile = "{$_CONF['backup_path']}geeklog_db_backup_{$curdatetime}.sql";
+        if (!empty($_CONF['mysqldump_filename_mask'])) {
+            $filename_mask = strftime($_CONF['mysqldump_filename_mask']);
+        } else {
+            $curdatetime = date('Y_m_d_H_i_s');
+            $filename_mask = "geeklog_db_backup_{$curdatetime}.sql";
+        }
+        $backupfile = $_CONF['backup_path'] . $filename_mask;
         $command = $_DB_mysqldump_path . " -h$_DB_host -u$_DB_user";
         if (!empty($_DB_pass)) {
             $command .= " -p$_DB_pass";
diff -r cd37daba7d4b -r 6e9c261610c2 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/public_html/admin/install/config-install.php	Sat Feb 21 15:07:45 2009 +0100
@@ -81,6 +81,7 @@
     $c->add('allow_mysqldump',1,'select',0,5,0,170,TRUE);
     $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
     $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
+    $c->add('mysqldump_filename_mask','geeklog_db_backup_%Y_%m_%d_%H_%M_%S.sql','text',0,5,NULL,185,TRUE);
 
     // squeeze search options between 640 (lastlogin) and 680 (loginrequired)
     $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
diff -r cd37daba7d4b -r 6e9c261610c2 public_html/docs/config.html
--- a/public_html/docs/config.html	Sat Feb 21 14:36:24 2009 +0100
+++ b/public_html/docs/config.html	Sat Feb 21 15:07:45 2009 +0100
@@ -254,6 +254,11 @@
     <td valign="top">Here you can include additional options for the <a
         href="http://www.mysql.com/doc/en/mysqldump.html">mysqldump</a> call
         that Geeklog uses to create a backup from your database.</td></tr>
+<tr><td valign="top"><a name="desc_mysqldump_filename_mask">mysqldump_filename_mask</a></td>
+    <td valign="top">geeklog_db_backup_%Y_%m_%d_%H_%M_%S.sql</td>
+    <td valign="top">Mask to use for the names of the backup files. See <a
+        href="#date_formats">date formats</a> below for details of the date and
+        time in the file name.</td></tr>
 </table>
 
 <h3><a name="site_search">Site: Search</a></h3>
diff -r cd37daba7d4b -r 6e9c261610c2 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 14:36:24 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 15:07:45 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Added a filename mask config option for the names of the database backups
+  [Dirk]
 - Removed $_CONF['pagetitle'] hack. Use COM_siteHeader('menu', $pagetitle)
   instead [Dirk]
 - Added canonical link for articles [Dirk]
diff -r cd37daba7d4b -r 6e9c261610c2 sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Sat Feb 21 15:07:45 2009 +0100
@@ -48,6 +48,9 @@
     $c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
     $c->add('search_use_fulltext',FALSE,'hidden',0,6); // 678
 
+    // filename mask for db backup files
+    $c->add('mysqldump_filename_mask','geeklog_db_backup_%Y_%m_%d_%H_%M_%S.sql','text',0,5,NULL,185,TRUE);
+
     return true;
 }
 
diff -r cd37daba7d4b -r 6e9c261610c2 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Sat Feb 21 14:36:24 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Sat Feb 21 15:07:45 2009 +0100
@@ -49,6 +49,9 @@
     $c->add('search_def_keytype','phrase','select',0,6,20,675,TRUE);
     $c->add('search_use_fulltext',FALSE,'hidden',0,6); // 678
 
+    // filename mask for db backup files
+    $c->add('mysqldump_filename_mask','geeklog_db_backup_%Y_%m_%d_%H_%M_%S.sql','text',0,5,NULL,185,TRUE);
+
     return true;
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 09:53:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 09:53:23 -0500
Subject: [geeklog-cvs] geeklog: Added canonical link for static pages
Message-ID: <hg.000c9fe7852b.1235228003.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/000c9fe7852b
changeset: 6786:000c9fe7852b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 12:41:05 2009 +0100
description:
Added canonical link for static pages

diffstat:

2 files changed, 8 insertions(+), 2 deletions(-)
plugins/staticpages/functions.inc |    9 +++++++--
public_html/docs/history          |    1 +

diffs (33 lines):

diff -r d6c9bb40e6ff -r 000c9fe7852b plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Feb 21 11:55:21 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Feb 21 12:41:05 2009 +0100
@@ -272,11 +272,16 @@
 
     $retval = '';
 
+    $sp_url = COM_buildUrl($_CONF['site_url'] . '/staticpages/index.php?page='
+                           . $page);
+    $headercode = '<link rel="canonical" href="' . $sp_url . '"' . XHTML . '>'
+                . LB;
+
     if ($A['sp_format'] == 'allblocks' OR $A['sp_format'] == 'leftblocks') {
-        $retval .= COM_siteHeader('menu', $A['sp_title']);
+        $retval .= COM_siteHeader('menu', $A['sp_title'], $headercode);
     } else {
         if ($A['sp_format'] <> 'blankpage') {
-            $retval .= COM_siteHeader('none', $A['sp_title']);
+            $retval .= COM_siteHeader('none', $A['sp_title'], $headercode);
         }
     }
     if ($msg > 0) {
diff -r d6c9bb40e6ff -r 000c9fe7852b public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 11:55:21 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 12:41:05 2009 +0100
@@ -73,6 +73,7 @@
 
 Static Pages plugin
 -------------------
+- Added canonical link [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
 - The printable.thtml template file uses the HTML Strict doctype and print.css

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 09:53:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 09:53:23 -0500
Subject: [geeklog-cvs] geeklog: Added Links Category default permissions
Message-ID: <hg.06568a815aa0.1235228003.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/06568a815aa0
changeset: 6787:06568a815aa0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 14:04:25 2009 +0100
description:
Added Links Category default permissions

diffstat:

6 files changed, 34 insertions(+), 11 deletions(-)
plugins/links/functions.inc                  |    7 +++++++
plugins/links/install_defaults.php           |   15 +++++++++++++++
plugins/links/language/english.php           |    7 ++++---
plugins/links/language/english_utf-8.php     |    7 ++++---
public_html/admin/plugins/links/category.php |    8 +++-----
public_html/docs/history                     |    1 +

diffs (159 lines):

diff -r 000c9fe7852b -r 06568a815aa0 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sat Feb 21 12:41:05 2009 +0100
+++ b/plugins/links/functions.inc	Sat Feb 21 14:04:25 2009 +0100
@@ -647,6 +647,13 @@
     if (! isset($_LI_CONF['new_window'])) {
         $c = config::get_instance();
         $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
+    }
+
+    if (! isset($_LI_CONF['category_permissions'])) {
+        $c = config::get_instance();
+        $c->add('fs_cpermissions', NULL, 'fieldset', 0, 3, NULL, 0, true, 'links');
+        $c->add('category_permissions', array (3, 2, 2, 2),
+                '@select', 0, 3, 12, 150, true, 'links');
     }
 
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'links'");
diff -r 000c9fe7852b -r 06568a815aa0 plugins/links/install_defaults.php
--- a/plugins/links/install_defaults.php	Sat Feb 21 12:41:05 2009 +0100
+++ b/plugins/links/install_defaults.php	Sat Feb 21 14:04:25 2009 +0100
@@ -155,6 +155,17 @@
  */
 $_LI_DEFAULT['default_permissions'] = array (3, 2, 2, 2);
 
+/**
+ * Define default permissions for new link categories.
+ * Permissions are perm_owner, perm_group, perm_members, perm_anon (in that
+ * order). Possible values:<br>
+ * - 3 = read + write permissions (perm_owner and perm_group only)
+ * - 2 = read-only
+ * - 0 = neither read nor write permissions
+ * (a value of 1, ie. write-only, does not make sense and is not allowed)
+ */
+$_LI_DEFAULT['category_permissions'] = array (3, 2, 2, 2);
+
 
 /**
 * Initialize Links plugin configuration
@@ -213,6 +224,10 @@
         $c->add('default_permissions', $_LI_DEFAULT['default_permissions'],
                 '@select', 0, 2, 12, 140, true, 'links');
 
+        $c->add('fs_cpermissions', NULL, 'fieldset', 0, 3, NULL, 0, true, 'links');
+        $c->add('category_permissions', $_LI_DEFAULT['category_permissions'],
+                '@select', 0, 3, 12, 150, true, 'links');
+
     }
 
     return true;
diff -r 000c9fe7852b -r 06568a815aa0 plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sat Feb 21 12:41:05 2009 +0100
+++ b/plugins/links/language/english.php	Sat Feb 21 14:04:25 2009 +0100
@@ -25,7 +25,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ###############################################################################
-# $Id: english.php,v 1.33 2008/09/22 07:53:40 dhaun Exp $
 
 /**
  * This is the english language page for the Geeklog links Plug-in!
@@ -276,7 +275,8 @@
     'show_category_descriptions' => 'Show Category Description?',
     'new_window' => 'Open external links in new window?',
     'root' => 'ID of Root Category',
-    'default_permissions' => 'Link Default Permissions'
+    'default_permissions' => 'Link Default Permissions',
+    'category_permissions' => 'Category Default Permissions'
 );
 
 $LANG_configsubgroups['links'] = array(
@@ -286,7 +286,8 @@
 $LANG_fs['links'] = array(
     'fs_public' => 'Public Links List Settings',
     'fs_admin' => 'Links Admin Settings',
-    'fs_permissions' => 'Default Permissions'
+    'fs_permissions' => 'Link Permissions',
+    'fs_cpermissions' => 'Category Permissions'
 );
 
 // Note: entries 0, 1, and 12 are the same as in $LANG_configselects['Core']
diff -r 000c9fe7852b -r 06568a815aa0 plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sat Feb 21 12:41:05 2009 +0100
+++ b/plugins/links/language/english_utf-8.php	Sat Feb 21 14:04:25 2009 +0100
@@ -25,7 +25,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ###############################################################################
-# $Id: english_utf-8.php,v 1.20 2008/09/22 07:53:40 dhaun Exp $
 
 /**
  * This is the english language page for the Geeklog links Plug-in!
@@ -276,7 +275,8 @@
     'show_category_descriptions' => 'Show Category Description?',
     'new_window' => 'Open external links in new window?',
     'root' => 'ID of Root Category',
-    'default_permissions' => 'Link Default Permissions'
+    'default_permissions' => 'Link Default Permissions',
+    'category_permissions' => 'Category Default Permissions'
 );
 
 $LANG_configsubgroups['links'] = array(
@@ -286,7 +286,8 @@
 $LANG_fs['links'] = array(
     'fs_public' => 'Public Links List Settings',
     'fs_admin' => 'Links Admin Settings',
-    'fs_permissions' => 'Default Permissions'
+    'fs_permissions' => 'Link Permissions',
+    'fs_cpermissions' => 'Category Permissions'
 );
 
 // Note: entries 0, 1, and 12 are the same as in $LANG_configselects['Core']
diff -r 000c9fe7852b -r 06568a815aa0 public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sat Feb 21 12:41:05 2009 +0100
+++ b/public_html/admin/plugins/links/category.php	Sat Feb 21 14:04:25 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Links Plugin 2.0                                                          |
+// | Links Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | category.php                                                              |
 // |                                                                           |
 // | Geeklog links category administration page.                               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users.sourceforge DOT net        |
@@ -32,8 +32,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: category.php,v 1.19 2008/06/22 08:55:01 dhaun Exp $
 
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
@@ -179,7 +177,7 @@
         // nothing, so making a new top-level category
         // get default access rights
         $A['group_id'] = DB_getItem($_TABLES['groups'], 'grp_id', "grp_name='Links Admin'");
-        SEC_setDefaultPermissions($A, $_LI_CONF['default_permissions']);
+        SEC_setDefaultPermissions($A, $_LI_CONF['category_permissions']);
         $A['owner_id'] = $_USER['uid'];
         $A['pid']      = $_LI_CONF['root'];
     }
diff -r 000c9fe7852b -r 06568a815aa0 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 12:41:05 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 14:04:25 2009 +0100
@@ -52,6 +52,7 @@
 
 Links plugin
 ------------
+- Added category default permissions [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
 - Introduced function LINKS_getCategorySQL and fixed visibility of link

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 09:53:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 09:53:24 -0500
Subject: [geeklog-cvs] geeklog: Present names of backup files unchanged
Message-ID: <hg.cd37daba7d4b.1235228004.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cd37daba7d4b
changeset: 6788:cd37daba7d4b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 14:36:24 2009 +0100
description:
Present names of backup files unchanged

diffstat:

1 file changed, 3 insertions(+), 25 deletions(-)
public_html/admin/install/migrate.php |   28 +++-------------------------

diffs (38 lines):

diff -r 06568a815aa0 -r cd37daba7d4b public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Feb 21 14:04:25 2009 +0100
+++ b/public_html/admin/install/migrate.php	Sat Feb 21 14:36:24 2009 +0100
@@ -338,31 +338,9 @@
             // List each of the backup files in the backups directory
             foreach ($backup_files as $file_path) { 
 
-                $file_path  = ereg_replace('../../../backups/', '', $file_path);
-                $filename   = ereg_replace($backup_dir, '', $file_path);
-                $tmp_file   = explode('_', $filename);
-
-                // Check if backup file is formatted the same way Geeklog's admin/backup.php script does
-                // ie: geeklog_db_backup_2008_06_29_15_54_06.sql
-                if (count($tmp_file) >= 9) { 
-
-                    $backup_file = $tmp_file[4] . '/' . $tmp_file[5] . '/' . $tmp_file[3] . ' at ' .
-                                    $tmp_file[6] . ':' . $tmp_file[7] . ':' . str_replace('.sql', '', $tmp_file[8]);
-                    
-                    // Check if multiple versions of the backup file exist
-                    if (count($tmp_file) === 10) { 
-
-                        // If so, append (1), (2), etc.    
-                        $file_copy_num = substr($tmp_file[9], 0, 1);
-                        $backup_file .= " (" . $file_copy_num . ")";
-    
-                    }
-    
-                } else { 
-                
-                    $backup_file = ereg_replace($backup_dir, '', $file_path);
-
-                }
+                $file_path   = str_replace('../../../backups/', '', $file_path);
+                $filename    = str_replace($backup_dir, '', $file_path);
+                $backup_file = str_replace($backup_dir, '', $file_path);
 
                 $display .= INST_printTab(6) . '<option value="' . $filename .'">' . $backup_file . ' (' . INST_formatSize(filesize($file_path)) . ')</option>' . LB;
 

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 11:08:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 11:08:21 -0500
Subject: [geeklog-cvs] geeklog: Raised minimum required PHP version to PHP
	4.3.0
Message-ID: <hg.93f182e7807e.1235232501.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/93f182e7807e
changeset: 6790:93f182e7807e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 16:46:34 2009 +0100
description:
Raised minimum required PHP version to PHP 4.3.0

diffstat:

20 files changed, 65 insertions(+), 112 deletions(-)
plugins/spamx/BlackList.Examine.class.php                        |    9 -
plugins/spamx/IPofUrl.Examine.class.php                          |    9 -
plugins/spamx/MTBlackList.Examine.class.php                      |    9 -
public_html/admin/install/index.php                              |    4 
public_html/admin/install/language/chinese_simplified_utf-8.php  |    4 
public_html/admin/install/language/chinese_traditional_utf-8.php |    4 
public_html/admin/install/language/english.php                   |    4 
public_html/admin/install/language/german.php                    |    4 
public_html/admin/install/language/hebrew_utf-8.php              |    4 
public_html/admin/install/language/japanese_utf-8.php            |    4 
public_html/admin/install/language/polish.php                    |    4 
public_html/admin/install/lib-install.php                        |   13 +-
public_html/admin/user.php                                       |    1 
public_html/docs/changes.html                                    |   21 ++++
public_html/docs/history                                         |    4 
public_html/lib-common.php                                       |   47 ++--------
system/classes/story.class.php                                   |   23 ----
system/lib-sessions.php                                          |    1 
system/lib-user.php                                              |    1 
system/pear/README                                               |    7 -

diffs (truncated from 415 to 300 lines):

diff -r 6e9c261610c2 -r 93f182e7807e plugins/spamx/BlackList.Examine.class.php
--- a/plugins/spamx/BlackList.Examine.class.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/plugins/spamx/BlackList.Examine.class.php	Sat Feb 21 16:46:34 2009 +0100
@@ -20,15 +20,6 @@
  * Include Abstract Examine Class
  */
 require_once $_CONF['path'] . 'plugins/spamx/' . 'BaseCommand.class.php';
-
-/**
-* html_entity_decode is only available as of PHP 4.3.0
-*/
-if (!function_exists ('html_entity_decode')) {
-    require_once ('PHP/Compat.php');
-
-    PHP_Compat::loadFunction ('html_entity_decode');
-}
 
 /**
  * Examines Comment according to Personal BLacklist
diff -r 6e9c261610c2 -r 93f182e7807e plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Sat Feb 21 16:46:34 2009 +0100
@@ -20,15 +20,6 @@
 * Include Abstract Examine Class
 */
 require_once $_CONF['path'] . 'plugins/spamx/' . 'BaseCommand.class.php';
-
-/**
-* html_entity_decode is only available as of PHP 4.3.0
-*/
-if (!function_exists ('html_entity_decode')) {
-    require_once ('PHP/Compat.php');
-
-    PHP_Compat::loadFunction ('html_entity_decode');
-}
 
 /**
 * Examines Comment according to Personal BLacklist
diff -r 6e9c261610c2 -r 93f182e7807e plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Sat Feb 21 16:46:34 2009 +0100
@@ -24,15 +24,6 @@
  * Include Abstract Examine Class
  */
 require_once $_CONF['path'] . 'plugins/spamx/' . 'BaseCommand.class.php';
-
-/**
-* html_entity_decode is only available as of PHP 4.3.0
-*/
-if (!function_exists ('html_entity_decode')) {
-    require_once ('PHP/Compat.php');
-
-    PHP_Compat::loadFunction ('html_entity_decode');
-}
 
 /**
  * Examines Comment according to MT-BLacklist
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/index.php	Sat Feb 21 16:46:34 2009 +0100
@@ -951,8 +951,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1 class="heading">' . $LANG_INSTALL[4] . '</h1>' . LB;
-    $display .= '<p>' . $LANG_INSTALL[5] . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1 class="heading">' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[4]) . '</h1>' . LB;
+    $display .= '<p>' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[5]) . phpversion() . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sat Feb 21 16:46:34 2009 +0100
@@ -54,8 +54,8 @@
     1 => '????????????',
     2 => '??????????????????',
     3 => '????????????',
-    4 => '??????PHP 4.1.0',
-    5 => '??????, ?????????????????? PHP 4.1.0 ?????????(????????????',
+    4 => '??????PHP 4.3.0',
+    5 => '??????, ?????????????????? PHP 4.3.0 ?????????(????????????',
     6 => '). ??? <a href="http://www.php.net/downloads.php">??????PHP</a> ?????? ???????????????????????????????????????.',
     7 => '?????????????????????',
     8 => '?????????????????????????????????????????????. ???????????????????????????. ???????????????????????????????????????:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sat Feb 21 16:46:34 2009 +0100
@@ -54,8 +54,8 @@
     1 => '????????????',
     2 => '??????????????????',
     3 => '????????????',
-    4 => '??????PHP 4.1.0',
-    5 => '??????, ?????????????????? PHP 4.1.0 ?????????(????????????',
+    4 => '??????PHP 4.3.0',
+    5 => '??????, ?????????????????? PHP 4.3.0 ?????????(????????????',
     6 => '). ??? <a href="http://www.php.net/downloads.php">??????PHP</a> ?????? ???????????????????????????????????????.',
     7 => '?????????????????????',
     8 => '?????????????????????????????????????????????. ???????????????????????????. ???????????????????????????????????????:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/english.php	Sat Feb 21 16:46:34 2009 +0100
@@ -53,8 +53,8 @@
     1 => 'Installation Support',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog Installation',
-    4 => 'PHP 4.1.0 required',
-    5 => 'Sorry, but Geeklog requires at least PHP 4.1.0 to run (you have version ',
+    4 => 'PHP 4.3.0 required',
+    5 => 'Sorry, but Geeklog requires at least PHP 4.3.0 to run (you have version ',
     6 => '). Please <a href="http://www.php.net/downloads.php">upgrade your PHP</a> install or ask your hosting service to do it for you.',
     7 => 'Unable to locate Geeklog files',
     8 => 'The installer was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/german.php	Sat Feb 21 16:46:34 2009 +0100
@@ -53,8 +53,8 @@
     1 => 'Hilfe zur Installation',
     2 => 'Zuverl?ssigkeit eingebaut',
     3 => 'Geeklog-Installation',
-    4 => 'PHP 4.1.0 ben?tigt',
-    5 => 'Sorry, Geeklog ben?tigt mindestens PHP 4.1.0 (Du hast Version ',
+    4 => 'PHP 4.3.0 ben?tigt',
+    5 => 'Sorry, Geeklog ben?tigt mindestens PHP 4.3.0 (Du hast Version ',
     6 => '). Bitte <a href="http://www.php.net/downloads.php">aktualisiere Deine PHP-Installation</a> oder bitte Deinen Hosting-Provider darum.',
     7 => 'Geeklog-Dateien nicht gefunden',
     8 => 'Das Installations-Skript hat einige wichtige Geeklog-Dateien nicht gefunden. Wahrscheinlich hast Du diese in andere Verzeichnisse verschoben. Bitte gib hier die Pfade zu den Dateien und Verzeichnissen an:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sat Feb 21 16:46:34 2009 +0100
@@ -49,8 +49,8 @@
     1 => '?????????? ??????????',
     2 => 'The Ultimate Weblog System',
     3 => '?????????? Geeklog',
-    4 => '???????? PHP 4.1.0',
-    5 => '??????????????, ?????? Geeklog ???????? ?????????? PHP 4.1.0 ?????????? ???????? (?????? ???? ?????????? ',
+    4 => '???????? PHP 4.3.0',
+    5 => '??????????????, ?????? Geeklog ???????? ?????????? PHP 4.3.0 ?????????? ???????? (?????? ???? ?????????? ',
     6 => '). ?????? <a href="http://www.php.net/downloads.php">?????????? ???? ?????????? ??-PHP ????????</a> ???? ???????? ???????????? ???????? ???????? ?????????? ?????? ??????????????.',
     7 => '???? ?????????? ???????????? ???? Geeklog',
     8 => '???????? ???????????? ???? ?????????? ???????? ???? ???????????? ?????????????? ???? Geeklog. ???? ?????????? ???????? ?????????????? ???????? ???????????? ?????????? ?????????? ????????. ?????? ?????????? ???? ?????????????? ???????????? ???????????????? ????????:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sat Feb 21 16:46:34 2009 +0100
@@ -55,8 +55,8 @@
     1 => '????????????????????????????????????????????????????????????',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog?????????????????????',
-    4 => 'PHP 4.1.0???????????????',
-    5 => '??????????????????Geeklog?????????????????????????????????????????????PHP 4.1.0???????????????(??????????????????????????? ',
+    4 => 'PHP 4.3.0???????????????',
+    5 => '??????????????????Geeklog?????????????????????????????????????????????PHP 4.3.0???????????????(??????????????????????????? ',
     6 => ')????????????<a href="http://www.php.net/downloads.php">PHP?????????????????????????????????</a>????????????????????????????????????????????????????????????',
     7 => 'Geeklog??????????????????????????????????????????????????????',
     8 => 'Geeklog??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/language/polish.php	Sat Feb 21 16:46:34 2009 +0100
@@ -53,8 +53,8 @@
     1 => 'Instalacja Pomoc',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog - Instalacja',
-    4 => 'Wymagane PHP 4.1.0',
-    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP 4.1.0 (wersja zainstalowana to ',
+    4 => 'Wymagane PHP 4.3.0',
+    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP 4.3.0 (wersja zainstalowana to ',
     6 => '). Prosz? <a href="http://www.php.net/downloads.php">uaktualni? wersj? PHP</a> lub zg?osi? to do swojego providera hostingu.',
     7 => 'Nie mo?na zlokalizowa? plik?w Geeklog-a',
     8 => 'The installation script was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/install/lib-install.php	Sat Feb 21 16:46:34 2009 +0100
@@ -58,7 +58,7 @@
     define('XHTML', ' /');
 }
 if (!defined('SUPPORTED_PHP_VER')) {
-    define('SUPPORTED_PHP_VER', '4.1.0');
+    define('SUPPORTED_PHP_VER', '4.3.0');
 }
 
 if (empty($LANG_DIRECTION)) {
@@ -237,6 +237,7 @@
 function php_v()
 {
     $phpv = explode('.', phpversion());
+
     return array($phpv[0], $phpv[1], (int) $phpv[2]);
 }
 
@@ -248,12 +249,16 @@
  */
 function INST_phpOutOfDate()
 {
+    $minv = explode('.', SUPPORTED_PHP_VER);
+
     $phpv = php_v();
-    if (($phpv[0] < 4) || (($phpv[0] == 4) && ($phpv[1] < 1))) {
+    if (($phpv[0] <  $minv[0]) ||
+       (($phpv[0] == $minv[0]) && ($phpv[1] <  $minv[1])) ||
+       (($phpv[0] == $minv[0]) && ($phpv[1] == $minv[1]) && ($phpv[2] < $minv[2]))) {
         return true;    
-    } else {
-        return false;
     }
+
+    return false;
 }
 
 /**
diff -r 6e9c261610c2 -r 93f182e7807e public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/admin/user.php	Sat Feb 21 16:46:34 2009 +0100
@@ -488,7 +488,6 @@
         if (empty ($uid)) {
             if (empty ($passwd)) {
                 // no password? create one ...
-                srand ((double) microtime () * 1000000);
                 $passwd = rand ();
                 $passwd = md5 ($passwd);
                 $passwd = substr ($passwd, 1, 8);
diff -r 6e9c261610c2 -r 93f182e7807e public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/docs/changes.html	Sat Feb 21 16:46:34 2009 +0100
@@ -15,6 +15,27 @@
 and / or obvious changes. For a detailed list of changes, please consult the
 <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="changes160">Geeklog 1.6.0</a></h2>
+
+<h3>Results from the Summer of Code</h3>
+
+<p>This release incorporates the following projects implemented during the
+the 2008 Google Summer of Code:</p>
+
+<ul>
+<li>Site migration support and easier plugin installation, by Matt West</li>
+<li>Improved search, by Sami Barakat</li>
+<li>Comment moderation and editable comments, by Jared Wenerd</li>
+</ul>
+
+<h3>Other changes</h3>
+
+<ul>
+<li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP in August 2008, you should be
+looking into upgrading to PHP 5 anyway.</li>
+</ul>
+
 
 <h2><a name="changes152">Geeklog 1.5.2</a></h2>
 
diff -r 6e9c261610c2 -r 93f182e7807e public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 16:46:34 2009 +0100
@@ -7,10 +7,12 @@
 the 2008 Google Summer of Code:
 
 + Site migration support and easier plugin installation, by Matt West
-+ (TBD) Improved search, by Sami Barakat
++ Improved search, by Sami Barakat
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Raised minimum required PHP version to PHP 4.3.0 and removed all workarounds
+  that ensured compatibility with PHP 4.1.0 [Dirk]
 - Added a filename mask config option for the names of the database backups
   [Dirk]
 - Removed $_CONF['pagetitle'] hack. Use COM_siteHeader('menu', $pagetitle)
diff -r 6e9c261610c2 -r 93f182e7807e public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Feb 21 15:07:45 2009 +0100
+++ b/public_html/lib-common.php	Sat Feb 21 16:46:34 2009 +0100
@@ -137,39 +137,18 @@
 * If needed, add our PEAR path to the list of include paths
 *
 */
-if( !$_CONF['have_pear'] )
-{
-    $curPHPIncludePath = ini_get( 'include_path' );
-    if( defined( 'PATH_SEPARATOR' ))
-    {
-        $separator = PATH_SEPARATOR;
-    }
-    else
-    {
-        // prior to PHP 4.3.0, we have to guess the correct separator ...
-        $separator = ';';
-        if( strpos( $curPHPIncludePath, $separator ) === false )
-        {
-            $separator = ':';
-        }
-    }
-    if( ini_set( 'include_path', $_CONF['path_pear'] . $separator
-                                 . $curPHPIncludePath ) === false )
-    {
-        COM_errorLog( 'ini_set failed - there may be problems using the PEAR classes.', 1);
-    }
-}
-
-
-/**

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 13:46:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 13:46:55 -0500
Subject: [geeklog-cvs] tools: Don't need the PHP_Compat package any more
Message-ID: <hg.c8968b9f3449.1235242015.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c8968b9f3449
changeset: 23:c8968b9f3449
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 17:09:21 2009 +0100
description:
Don't need the PHP_Compat package any more

diffstat:

1 file changed, 2 insertions(+)
ship/mkdist.sh |    2 ++

diffs (12 lines):

diff -r a1a5eac24259 -r c8968b9f3449 ship/mkdist.sh
--- a/ship/mkdist.sh	Sun Feb 08 19:50:21 2009 +0100
+++ b/ship/mkdist.sh	Sat Feb 21 17:09:21 2009 +0100
@@ -42,6 +42,8 @@
 mv $repository $NEWVERSION
 
 cp -r -p ../pear-1.3/pear/* $NEWVERSION/system/pear/
+# remove PHP_Compat package
+rm -rf $NEWVERSION/system/pear/PHP
 
 cd $NEWVERSION
 

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 13:46:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 13:46:55 -0500
Subject: [geeklog-cvs] tools: Added support for install script language
	files and updat...
Message-ID: <hg.d1819f2e9466.1235242015.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d1819f2e9466
changeset: 24:d1819f2e9466
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 19:43:00 2009 +0100
description:
Added support for install script language files and updated for Geeklog 1.6

diffstat:

5 files changed, 165 insertions(+), 20 deletions(-)
lm/README              |    5 +-
lm/include/core.inc    |   10 ++--
lm/include/install.inc |  118 ++++++++++++++++++++++++++++++++++++++++++++++++
lm/lm.php              |   28 +++++++++--
lm/uplng.sh            |   24 ++++++---

diffs (truncated from 340 to 300 lines):

diff -r c8968b9f3449 -r d1819f2e9466 lm/README
--- a/lm/README	Sat Feb 21 17:09:21 2009 +0100
+++ b/lm/README	Sat Feb 21 19:43:00 2009 +0100
@@ -1,4 +1,4 @@
-lm.php v1.0.1
+lm.php v1.0.2
 
 This script merges a Geeklog (foreign) language file with the english.php
 language file, so that new strings added to english.php are automatically added
@@ -44,7 +44,7 @@
 
     http://lists.geeklog.net/mailman/listinfo/geeklog-translations
 
-Copyright (C) 2004-2008 by Dirk Haun, <dirk AT haun-online DOT de>,
+Copyright (C) 2004-2009 by Dirk Haun, <dirk AT haun-online DOT de>,
 and released under the GNU General Public License v2.
 
 
@@ -60,4 +60,5 @@
 0.9   moved updating code into includes; now supports plugins
 1.0   now supports core language files and all 5 default plugins
 1.0.1 fixed handling of <br> tags and fixed accidentally created <brXHTML> tags
+1.0.2 added support for install script language files
 
diff -r c8968b9f3449 -r d1819f2e9466 lm/include/core.inc
--- a/lm/include/core.inc	Sat Feb 21 17:09:21 2009 +0100
+++ b/lm/include/core.inc	Sat Feb 21 19:43:00 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | core.inc                                                                  |
 // |                                                                           |
 // | Update a core language file by merging it with english.php                |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Author:  Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -28,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: core.inc,v 1.3 2008/05/02 15:18:20 dhaun Exp $
 
 /**
 * Helper function: Fix URLs in some language files
@@ -151,6 +149,10 @@
 separator();
 echo "\n";
 
+// http://project.geeklog.net/tracking/view.php?id=801
+$ENG01[95]  = str_replace('Powered By', 'Powered by', $ENG01[95]);
+$LANG01[95] = str_replace('Powered By', 'Powered by', $LANG01[95]);
+
 mergeArrays($ENG01, $LANG01, 'LANG01', 'lib-common.php');
 mergeArrays($ENG03, $LANG03, 'LANG03', 'comment.php');
 mergeArrays($ENG04, $LANG04, 'LANG04', 'users.php');
diff -r c8968b9f3449 -r d1819f2e9466 lm/include/install.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lm/include/install.inc	Sat Feb 21 19:43:00 2009 +0100
@@ -0,0 +1,118 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | install.inc                                                               |
+// |                                                                           |
+// | Update a language file for the install script                             |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Author:  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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+// save the english text strings
+$ENG_INSTALL = $LANG_INSTALL;
+$ENG_SUCCESS = $LANG_SUCCESS;
+$ENG_MIGRATE = $LANG_MIGRATE;
+$ENG_PLUGINS = $LANG_PLUGINS;
+$ENG_BIGDUMP = $LANG_BIGDUMP;
+$ENG_ERROR = $LANG_ERROR;
+$ENG_HELP = $LANG_HELP;
+
+// now load the language file we want to update
+require_once $langfile;
+
+echo "\n";
+separatorThin();
+echo "\n";
+echo '$LANG_CHARSET = \'' . $LANG_CHARSET . "';\n";
+if (!empty($LANG_DIRECTION) && ($LANG_DIRECTION != 'ltr')) {
+    echo '$LANG_DIRECTION = \'' . $LANG_DIRECTION . "';\n";
+}
+echo "\n";
+
+separatorThin();
+echo "// | Array Format:                                                             |\n";
+echo "// | \$LANG_NAME[XX]: \$LANG - variable name                                     |\n";
+echo "// |                 NAME  - where array is used                               |\n";
+echo "// |                 XX    - phrase id number                                  |\n";
+separatorThin();
+echo "\n";
+
+separatorThin();
+echo "// install.php\n";
+mergeArrays($ENG_INSTALL, $LANG_INSTALL, 'LANG_INSTALL', false);
+echo "\n";
+
+separatorThin();
+echo "// success.php\n";
+mergeArrays($ENG_SUCCESS, $LANG_SUCCESS, 'LANG_SUCCESS', false);
+echo "\n";
+
+separatorThin();
+echo "// migrate.php\n";
+mergeArrays($ENG_MIGRATE, $LANG_MIGRATE, 'LANG_MIGRATE', false);
+echo "\n";
+
+separatorThin();
+echo "// install-plugins.php\n";
+mergeArrays($ENG_PLUGINS, $LANG_PLUGINS, 'LANG_PLUGINS', false);
+echo "\n";
+
+separatorThin();
+echo "// bigdump.php\n";
+mergeArrays($ENG_BIGDUMP, $LANG_BIGDUMP, 'LANG_BIGDUMP', false);
+echo "\n";
+
+separatorThin();
+echo "// Error Messages\n";
+mergeArrays($ENG_ERROR, $LANG_ERROR, 'LANG_ERROR', false);
+echo "\n";
+
+separatorThin();
+echo "// help.php\n";
+mergeArrays($ENG_HELP, $LANG_HELP, 'LANG_HELP', false);
+
+// hard-code this here (for now)
+$label = '
+// which texts to use as labels, so they don\'t have to be translated again
+$LANG_LABEL = array(
+    \'site_name\'      => $LANG_INSTALL[32],
+    \'site_slogan\'    => $LANG_INSTALL[33],
+    \'db_type\'        => $LANG_INSTALL[34],
+    \'db_host\'        => $LANG_INSTALL[39],
+    \'db_name\'        => $LANG_INSTALL[40],
+    \'db_user\'        => $LANG_INSTALL[41],
+    \'db_pass\'        => $LANG_INSTALL[42],
+    \'db_prefix\'      => $LANG_INSTALL[43],
+    \'site_url\'       => $LANG_INSTALL[45],
+    \'site_admin_url\' => $LANG_INSTALL[47],
+    \'site_mail\'      => $LANG_INSTALL[48],
+    \'noreply_mail\'   => $LANG_INSTALL[49],
+    \'utf8\'           => $LANG_INSTALL[92],
+    \'migrate_file\'   => $LANG_MIGRATE[6],
+    \'plugin_upload\'  => $LANG_PLUGINS[10]
+);';
+
+echo "$label\n";
+
+?>
diff -r c8968b9f3449 -r d1819f2e9466 lm/lm.php
--- a/lm/lm.php	Sat Feb 21 17:09:21 2009 +0100
+++ b/lm/lm.php	Sat Feb 21 19:43:00 2009 +0100
@@ -3,13 +3,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | lm.php                                                                    |
 // |                                                                           |
 // | Update a language file by merging it with english.php                     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Author:  Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -29,10 +29,8 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lm.php,v 1.7 2008/05/06 18:24:35 dhaun Exp $
 
-$VERSION = '1.0.1';
+$VERSION = '1.0.2';
 
 // Prevent PHP from reporting uninitialized variables
 error_reporting( E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR );
@@ -91,6 +89,8 @@
 // load the English language file
 if (empty($module)) {
     require_once 'language/english.php';
+} elseif ($module == 'install') {
+    require_once 'public_html/admin/install/language/english.php';
 } else {
     require_once 'plugins/' . $module . '/language/english.php';
 }
@@ -106,6 +106,11 @@
 function separator()
 {
     echo "###############################################################################\n";
+}
+
+function separatorThin()
+{
+    echo "// +---------------------------------------------------------------------------+\n";
 }
 
 /**
@@ -333,6 +338,15 @@
                 } elseif (strstr($line, '*/') !== false) {
                     // end of credits reached, Spam-X style
                     break;
+                } elseif (strstr($line, '+-----') !== false) {
+                    $nextline = fgets($fh);
+                    $tst = trim($nextline);
+                    if (empty($tst)) {
+                        // end of credits reached, install script style
+                        break;
+                    } else {
+                        $credits[] = $nextline;
+                    }
                 }
             } else {
                 if (strstr ($line, '#####') !== false) {
@@ -341,6 +355,10 @@
                     $credits[] = $line;
                 } elseif (strstr($line, '/**') !== false) {
                     // start of credits, Spam-X style
+                    $firstcomment = true;
+                    $credits[] = $line;
+                } elseif (strstr($line, '/* Reminder:') !== false) {
+                    // start of credits, install script style
                     $firstcomment = true;
                     $credits[] = $line;
                 }
diff -r c8968b9f3449 -r d1819f2e9466 lm/uplng.sh
--- a/lm/uplng.sh	Sat Feb 21 17:09:21 2009 +0100
+++ b/lm/uplng.sh	Sat Feb 21 19:43:00 2009 +0100
@@ -1,13 +1,13 @@
 #!/bin/bash
 # +---------------------------------------------------------------------------+
-# | Geeklog 1.5                                                               |
+# | Geeklog 1.6                                                               |
 # +---------------------------------------------------------------------------+
 # | uplng.sh                                                                  |
 # |                                                                           |
 # | Helper script to update the Geeklog language files,                       |
 # | using the lm.php script.                                                  |
 # +---------------------------------------------------------------------------+
-# | Copyright (C) 2004-2008 by the following authors:                         |
+# | Copyright (C) 2004-2009 by the following authors:                         |
 # |                                                                           |
 # | Author:  Dirk Haun         - dirk AT haun-online DOT de                   |
 # +---------------------------------------------------------------------------+
@@ -27,8 +27,6 @@
 # | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 # |                                                                           |
 # +---------------------------------------------------------------------------+
-#
-# $Id: uplng.sh,v 1.8 2008/04/29 18:47:45 dhaun Exp $
 
 # Installation and usage:
 # - copy this script into the /path/to/geeklog of a local Geeklog install
@@ -40,14 +38,14 @@
 # just a basedir to save some typing ...
 basedir=/Users/dirk/darwin
 
-# the /path/to/geeklog of your local copy of the CVS repository
-cvspath=$basedir/cvs.geeklog.net/Geeklog-1.x
+# the /path/to/geeklog of your local copy of the Mercurial repository
+cvspath=$basedir/hg.geeklog.net/geeklog/geeklog

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 13:52:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 13:52:20 -0500
Subject: [geeklog-cvs] geeklog: Updated language files (test run for the
	updated 'lm' s...
Message-ID: <hg.ba2231f87362.1235242340.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ba2231f87362
changeset: 6791:ba2231f87362
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 19:52:03 2009 +0100
description:
Updated language files (test run for the updated 'lm' script)

diffstat:

118 files changed, 5310 insertions(+), 2269 deletions(-)
language/afrikaans.php                                           |   88 -
language/afrikaans_utf-8.php                                     |   88 -
language/bosnian.php                                             |   88 -
language/bosnian_utf-8.php                                       |   88 -
language/bulgarian.php                                           |   90 -
language/bulgarian_utf-8.php                                     |   90 -
language/catalan.php                                             |   88 -
language/catalan_utf-8.php                                       |   88 -
language/chinese_simplified_utf-8.php                            |   88 -
language/chinese_traditional_utf-8.php                           |   88 -
language/croatian.php                                            |   88 -
language/croatian_utf-8.php                                      |   88 -
language/czech.php                                               |   88 -
language/czech_utf-8.php                                         |   88 -
language/danish.php                                              |   88 -
language/danish_utf-8.php                                        |   88 -
language/dutch.php                                               |   88 -
language/dutch_utf-8.php                                         |   88 -
language/english.php                                             |    2 
language/english_utf-8.php                                       |    2 
language/estonian.php                                            |  113 -
language/estonian_utf-8.php                                      |  113 -
language/farsi_utf-8.php                                         |   88 -
language/finnish.php                                             |   88 -
language/finnish_utf-8.php                                       |   88 -
language/french_canada.php                                       |   88 -
language/french_canada_utf-8.php                                 |   88 -
language/french_france.php                                       |   88 -
language/french_france_utf-8.php                                 |   88 -
language/german.php                                              |   61 
language/german_formal.php                                       |   61 
language/german_formal_utf-8.php                                 |   61 
language/german_utf-8.php                                        |   61 
language/hebrew_utf-8.php                                        |   94 -
language/hellenic.php                                            |   88 -
language/hellenic_utf-8.php                                      |   88 -
language/indonesian.php                                          |   88 -
language/indonesian_utf-8.php                                    |   88 -
language/italian.php                                             |   90 -
language/italian_utf-8.php                                       |   90 -
language/japanese_utf-8.php                                      |  830 +++++-----
language/korean.php                                              |   88 -
language/korean_utf-8.php                                        |   88 -
language/norwegian.php                                           |   88 -
language/norwegian_utf-8.php                                     |   88 -
language/polish.php                                              |   90 -
language/polish_utf-8.php                                        |   90 -
language/portuguese.php                                          |   88 -
language/portuguese_brazil.php                                   |   88 -
language/portuguese_brazil_utf-8.php                             |   88 -
language/portuguese_utf-8.php                                    |   88 -
language/romanian.php                                            |   90 -
language/romanian_utf-8.php                                      |   90 -
language/russian.php                                             |   88 -
language/russian_utf-8.php                                       |   88 -
language/slovak.php                                              |   88 -
language/slovak_utf-8.php                                        |   88 -
language/slovenian.php                                           |   92 -
language/slovenian_utf-8.php                                     |   94 -
language/spanish.php                                             |   88 -
language/spanish_argentina.php                                   |   90 -
language/spanish_argentina_utf-8.php                             |   90 -
language/spanish_utf-8.php                                       |   88 -
language/swedish.php                                             |   90 -
language/swedish_utf-8.php                                       |   90 -
language/turkish.php                                             |   90 -
language/turkish_utf-8.php                                       |   90 -
language/ukrainian.php                                           |   88 -
language/ukrainian_koi8-u.php                                    |   88 -
language/ukrainian_utf-8.php                                     |   88 -
plugins/calendar/language/estonian.php                           |    2 
plugins/calendar/language/estonian_utf-8.php                     |    2 
plugins/calendar/language/japanese_utf-8.php                     |   23 
plugins/links/language/chinese_simplified_utf-8.php              |    7 
plugins/links/language/chinese_traditional_utf-8.php             |    7 
plugins/links/language/czech.php                                 |    7 
plugins/links/language/czech_utf-8.php                           |    7 
plugins/links/language/dutch.php                                 |    7 
plugins/links/language/dutch_utf-8.php                           |    7 
plugins/links/language/estonian.php                              |    9 
plugins/links/language/estonian_utf-8.php                        |    9 
plugins/links/language/french_canada.php                         |    7 
plugins/links/language/french_canada_utf-8.php                   |    7 
plugins/links/language/german.php                                |    8 
plugins/links/language/german_formal.php                         |    8 
plugins/links/language/german_formal_utf-8.php                   |    8 
plugins/links/language/german_utf-8.php                          |    8 
plugins/links/language/hebrew_utf-8.php                          |   78 
plugins/links/language/japanese_utf-8.php                        |  164 -
plugins/links/language/korean.php                                |    7 
plugins/links/language/korean_utf-8.php                          |    7 
plugins/links/language/polish.php                                |    7 
plugins/links/language/polish_utf-8.php                          |    7 
plugins/links/language/russian.php                               |    7 
plugins/links/language/russian_utf-8.php                         |    7 
plugins/links/language/slovenian.php                             |    9 
plugins/links/language/slovenian_utf-8.php                       |    7 
plugins/links/language/spanish.php                               |    7 
plugins/links/language/spanish_utf-8.php                         |    7 
plugins/links/language/ukrainian.php                             |    7 
plugins/links/language/ukrainian_koi8-u.php                      |    7 
plugins/links/language/ukrainian_utf-8.php                       |    7 
plugins/polls/language/estonian.php                              |    4 
plugins/polls/language/estonian_utf-8.php                        |    4 
plugins/polls/language/hebrew_utf-8.php                          |   56 
plugins/polls/language/japanese_utf-8.php                        |   62 
plugins/polls/language/slovenian.php                             |    2 
plugins/spamx/language/estonian.php                              |    5 
plugins/spamx/language/estonian_utf-8.php                        |    5 
plugins/spamx/language/japanese_utf-8.php                        |   37 
plugins/staticpages/language/japanese_utf-8.php                  |   13 
public_html/admin/install/language/chinese_simplified_utf-8.php  |   35 
public_html/admin/install/language/chinese_traditional_utf-8.php |   35 
public_html/admin/install/language/english.php                   |    2 
public_html/admin/install/language/german.php                    |   26 
public_html/admin/install/language/hebrew_utf-8.php              |   35 
public_html/admin/install/language/japanese_utf-8.php            |   39 
public_html/admin/install/language/polish.php                    |   35 

diffs (truncated from 15534 to 300 lines):

diff -r 93f182e7807e -r ba2231f87362 language/afrikaans.php
--- a/language/afrikaans.php	Sat Feb 21 16:46:34 2009 +0100
+++ b/language/afrikaans.php	Sat Feb 21 19:52:03 2009 +0100
@@ -363,7 +363,10 @@
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
-    159 => 'This email was generated automatically. Please do not reply to this email.'
+    159 => 'This email was generated automatically. Please do not reply to this email.',
+    160 => '(max. %d x %d pixels, %d bytes; %s)',
+    161 => 'will be scaled down',
+    162 => 'will not be scaled'
 );
 
 ###############################################################################
@@ -498,7 +501,14 @@
     58 => 'Meer resultate &gt;&gt;',
     59 => 'Resultate',
     60 => 'per bladsy',
-    61 => 'Verfyn soektog'
+    61 => 'Verfyn soektog',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -919,7 +929,9 @@
     82 => "Your account on {$_CONF['site_name']} has not been accesssed since %s and will be disabled if not accessed in the 30 days.",
     83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will deleted soon if not accessed.",
     84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
-    85 => 'If you have forgotten the password use the following link: %s'
+    85 => 'If you have forgotten the password use the following link: %s',
+    86 => 'Include',
+    87 => 'Reminders'
 );
 
 ###############################################################################
@@ -1021,7 +1033,20 @@
     35 => 'Wysig',
     36 => 'Kode',
     37 => 'Data',
-    38 => 'Opdateer!'
+    38 => 'Opdateer!',
+    39 => 'Upload a plugin',
+    40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
+    41 => 'Upload',
+    99 => 'An unknown error occured',
+    100 => 'Ok.',
+    101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
+    102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
+    103 => 'The uploaded file was only partially uploaded.',
+    104 => 'No file was uploaded.',
+    105 => '(undefined error)',
+    106 => 'Missing a temporary folder.',
+    107 => 'Failed to write file to disk.',
+    108 => 'File upload stopped by extension.'
 );
 
 ###############################################################################
@@ -1112,24 +1137,24 @@
     26 => '',
     27 => 'Boodskap suksesvol gestuur.',
     28 => 'Die proppie is suksesvol gestoor',
-    29 => '',
+    29 => 'Sorry, you do not have access to this administration page.  Please note that all attempts to access unauthorized features are logged',
     30 => 'Toegang geweier',
-    31 => 'Jammer, u het nie toegang tot die artikel adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    32 => 'Jammer, u het nie toegang tot die onderwerp adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    33 => 'Jammer, u het nie toegang tot die blok adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    31 => '',
+    32 => '',
+    33 => '',
     34 => '',
     35 => '',
     36 => '',
-    37 => 'Jammer, u het nie toegang tot die gebruiker adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    38 => 'Jammer, u het nie toegang tot die prop adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    39 => 'Jammer, u het nie toegang tot die epos adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    37 => '',
+    38 => '',
+    39 => '',
     40 => 'Stelselboodskap',
-    41 => 'Jammer, u het nie toegang to die woordvervangingsblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    42 => 'U woord is suksesvol gestoor.',
-    43 => 'Die woord is suksesvol verwyder.',
+    41 => '',
+    42 => '',
+    43 => '',
     44 => 'Die prop is suksesvol gestoor!',
     45 => 'Die prop is suksesvol verwyder.',
-    46 => 'Jammer, u het nie toegang tot die databasis rugsteunfunksie nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    46 => '',
     47 => 'Hierdie funksie werk slegs onder *nix stelsels.  Indien u wel \'n *nix bedryfstelsel gebruik is u kasgeheue suksesvol skoongevee. As u op Windows werk, moet u na l&ecirc;ers soek met die naam adodb_*.php en hulle handmatig verwyder.',
     48 => "Dankie vir u aansoek vir lidmaatskap tot {$_CONF['site_name']}. Ons span sal u aansoek nagaan.  Indien goedgekeur, sal u wagwoord gestuur word aan die epos adres wat u verskaf het.",
     49 => 'U groep is suksesvol gestoor.',
@@ -1179,8 +1204,14 @@
     93 => 'Database back up was successful.',
     94 => 'Backup Failed: Filesize less than 1kb',
     95 => 'There was an error.',
-    96 => 'Sorry, you do not have access to the configuration administration page.  Please note that all attempts to access unauthorized features are logged.',
-    97 => 'Not all required fields have been passed validation - default custom membership message'
+    96 => '',
+    97 => '',
+    98 => 'The plugin was successfully uploaded.',
+    99 => 'The plugin already exists.',
+    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
+    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.',
+    400 => 'Not all required fields have been passed validation',
+    401 => 'Please enter Fullname'
 );
 
 ###############################################################################
@@ -1583,7 +1614,8 @@
     'reset_form' => 'Reset Form',
     'changes_made' => 'Changes were successfully made to',
     'title' => 'Configuration Manager',
-    'disable' => 'Click to disable this option'
+    'disable' => 'Click to disable this option',
+    'enable' => 'Enable'
 );
 
 $LANG_configsections['Core'] = array(
@@ -1611,6 +1643,7 @@
     'allow_mysqldump' => 'Allow MySQL Dump',
     'mysqldump_path' => 'Path of Executable',
     'mysqldump_options' => 'MySQL Dump Options',
+    'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => 'Theme',
     'menu_elements' => 'Menu Elements',
     'path_themes' => 'Themes Path',
@@ -1741,6 +1774,7 @@
     'debug_image_upload' => 'Debug Image Uploading?',
     'keep_unscaled_image' => 'Keep Unscaled Image?',
     'allow_user_scaling' => 'Allow User Scaling?',
+    'jpeg_quality' => 'JPEG Quality?',
     'max_image_width' => 'Max Image Width?',
     'max_image_height' => 'Max Image Height?',
     'max_image_size' => 'Max Image Size?',
@@ -1763,6 +1797,7 @@
     'login_speedlimit' => 'Login Speed Limit',
     'user_html' => 'User HTML',
     'admin_html' => 'Admin HTML',
+    'advanced_html' => 'Additional HTML for Adv. Editor',
     'skip_html_filter_for_root' => 'Skip HTML Filter for Root?',
     'allowed_protocols' => 'Allowed Protocols',
     'disable_autolinks' => 'Disable Autolinks?',
@@ -1776,7 +1811,18 @@
     'default_permissions_topic' => 'Topic Default Permissions',
     'atom_max_stories' => 'Max. Stories in Webservices Feed',
     'disable_webservices' => 'Disable Webservices?',
-    'restrict_webservices' => 'Restrict Webservices?'
+    'restrict_webservices' => 'Restrict Webservices?',
+    'search_style' => 'Results List Style',
+    'search_limits' => 'Page Limits',
+    'search_show_num' => 'Show Result Number?',
+    'search_show_type' => 'Show Result Type?',
+    'search_show_user' => 'Show Author?',
+    'search_show_hits' => 'Show Number of Hits?',
+    'search_show_sort' => 'Allow User to Sort Results?',
+    'search_show_limit' => 'Show Page Limits?',
+    'search_no_data' => 'If No Data is Avaliable, Display',
+    'search_separator' => 'Group Separator',
+    'search_def_keytype' => 'Default Search Method'
 );
 
 $LANG_configsubgroups['Core'] = array(
@@ -1853,7 +1899,9 @@
     15 => array('By Number' => 'sortnum', 'Alphabetically' => 'alpha'),
     16 => array('No Login required' => 0, 'Advanced Search only' => 1, 'Simple + Advanced Search' => 2),
     17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
-    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3)
+    18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
+    19 => array('Google' => 'google', 'Table' => 'table'),
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
 ?>
\ No newline at end of file
diff -r 93f182e7807e -r ba2231f87362 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sat Feb 21 16:46:34 2009 +0100
+++ b/language/afrikaans_utf-8.php	Sat Feb 21 19:52:03 2009 +0100
@@ -363,7 +363,10 @@
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
-    159 => 'This email was generated automatically. Please do not reply to this email.'
+    159 => 'This email was generated automatically. Please do not reply to this email.',
+    160 => '(max. %d x %d pixels, %d bytes; %s)',
+    161 => 'will be scaled down',
+    162 => 'will not be scaled'
 );
 
 ###############################################################################
@@ -498,7 +501,14 @@
     58 => 'Meer resultate &gt;&gt;',
     59 => 'Resultate',
     60 => 'per bladsy',
-    61 => 'Verfyn soektog'
+    61 => 'Verfyn soektog',
+    62 => '#',
+    63 => 'Description',
+    64 => 'Showing %d - %d of %d results',
+    65 => 'Story',
+    66 => 'Comment',
+    67 => 'Show %d Results',
+    68 => 'Sort By'
 );
 
 ###############################################################################
@@ -919,7 +929,9 @@
     82 => "Your account on {$_CONF['site_name']} has not been accesssed since %s and will be disabled if not accessed in the 30 days.",
     83 => "Your account on {$_CONF['site_name']} has not been used since it was created and will deleted soon if not accessed.",
     84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
-    85 => 'If you have forgotten the password use the following link: %s'
+    85 => 'If you have forgotten the password use the following link: %s',
+    86 => 'Include',
+    87 => 'Reminders'
 );
 
 ###############################################################################
@@ -1021,7 +1033,20 @@
     35 => 'Wysig',
     36 => 'Kode',
     37 => 'Data',
-    38 => 'Opdateer!'
+    38 => 'Opdateer!',
+    39 => 'Upload a plugin',
+    40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
+    41 => 'Upload',
+    99 => 'An unknown error occured',
+    100 => 'Ok.',
+    101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
+    102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
+    103 => 'The uploaded file was only partially uploaded.',
+    104 => 'No file was uploaded.',
+    105 => '(undefined error)',
+    106 => 'Missing a temporary folder.',
+    107 => 'Failed to write file to disk.',
+    108 => 'File upload stopped by extension.'
 );
 
 ###############################################################################
@@ -1112,24 +1137,24 @@
     26 => '',
     27 => 'Boodskap suksesvol gestuur.',
     28 => 'Die proppie is suksesvol gestoor',
-    29 => '',
+    29 => 'Sorry, you do not have access to this administration page.  Please note that all attempts to access unauthorized features are logged',
     30 => 'Toegang geweier',
-    31 => 'Jammer, u het nie toegang tot die artikel adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    32 => 'Jammer, u het nie toegang tot die onderwerp adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    33 => 'Jammer, u het nie toegang tot die blok adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    31 => '',
+    32 => '',
+    33 => '',
     34 => '',
     35 => '',
     36 => '',
-    37 => 'Jammer, u het nie toegang tot die gebruiker adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    38 => 'Jammer, u het nie toegang tot die prop adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    39 => 'Jammer, u het nie toegang tot die epos adminblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    37 => '',
+    38 => '',
+    39 => '',
     40 => 'Stelselboodskap',
-    41 => 'Jammer, u het nie toegang to die woordvervangingsblad nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
-    42 => 'U woord is suksesvol gestoor.',
-    43 => 'Die woord is suksesvol verwyder.',
+    41 => '',
+    42 => '',
+    43 => '',
     44 => 'Die prop is suksesvol gestoor!',
     45 => 'Die prop is suksesvol verwyder.',
-    46 => 'Jammer, u het nie toegang tot die databasis rugsteunfunksie nie.  Neem kennis dat alle pogings tot ongemagtigde toegang aangeteken word',
+    46 => '',
     47 => 'Hierdie funksie werk slegs onder *nix stelsels.  Indien u wel \'n *nix bedryfstelsel gebruik is u kasgeheue suksesvol skoongevee. As u op Windows werk, moet u na l&ecirc;ers soek met die naam adodb_*.php en hulle handmatig verwyder.',
     48 => "Dankie vir u aansoek vir lidmaatskap tot {$_CONF['site_name']}. Ons span sal u aansoek nagaan.  Indien goedgekeur, sal u wagwoord gestuur word aan die epos adres wat u verskaf het.",
     49 => 'U groep is suksesvol gestoor.',
@@ -1179,8 +1204,14 @@
     93 => 'Database back up was successful.',
     94 => 'Backup Failed: Filesize less than 1kb',
     95 => 'There was an error.',
-    96 => 'Sorry, you do not have access to the configuration administration page.  Please note that all attempts to access unauthorized features are logged.',
-    97 => 'Not all required fields have been passed validation - default custom membership message'
+    96 => '',
+    97 => '',
+    98 => 'The plugin was successfully uploaded.',
+    99 => 'The plugin already exists.',
+    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
+    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.',
+    400 => 'Not all required fields have been passed validation',
+    401 => 'Please enter Fullname'
 );
 
 ###############################################################################

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 17:03:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 17:03:35 -0500
Subject: [geeklog-cvs] geeklog: Added new permission 'group.assign',
	now required to be...
Message-ID: <hg.10dfb994ef83.1235253815.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/10dfb994ef83
changeset: 6793:10dfb994ef83
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 22:58:23 2009 +0100
description:
Added new permission 'group.assign', now required to be able to assign a user to a group (feature request #0000190)

diffstat:

7 files changed, 64 insertions(+), 37 deletions(-)
public_html/admin/install/lib-upgrade.php |    2 -
public_html/admin/user.php                |   48 ++++++++++++++---------------
public_html/docs/history                  |    3 +
sql/mssql_tableanddata.php                |    2 +
sql/mysql_tableanddata.php                |    2 +
sql/updates/mssql_1.5.2_to_1.6.0.php      |   22 +++++++++----
sql/updates/mysql_1.5.2_to_1.6.0.php      |   22 +++++++++----

diffs (254 lines):

diff -r b4dc97200076 -r 10dfb994ef83 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php	Sat Feb 21 22:58:23 2009 +0100
@@ -464,7 +464,7 @@
             INST_updateDB($_SQL);
 
             update_ConfValues();
-            upgrade_addPluginPermissions();
+            upgrade_addNewPermissions();
             upgrade_addIsoFormat();
 
             $current_gl_version = '1.6.0';
diff -r b4dc97200076 -r 10dfb994ef83 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/public_html/admin/user.php	Sat Feb 21 22:58:23 2009 +0100
@@ -246,7 +246,7 @@
         }
     }
 
-    if (SEC_hasRights('group.edit')) {
+    if (SEC_hasRights('group.assign')) {
         $user_templates->set_var('lang_securitygroups',
                                  $LANG_ACCESS['securitygroups']);
         $user_templates->set_var('lang_groupinstructions',
@@ -543,23 +543,23 @@
             $userChanged = true;
         }
 
-        // if groups is -1 then this user isn't allowed to change any groups so ignore
-        if (is_array ($groups) && SEC_inGroup ('Group Admin')) {
-            if (!SEC_inGroup ('Root')) {
-                $rootgrp = DB_getItem ($_TABLES['groups'], 'grp_id',
-                                       "grp_name = 'Root'");
-                if (in_array ($rootgrp, $groups)) {
-                    COM_accessLog ("User {$_USER['username']} ({$_USER['uid']}) just tried to give Root permissions to user $username.");
-                    echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
+        // check that the user is allowed to change group assignments
+        if (is_array($groups) && SEC_hasRights('group.assign')) {
+            if (! SEC_inGroup('Root')) {
+                $rootgrp = DB_getItem($_TABLES['groups'], 'grp_id',
+                                      "grp_name = 'Root'");
+                if (in_array($rootgrp, $groups)) {
+                    COM_accessLog("User {$_USER['username']} ({$_USER['uid']}) just tried to give Root permissions to user $username.");
+                    echo COM_refresh($_CONF['site_admin_url'] . '/index.php');
                     exit;
                 }
             }
 
             // make sure the Remote Users group is in $groups
-            if (SEC_inGroup ('Remote Users', $uid)) {
-                $remUsers = DB_getItem ($_TABLES['groups'], 'grp_id',
-                                        "grp_name = 'Remote Users'");
-                if (!in_array ($remUsers, $groups)) {
+            if (SEC_inGroup('Remote Users', $uid)) {
+                $remUsers = DB_getItem($_TABLES['groups'], 'grp_id',
+                                       "grp_name = 'Remote Users'");
+                if (! in_array($remUsers, $groups)) {
                     $groups[] = $remUsers;
                 }
             }
@@ -569,31 +569,31 @@
             }
 
             // remove user from all groups that the User Admin is a member of
-            $UserAdminGroups = SEC_getUserGroups ();
+            $UserAdminGroups = SEC_getUserGroups();
             $whereGroup = 'ug_main_grp_id IN ('
                         . implode (',', $UserAdminGroups) . ')';
             DB_query("DELETE FROM {$_TABLES['group_assignments']} WHERE (ug_uid = $uid) AND " . $whereGroup);
 
             // make sure to add user to All Users and Logged-in Users groups
-            $allUsers = DB_getItem ($_TABLES['groups'], 'grp_id',
-                                    "grp_name = 'All Users'");
-            if (!in_array ($allUsers, $groups)) {
+            $allUsers = DB_getItem($_TABLES['groups'], 'grp_id',
+                                   "grp_name = 'All Users'");
+            if (! in_array($allUsers, $groups)) {
                 $groups[] = $allUsers;
             }
-            $logUsers = DB_getItem ($_TABLES['groups'], 'grp_id',
-                                    "grp_name = 'Logged-in Users'");
-            if (!in_array ($logUsers, $groups)) {
+            $logUsers = DB_getItem($_TABLES['groups'], 'grp_id',
+                                   "grp_name = 'Logged-in Users'");
+            if (! in_array($logUsers, $groups)) {
                 $groups[] = $logUsers;
             }
 
             foreach ($groups as $userGroup) {
-                if (in_array ($userGroup, $UserAdminGroups)) {
+                if (in_array($userGroup, $UserAdminGroups)) {
                     if ($_USER_VERBOSE) {
-                        COM_errorLog ("adding group_assignment " . $userGroup
-                                      . " for $username", 1);
+                        COM_errorLog("adding group_assignment " . $userGroup
+                                     . " for $username", 1);
                     }
                     $sql = "INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid) VALUES ($userGroup, $uid)";
-                    DB_query ($sql);
+                    DB_query($sql);
                 }
             }
         }
diff -r b4dc97200076 -r 10dfb994ef83 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 21 22:41:54 2009 +0100
+++ b/public_html/docs/history	Sat Feb 21 22:58:23 2009 +0100
@@ -11,6 +11,9 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Added new permission 'group.assign', now required to be able to assign a user
+  to a group. Part of the Group Admin (not User Admin) permissions by default
+  (feature request #0000190) [Dirk]
 - Raised minimum required PHP version to PHP 4.3.0 and removed all workarounds
   that ensured compatibility with PHP 4.1.0 [Dirk]
 - Added a filename mask config option for the names of the database backups
diff -r b4dc97200076 -r 10dfb994ef83 sql/mssql_tableanddata.php
--- a/sql/mssql_tableanddata.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/sql/mssql_tableanddata.php	Sat Feb 21 22:58:23 2009 +0100
@@ -1180,6 +1180,7 @@
 $_SQL[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (16,4)";
 $_SQL[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (17,10)";
 $_SQL[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (18,10)";
+$_SQL[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (19,11)";
 
 $_SQL[] = "
 set identity_insert {$_TABLES['blocks']} on;
@@ -1263,6 +1264,7 @@
 INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (16,'block.delete','Ability to delete a block',1)
 INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (17,'plugin.install','Can install/uninstall plugins',1)
 INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (18,'plugin.upload','Can upload new plugins',1)
+INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (19,'group.assign','Ability to assign users to groups',1)
 
 set identity_insert {$_TABLES['features']} off
 ";
diff -r b4dc97200076 -r 10dfb994ef83 sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/sql/mysql_tableanddata.php	Sat Feb 21 22:58:23 2009 +0100
@@ -508,6 +508,7 @@
 $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (16,4) ";
 $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (17,10) ";
 $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (18,10) ";
+$_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (19,11) ";
 
 $_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1,1,'user_block','gldefault','User Functions','all',2,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
 $_DATA[] = "INSERT INTO {$_TABLES['blocks']} (bid, is_enabled, name, type, title, tid, blockorder, content, rdfurl, rdfupdated, onleft, phpblockfn, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (2,1,'admin_block','gldefault','Admins Only','all',1,'','','0000-00-00 00:00:00',1,'',4,2,3,3,2,2) ";
@@ -575,6 +576,7 @@
 $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (16,'block.delete','Ability to delete a block',1) ";
 $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (17,'plugin.install','Can install/uninstall plugins',1) ";
 $_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (18,'plugin.upload','Can upload new plugins',1) ";
+$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core) VALUES (19,'group.assign','Ability to assign users to groups',1) ";
 
 $_DATA[] = "INSERT INTO {$_TABLES['frontpagecodes']} (code, name) VALUES (0,'Show Only in Topic') ";
 $_DATA[] = "INSERT INTO {$_TABLES['frontpagecodes']} (code, name) VALUES (1,'Show on Front Page') ";
diff -r b4dc97200076 -r 10dfb994ef83 sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Sat Feb 21 22:58:23 2009 +0100
@@ -7,6 +7,7 @@
 $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.install','Can install/uninstall plugins',1)";
 $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.upload','Can upload new plugins',1)";
 $_SQL[] = "UPDATE {$_TABLES['features']} SET ft_descr = 'Can change plugin status' WHERE ft_name = 'plugin.edit'";
+$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('group.assign','Ability to assign users to groups',1)";
 
 /**
  * Add new config options
@@ -55,10 +56,10 @@
 }
 
 /**
- * Add new plugin-related permissions to Plugin Admin group
+ * Add new permissions
  *
  */
-function upgrade_addPluginPermissions()
+function upgrade_addNewPermissions()
 {
     global $_TABLES;
 
@@ -66,12 +67,21 @@
                              "ft_name = 'plugin.install'");
     $upload_id = DB_getItem($_TABLES['features'], 'ft_id',
                             "ft_name = 'plugin.upload'");
-    $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+    $plg_id = DB_getItem($_TABLES['groups'], 'grp_id',
                          "grp_name = 'Plugin Admin'");
 
-    if (($grp_id > 0) && ($install_id > 0) && ($upload_id > 0)) {
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($install_id, $grp_id)");
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($upload_id, $grp_id)");
+    if (($plg_id > 0) && ($install_id > 0) && ($upload_id > 0)) {
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($install_id, $plg_id)");
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($upload_id, $plg_id)");
+    }
+
+    $assign_id = DB_getItem($_TABLES['features'], 'ft_id',
+                            "ft_name = 'group.assign'");
+    $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                         "grp_name = 'Group Admin'");
+
+    if (($grp_id > 0) && ($assign_id > 0)) {
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($assign_id, $grp_id)");
     }
 }
 
diff -r b4dc97200076 -r 10dfb994ef83 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Sat Feb 21 22:41:54 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Sat Feb 21 22:58:23 2009 +0100
@@ -8,6 +8,7 @@
 $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.install','Can install/uninstall plugins',1)";
 $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.upload','Can upload new plugins',1)";
 $_SQL[] = "UPDATE {$_TABLES['features']} SET ft_descr = 'Can change plugin status' WHERE ft_name = 'plugin.edit'";
+$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('group.assign','Ability to assign users to groups',1)";
 
 /**
  * Add new config options
@@ -56,10 +57,10 @@
 }
 
 /**
- * Add new plugin-related permissions to Plugin Admin group
+ * Add new permissions
  *
  */
-function upgrade_addPluginPermissions()
+function upgrade_addNewPermissions()
 {
     global $_TABLES;
 
@@ -67,12 +68,21 @@
                              "ft_name = 'plugin.install'");
     $upload_id = DB_getItem($_TABLES['features'], 'ft_id',
                             "ft_name = 'plugin.upload'");
-    $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+    $plg_id = DB_getItem($_TABLES['groups'], 'grp_id',
                          "grp_name = 'Plugin Admin'");
 
-    if (($grp_id > 0) && ($install_id > 0) && ($upload_id > 0)) {
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($install_id, $grp_id)");
-        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($upload_id, $grp_id)");
+    if (($plg_id > 0) && ($install_id > 0) && ($upload_id > 0)) {
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($install_id, $plg_id)");
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($upload_id, $plg_id)");
+    }
+
+    $assign_id = DB_getItem($_TABLES['features'], 'ft_id',
+                            "ft_name = 'group.assign'");
+    $grp_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                         "grp_name = 'Group Admin'");
+
+    if (($grp_id > 0) && ($assign_id > 0)) {
+        DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($assign_id, $grp_id)");
     }
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Feb 21 17:03:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Feb 2009 17:03:34 -0500
Subject: [geeklog-cvs] geeklog: Fixed assigning groups to groups
Message-ID: <hg.b4dc97200076.1235253814.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b4dc97200076
changeset: 6792:b4dc97200076
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 21 22:41:54 2009 +0100
description:
Fixed assigning groups to groups

diffstat:

1 file changed, 18 insertions(+), 20 deletions(-)
public_html/admin/group.php |   38 ++++++++++++++++++--------------------

diffs (66 lines):

diff -r ba2231f87362 -r b4dc97200076 public_html/admin/group.php
--- a/public_html/admin/group.php	Sat Feb 21 19:52:03 2009 +0100
+++ b/public_html/admin/group.php	Sat Feb 21 22:41:54 2009 +0100
@@ -466,8 +466,8 @@
     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $VERBOSE;
 
     $retval = '';
-    if (!empty ($grp_name) && !empty ($grp_descr)) {
-        $GroupAdminGroups = SEC_getUserGroups ();
+    if (!empty($grp_name) && !empty($grp_descr)) {
+        $GroupAdminGroups = SEC_getUserGroups();
         if (!empty ($grp_id) &&
             ($grp_id > 0) &&
             !in_array ($grp_id, $GroupAdminGroups) &&
@@ -537,19 +537,18 @@
         }
 
         // now save the features
-        DB_delete ($_TABLES['access'], 'acc_grp_id', $grp_id);
-        if (SEC_inGroup ('Root')) {
-            for ($i = 1; $i <= sizeof ($features); $i++) {
-                DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id,acc_grp_id) VALUES (" . current ($features) . ",$grp_id)");
-                next ($features);
+        DB_delete($_TABLES['access'], 'acc_grp_id', $grp_id);
+        $num_features = count($features);
+        if (SEC_inGroup('Root')) {
+            foreach ($features as $f) {
+                DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id,acc_grp_id) VALUES ($f,$grp_id)");
             }
         } else {
-            $GroupAdminFeatures = SEC_getUserPermissions ();
-            $availableFeatures = explode (',', $GroupAdminFeatures);
-            for ($i = 1; $i <= sizeof($features); $i++) {
-                if (in_array (current ($features), $availableFeatures)) {
-                    DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id,acc_grp_id) VALUES (" . current($features) . ",$grp_id)");
-                    next($features);
+            $GroupAdminFeatures = SEC_getUserPermissions();
+            $availableFeatures = explode(',', $GroupAdminFeatures);
+            foreach ($features as $f) {
+                if (in_array($f, $availableFeatures)) {
+                    DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id,acc_grp_id) VALUES ($f,$grp_id)");
                 }
             }
         }
@@ -558,15 +557,14 @@
             COM_errorLog("deleting all group_assignments for group $grp_id/$grp_name",1);
         }
 
-        DB_delete ($_TABLES['group_assignments'], 'ug_grp_id', $grp_id);
-        if (!empty ($groups)) {
-            for ($i = 1; $i <= sizeof ($groups); $i++) {
-                if (in_array ($grp_id, $GroupAdminGroups)) {
-                    if ($VERBOSE) COM_errorLog("adding group_assignment " . current($groups) . " for $grp_name",1);
-                    $sql = "INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_grp_id) VALUES (" . current($groups) . ",$grp_id)";
+        DB_delete($_TABLES['group_assignments'], 'ug_grp_id', $grp_id);
+        if (! empty($groups)) {
+            foreach ($groups as $g) {
+                if (in_array($g, $GroupAdminGroups)) {
+                    if ($VERBOSE) COM_errorLog("adding group_assignment $g for $grp_name",1);
+                    $sql = "INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_grp_id) VALUES ($g,$grp_id)";
                     DB_query($sql);
                 }
-                next($groups);
             }
         }
 

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 08:03:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 08:03:24 -0500
Subject: [geeklog-cvs] geeklog: Add topic name in the <title> when not "All"
Message-ID: <hg.00df2e53c8cf.1235307804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/00df2e53c8cf
changeset: 6796:00df2e53c8cf
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 22 12:27:17 2009 +0100
description:
Add topic name in the <title> when not "All"

diffstat:

1 file changed, 11 insertions(+), 2 deletions(-)
public_html/directory.php |   13 +++++++++++--

diffs (37 lines):

diff -r 1d2197278654 -r 00df2e53c8cf public_html/directory.php
--- a/public_html/directory.php	Sun Feb 22 12:21:35 2009 +0100
+++ b/public_html/directory.php	Sun Feb 22 12:27:17 2009 +0100
@@ -473,22 +473,31 @@
     $month = 0;
 }
 
+$topicName = '';
+if ($topic != 'all') {
+    $topicName = DB_getItem($_TABLES['topics'], 'topic',
+                            "tid = '" . addslashes($topic) . "'");
+}
 if (($year != 0) && ($month != 0)) {
     $title = sprintf ($LANG_DIR['title_month_year'],
                       $LANG_MONTH[$month], $year);
+    if ($topic != 'all') {
+        $title .= ': ' . $topicName;
+    }
     $display .= COM_siteHeader ('menu', $title);
     $display .= DIR_displayMonth ($topic, $year, $month, true);
     $display .= DIR_navBar ($topic, $year, $month);
 } else if ($year != 0) {
     $title = sprintf ($LANG_DIR['title_year'], $year);
+    if ($topic != 'all') {
+        $title .= ': ' . $topicName;
+    }
     $display .= COM_siteHeader ('menu', $title);
     $display .= DIR_displayYear ($topic, $year, true);
     $display .= DIR_navBar ($topic, $year);
 } else {
     $title = $LANG_DIR['title'];
     if ($topic != 'all') {
-        $topicName = DB_getItem($_TABLES['topics'], 'topic',
-                                "tid = '" . addslashes($topic) . "'");
         $title .= ': ' . $topicName;
     }
     $display .= COM_siteHeader('menu', $title);

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 08:03:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 08:03:23 -0500
Subject: [geeklog-cvs] geeklog: Use get/set_include_path
Message-ID: <hg.9649bc9f60b6.1235307803.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9649bc9f60b6
changeset: 6794:9649bc9f60b6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 22 09:34:19 2009 +0100
description:
Use get/set_include_path

diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
public_html/admin/install/migrate.php |    6 +++---

diffs (16 lines):

diff -r 10dfb994ef83 -r 9649bc9f60b6 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Feb 21 22:58:23 2009 +0100
+++ b/public_html/admin/install/migrate.php	Sun Feb 22 09:34:19 2009 +0100
@@ -129,9 +129,9 @@
         return $backup_file;
     }
 
-    $include_path = @ini_get('include_path');
-    if (@ini_set('include_path', $_CONF['path'] . 'system/pear/'
-                                 . PATH_SEPARATOR . $include_path) === false) {
+    $include_path = get_include_path();
+    if (set_include_path($_CONF['path'] . 'system/pear/' . PATH_SEPARATOR
+                         . $include_path) === false) {
         // couldn't set PEAR path - can't handle compressed backups
         $display .= INST_getAlertMsg($LANG_MIGRATE[39]);
         return false;

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 08:03:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 08:03:24 -0500
Subject: [geeklog-cvs] geeklog: Allow comment indexing but disallow indexing
	the "post ...
Message-ID: <hg.1d2197278654.1235307804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1d2197278654
changeset: 6795:1d2197278654
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 22 12:21:35 2009 +0100
description:
Allow comment indexing but disallow indexing the "post a comment" form

diffstat:

2 files changed, 4 insertions(+), 3 deletions(-)
public_html/comment.php |    6 ++++--
public_html/robots.txt  |    1 -

diffs (32 lines):

diff -r 9649bc9f60b6 -r 1d2197278654 public_html/comment.php
--- a/public_html/comment.php	Sun Feb 22 09:34:19 2009 +0100
+++ b/public_html/comment.php	Sun Feb 22 12:21:35 2009 +0100
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | comment.php                                                               |
 // |                                                                           |
@@ -347,7 +347,9 @@
                 $title = str_replace ( '&lt;', '<', $title );
                 $title = str_replace ( '&gt;', '>', $title );
             }
-            $display .= COM_siteHeader('menu', $LANG03[1])
+            $noindex = '<meta name="robots" content="noindex"' . XHTML . '>'
+                     . LB;
+            $display .= COM_siteHeader('menu', $LANG03[1], $noindex)
                      . CMT_commentForm ($title, '', $sid,
                             COM_applyFilter ($_REQUEST['pid'], true), $type, $mode,
                             $postmode)
diff -r 9649bc9f60b6 -r 1d2197278654 public_html/robots.txt
--- a/public_html/robots.txt	Sun Feb 22 09:34:19 2009 +0100
+++ b/public_html/robots.txt	Sun Feb 22 12:21:35 2009 +0100
@@ -1,5 +1,4 @@
 User-agent: *
-Disallow: /comment.php
 Disallow: /docs
 Disallow: /pingback.php
 Disallow: /submit.php

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 13:17:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 13:17:20 -0500
Subject: [geeklog-cvs] geeklog: Added missing {lang_permissions_msg}
Message-ID: <hg.489c6192d42e.1235326640.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/489c6192d42e
changeset: 6798:489c6192d42e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 22 18:58:00 2009 +0100
description:
Added missing {lang_permissions_msg}

diffstat:

2 files changed, 6 insertions(+)
plugins/calendar/templates/admin/eventeditor.thtml            |    3 +++
public_html/layout/professional/admin/topic/topiceditor.thtml |    3 +++

diffs (26 lines):

diff -r 86ac6368a553 -r 489c6192d42e plugins/calendar/templates/admin/eventeditor.thtml
--- a/plugins/calendar/templates/admin/eventeditor.thtml	Sun Feb 22 18:50:02 2009 +0100
+++ b/plugins/calendar/templates/admin/eventeditor.thtml	Sun Feb 22 18:58:00 2009 +0100
@@ -151,6 +151,9 @@
                                             {permissions_editor} 
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td colspan="2">{lang_permissions_msg}</td>
+                                    </tr>
                                     <tr><td>&nbsp;</td></tr>
                                     <tr>
                                         <td colspan="2">
diff -r 86ac6368a553 -r 489c6192d42e public_html/layout/professional/admin/topic/topiceditor.thtml
--- a/public_html/layout/professional/admin/topic/topiceditor.thtml	Sun Feb 22 18:50:02 2009 +0100
+++ b/public_html/layout/professional/admin/topic/topiceditor.thtml	Sun Feb 22 18:58:00 2009 +0100
@@ -63,6 +63,9 @@
                                         </td>
                                     </tr>
                                     <tr>
+                                        <td colspan="2">{lang_permissions_msg}</td>
+                                    </tr>
+                                    <tr>
                                         <td colspan="2"><hr{xhtml}></td>
                                     </tr>
                                     <tr>

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 13:17:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 13:17:19 -0500
Subject: [geeklog-cvs] geeklog: Ensure consistent template variable names
	for the Permi...
Message-ID: <hg.86ac6368a553.1235326639.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/86ac6368a553
changeset: 6797:86ac6368a553
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Feb 22 18:50:02 2009 +0100
description:
Ensure consistent template variable names for the Permission Editor

diffstat:

20 files changed, 46 insertions(+), 24 deletions(-)
plugins/calendar/templates/admin/eventeditor.thtml                     |    2 -
plugins/links/templates/admin/categoryeditor.thtml                     |    4 +-
plugins/links/templates/admin/linkeditor.thtml                         |    4 +-
plugins/polls/templates/admin/polleditor.thtml                         |    2 -
plugins/staticpages/templates/admin/editor.thtml                       |    2 -
plugins/staticpages/templates/admin/editor_advanced.thtml              |    2 -
public_html/admin/block.php                                            |    7 ++---
public_html/admin/plugins/calendar/index.php                           |    2 +
public_html/admin/plugins/links/category.php                           |    2 +
public_html/admin/plugins/links/index.php                              |    2 +
public_html/admin/plugins/polls/index.php                              |    1 
public_html/admin/plugins/staticpages/index.php                        |    7 ++---
public_html/admin/story.php                                            |    1 
public_html/admin/topic.php                                            |    9 +++---
public_html/docs/history                                               |    1 
public_html/docs/theme.html                                            |   14 ++++++++++
public_html/layout/professional/admin/block/defaultblockeditor.thtml   |    2 -
public_html/layout/professional/admin/story/storyeditor.thtml          |    2 -
public_html/layout/professional/admin/story/storyeditor_advanced.thtml |    2 -
public_html/layout/professional/admin/topic/topiceditor.thtml          |    2 -

diffs (truncated from 345 to 300 lines):

diff -r 00df2e53c8cf -r 86ac6368a553 plugins/calendar/templates/admin/eventeditor.thtml
--- a/plugins/calendar/templates/admin/eventeditor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/calendar/templates/admin/eventeditor.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -144,7 +144,7 @@
                                         <td colspan="2"></td>
                                     </tr>
                                     <tr>
-                                        <td colspan="2">{lang_permissionskey}</td>
+                                        <td colspan="2">{lang_perm_key}</td>
                                     </tr>
                                     <tr>
                                         <td colspan="2">
diff -r 00df2e53c8cf -r 86ac6368a553 plugins/links/templates/admin/categoryeditor.thtml
--- a/plugins/links/templates/admin/categoryeditor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/links/templates/admin/categoryeditor.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -45,7 +45,7 @@
                 <td colspan="2"></td>
             </tr>
             <tr>
-                <td colspan="2">{lang_permissionskey}</td>
+                <td colspan="2">{lang_perm_key}</td>
             </tr>
             <tr>
                 <td colspan="2">
@@ -53,7 +53,7 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="2">{lang_lockmsg}<td>
+                <td colspan="2">{lang_permissions_msg}<td>
             </tr>
             <tr><td>&nbsp;</td></tr>
             <tr>
diff -r 00df2e53c8cf -r 86ac6368a553 plugins/links/templates/admin/linkeditor.thtml
--- a/plugins/links/templates/admin/linkeditor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/links/templates/admin/linkeditor.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -66,7 +66,7 @@
                                             <td colspan="2"></td>
                                         </tr>
                                         <tr>
-                                            <td colspan="2">{lang_permissionskey}</td>
+                                            <td colspan="2">{lang_perm_key}</td>
                                         </tr>
                                         <tr>
                                             <td colspan="2">
@@ -74,7 +74,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan="2">{lang_lockmsg}</td>
+                                            <td colspan="2">{lang_permissions_msg}</td>
                                         </tr>
                                         <tr><td>&nbsp;</td></tr>
                                         <tr>
diff -r 00df2e53c8cf -r 86ac6368a553 plugins/polls/templates/admin/polleditor.thtml
--- a/plugins/polls/templates/admin/polleditor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/polls/templates/admin/polleditor.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -39,7 +39,7 @@
                                     <p>{lang_owner}: {owner_name}<input type="hidden" name="owner_id" value="{owner_id}"{xhtml}><br{xhtml}></p>
                                     <p>{lang_group}: {group_dropdown}<br{xhtml}></p>
                                     <h2>{lang_permissions}</h2>
-                                    <p>{lang_permissionskey}</p>
+                                    <p>{lang_perm_key}</p>
                                     <div>{permissions_editor}</div>
                                     <p>{lang_permissions_msg}</p>
                                     <p>
diff -r 00df2e53c8cf -r 86ac6368a553 plugins/staticpages/templates/admin/editor.thtml
--- a/plugins/staticpages/templates/admin/editor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/staticpages/templates/admin/editor.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -116,7 +116,7 @@
               </td>
           </tr>
           <tr>
-              <td colspan="2">{permissions_msg}</td>
+              <td colspan="2">{lang_permissions_msg}</td>
           </tr>
           <tr>
               <td colspan="2"><hr{xhtml}></td>
diff -r 00df2e53c8cf -r 86ac6368a553 plugins/staticpages/templates/admin/editor_advanced.thtml
--- a/plugins/staticpages/templates/admin/editor_advanced.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/plugins/staticpages/templates/admin/editor_advanced.thtml	Sun Feb 22 18:50:02 2009 +0100
@@ -147,7 +147,7 @@
               </td>
           </tr>
           <tr>
-              <td colspan="2">{permissions_msg}</td>
+              <td colspan="2">{lang_permissions_msg}</td>
           </tr>
           <tr>
               <td colspan="2"><hr{xhtml}></td>
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/block.php
--- a/public_html/admin/block.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/block.php	Sun Feb 22 18:50:02 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | block.php                                                                 |
 // |                                                                           |
 // | Geeklog block administration.                                             |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -32,8 +32,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: block.php,v 1.124 2008/06/07 12:41:44 dhaun Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -163,6 +161,7 @@
     $block_templates->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
     $block_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
     $block_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+    $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());
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/plugins/calendar/index.php	Sun Feb 22 18:50:02 2009 +0100
@@ -322,7 +322,9 @@
                               SEC_getGroupDropdown ($A['group_id'], $access));
     $event_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
     $event_templates->set_var('lang_permissionskey', $LANG_ACCESS['permissionskey']);
+    $event_templates->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
     $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->parse('output', 'editor');
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/plugins/links/category.php	Sun Feb 22 18:50:02 2009 +0100
@@ -262,8 +262,10 @@
     $T->set_var('group_dropdown', SEC_getGroupDropdown($A['group_id'], $access));
     $T->set_var('lang_permissions', $LANG_ACCESS['permissions']);
     $T->set_var('lang_permissionskey', $LANG_ACCESS['permissionskey']);
+    $T->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
     $T->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],
             $A['perm_group'], $A['perm_members'], $A['perm_anon']));
+    $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());
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/plugins/links/index.php	Sun Feb 22 18:50:02 2009 +0100
@@ -199,7 +199,9 @@
                              SEC_getGroupDropdown ($A['group_id'], $access));
     $link_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
     $link_templates->set_var('lang_permissionskey', $LANG_ACCESS['permissionskey']);
+    $link_templates->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
     $link_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
+    $link_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $link_templates->set_var('lang_lockmsg', $LANG_ACCESS['permmsg']);
     $link_templates->set_var('gltoken_name', CSRF_TOKEN);
     $link_templates->set_var('gltoken', SEC_createToken());
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/plugins/polls/index.php	Sun Feb 22 18:50:02 2009 +0100
@@ -441,6 +441,7 @@
                              SEC_getGroupDropdown ($T['group_id'], $access));
     $poll_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
     $poll_templates->set_var('lang_permissionskey', $LANG_ACCESS['permissionskey']);
+    $poll_templates->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
     $poll_templates->set_var('permissions_editor', SEC_getPermissionsHTML($T['perm_owner'],$T['perm_group'],$T['perm_members'],$T['perm_anon']));
     $poll_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $poll_templates->set_var('lang_answersvotes', $LANG25[10]);
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/plugins/staticpages/index.php	Sun Feb 22 18:50:02 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Geeklog Plugin 1.5                                           |
+// | Static Pages Geeklog Plugin 1.6                                           |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | Administration page.                                                      |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Phill Gillespie  - phill AT mediaaustralia DOT com DOT au        |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.94 2008/06/22 14:49:06 dhaun Exp $
 
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
@@ -154,6 +152,7 @@
         $sp_template->set_var('lang_permissions', $LANG_ACCESS['permissions']);
         $sp_template->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
         $sp_template->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+        $sp_template->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
         $sp_template->set_var('site_url', $_CONF['site_url']);
         $sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
         $sp_template->set_var('start_block_editor',
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/story.php
--- a/public_html/admin/story.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/story.php	Sun Feb 22 18:50:02 2009 +0100
@@ -423,6 +423,7 @@
         $story->EditElements('perm_owner'),$story->EditElements('perm_group'),
         $story->EditElements('perm_members'),$story->EditElements('perm_anon')));
     $story_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+    $story_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $curtime = COM_getUserDateTimeFormat($story->EditElements('date'));
     $story_templates->set_var('lang_date', $LANG24[15]);
 
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/admin/topic.php	Sun Feb 22 18:50:02 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | topic.php                                                                 |
 // |                                                                           |
 // | Geeklog topic administration page.                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: topic.php,v 1.80 2008/05/18 16:58:51 dhaun Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -140,6 +138,9 @@
                               SEC_getGroupDropdown ($A['group_id'], $access));
     $topic_templates->set_var('lang_permissions', $LANG_ACCESS['permissions']);
     $topic_templates->set_var('lang_permissions_key', $LANG_ACCESS['permissionskey']);
+    $topic_templates->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
+    $topic_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+    $topic_templates->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
     $topic_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
 
     // show sort order only if they specified sortnum as the sort method
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/docs/history	Sun Feb 22 18:50:02 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Ensure consistent template variable names for the Permission Editor [Dirk]
 - Added new permission 'group.assign', now required to be able to assign a user
   to a group. Part of the Group Admin (not User Admin) permissions by default
   (feature request #0000190) [Dirk]
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/docs/theme.html	Sun Feb 22 18:50:02 2009 +0100
@@ -223,6 +223,20 @@
     now.</li>
 </ul>
 
+<h3>Permissions Editor</h3>
+
+<p>The various instances of the Permissions Editor (where you can set the Read
+/ Edit permissions for Owner, Group, Members, Anonymous) were using slightly
+different template variable names. From now on, the following names are defined
+everywhere:</p>
+<ul>
+<li><tt>{lang_permissions}</tt> (headline)</li>
+<li><tt>{lang_perm_key}</tt> (legend: R = read, ...)</li>
+<li><tt>{permissions_editor}</tt> (the actual checkboxes)</li>
+<li><tt>{lang_permissions_msg}</tt> ("Note: members is all logged in member ...)</li>
+</ul>
+<p>Template files using the alternative names will continue to work, but new
+files should use the above names from now on.</p>
 
 <h2><a name="changes152">Theme changes in Geeklog 1.5.2</a></h2>
 
diff -r 00df2e53c8cf -r 86ac6368a553 public_html/layout/professional/admin/block/defaultblockeditor.thtml
--- a/public_html/layout/professional/admin/block/defaultblockeditor.thtml	Sun Feb 22 12:27:17 2009 +0100
+++ b/public_html/layout/professional/admin/block/defaultblockeditor.thtml	Sun Feb 22 18:50:02 2009 +0100

From geeklog-cvs at lists.geeklog.net  Sun Feb 22 17:42:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Feb 2009 17:42:16 -0500
Subject: [geeklog-cvs] geeklog: Fixed handeling of german umlauts in searches
Message-ID: <hg.4ac03f3820e2.1235342536.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4ac03f3820e2
changeset: 6799:4ac03f3820e2
user:      Sami Barakat
date:      Sun Feb 22 21:22:24 2009 +0000
description:
Fixed handeling of german umlauts in searches

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
language/english.php |    2 +-

diffs (12 lines):

diff -r 489c6192d42e -r 4ac03f3820e2 language/english.php
--- a/language/english.php	Sun Feb 22 18:58:00 2009 +0100
+++ b/language/english.php	Sun Feb 22 21:22:24 2009 +0000
@@ -505,7 +505,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',

From geeklog-cvs at lists.geeklog.net  Sat Feb 28 12:25:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Feb 2009 12:25:19 -0500
Subject: [geeklog-cvs] geeklog: Updated Hebrew language file for the install
	script, pr...
Message-ID: <hg.3501e8c84f26.1235841919.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3501e8c84f26
changeset: 6802:3501e8c84f26
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 18:24:42 2009 +0100
description:
Updated Hebrew language file for the install script, provided by LWC

diffstat:

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

diffs (30 lines):

diff -r 26421e8c56cc -r 3501e8c84f26 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sat Feb 28 18:20:13 2009 +0100
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sat Feb 28 18:24:42 2009 +0100
@@ -126,7 +126,7 @@
     78 => '???????? ??????????????',
     79 => '?????? ???????? ???????? ?????????????? ???? ?????????? Geeklog ????????.',
     80 => '??????????',
-    81 => '????????!',
+    81 => '????????????!',
     82 => '???????? ???????? ?????????? ???? ???????????? ???????????? ?????????????? ????????. Geeklog ???? ?????????? ?????????? ?????????? ???? ?????????? ??????.',
     83 => '???????? ????????????',
     84 => '?????????? "',
@@ -359,4 +359,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>
diff -r 26421e8c56cc -r 3501e8c84f26 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 28 18:20:13 2009 +0100
+++ b/public_html/docs/history	Sat Feb 28 18:24:42 2009 +0100
@@ -53,6 +53,7 @@
 - Added a configuration option to control the JPEG quality (Feature request
   #0000720) [Dirk]
 
+- Updated Hebrew language file for the install script, provided by LWC
 - New Serbian (Latin) language files, provided by Aleksandar Scepanovic
 
 Calendar plugin

From geeklog-cvs at lists.geeklog.net  Sat Feb 28 12:25:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Feb 2009 12:25:17 -0500
Subject: [geeklog-cvs] geeklog: DB_Query -> DB_query, for consistency
Message-ID: <hg.f65e87f65971.1235841917.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f65e87f65971
changeset: 6800:f65e87f65971
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 09:39:18 2009 +0100
description:
DB_Query -> DB_query, for consistency

diffstat:

5 files changed, 15 insertions(+), 18 deletions(-)
plugins/spamx/MTBlackList.Examine.class.php |    5 ++---
public_html/admin/moderation.php            |    2 +-
sql/updates/mssql_1.4.1_to_1.5.0.php        |    2 +-
system/lib-database.php                     |   12 +++++-------
system/lib-security.php                     |   12 ++++++------

diffs (159 lines):

diff -r 4ac03f3820e2 -r f65e87f65971 plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Sun Feb 22 21:22:24 2009 +0000
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Sat Feb 28 09:39:18 2009 +0100
@@ -5,7 +5,7 @@
  * This module examines comments for entries on the MT-Blacklist
  * for the Geeklog Spam-X plugin
  * 
- * Copyright (C) 2004-2006 by the following authors:
+ * Copyright (C) 2004-2009 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  * 
  * Licensed under GNU General Public License
@@ -13,7 +13,6 @@
  * The MT-Blacklist was maintained by Jay Allen
  * http://www.jayallen.org/comment_spam/
  *
- * $Id: MTBlackList.Examine.class.php,v 1.12 2008/09/21 08:37:08 dhaun Exp $
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MTBlackList.Examine.class.php') !== false) {
@@ -51,7 +50,7 @@
         /**
          * Include Blacklist Data
          */
-        $result = DB_Query ("SELECT value FROM {$_TABLES['spamx']} WHERE name = 'MTBlacklist'", 1);
+        $result = DB_query ("SELECT value FROM {$_TABLES['spamx']} WHERE name = 'MTBlacklist'", 1);
         $nrows = DB_numRows ($result);
 
         // named entities
diff -r 4ac03f3820e2 -r f65e87f65971 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sun Feb 22 21:22:24 2009 +0000
+++ b/public_html/admin/moderation.php	Sat Feb 28 09:39:18 2009 +0100
@@ -617,7 +617,7 @@
                 if ($nrows == 1) {
                     $A = DB_fetchArray($result);
                     $sql = "UPDATE {$_TABLES['users']} SET status=3 WHERE uid={$A['uid']}";
-                    DB_Query($sql);
+                    DB_query($sql);
                     USER_createAndSendPassword ($A['username'], $A['email'], $A['uid']);
                 }
                 break;
diff -r 4ac03f3820e2 -r f65e87f65971 sql/updates/mssql_1.4.1_to_1.5.0.php
--- a/sql/updates/mssql_1.4.1_to_1.5.0.php	Sun Feb 22 21:22:24 2009 +0000
+++ b/sql/updates/mssql_1.4.1_to_1.5.0.php	Sat Feb 28 09:39:18 2009 +0100
@@ -69,7 +69,7 @@
         ON [PRIMARY]
         ");
         
-    DB_Query ("
+    DB_query ("
         ALTER function [DESCRIBE](@d as varchar(100)='', @c as varchar(100)=null)
         RETURNS table AS
 
diff -r 4ac03f3820e2 -r f65e87f65971 system/lib-database.php
--- a/system/lib-database.php	Sun Feb 22 21:22:24 2009 +0000
+++ b/system/lib-database.php	Sat Feb 28 09:39:18 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | lib-database.php                                                          |
 // |                                                                           |
 // | Geeklog database library.                                                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
 // +---------------------------------------------------------------------------+
@@ -28,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-database.php,v 1.54 2008/09/21 08:37:11 dhaun Exp $
 
 /**
 * This is the high-level database layer for Geeklog (for the low-level stuff,
@@ -137,7 +135,7 @@
 // +---------------------------------------------------------------------------+
 // | These are the library functions.  In all cases they turn around and make  |
 // | calls to the DBMS specific functions.  These ARE to be used directly in   |
-// | the code...do NOT use the $_DB methods directly
+// | the code...do NOT use the $_DB methods directly                           |
 // +---------------------------------------------------------------------------+
 
 /**
@@ -154,7 +152,7 @@
 * @param        boolean     $flag       true or false
 *
 */
-function DB_setdebug($flag)
+function DB_setDebug($flag)
 {
     global $_DB;
 
@@ -556,7 +554,7 @@
             $exists = true;
         }
     } elseif ($_DB_dbms == 'mssql') {
-        $result = DB_Query("SELECT 1 FROM sysobjects WHERE name='{$_TABLES[$table]}' AND xtype='U'");
+        $result = DB_query("SELECT 1 FROM sysobjects WHERE name='{$_TABLES[$table]}' AND xtype='U'");
         if (DB_numRows ($result) > 0) {
             $exists = true;
         }
diff -r 4ac03f3820e2 -r f65e87f65971 system/lib-security.php
--- a/system/lib-security.php	Sun Feb 22 21:22:24 2009 +0000
+++ b/system/lib-security.php	Sat Feb 28 09:39:18 2009 +0100
@@ -174,7 +174,7 @@
     global $_TABLES, $_CONF;
     if(!isset($_CONF['remote_users_group_id']))
     {
-        $result = DB_Query("SELECT grp_id FROM {$_TABLES['groups']} WHERE grp_name='Remote Users'");
+        $result = DB_query("SELECT grp_id FROM {$_TABLES['groups']} WHERE grp_name='Remote Users'");
         if( $result )
         {
             $row = DB_fetchArray( $result );
@@ -1097,17 +1097,17 @@
         $sql = "DELETE FROM {$_TABLES['tokens']} WHERE (DATE_ADD(created, INTERVAL ttl SECOND) < NOW())"
            . " AND (ttl > 0)";
     }
-    DB_Query($sql);
+    DB_query($sql);
     
     /* Destroy tokens for this user/url combination */
     $sql = "DELETE FROM {$_TABLES['tokens']} WHERE owner_id={$_USER['uid']} AND urlfor='$pageURL'";
-    DB_Query($sql);
+    DB_query($sql);
     
     /* Create a token for this user/url combination */
     /* NOTE: TTL mapping for PageURL not yet implemented */
     $sql = "INSERT INTO {$_TABLES['tokens']} (token, created, owner_id, urlfor, ttl) "
            . "VALUES ('$token', NOW(), {$_USER['uid']}, '$pageURL', $ttl)";
-    DB_Query($sql);
+    DB_query($sql);
            
     $last_token = $token;
 
@@ -1149,7 +1149,7 @@
                       END
                     FROM {$_TABLES['tokens']} WHERE token='$token'";
         }
-        $tokens = DB_Query($sql);
+        $tokens = DB_query($sql);
         $numberOfTokens = DB_numRows($tokens);
         if($numberOfTokens != 1) {
             $return = false; // none, or multiple tokens. Both are invalid. (token is unique key...)
@@ -1172,7 +1172,7 @@
            
             // It's a one time token. So eat it.
             $sql = "DELETE FROM {$_TABLES['tokens']} WHERE token='$token'";
-            DB_Query($sql);
+            DB_query($sql);
         }
     } else {
         $return = false; // no token.

From geeklog-cvs at lists.geeklog.net  Sat Feb 28 12:25:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Feb 2009 12:25:18 -0500
Subject: [geeklog-cvs] geeklog: New Serbian (Latin) language files,
	provided by Aleksan...
Message-ID: <hg.26421e8c56cc.1235841918.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/26421e8c56cc
changeset: 6801:26421e8c56cc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 18:20:13 2009 +0100
description:
New Serbian (Latin) language files, provided by Aleksandar Scepanovic

diffstat:

3 files changed, 3736 insertions(+)
language/serbian.php       | 1867 ++++++++++++++++++++++++++++++++++++++++++++
language/serbian_utf-8.php | 1867 ++++++++++++++++++++++++++++++++++++++++++++
public_html/docs/history   |    2 

diffs (truncated from 3754 to 300 lines):

diff -r f65e87f65971 -r 26421e8c56cc language/serbian.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/language/serbian.php	Sat Feb 28 18:20:13 2009 +0100
@@ -0,0 +1,1867 @@
+<?php
+
+###############################################################################
+# serbian.php
+# This is the Serbian (latin) language file for Geeklog!
+# Special thanks to GOSC which motivated me to contribute to Geeklog project.
+#
+# By: Aleksandar Scepanovic 2009
+# Contact email: ascepanovic at gmail.com
+# WEB: http://www.scepanovic.info
+#
+# NAPOMENA: Prosto je nemoguce uskladiti prevod da svi korisnic budu zadovoljni
+# ako imate bilo koji predlog za izmenu prevoda ili ste uocili gresku molim
+# da me kontaktirate kako bi ista bila ispravljena
+#
+# 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.
+#
+###############################################################################
+
+$LANG_CHARSET = 'iso-8859-2';
+
+###############################################################################
+# Array Format:
+# $LANGXX[YY]:  $LANG - variable name
+#               XX    - file id number
+#               YY    - phrase id number
+###############################################################################
+
+###############################################################################
+# USER PHRASES - These are file phrases used in end user scripts
+###############################################################################
+
+###############################################################################
+# lib-common.php
+
+$LANG01 = array(
+    1 => 'Autor:',
+    2 => 'detaljnije',
+    3 => 'komentar(a)',
+    4 => 'Izmeni',
+    5 => 'Anketa',
+    6 => 'Rezultati',
+    7 => '',
+    8 => 'glasova',
+    9 => 'Za Administratora:',
+    10 => 'Zahtevi',
+    11 => 'Tekst(a)',
+    12 => 'Blokovi',
+    13 => 'Kategorije',
+    14 => '',
+    15 => '',
+    16 => '',
+    17 => 'Korisnici',
+    18 => 'SQL upit',
+    19 => 'Odjava',
+    20 => 'Korisnicke postavke:',
+    21 => 'Korisnicko ime',
+    22 => 'Korisnicki ID',
+    23 => 'Sigurnosni nivo',
+    24 => 'Anonimni korisnik',
+    25 => 'Odgovori',
+    26 => 'Prikazani komentari su vlasnistvo autora istih. Mi nismo odgovorni za njihov sadrzaj',
+    27 => 'Najnoviji tekst',
+    28 => 'Obrisi',
+    29 => 'Nema korisnickih komentara.',
+    30 => 'Stariji tekstovi',
+    31 => 'Dozvoljeni HTML kodovi:',
+    32 => 'Greska, korisnicko ime nije ispravno',
+    33 => 'Greska, ne mogu pisati u log fajlove',
+    34 => 'Greska',
+    35 => 'Odjavi se',
+    36 => 'on',
+    37 => 'Nema korisnickih tekstova',
+    38 => 'RSS',
+    39 => 'Osvezi',
+    40 => 'Imate <tt>register_globals = Off</tt> u vasem <tt>php.ini</tt> fajlu. Geeklog zahteva da promenjiva <tt>register_globals</tt> bude <strong>on</strong>. Pre nego sto nastavite, molimo vas izvrsite izmene i restartujte web server.',
+    41 => 'Gosti',
+    42 => 'Autor:',
+    43 => 'Odgovori na ovo',
+    44 => 'Roditelj',
+    45 => 'MySQL greska broj',
+    46 => 'MySQL poruka greske',
+    47 => 'Korisnici',
+    48 => 'Korisnicke postavke',
+    49 => 'Moj nalog',
+    50 => 'Greska u SQL naredbi',
+    51 => 'pomoc',
+    52 => 'Novi',
+    53 => 'Administracija',
+    54 => 'Ne mogu otvoriti log fajl.',
+    55 => 'Greska u',
+    56 => 'Glasaj',
+    57 => 'Lozinka',
+    58 => 'Prijava',
+    59 => "Nemate korisnicki nalog? Kreirajte ga besplatno <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">Ovde</a>",
+    60 => 'Posaljite komentar',
+    61 => 'Kreiraj Novi Nalog',
+    62 => 'reci',
+    63 => 'Postavke komentara',
+    64 => 'Posalji tekst prijatelju',
+    65 => 'Pogledaj verziju za stampu',
+    66 => '',
+    67 => 'Dobrodosli na ',
+    68 => 'Pocetna',
+    69 => 'Kontakt',
+    70 => 'Pretraga',
+    71 => 'Doprinesi',
+    72 => 'Web izvori',
+    73 => '',
+    74 => '',
+    75 => 'Napredna pretraga',
+    76 => 'Statistika web stranice',
+    77 => 'Pluginovi',
+    78 => '',
+    79 => 'Sta je novo',
+    80 => 'tekst(ovi) u poslednjih',
+    81 => 'tekst(ova) u zadnjih',
+    82 => 'sati',
+    83 => 'Komentari',
+    84 => '',
+    85 => 'poslednjih 48 sati',
+    86 => 'Nema novih komentara',
+    87 => 'poslednje 2 sedmice',
+    88 => '',
+    89 => '',
+    90 => 'Pocetna stranica',
+    91 => 'Stranica generisana za',
+    92 => 'sekundi',
+    93 => 'Copyright',
+    94 => 'Svi zastitni znakovi i autorska prava pripadaju vlasnicima istih',
+    95 => 'Sajt pokrece',
+    96 => 'Korisnicke grupe',
+    97 => 'Lista reci',
+    98 => 'Pluginovi',
+    99 => 'Tekstovi',
+    100 => 'Nema novih tekstova',
+    101 => '',
+    102 => '',
+    103 => 'Sigurnosne Kopije',
+    104 => 'od',
+    105 => 'Posalji emali korisnicima',
+    106 => 'Ukupno pregleda:',
+    107 => 'Provera Geeklog verzije',
+    108 => 'Obrisi Cache',
+    109 => 'Prijavi zloupotrebu',
+    110 => 'Prijavi ovaj tekst administratoru',
+    111 => 'Pogledaj PDF Verziju',
+    112 => 'Registrovani Korisnici',
+    113 => 'Dokumentacija',
+    114 => 'TRACKBACKS',
+    115 => 'Nema novih trackback komentara',
+    116 => 'Trackback',
+    117 => 'Katalog',
+    118 => 'Nastavi sa citanjem na sledecoj strani:',
+    119 => "Zaboravili ste <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">lozinku</a>?",
+    120 => 'Direktan link za komentar',
+    121 => 'Komentari (%d)',
+    122 => 'Trackbacks (%d)',
+    123 => 'Kompletan HTML je dozvoljen',
+    124 => 'Klik za brisanje svih cekiranih stavki',
+    125 => 'Da li ste sigurni da zelite da obrisete cekirane stavke?',
+    126 => 'Selektuj de-selektuj sve stavke',
+    127 => 'Direktan link',
+    128 => 'Prijavi se sa OpenID:',
+    129 => 'Podesavanja',
+    130 => 'Web Servisi'
+);
+
+###############################################################################
+# comment.php
+
+$LANG03 = array(
+    1 => 'Posalji komentar',
+    2 => 'Postavke slanja',
+    3 => 'Odjava',
+    4 => 'Kreirajte korisnicki nalog',
+    5 => 'Korisnicko ime',
+    6 => 'Da bi poslali komentar, morate biti prijavljeni. Molimo prijavite se. Ako nemate korisnicki nalog mozete ga besplatno kreirati.',
+    7 => 'Vas poslednji komentar je bio pre ',
+    8 => " sekundi.  Stranica zahteva da prodje najmanje {$_CONF['commentspeedlimit']} sekundi izmedju komentara",
+    9 => 'Komentar',
+    10 => 'Posalji Izvestaj',
+    11 => 'Posalji Komentar',
+    12 => 'Molim popunite polje Naslov i Komentar!',
+    13 => 'Vase informacije',
+    14 => 'Pregled',
+    15 => 'Prijavi komentar',
+    16 => 'Naslov',
+    17 => 'Greska',
+    18 => 'Vazno',
+    19 => 'Molimo Vas da se pridrzavate teme.',
+    20 => 'Molimo Vas da odgovarate na vec objavljene komentare umesto da zapocinjete nove teme.',
+    21 => 'Pre nego posaljete komentar, molimo procitajte komentare ostalih korisnika kako bi izbegli ponavljanje.',
+    22 => 'Budite jasni kako bi ostalima bilo jasno sta ste zeleli da kazete.',
+    23 => 'Vasa email adresa nije javno dostupna.',
+    24 => 'Anonimni korisnik',
+    25 => 'Sigurno zelite da prijavite ovaj komentar administratoru?',
+    26 => '%s prijavljena zloupotreba u sledecem komentaru:',
+    27 => 'Prijavi zloupotrebu'
+);
+
+###############################################################################
+# users.php
+
+$LANG04 = array(
+    1 => 'Profil korisnika',
+    2 => 'Korisnicko ime',
+    3 => 'Puno ime',
+    4 => 'Lozinka',
+    5 => 'Email adresa',
+    6 => 'Web stranica',
+    7 => 'Biografija',
+    8 => 'PGP kljuc',
+    9 => 'Sacuvaj informacije',
+    10 => 'Poslednjih 10 komentara od korisnika',
+    11 => 'Nema korisnickih komentara',
+    12 => 'Korisnicka podesavanja za',
+    13 => 'Email beleske',
+    14 => 'Ova lozinka je kreirana slucajnim izborom. Preporucujemo da sto pre promenite istu. Da biste promenili lozinku, prijavite se i udjite u Korisnicke postavke',
+    15 => "Vas {$_CONF['site_name']} nalog je uspesno kreiran. Da biste ga koristili, morate se prijaviti koristeci vase informacije. Molimo sacuvajte ovu poruku.",
+    16 => 'Informacije o vasem nalogu',
+    17 => 'Korisnicki nalog nije definisan',
+    18 => 'Upisana email adresa nije validna.',
+    19 => 'Korisnicko ime ili email adresa koju ste uneli vec postoji u bazi.',
+    20 => 'Email adresu koju ste uneli ne mozemo prihvatiti jer nije validna',
+    21 => 'Greska',
+    22 => "Registracija na {$_CONF['site_name']}!",
+    23 => "Kreiranjem korisnickog naloga imate samo prednosti na {$_CONF['site_name']} i mozete koristiti neke funkcije koje obicni korisnici nemogu. Ako nemate nalog, sve sto radite belezi se za anonimnog korisnika. Molimo zapamtitie da vas email <b><i>nikada</i></b> nece biti javno prikazan na ovom sajtu.",
+    24 => 'Lozinka ce biti poslata na email adresu koju ste uneli.',
+    25 => 'Zaboravili ste lozinku?',
+    26 => 'Ukucajte <em>vase</em> korisnicko ime <em>ili</em> email addresu koju ste koristili prilikom registracije i kliknite na Posalji Lozinku. Instrukcije za postavljanje vase nove lozinke saljemo na vas email.',
+    27 => 'Registruj se ',
+    28 => 'Posalji Lozniku',
+    29 => 'forma za odjavu',
+    30 => 'forma za prijavu',
+    31 => 'Izabrane funkcije zahtevaju da budete prijavljeni',
+    32 => 'Potpis',
+    33 => 'Nikada ne prikazuj javno',
+    34 => 'Ovo je vase pravo ime',
+    35 => 'Unesite novu lozinku za promenu',
+    36 => 'Pocinje sa http://',
+    37 => 'Prikazuje se u vasim komentarima',
+    38 => 'Sve o vama! Svi to mogu citati',
+    39 => 'Vas javni PGP kljuc',
+    40 => 'Kategorija nema ikonu',
+    41 => 'Zelite biti moderator',
+    42 => 'Format datuma',
+    43 => 'Maksimalno tekstova',
+    44 => 'Nema blokova',
+    45 => 'Postavke prikazivanja za',
+    46 => 'Delovi za izvrsavanje za',
+    47 => 'Konfiguracija tekstova za',
+    48 => 'Kategorije',
+    49 => 'Nema ikone u tekstu',
+    50 => 'Deselektuje ovo ako niste zainteresovani',
+    51 => 'Samo novi tekstovi',
+    52 => 'Podrazumevani',
+    53 => 'Primi nove vesti svaku noc',
+    54 => 'Oznaci blokove za naslove i autore koje ne zelis da vidis.',
+    55 => 'Ako ovo ostavite kako jeste, to znaci da hocete obicne selekcije blokova. Ako pocnete birati blokove, zapamtite da postavite sve one koje zelite jer ce obicna postavka biti zanemarena. Obicne postavke su boldirane.',
+    56 => 'Autori',
+    57 => 'Nacin prikazivanja',
+    58 => 'Sortiraj po',
+    59 => 'Maksimalno komentara',
+    60 => 'Kako zelite da se vasi komentari prikazuju?',
+    61 => 'Noviji ili najstariji prvo?',
+    62 => 'Podrazumevano je 100',
+    63 => "Vasa lozinka vam je poslata putem emaila i trebali biste je primiti svakog trenutka. Molimo pratite instrukcije koje ste dobili u poruci i zahvaljujemo vam za prijavu na {$_CONF['site_name']}",
+    64 => 'Postavke komentara za',
+    65 => 'Pokusajte ponoviti prijavu',
+    66 => "Verovatno ste pogresno uneli korisnicko ime ili lozinku. Pokusajte se ponovo prijaviti. Jeste li <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">novi korisnik</a>?",
+    67 => 'Clan od',
+    68 => 'Pamti me',
+    69 => 'Koliko dugo zelite biti prijavljeni?',
+    70 => "Postavi izgled sajta {$_CONF['site_name']}",
+    71 => "Jedna od velikih prednosti {$_CONF['site_name']} je ta sto mozete promeniti izgled sajta po vasoj volji. Da biste to mogli uciniti morate se prvo <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">registrovati</a> na {$_CONF['site_name']}. Ako ste vec clan, koristite vase podatke i prijavite se!",
+    72 => 'Kategorija',
+    73 => 'Jezik',
+    74 => 'Promeni izgled sajta!',
+    75 => 'Email-ovani tekstovi za',
+    76 => 'Ako selektujete kategoriju iz liste ispod, primit cete svaki novi tekst vezan za tu kategoriju na kraju svakog dana. Izaberi jedino onu kategoriju koja te zaista zanima!',
+    77 => 'Fotografija',
+    78 => 'Dodaj vlastitu fotografiju!',
+    79 => 'Oznaci ovde za brisanje fotografije',