From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:53 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:53 -0500
Subject: [geeklog-cvs] geeklog: Removed comment
Message-ID: <hg.0dab4911359a.1235895053.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0dab4911359a
changeset: 6803:0dab4911359a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 18:39:17 2009 +0100
description:
Removed comment

diffstat:

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

diffs (12 lines):

diff -r 3501e8c84f26 -r 0dab4911359a public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Feb 28 18:24:42 2009 +0100
+++ b/public_html/lib-common.php	Sat Feb 28 18:39:17 2009 +0100
@@ -165,8 +165,6 @@
 * Include URL class
 *
 * This provides optional URL rewriting functionality.
-* Please note this code is still experimental and is only currently used by the
-* staticpages plugin.
 */
 
 require_once( $_CONF['path_system'] . 'classes/url.class.php' );

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:54 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:54 -0500
Subject: [geeklog-cvs] geeklog: Auto-deleting a story didn't delete
	trackbacks for that...
Message-ID: <hg.80cdeb74d1a6.1235895054.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/80cdeb74d1a6
changeset: 6804:80cdeb74d1a6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 19:25:22 2009 +0100
description:
Auto-deleting a story didn't delete trackbacks for that story

diffstat:

3 files changed, 34 insertions(+), 19 deletions(-)
public_html/docs/history |    1 +
public_html/index.php    |    8 +++-----
system/lib-story.php     |   44 ++++++++++++++++++++++++++++++--------------

diffs (94 lines):

diff -r 0dab4911359a -r 80cdeb74d1a6 public_html/docs/history
--- a/public_html/docs/history	Sat Feb 28 18:39:17 2009 +0100
+++ b/public_html/docs/history	Sat Feb 28 19:25:22 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Auto-deleting a story didn't delete trackbacks for that story [Dirk]
 - 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
diff -r 0dab4911359a -r 80cdeb74d1a6 public_html/index.php
--- a/public_html/index.php	Sat Feb 28 18:39:17 2009 +0100
+++ b/public_html/index.php	Sat Feb 28 19:25:22 2009 +0100
@@ -215,14 +215,12 @@
 while (list ($sid, $expiretopic, $title, $expire, $statuscode) = DB_fetchArray ($expiresql)) {
     if ($statuscode == STORY_ARCHIVE_ON_EXPIRE) {
         if (!empty ($archivetid) ) {
-            COM_errorLOG("Archive Story: $sid, Topic: $archivetid, Title: $title, Expired: $expire");
+            COM_errorLog("Archive Story: $sid, Topic: $archivetid, Title: $title, Expired: $expire");
             DB_query ("UPDATE {$_TABLES['stories']} SET tid = '$archivetid', frontpage = '0', featured = '0' WHERE sid='{$sid}'");
         }
     } else if ($statuscode == STORY_DELETE_ON_EXPIRE) {
-        COM_errorLOG("Delete Story and comments: $sid, Topic: $expiretopic, Title: $title, Expired: $expire");
-        STORY_deleteImages ($sid);
-        DB_query("DELETE FROM {$_TABLES['comments']} WHERE sid='{$sid}' AND type = 'article'");
-        DB_query("DELETE FROM {$_TABLES['stories']} WHERE sid='{$sid}'");
+        COM_errorLog("Delete Story and comments: $sid, Topic: $expiretopic, Title: $title, Expired: $expire");
+        STORY_doDeleteThisStoryNow($sid);
     }
 }
 
diff -r 0dab4911359a -r 80cdeb74d1a6 system/lib-story.php
--- a/system/lib-story.php	Sat Feb 28 18:39:17 2009 +0100
+++ b/system/lib-story.php	Sat Feb 28 19:25:22 2009 +0100
@@ -874,6 +874,34 @@
 }
 
 /**
+* Delete a story and related data immediately.
+*
+* Note: For internal use only! To delete a story, use STORY_deleteStory (see
+*       above), which will do permission checks and eventually end up here.
+*
+* @param    string  $sid    ID of the story to delete
+*
+*/
+function STORY_doDeleteThisStoryNow($sid)
+{
+    global $_TABLES;
+
+    STORY_deleteImages($sid);
+    DB_delete($_TABLES['comments'], array('sid', 'type'),
+                                    array($sid, 'article'));
+    DB_delete($_TABLES['trackback'], array('sid', 'type'),
+                                     array($sid, 'article'));
+    DB_delete($_TABLES['stories'], 'sid', $sid);
+
+    // notify plugins
+    PLG_itemDeleted($sid, 'article');
+
+    // update RSS feed and Older Stories block
+    COM_rdfUpToDateCheck();
+    COM_olderStuff();
+}
+
+/**
  * Return true since this component supports webservices
  *
  * @return  bool	True, if webservices are supported
@@ -1320,21 +1348,9 @@
         }
     }
 
-    STORY_deleteImages ($sid);
-    DB_query("DELETE FROM {$_TABLES['comments']} WHERE sid = '$sid' AND type = 'article'");
-    DB_delete ($_TABLES['stories'], 'sid', $sid);
+    STORY_doDeleteStoryNow($sid);
 
-    // delete Trackbacks
-    DB_query ("DELETE FROM {$_TABLES['trackback']} WHERE sid = '$sid' AND type = 'article';");
-
-    // notify plugins
-    PLG_itemDeleted($sid, 'article');
-
-    // update RSS feed and Older Stories block
-    COM_rdfUpToDateCheck();
-    COM_olderStuff();
-
-    $output = COM_refresh ($_CONF['site_admin_url'] . '/story.php?msg=10');
+    $output = COM_refresh($_CONF['site_admin_url'] . '/story.php?msg=10');
 
     return PLG_RET_OK;
 }

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:55 -0500
Subject: [geeklog-cvs] geeklog: We really should be using DB_delete instead
	of DB_query...
Message-ID: <hg.9ec56f3acd37.1235895055.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9ec56f3acd37
changeset: 6805:9ec56f3acd37
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 19:44:23 2009 +0100
description:
We really should be using DB_delete instead of DB_query("DELETE...") where possible

diffstat:

4 files changed, 20 insertions(+), 20 deletions(-)
plugins/links/functions.inc |    2 +-
plugins/polls/functions.inc |   11 ++++++-----
system/lib-plugins.php      |   24 ++++++++++++------------
system/lib-security.php     |    3 +--

diffs (122 lines):

diff -r 80cdeb74d1a6 -r 9ec56f3acd37 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sat Feb 28 19:25:22 2009 +0100
+++ b/plugins/links/functions.inc	Sat Feb 28 19:44:23 2009 +0100
@@ -441,7 +441,7 @@
 
     if ($_LI_CONF['delete_links'] == 1) {
         // delete the links
-        DB_query ("DELETE FROM {$_TABLES['links']} WHERE owner_id = $uid");
+        DB_delete($_TABLES['links'], 'owner_id', $uid);
     } else {
         // assign ownership to a user from the Root group
         $rootgroup = DB_getItem ($_TABLES['groups'], 'grp_id',
diff -r 80cdeb74d1a6 -r 9ec56f3acd37 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Feb 28 19:25:22 2009 +0100
+++ b/plugins/polls/functions.inc	Sat Feb 28 19:44:23 2009 +0100
@@ -336,12 +336,13 @@
         $result = DB_query ("SELECT pid FROM {$_TABLES['polltopics']} WHERE owner_id = $uid");
         $numPolls = DB_numRows ($result);
         for ($i = 0; $i < $numPolls; $i++) {
-            list($pid) = DB_fetchArray ($result);
-            DB_delete ($_TABLES['pollanswers'], 'pid', $pid);
-            DB_delete ($_TABLES['pollvoters'], 'pid', $pid);
-            DB_query ("DELETE FROM {$_TABLES['comments']} WHERE sid = '$pid' AND type = 'polls'");
+            list($pid) = DB_fetchArray($result);
+            DB_delete($_TABLES['pollanswers'], 'pid', $pid);
+            DB_delete($_TABLES['pollvoters'], 'pid', $pid);
+            DB_delete($_TABLES['comments'], array('sid', 'type'),
+                                            array($pid, 'polls'));
         }
-        DB_delete ($_TABLES['polltopics'], 'owner_id', $uid);
+        DB_delete($_TABLES['polltopics'], 'owner_id', $uid);
     } else {
         // assign ownership to a user from the Root group
         $rootgroup = DB_getItem ($_TABLES['groups'], 'grp_id',
diff -r 80cdeb74d1a6 -r 9ec56f3acd37 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Feb 28 19:25:22 2009 +0100
+++ b/system/lib-plugins.php	Sat Feb 28 19:44:23 2009 +0100
@@ -210,7 +210,7 @@
         // removing variables
         for ($i = 0; $i < count($remvars['vars']); $i++) {
             COM_errorLog ("Removing variable {$remvars['vars'][$i]}", 1);
-            DB_query("DELETE FROM {$_TABLES['vars']} WHERE name = '{$remvars['vars'][$i]}'");
+            DB_delete($_TABLES['vars'], 'name', $remvars['vars'][$i]);
             COM_errorLog ('...success', 1);
         }
 
@@ -220,10 +220,10 @@
                                   "grp_name = '{$remvars['groups'][$i]}'");
             if (!empty ($grp_id)) {
                 COM_errorLog ("Attempting to remove the {$remvars['groups'][$i]} group", 1);
-                DB_query ("DELETE FROM {$_TABLES['groups']} WHERE grp_id = $grp_id");
+                DB_delete($_TABLES['groups'], 'grp_id', $grp_id);
                 COM_errorLog ('...success', 1);
                 COM_errorLog ("Attempting to remove the {$remvars['groups'][$i]} group from all groups.", 1);
-                DB_query("DELETE FROM {$_TABLES['group_assignments']} WHERE ug_main_grp_id = $grp_id");
+                DB_delete($_TABLES['group_assignments'], 'ug_main_grp_id', $grp_id);
                 COM_errorLog ('...success', 1);
             }
         }
@@ -234,10 +234,10 @@
                                     "ft_name = '{$remvars['features'][$i]}'");
             if (!empty ($access_id)) {
                 COM_errorLog ("Attempting to remove {$remvars['features'][$i]} rights from all groups" ,1);
-                DB_query ("DELETE FROM {$_TABLES['access']} WHERE acc_ft_id = $access_id");
+                DB_delete($_TABLES['access'], 'acc_ft_id', $access_id);
                 COM_errorLog ('...success', 1);
                 COM_errorLog ("Attempting to remove the {$remvars['features'][$i]} feature", 1);
-                DB_query ("DELETE FROM {$_TABLES['features']} WHERE ft_name = '{$remvars['features'][$i]}'");
+                DB_delete($_TABLES['features'], 'ft_name', $remvars['features'][$i]);
                 COM_errorLog ('...success', 1);
             }
         }
@@ -263,29 +263,29 @@
             COM_errorLog ('...success', 1);
             // Remove Links Feeds from syndiaction table
             COM_errorLog ('removing links feeds from table', 1);
-            DB_query ("DELETE FROM {$_TABLES['syndication']} WHERE `type` = '$type'");
+            DB_delete($_TABLES['syndication'], 'type', $type);
             COM_errorLog ('...success', 1);
         }
 
         // remove comments for this plugin
         COM_errorLog ("Attempting to remove comments for $type", 1);
-        DB_query ("DELETE FROM {$_TABLES['comments']} WHERE type = '$type'");
+        DB_delete($_TABLES['comments'], 'type', $type);
         COM_errorLog ('...success', 1);
 
         // uninstall php-blocks
-        for ($i=0; $i <  count($remvars['php_blocks']); $i++) {
-            DB_delete ($_TABLES['blocks'], array ('type',     'phpblockfn'),
-                                           array ('phpblock', $remvars['php_blocks'][$i]));
+        for ($i = 0; $i < count($remvars['php_blocks']); $i++) {
+            DB_delete($_TABLES['blocks'], array('type',     'phpblockfn'),
+                                          array('phpblock', $remvars['php_blocks'][$i]));
         }
 
         // remove config table data for this plugin
         COM_errorLog ("Attempting to remove config table records for group_name: $type", 1);
-        DB_query ("DELETE FROM {$_TABLES['conf_values']} WHERE group_name = '$type'");
+        DB_delete($_TABLES['conf_values'], 'group_name', $type);
         COM_errorLog ('...success', 1);
 
         // uninstall the plugin
         COM_errorLog ("Attempting to unregister the $type plugin from Geeklog", 1);
-        DB_query ("DELETE FROM {$_TABLES['plugins']} WHERE pi_name = '$type'");
+        DB_delete($_TABLES['plugins'], 'pi_name', $type);
         COM_errorLog ('...success',1);
 
         COM_errorLog ("Finished uninstalling the $type plugin.", 1);
diff -r 80cdeb74d1a6 -r 9ec56f3acd37 system/lib-security.php
--- a/system/lib-security.php	Sat Feb 28 19:25:22 2009 +0100
+++ b/system/lib-security.php	Sat Feb 28 19:44:23 2009 +0100
@@ -1171,8 +1171,7 @@
             }
            
             // It's a one time token. So eat it.
-            $sql = "DELETE FROM {$_TABLES['tokens']} WHERE token='$token'";
-            DB_query($sql);
+            DB_delete($_TABLES['tokens'], 'token', $token);
         }
     } else {
         $return = false; // no token.

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:55 -0500
Subject: [geeklog-cvs] geeklog: Very minor optimization: avoid multiple
	calls to count()
Message-ID: <hg.b323f2256af0.1235895055.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b323f2256af0
changeset: 6806:b323f2256af0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 20:51:43 2009 +0100
description:
Very minor optimization: avoid multiple calls to count()

diffstat:

1 file changed, 18 insertions(+), 16 deletions(-)
system/databases/mysql.class.php |   34 ++++++++++++++++++----------------

diffs (92 lines):

diff -r 9ec56f3acd37 -r b323f2256af0 system/databases/mysql.class.php
--- a/system/databases/mysql.class.php	Sat Feb 28 19:44:23 2009 +0100
+++ b/system/databases/mysql.class.php	Sat Feb 28 20:51:43 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | mysql.class.php                                                           |
 // |                                                                           |
 // | mysql database class                                                      |
 // +---------------------------------------------------------------------------+
-// | 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: mysql.class.php,v 1.28 2008/09/11 19:07:42 dhaun Exp $
 
 /**
 * This file is the mysql implementation of the Geeklog abstraction layer.
@@ -329,11 +327,12 @@
         $sql = "DELETE FROM $table";
 
         if (is_array($id) || is_array($value)) {
-            if (is_array($id) && is_array($value) && count($id) == count($value)) {
+            $num_ids = count($id);
+            if (is_array($id) && is_array($value) && $num_ids == count($value)) {
                 // they are arrays, traverse them and build sql
                 $sql .= ' WHERE ';
-                for ($i = 1; $i <= count($id); $i++) {
-                    if ($i == count($id)) {
+                for ($i = 1; $i <= $num_ids; $i++) {
+                    if ($i == $num_ids) {
                         $sql .= current($id) . " = '" . current($value) . "'";
                     } else {
                         $sql .= current($id) . " = '" . current($value) . "' AND ";
@@ -390,11 +389,12 @@
         } 
 
         if (is_array($id) || is_array($value)) {
-            if (is_array($id) && is_array($value) && count($id) == count($value)) {
+            $num_ids = count($id);
+            if (is_array($id) && is_array($value) && $num_ids == count($value)) {
                 // they are arrays, traverse them and build sql
                 $sql .= ' WHERE ';
-                for ($i = 1; $i <= count($id); $i++) {
-                    if ($i == count($id)) {
+                for ($i = 1; $i <= $num_ids; $i++) {
+                    if ($i == $num_ids) {
                         $sql .= current($id) . " = '" . current($value) . "'";
                     } else {
                         $sql .= current($id) . " = '" . current($value) . "' AND ";
@@ -447,11 +447,12 @@
         $sql = "SELECT COUNT(*) FROM $table";
 
         if (is_array($id) || is_array($value)) {
-            if (is_array($id) && is_array($value) && count($id) == count($value)) {
+            $num_ids = count($id);
+            if (is_array($id) && is_array($value) && $num_ids == count($value)) {
                 // they are arrays, traverse them and build sql
                 $sql .= ' WHERE ';
-                for ($i = 1; $i <= count($id); $i++) {
-                    if ($i == count($id)) {
+                for ($i = 1; $i <= $num_ids; $i++) {
+                    if ($i == $num_ids) {
                         $sql .= current($id) . " = '" . current($value) . "'";
                     } else {
                         $sql .= current($id) . " = '" . current($value) . "' AND ";
@@ -508,11 +509,12 @@
         $sql = "REPLACE INTO $table ($fields) SELECT $values FROM $tablefrom";
 
         if (is_array($id) || is_array($value)) {
-            if (is_array($id) && is_array($value) && count($id) == count($value)) {
+            $num_ids = count($id);
+            if (is_array($id) && is_array($value) && $num_ids == count($value)) {
                 // they are arrays, traverse them and build sql
                 $sql .= ' WHERE ';
-                for ($i = 1; $i <= count($id); $i++) {
-                    if ($i == count($id)) {
+                for ($i = 1; $i <= $num_ids; $i++) {
+                    if ($i == $num_ids) {
                         $sql .= current($id) . " = '" . current($value) . "'";
                     } else {
                         $sql .= current($id) . " = '" . current($value) . "' AND ";

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:56 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:56 -0500
Subject: [geeklog-cvs] geeklog: More cases where we should be using DB_delete
Message-ID: <hg.542d249e5af4.1235895056.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/542d249e5af4
changeset: 6807:542d249e5af4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 22:43:04 2009 +0100
description:
More cases where we should be using DB_delete

diffstat:

9 files changed, 37 insertions(+), 34 deletions(-)
plugins/spamx/EditBlackList.Admin.class.php |    6 +++---
plugins/spamx/EditHeader.Admin.class.php    |    6 +++---
plugins/spamx/EditIP.Admin.class.php        |    6 +++---
plugins/spamx/EditIPofURL.Admin.class.php   |    6 +++---
plugins/spamx/Import.Admin.class.php        |    6 +++---
plugins/spamx/SLVwhitelist.Admin.class.php  |    6 +++---
public_html/admin/plugins/polls/index.php   |    9 +++++----
public_html/admin/topic.php                 |   18 ++++++++++--------
system/lib-sessions.php                     |    8 ++++----

diffs (254 lines):

diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -4,13 +4,12 @@
  * File: EditBlackList.Admin.class.php
  * This is the Edit Personal Blacklist Module for the Geeklog Spam-X plugin
  *
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2009 by the following authors:
  * Author   Tom Willett     tomw AT pigstye DOT net
  *          Dirk Haun       dirk AT haun-online DOT de
  *
  * Licensed under GNU General Public License
  *
- * $Id: EditBlackList.Admin.class.php,v 1.14 2008/09/21 08:37:08 dhaun Exp $
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditBlackList.Admin.class.php') !== false) {
@@ -47,7 +46,8 @@
 
         if (($action == 'delete') && SEC_checkToken()) {
             $entry = addslashes($entry);
-            $result = DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name = 'Personal' AND value = '$entry'");
+            DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                         array('Personal', $entry));
         } elseif (($action == $LANG_SX00['addentry']) && SEC_checkToken()) {
             if (!empty($entry)) {
                 $entry = addslashes($entry);
diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/EditHeader.Admin.class.php
--- a/plugins/spamx/EditHeader.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/EditHeader.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -4,14 +4,13 @@
 * File: EditHeader.Admin.class.php
 * This is the Edit HTTP Header Module for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2005-2008 by the following authors:
+* Copyright (C) 2005-2009 by the following authors:
 * Author    Dirk Haun <dirk AT haun-online DOT de>
 *
 * based on the works of Tom Willett <tomw AT pigstye DOT net>
 *
 * Licensed under GNU General Public License
 *
-* $Id: EditHeader.Admin.class.php,v 1.11 2008/09/21 08:37:08 dhaun Exp $
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditHeader.Admin.class.php') !== false) {
@@ -43,7 +42,8 @@
             $entry = $_GET['entry'];
             if (!empty($entry)) {
                 $dbentry = addslashes($entry);
-                $result = DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name='HTTPHeader' AND value='$dbentry'");
+                DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                             array('HTTPHeader', $dbentry));
             }
         } elseif (($action == $LANG_SX00['addentry']) && SEC_checkToken()) {
             $entry = '';
diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/EditIP.Admin.class.php
--- a/plugins/spamx/EditIP.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/EditIP.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -4,13 +4,12 @@
 * File: EditIP.Admin.class.php
 * This is the Edit IPBlacklist Module for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2004-2008 by the following authors:
+* Copyright (C) 2004-2009 by the following authors:
 * Author   Tom Willett     tomw AT pigstye DOT net
 *          Dirk Haun       dirk AT haun-online DOT de
 *
 * Licensed under GNU General Public License
 *
-* $Id: EditIP.Admin.class.php,v 1.13 2008/09/21 08:37:08 dhaun Exp $
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIP.Admin.class.php') !== false) {
@@ -47,7 +46,8 @@
 
         if (($action == 'delete') && SEC_checkToken()) {
             $entry = addslashes($entry);
-            $result = DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name = 'IP' AND value = '$entry'");
+            DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                         array('IP', $entry));
         } elseif (($action == $LANG_SX00['addentry']) && SEC_checkToken()) {
             if (!empty($entry)) {
                 $entry = str_replace(' ', '', $entry);
diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/EditIPofURL.Admin.class.php
--- a/plugins/spamx/EditIPofURL.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/EditIPofURL.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -4,13 +4,12 @@
 * File: EditIPofURL.Admin.class.php
 * This is the Edit IPofURL Module for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2004-2008 by the following authors:
+* Copyright (C) 2004-2009 by the following authors:
 * Author    Tom Willett     tomw AT pigstye DOT net
 *           Dirk Haun       dirk AT haun-online DOT de
 *
 * Licensed under GNU General Public License
 *
-* $Id: EditIPofURL.Admin.class.php,v 1.12 2008/09/21 08:37:08 dhaun Exp $
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIPofURL.Admin.class.php') !== false) {
@@ -47,7 +46,8 @@
 
         if (($action == 'delete') && SEC_checkToken()) {
             $entry = addslashes($entry);
-            $result = DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name = 'IPofUrl' AND value = '$entry'");
+            DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                         array('IPofUrl', $entry));
         } elseif (($action == $LANG_SX00['addentry']) && SEC_checkToken()) {
             if (!empty($entry)) {
                 $entry = addslashes($entry);
diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/Import.Admin.class.php
--- a/plugins/spamx/Import.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/Import.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -6,7 +6,7 @@
  *
  * Updates Sites MT Blacklist via Master MT Blacklist rss feed
  *
- * Copyright (C) 2004-2007 by the following authors:
+ * Copyright (C) 2004-2009 by the following authors:
  * Author      Tom Willett     tomw AT pigstye DOT net
  * Author      Dirk Haun       dirk AT haun-online DOT de
  *
@@ -15,7 +15,6 @@
  * Based on MT-Blacklist Updater by
  * Cheah Chu Yeow (http://blog.codefront.net/)
  *
- * $Id: Import.Admin.class.php,v 1.15 2008/09/21 08:37:08 dhaun Exp $
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'Import.Admin.class.php') !== false) {
@@ -102,7 +101,8 @@
                 $result = DB_query("SELECT name FROM {$_TABLES['spamx']} WHERE name = 'MTBlacklist' AND value = '$dbentry'");
                 $nrows = DB_numRows($result);
                 if ($nrows >= 1) {
-                    DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name = 'MTBlacklist' AND value = '$dbentry'");
+                    DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                                 array('MTBlacklist', $dbentry));
                     $to_delete[] = $entry;
                 }
             }
diff -r b323f2256af0 -r 542d249e5af4 plugins/spamx/SLVwhitelist.Admin.class.php
--- a/plugins/spamx/SLVwhitelist.Admin.class.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/plugins/spamx/SLVwhitelist.Admin.class.php	Sat Feb 28 22:43:04 2009 +0100
@@ -4,13 +4,12 @@
 * File: SLVwhitelist.Admin.class.php
 * This is the SLV Whitelist Module for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2004-2008 by the following authors:
+* Copyright (C) 2004-2009 by the following authors:
 * Author   Tom Willett     tomw AT pigstye DOT net
 *          Dirk Haun       dirk AT haun-online DOT de
 *
 * Licensed under GNU General Public License
 *
-* $Id: SLVwhitelist.Admin.class.php,v 1.8 2008/09/21 08:37:08 dhaun Exp $
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVwhitelist.Admin.class.php') !== false) {
@@ -47,7 +46,8 @@
 
         if (($action == 'delete') && SEC_checkToken()) {
             $entry = addslashes($entry);
-            $result = DB_query("DELETE FROM {$_TABLES['spamx']} WHERE name = 'SLVwhitelist' AND value = '$entry'");
+            DB_delete($_TABLES['spamx'], array('name', 'value'),
+                                         array('SLVwhitelist', $entry));
         } elseif (($action == $LANG_SX00['addentry']) && SEC_checkToken()) {
             if (!empty($entry)) {
                 $entry = addslashes($entry);
diff -r b323f2256af0 -r 542d249e5af4 public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/public_html/admin/plugins/polls/index.php	Sat Feb 28 22:43:04 2009 +0100
@@ -530,10 +530,11 @@
         return COM_refresh ($_CONF['site_admin_url'] . '/plugins/polls/index.php');
     }
 
-    DB_delete ($_TABLES['polltopics'], 'pid', $pid);
-    DB_delete ($_TABLES['pollanswers'], 'pid', $pid);
-    DB_delete ($_TABLES['pollquestions'], 'pid', $pid);
-    DB_query ("DELETE FROM {$_TABLES['comments']} WHERE sid = '$pid' AND type = 'polls'");
+    DB_delete($_TABLES['polltopics'], 'pid', $pid);
+    DB_delete($_TABLES['pollanswers'], 'pid', $pid);
+    DB_delete($_TABLES['pollquestions'], 'pid', $pid);
+    DB_delete($_TABLES['comments'], array('sid', 'type'),
+                                    array($pid,  'polls'));
 
     PLG_itemDeleted($pid, 'polls');
 
diff -r b323f2256af0 -r 542d249e5af4 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/public_html/admin/topic.php	Sat Feb 28 22:43:04 2009 +0100
@@ -422,18 +422,20 @@
 
     // delete comments, trackbacks, images associated with stories in this topic
     $result = DB_query ("SELECT sid FROM {$_TABLES['stories']} WHERE tid = '$tid'");
-    $numStories = DB_numRows ($result);
+    $numStories = DB_numRows($result);
     for ($i = 0; $i < $numStories; $i++) {
-        $A = DB_fetchArray ($result);
-        STORY_deleteImages ($A['sid']);
-        DB_query("DELETE FROM {$_TABLES['comments']} WHERE sid = '{$A['sid']}' AND type = 'article'");
-        DB_query("DELETE FROM {$_TABLES['trackback']} WHERE sid = '{$A['sid']}' AND type = 'article'");
+        $A = DB_fetchArray($result);
+        STORY_deleteImages($A['sid']);
+        DB_delete($_TABLES['comments'], array('sid', 'type'),
+                                        array($A['sid'], 'article'));
+        DB_delete($_TABLES['trackback'], array('sid', 'type'),
+                                         array($A['sid'], 'article'));
     }
 
     // delete these
-    DB_delete ($_TABLES['stories'], 'tid', $tid);
-    DB_delete ($_TABLES['storysubmission'], 'tid', $tid);
-    DB_delete ($_TABLES['topics'], 'tid', $tid);
+    DB_delete($_TABLES['stories'], 'tid', $tid);
+    DB_delete($_TABLES['storysubmission'], 'tid', $tid);
+    DB_delete($_TABLES['topics'], 'tid', $tid);
 
     // update feed(s) and Older Stories block
     COM_rdfUpToDateCheck('article');
diff -r b323f2256af0 -r 542d249e5af4 system/lib-sessions.php
--- a/system/lib-sessions.php	Sat Feb 28 20:51:43 2009 +0100
+++ b/system/lib-sessions.php	Sat Feb 28 22:43:04 2009 +0100
@@ -253,7 +253,7 @@
     $expirytime = (string) (time() - $lifespan);
     if (!isset($_COOKIE[$_CONF['cookie_session']])) {
         // ok, delete any old sessons for this user
-        DB_query("DELETE FROM {$_TABLES['sessions']} WHERE uid = $userid");
+        DB_delete($_TABLES['sessions'], 'uid', $userid);
     } else {
         $deleteSQL = "DELETE FROM {$_TABLES['sessions']} WHERE (start_time < $expirytime)";
         $delresult = DB_query($deleteSQL);
@@ -268,7 +268,8 @@
         }
     }
     // Remove the anonymous sesssion for this user
-    DB_query("DELETE FROM {$_TABLES['sessions']} WHERE uid = 1 AND remote_ip = '$remote_ip'");
+    DB_delete($_TABLES['sessions'], array('uid', 'remote_ip'),
+                                    array(1, $remote_ip));
 
     // Create new session
     if (empty ($md5_sessid)) {
@@ -417,8 +418,7 @@
 {
     global $_TABLES;
 
-    $sql = "DELETE FROM {$_TABLES['sessions']} WHERE (uid = $userid)";
-    $result = DB_query($sql);
+    DB_delete($_TABLES['sessions'], 'uid', $userid);
 
     return 1;
 }

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 03:10:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 03:10:57 -0500
Subject: [geeklog-cvs] geeklog: Prefer SQL keywords in uppercase
Message-ID: <hg.b1a61ff147cb.1235895057.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b1a61ff147cb
changeset: 6808:b1a61ff147cb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Feb 28 22:58:46 2009 +0100
description:
Prefer SQL keywords in uppercase

diffstat:

4 files changed, 8 insertions(+), 8 deletions(-)
plugins/calendar/functions.inc    |    2 +-
plugins/polls/functions.inc       |    6 +++---
plugins/staticpages/functions.inc |    4 ++--
public_html/lib-common.php        |    4 ++--

diffs (84 lines):

diff -r 542d249e5af4 -r b1a61ff147cb plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Feb 28 22:43:04 2009 +0100
+++ b/plugins/calendar/functions.inc	Sat Feb 28 22:58:46 2009 +0100
@@ -1295,7 +1295,7 @@
     $display = '';
 
     // Top Ten Events
-    $result = DB_query("SELECT eid,title,hits from {$_TABLES['events']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
+    $result = DB_query("SELECT eid,title,hits FROM {$_TABLES['events']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
     $nrows  = DB_numRows($result);
     if ($nrows > 0) {
         $header_arr = array(
diff -r 542d249e5af4 -r b1a61ff147cb plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Feb 28 22:43:04 2009 +0100
+++ b/plugins/polls/functions.inc	Sat Feb 28 22:58:46 2009 +0100
@@ -220,7 +220,7 @@
 
     $retval = '';
 
-    $result = DB_query ("SELECT pid,topic,voters from {$_TABLES['polltopics']} WHERE (voters > 0)" . COM_getPermSQL ('AND') . " ORDER BY voters DESC LIMIT 10");
+    $result = DB_query ("SELECT pid,topic,voters FROM {$_TABLES['polltopics']} WHERE (voters > 0)" . COM_getPermSQL ('AND') . " ORDER BY voters DESC LIMIT 10");
     $nrows  = DB_numRows ($result);
 
     if ($nrows > 0) {
@@ -638,7 +638,7 @@
 
     $retval = '';
 
-    DB_query("DELETE FROM {$_TABLES['pollvoters']} WHERE date < unix_timestamp() - {$_PO_CONF['polladdresstime']}");
+    DB_query("DELETE FROM {$_TABLES['pollvoters']} WHERE date < UNIX_TIMESTAMP() - {$_PO_CONF['polladdresstime']}");
 
     if(!empty($pid)) {
         if(!isset($_COOKIE["poll-".$pid]) && !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
@@ -647,7 +647,7 @@
             $retval .= POLLS_pollResults($pid, $size);
         }
     } else {
-        $result = DB_query("SELECT pid,topic,is_open from {$_TABLES['polltopics']} WHERE display = 1 ORDER BY date DESC");
+        $result = DB_query("SELECT pid,topic,is_open FROM {$_TABLES['polltopics']} WHERE display = 1 ORDER BY date DESC");
         $nrows = DB_numRows($result );
 
         $title = DB_getItem($_TABLES['blocks'], 'title', "name='poll_block'");
diff -r 542d249e5af4 -r b1a61ff147cb plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Feb 28 22:43:04 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Feb 28 22:58:46 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the Static     |
 // | Pages' PHP files.                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -644,7 +644,7 @@
     global $_CONF, $_TABLES, $LANG_STATIC;
 
     if (SEC_hasRights ('staticpages.edit,staticpages.delete', 'OR')) {
-        $result = DB_query ("SELECT count(*) AS cnt FROM {$_TABLES['staticpage']}" . COM_getPermSQL ('WHERE', 0, 3));
+        $result = DB_query ("SELECT COUNT(*) AS cnt FROM {$_TABLES['staticpage']}" . COM_getPermSQL ('WHERE', 0, 3));
         $A = DB_fetchArray ($result);
         $total_pages = $A['cnt'];
         return array ($LANG_STATIC['staticpages'], $_CONF['site_admin_url'] . '/plugins/staticpages/index.php', $total_pages);
diff -r 542d249e5af4 -r b1a61ff147cb public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Feb 28 22:43:04 2009 +0100
+++ b/public_html/lib-common.php	Sat Feb 28 22:58:46 2009 +0100
@@ -1842,7 +1842,7 @@
 
     $curdate = date( "Y-m-d H:i:s", time() );
 
-    if( DB_getItem( $_TABLES['stories'], 'count(*)', "featured = 1 AND draft_flag = 0 AND date <= '$curdate'" ) > 1 )
+    if( DB_getItem( $_TABLES['stories'], 'COUNT(*)', "featured = 1 AND draft_flag = 0 AND date <= '$curdate'" ) > 1 )
     {
         // OK, we have two featured stories, fix that
 
@@ -2495,7 +2495,7 @@
             }
             else
             {
-                $nresult = DB_query( "SELECT COUNT(*) AS count from {$_TABLES['stories']} WHERE" . $topicsql . COM_getPermSql( 'AND' ));
+                $nresult = DB_query( "SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE" . $topicsql . COM_getPermSql( 'AND' ));
                 $N = DB_fetchArray( $nresult );
                 $numstories = $N['count'];
             }

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 04:19:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 04:19:27 -0500
Subject: [geeklog-cvs] geeklog: Reinstated old definitions of the
	{start_contributedby_...
Message-ID: <hg.40ee788859dc.1235899167.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/40ee788859dc
changeset: 6809:40ee788859dc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 09:38:38 2009 +0100
description:
Reinstated old definitions of the {start_contributedby_anchortag}, {end_contributedby_anchortag}, and {contributedby_author} variables (bug #0000821)

diffstat:

4 files changed, 29 insertions(+), 9 deletions(-)
public_html/docs/history        |    4 ++++
public_html/docs/theme.html     |    8 ++++++++
public_html/docs/themevars.html |    5 +++++
system/lib-story.php            |   21 ++++++++++++---------

diffs (81 lines):

diff -r b1a61ff147cb -r 40ee788859dc public_html/docs/history
--- a/public_html/docs/history	Sat Feb 28 22:58:46 2009 +0100
+++ b/public_html/docs/history	Sun Mar 01 09:38:38 2009 +0100
@@ -11,6 +11,10 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Reinstated old definitions of the {start_contributedby_anchortag},
+  {end_contributedby_anchortag}, and {contributedby_author} variables, i.e. the
+  two anchortag variables are set again and _author contains the name only (bug
+  #0000821) [Dirk]
 - Auto-deleting a story didn't delete trackbacks for that story [Dirk]
 - Ensure consistent template variable names for the Permission Editor [Dirk]
 - Added new permission 'group.assign', now required to be able to assign a user
diff -r b1a61ff147cb -r 40ee788859dc public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sat Feb 28 22:58:46 2009 +0100
+++ b/public_html/docs/theme.html	Sun Mar 01 09:38:38 2009 +0100
@@ -198,6 +198,14 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.0</a></h2>
 
 <ul>
+<li>The two variables <tt>{start_contributedby_anchortag}</tt> and
+    <tt>{end_contributedby_anchortag}</tt> were not set any more (since Geeklog
+    1.5.0). Instead, the link to the author's profile was added to
+    <tt>{contributedby_author}</tt>, so that the combination of these three
+    variables (as used in the story templates) still seemed to work. Geeklog
+    1.6.0 reinstates the old definitions, i.e. the anchortag variables contain
+    the opening and closing tag to link to the author's profile and
+    <tt>{contributedby_author}</tt> contains only the author's name.</li>
 <li>New variable <tt>{photo_max_dimensions}</tt> to inform users about the
     max. dimensions of a userphoto: <tt>preferences/userphoto.thtml</tt></li>
 <li>Added a <tt>print.css</tt> stylesheet to be used by the
diff -r b1a61ff147cb -r 40ee788859dc public_html/docs/themevars.html
--- a/public_html/docs/themevars.html	Sat Feb 28 22:58:46 2009 +0100
+++ b/public_html/docs/themevars.html	Sun Mar 01 09:38:38 2009 +0100
@@ -325,6 +325,11 @@
     <td>Tony Bibbs</td>
     <td>The full name of the story's author. If the user hasn't filled in
         his/her full name, the user name is used instead.</td></tr>
+<tr><td><code>contributedby_author</code></td>
+    <td>Tony Bibbs</td>
+    <td>The name of the story's author. If <code>$_CONF['show_fullname']</code>
+        is enabled, it will contain the author's full name (if provided).
+        Otherwise, it will contain the user name.</td></tr>
 <tr><td><code>start_contributedby_anchortag</code></td>
     <td><code>&lt;a class="storybyline" href="http://www.example.com/<br>users.php?mode=profile&amp;uid=7"&gt;</code></td>
     <td>Opening tag for a link to the story author's profile (empty for
diff -r b1a61ff147cb -r 40ee788859dc system/lib-story.php
--- a/system/lib-story.php	Sat Feb 28 22:58:46 2009 +0100
+++ b/system/lib-story.php	Sun Mar 01 09:38:38 2009 +0100
@@ -125,18 +125,21 @@
         } else {
             $article->set_var( 'contributedby_fullname',$story->DisplayElements('fullname') );
         }
-        $authorname = COM_getDisplayName( $story->DisplayElements('uid'), $story->DisplayElements('username'), $fullname );
 
-        $article->set_var( 'author', $authorname );
-        $profileUrl = $_CONF['site_url'] . '/users.php?mode=profile&amp;uid='
-            . $story->DisplayElements('uid');
+        $authorname = COM_getDisplayName($story->DisplayElements('uid'),
+                            $story->DisplayElements('username'), $fullname);
+        $article->set_var('contributedby_author', $authorname);
+        $article->set_var('author', $authorname);
 
-        if( $story->DisplayElements('uid') > 1 )
-        {
-            $article->set_var( 'contributedby_url', $profileUrl );
-            $authorname = COM_createLink($authorname, $profileUrl, array('class' => 'storybyline'));
+        if ($story->DisplayElements('uid') > 1) {
+            $profileUrl = $_CONF['site_url']
+                        . '/users.php?mode=profile&amp;uid='
+                        . $story->DisplayElements('uid');
+            $article->set_var('start_contributedby_anchortag',
+                    '<a class="storybyline" href="' . $profileUrl . '">');
+            $article->set_var('end_contributedby_anchortag', '</a>');
+            $article->set_var('contributedby_url', $profileUrl);
         }
-        $article->set_var( 'contributedby_author', $authorname );
 
         $photo = '';
         if ($_CONF['allow_user_photo'] == 1) {

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 04:19:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 04:19:27 -0500
Subject: [geeklog-cvs] geeklog: {contributedby_user} and
	{contributedby_fullname} weren...
Message-ID: <hg.a488a2867ab6.1235899167.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a488a2867ab6
changeset: 6810:a488a2867ab6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 10:19:16 2009 +0100
description:
{contributedby_user} and {contributedby_fullname} weren't set in the story templates (bug #0000821)

diffstat:

5 files changed, 25 insertions(+), 9 deletions(-)
public_html/article.php        |    2 ++
public_html/docs/history       |    2 ++
public_html/docs/theme.html    |    2 ++
system/classes/story.class.php |    7 +++++++
system/lib-story.php           |   21 ++++++++++++---------

diffs (96 lines):

diff -r 40ee788859dc -r a488a2867ab6 public_html/article.php
--- a/public_html/article.php	Sun Mar 01 09:38:38 2009 +0100
+++ b/public_html/article.php	Sun Mar 01 10:19:16 2009 +0100
@@ -122,6 +122,8 @@
                 $story->{$varname} = $output[$fieldname];
             }
         }
+        $story->_username = $output['username'];
+        $story->_fullname = $output['fullname'];
     }
 
     if ($output == STORY_PERMISSION_DENIED) {
diff -r 40ee788859dc -r a488a2867ab6 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 01 09:38:38 2009 +0100
+++ b/public_html/docs/history	Sun Mar 01 10:19:16 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- {contributedby_user} and {contributedby_fullname} weren't set in the story
+  templates (bug #0000821) [Dirk]
 - Reinstated old definitions of the {start_contributedby_anchortag},
   {end_contributedby_anchortag}, and {contributedby_author} variables, i.e. the
   two anchortag variables are set again and _author contains the name only (bug
diff -r 40ee788859dc -r a488a2867ab6 public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sun Mar 01 09:38:38 2009 +0100
+++ b/public_html/docs/theme.html	Sun Mar 01 10:19:16 2009 +0100
@@ -198,6 +198,8 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.0</a></h2>
 
 <ul>
+<li>Bugfix: The variables <tt>{contributedby_user}</tt> and
+    <tt>{contributedby_fullname}</tt> were always empty.</li>
 <li>The two variables <tt>{start_contributedby_anchortag}</tt> and
     <tt>{end_contributedby_anchortag}</tt> were not set any more (since Geeklog
     1.5.0). Instead, the link to the author's profile was added to
diff -r 40ee788859dc -r a488a2867ab6 system/classes/story.class.php
--- a/system/classes/story.class.php	Sun Mar 01 09:38:38 2009 +0100
+++ b/system/classes/story.class.php	Sun Mar 01 10:19:16 2009 +0100
@@ -363,6 +363,13 @@
             if (array_key_exists($fieldname, $story)) {
                 $this->{$varname}= stripslashes($story[$fieldname]);
             }
+        }
+
+        if (array_key_exists('username', $story)) {
+            $this->_username = $story['username'];
+        }
+        if (array_key_exists('fullname', $story)) {
+            $this->_fullname = $story['fullname'];
         }
 
         // Overwrite the date with the timestamp.
diff -r 40ee788859dc -r a488a2867ab6 system/lib-story.php
--- a/system/lib-story.php	Sun Mar 01 09:38:38 2009 +0100
+++ b/system/lib-story.php	Sun Mar 01 10:19:16 2009 +0100
@@ -114,20 +114,21 @@
     }
     $article->set_var( 'story_id', $story->getSid() );
 
-    if( $_CONF['contributedbyline'] == 1 )
-    {
-        $article->set_var( 'lang_contributed_by', $LANG01[1] );
-        $article->set_var( 'contributedby_uid', $story->DisplayElements('uid') );
+    if ($_CONF['contributedbyline'] == 1) {
+        $article->set_var('lang_contributed_by', $LANG01[1]);
+        $article->set_var('contributedby_uid', $story->DisplayElements('uid'));
+
         $fullname = $story->DisplayElements('fullname');
-        $article->set_var( 'contributedby_user', $story->DisplayElements('username') );
-        if (empty ($fullname)) {
-            $article->set_var( 'contributedby_fullname', $story->DisplayElements('username') );
+        $username = $story->DisplayElements('username');
+        $article->set_var('contributedby_user', $username);
+        if (empty($fullname)) {
+            $article->set_var('contributedby_fullname', $username);
         } else {
-            $article->set_var( 'contributedby_fullname',$story->DisplayElements('fullname') );
+            $article->set_var('contributedby_fullname',$fullname);
         }
 
         $authorname = COM_getDisplayName($story->DisplayElements('uid'),
-                            $story->DisplayElements('username'), $fullname);
+                                         $username, $fullname);
         $article->set_var('contributedby_author', $authorname);
         $article->set_var('author', $authorname);
 
@@ -1441,6 +1442,8 @@
             $varname = '_' . $fieldname;
             $output[$fieldname] = $story->{$varname};
         }
+        $output['username'] = $story->_username;
+        $output['fullname'] = $story->_fullname;
 
         if ($args['gl_svc']) {
             if (($output['statuscode'] == STORY_ARCHIVE_ON_EXPIRE) ||

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 05:05:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 05:05:31 -0500
Subject: [geeklog-cvs] geeklog: Fixed duplicate plugin entries when a plugin
	has more t...
Message-ID: <hg.d1a4cbb036ee.1235901931.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d1a4cbb036ee
changeset: 6811:d1a4cbb036ee
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 11:05:21 2009 +0100
description:
Fixed duplicate plugin entries when a plugin has more than one entry for the admin or user menu (bug #0000820)

diffstat:

2 files changed, 14 insertions(+), 13 deletions(-)
public_html/docs/history |    2 ++
system/lib-plugins.php   |   25 ++++++++++++-------------

diffs (67 lines):

diff -r a488a2867ab6 -r d1a4cbb036ee public_html/docs/history
--- a/public_html/docs/history	Sun Mar 01 10:19:16 2009 +0100
+++ b/public_html/docs/history	Sun Mar 01 11:05:21 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed duplicate plugin entries when a plugin has more than one entry for the
+  admin or user menu (bug #0000820)
 - {contributedby_user} and {contributedby_fullname} weren't set in the story
   templates (bug #0000821) [Dirk]
 - Reinstated old definitions of the {start_contributedby_anchortag},
diff -r a488a2867ab6 -r d1a4cbb036ee system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 01 10:19:16 2009 +0100
+++ b/system/lib-plugins.php	Sun Mar 01 11:05:21 2009 +0100
@@ -825,19 +825,18 @@
 {
     global $_PLUGINS;
 
-    $plgresults = array ();
+    $plgresults = array();
 
-    $counter = 0;
+    $num_var_names = count($var_names);
     foreach ($_PLUGINS as $pi_name) {
         $function = $function_name . $pi_name;
-        if (function_exists ($function)) {
+        if (function_exists($function)) {
             $plg_array = $function();
-            if (($plg_array !== false) && (count ($plg_array) > 0)) {
+            if (($plg_array !== false) && (count($plg_array) > 0)) {
                 // Check if plugin is returning a single record array or multiple records
-                $entries = count ($plg_array[0]);
-                if ($entries == 0) {
-                    $sets_array = array ();
-                } else if ($entries == 1) {
+                $sets_array = array();
+                $entries = count($plg_array[0]);
+                if ($entries == 1) {
                     // Single record - so we need to prepare the sets_array;
                     $sets_array[0] = $plg_array;
                 } else {
@@ -847,19 +846,19 @@
                 foreach ($sets_array as $val) {
                     $plugin = new Plugin();
                     $good_array = true;
-                    for ($n = 0; $n < count($var_names); $n++) {
-                        if (isset ($val[$n])) {
+                    for ($n = 0; $n < $num_var_names; $n++) {
+                        if (isset($val[$n])) {
                             $plugin->$var_names[$n] = $val[$n];
                         } else {
                             $plugin->$var_names[$n] = '';
                         }
-                        if (empty ($plugin->$var_names[$n]) && $required_names[$n]) {
+                        if (empty($plugin->$var_names[$n]) && $required_names[$n]) {
                             $good_array = false;
                         }
                     }
-                    $counter++;
+
                     if ($good_array) {
-                        $plgresults[$counter] = $plugin;
+                        $plgresults[] = $plugin;
                     }
                 }
             }

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 15:31:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 15:31:42 -0500
Subject: [geeklog-cvs] geeklog: Made url rewriting work on setups that only
	set $_SERVE...
Message-ID: <hg.1986404b773e.1235939502.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1986404b773e
changeset: 6812:1986404b773e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 13:43:11 2009 +0100
description:
Made url rewriting work on setups that only set $_SERVER['ORIG_PATH_INFO'] (bug #0000816)

diffstat:

2 files changed, 16 insertions(+), 17 deletions(-)
public_html/docs/history     |    2 ++
system/classes/url.class.php |   31 ++++++++++++++-----------------

diffs (87 lines):

diff -r d1a4cbb036ee -r 1986404b773e public_html/docs/history
--- a/public_html/docs/history	Sun Mar 01 11:05:21 2009 +0100
+++ b/public_html/docs/history	Sun Mar 01 13:43:11 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Made url rewriting work on setups that only set $_SERVER['ORIG_PATH_INFO']
+  (bug #0000816)
 - Fixed duplicate plugin entries when a plugin has more than one entry for the
   admin or user menu (bug #0000820)
 - {contributedby_user} and {contributedby_fullname} weren't set in the story
diff -r d1a4cbb036ee -r 1986404b773e system/classes/url.class.php
--- a/system/classes/url.class.php	Sun Mar 01 11:05:21 2009 +0100
+++ b/system/classes/url.class.php	Sun Mar 01 13:43:11 2009 +0100
@@ -2,16 +2,15 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.4                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | url.class.php                                                             |
 // |                                                                           |
 // | class to allow for spider friendly URL's                                  |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002 by the following authors:                              |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
-// | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
-// |                                                                           |
+// | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // +---------------------------------------------------------------------------+
 // |                                                                           |
 // | This program is free software; you can redistribute it and/or             |
@@ -29,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: url.class.php,v 1.11 2006/09/09 12:52:06 dhaun Exp $
 
 /**
 * This class will allow you to use friendlier URL's, like:
@@ -76,23 +73,23 @@
     */
     function _getArguments()
     {
-        if (isset ($_SERVER['PATH_INFO'])) {
-            if ($_SERVER['PATH_INFO'] == '')
-            {
-                if (isset ($_ENV['ORIG_PATH_INFO']))
-                {
+        if (isset($_SERVER['PATH_INFO'])) {
+            if ($_SERVER['PATH_INFO'] == '') {
+                if (isset($_ENV['ORIG_PATH_INFO'])) {
                     $this->_arguments = explode('/', $_ENV['ORIG_PATH_INFO']);
                 } else {
                     $this->_arguments = array();
                 }
             } else {
-                $this->_arguments = explode ('/', $_SERVER['PATH_INFO']);
+                $this->_arguments = explode('/', $_SERVER['PATH_INFO']);
             }
-            array_shift ($this->_arguments);
-        } else if (isset ($_ENV['ORIG_PATH_INFO'])) {
-            $this->_arguments = explode('/', substr($_ENV['ORIG_PATH_INFO'],1));
+            array_shift($this->_arguments);
+        } elseif (isset($_ENV['ORIG_PATH_INFO'])) {
+            $this->_arguments = explode('/', substr($_ENV['ORIG_PATH_INFO'], 1));
+        } elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
+            $this->_arguments = explode('/', substr($_SERVER['ORIG_PATH_INFO'], 1));
         } else {
-            $this->_arguments = array ();
+            $this->_arguments = array();
         }
     }
 
@@ -200,7 +197,7 @@
         if (!$this->isEnabled()) {
             return $url;
         }
-        
+
         $pos = strpos($url,'?');
         $query_string = substr($url,$pos+1);
         $finalList = array();

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 15:31:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 15:31:43 -0500
Subject: [geeklog-cvs] geeklog: Removed outdated comment
Message-ID: <hg.4196a0ba839b.1235939503.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4196a0ba839b
changeset: 6813:4196a0ba839b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 16:22:02 2009 +0100
description:
Removed outdated comment

diffstat:

1 file changed, 3 deletions(-)
public_html/lib-common.php |    3 ---

diffs (13 lines):

diff -r 1986404b773e -r 4196a0ba839b public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 01 13:43:11 2009 +0100
+++ b/public_html/lib-common.php	Sun Mar 01 16:22:02 2009 +0100
@@ -251,9 +251,6 @@
 require_once( $_CONF['path_system'] . 'lib-mbyte.php' );
 
 // Set theme
-// Need to modify this code to check if theme was cached in user cookie.  That
-// way if user logged in and set theme and then logged out we would still know
-// which theme to show them.
 
 $usetheme = '';
 if( isset( $_POST['usetheme'] ))

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 15:31:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 15:31:44 -0500
Subject: [geeklog-cvs] geeklog: More cases where we should be using DB_delete
Message-ID: <hg.15dc24cdaccb.1235939504.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/15dc24cdaccb
changeset: 6814:15dc24cdaccb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 16:33:31 2009 +0100
description:
More cases where we should be using DB_delete

diffstat:

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

diffs (23 lines):

diff -r 4196a0ba839b -r 15dc24cdaccb public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 01 16:22:02 2009 +0100
+++ b/public_html/lib-common.php	Sun Mar 01 16:33:31 2009 +0100
@@ -340,7 +340,8 @@
 // Handle Who's Online block
 if (COM_isAnonUser() && isset($_SERVER['REMOTE_ADDR'])) {
     // The following code handles anonymous users so they show up properly
-    DB_query( "DELETE FROM {$_TABLES['sessions']} WHERE remote_ip = '{$_SERVER['REMOTE_ADDR']}' AND uid = 1" );
+    DB_delete($_TABLES['sessions'], array('remote_ip', 'uid'),
+                                    array($_SERVER['REMOTE_ADDR'], 1));
 
     $tries = 0;
     do
@@ -5202,7 +5203,8 @@
     }
     $property = addslashes($property);
 
-    DB_query("DELETE FROM {$_TABLES['speedlimit']} WHERE (type = '$type') AND (ipaddress = '$property')");
+    DB_delete($_TABLES['speedlimit'], array('type', 'ipaddress'),
+                                      array($type, $property));
 }
 
 /**

From geeklog-cvs at lists.geeklog.net  Sun Mar  1 15:31:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 01 Mar 2009 15:31:45 -0500
Subject: [geeklog-cvs] geeklog: Only open theme directory when needed
Message-ID: <hg.e6d01d19b66b.1235939505.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e6d01d19b66b
changeset: 6815:e6d01d19b66b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 01 16:44:29 2009 +0100
description:
Only open theme directory when needed

diffstat:

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

diffs (30 lines):

diff -r 15dc24cdaccb -r e6d01d19b66b public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 01 16:33:31 2009 +0100
+++ b/public_html/lib-common.php	Sun Mar 01 16:44:29 2009 +0100
@@ -144,7 +144,7 @@
     } else {
         $curPHPIncludePath = $_CONF['path_pear'] . PATH_SEPARATOR
                            . $curPHPIncludePath;
-    } 
+    }
 
     if (set_include_path($curPHPIncludePath) === false) {
         COM_errorLog('set_include_path failed - there may be problems using the PEAR classes.', 1);
@@ -528,8 +528,6 @@
 
     $themes = array();
 
-    $fd = opendir( $_CONF['path_themes'] );
-
     // If users aren't allowed to change their theme then only return the default theme
 
     if(( $_CONF['allow_user_themes'] == 0 ) && !$all )
@@ -538,6 +536,8 @@
     }
     else
     {
+        $fd = opendir( $_CONF['path_themes'] );
+
         while(( $dir = @readdir( $fd )) == TRUE )
         {
             if( is_dir( $_CONF['path_themes'] . $dir) && $dir <> '.' && $dir <> '..' && $dir <> 'CVS' && substr( $dir, 0 , 1 ) <> '.' )

From geeklog-cvs at lists.geeklog.net  Wed Mar  4 08:15:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Mar 2009 08:15:32 -0500
Subject: [geeklog-cvs] geeklog: Typo - calling wrong/nonexistent function
Message-ID: <hg.a28d8b6202c4.1236172532.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a28d8b6202c4
changeset: 6816:a28d8b6202c4
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Mar 04 14:08:02 2009 +0100
description:
Typo - calling wrong/nonexistent function

diffstat:

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

diffs (12 lines):

diff -r e6d01d19b66b -r a28d8b6202c4 system/classes/syndication/feedparserbase.class.php
--- a/system/classes/syndication/feedparserbase.class.php	Sun Mar 01 16:44:29 2009 +0100
+++ b/system/classes/syndication/feedparserbase.class.php	Wed Mar 04 14:08:02 2009 +0100
@@ -189,7 +189,7 @@
       {
         if($key != 'extensions')
         {
-            $value = $this->safeXML( $value );
+            $value = $this->_safeXML( $value );
             $xml .= "<$key>$value</$key>\n>";
         } else {
             if(is_array($value))

From geeklog-cvs at lists.geeklog.net  Wed Mar  4 08:15:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 04 Mar 2009 08:15:32 -0500
Subject: [geeklog-cvs] geeklog: Fixed a problem with words being merged
	together in new...
Message-ID: <hg.3b4d3b5170dc.1236172532.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3b4d3b5170dc
changeset: 6817:3b4d3b5170dc
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Mar 04 14:15:22 2009 +0100
description:
Fixed a problem with words being merged together in newsfeeds when the article was written with CR as the line separator

diffstat:

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

diffs (43 lines):

diff -r a28d8b6202c4 -r 3b4d3b5170dc public_html/docs/history
--- a/public_html/docs/history	Wed Mar 04 14:08:02 2009 +0100
+++ b/public_html/docs/history	Wed Mar 04 14:15:22 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed a problem with words being merged together in newsfeeds when the article
+  was written with CR as the line separator [Dirk]
 - Made url rewriting work on setups that only set $_SERVER['ORIG_PATH_INFO']
   (bug #0000816)
 - Fixed duplicate plugin entries when a plugin has more than one entry for the
diff -r a28d8b6202c4 -r 3b4d3b5170dc system/lib-syndication.php
--- a/system/lib-syndication.php	Wed Mar 04 14:08:02 2009 +0100
+++ b/system/lib-syndication.php	Wed Mar 04 14:15:22 2009 +0100
@@ -270,7 +270,7 @@
             $storytext = SYND_truncateSummary( $fulltext, $contentLength );
 
             $fulltext = trim( $fulltext );
-            $fulltext = str_replace("\015", '', $fulltext);
+            $fulltext = str_replace(array("\015\012", "\015"), "\012", $fulltext);
 
             if( $row['postmode'] == 'plaintext' ) 
             {
@@ -403,7 +403,8 @@
         $fulltext = PLG_replaceTags( $fulltext );
         $storytext = SYND_truncateSummary( $fulltext, $contentLength );
         $fulltext = trim( $fulltext );
-        $fulltext = str_replace("\015", '', $fulltext);
+COM_errorLog($fulltext);
+        $fulltext = str_replace(array("\015\012", "\015"), "\012", $fulltext);
 
         if( $row['postmode'] == 'plaintext' ) 
         {
@@ -631,7 +632,7 @@
     {
         $text = stripslashes( $text );
         $text = trim( $text );
-        $text = str_replace("\015", '', $text);
+        $text = str_replace(array("\015\012", "\015"), "\012", $text);
         if(( $length > 3 ) && ( MBYTE_strlen( $text ) > $length ))
         {
             $text = substr( $text, 0, $length - 3 ) . '...';

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 09:42:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 09:42:06 -0500
Subject: [geeklog-cvs] geeklog: An attempt to get phpDocumentator to
	recognize Spam-X a...
Message-ID: <hg.c6b33dac067e.1236436926.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c6b33dac067e
changeset: 6818:c6b33dac067e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 15:11:33 2009 +0100
description:
An attempt to get phpDocumentator to recognize Spam-X as a package and produce some documentation

diffstat:

25 files changed, 83 insertions(+), 38 deletions(-)
plugins/spamx/BaseAdmin.class.php               |    5 ++-
plugins/spamx/BaseCommand.class.php             |    9 ++++--
plugins/spamx/BlackList.Examine.class.php       |    2 -
plugins/spamx/DeleteComment.Action.class.php    |    2 -
plugins/spamx/EditBlackList.Admin.class.php     |    1 
plugins/spamx/EditHeader.Admin.class.php        |    1 
plugins/spamx/EditIP.Admin.class.php            |    1 
plugins/spamx/EditIPofURL.Admin.class.php       |    1 
plugins/spamx/Header.Examine.class.php          |    2 -
plugins/spamx/IP.Examine.class.php              |    2 -
plugins/spamx/IPofUrl.Examine.class.php         |    2 -
plugins/spamx/Import.Admin.class.php            |    1 
plugins/spamx/LogView.Admin.class.php           |    2 -
plugins/spamx/MTBlackList.Examine.class.php     |    1 
plugins/spamx/MailAdmin.Action.class.php        |    2 -
plugins/spamx/MassDelTrackback.Admin.class.php  |    2 -
plugins/spamx/MassDelete.Admin.class.php        |    2 -
plugins/spamx/ProjectHoneyPot.Examine.class.php |    6 ++--
plugins/spamx/SLV.Examine.class.php             |    2 -
plugins/spamx/SLVbase.class.php                 |    2 -
plugins/spamx/SLVreport.Action.class.php        |    2 -
plugins/spamx/SLVwhitelist.Admin.class.php      |    1 
plugins/spamx/autoinstall.php                   |   33 ++++++++++++++++++-----
plugins/spamx/functions.inc                     |   24 +++++++++-------
plugins/spamx/install_defaults.php              |   13 +++++----

diffs (truncated from 467 to 300 lines):

diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/BaseAdmin.class.php
--- a/plugins/spamx/BaseAdmin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/BaseAdmin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -5,9 +5,12 @@
  * 
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
- * $Id: BaseAdmin.class.php,v 1.3 2005/04/10 10:02:42 dhaun Exp $
+ * @package Spam-X
  */
 
+/**
+* @abstract
+*/
 class BaseAdmin {
     /**
      * 
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/BaseCommand.class.php
--- a/plugins/spamx/BaseCommand.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/BaseCommand.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -5,17 +5,21 @@
  * 
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
- * $Id: BaseCommand.class.php,v 1.3 2005/04/10 10:02:43 dhaun Exp $
+ * @package Spam-X
  */
 
+/**
+* @abstract
+*/
 class BaseCommand {
     /**
      * 
      * @access public 
      */
 
-    var $result = null; //Result of execute command
+    var $result = null; // Result of execute command
     var $num = 0; // Action Number	
+
     /**
      * Constructor
      * 
@@ -36,6 +40,7 @@
 
         return $result;
     } 
+
     function number()
     {
         global $num;
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/BlackList.Examine.class.php
--- a/plugins/spamx/BlackList.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/BlackList.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
  * 
  * Licensed under GNU General Public License
  *
- * $Id: BlackList.Examine.class.php,v 1.13 2008/09/21 08:37:08 dhaun Exp $
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'BlackList.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/DeleteComment.Action.class.php
--- a/plugins/spamx/DeleteComment.Action.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/DeleteComment.Action.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
  * 
  * Licensed under GNU General Public License
  *
- * $Id: DeleteComment.Action.class.php,v 1.7 2008/09/21 08:37:08 dhaun Exp $
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'DeleteComment.Action.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -10,6 +10,7 @@
  *
  * Licensed under GNU General Public License
  *
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditBlackList.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/EditHeader.Admin.class.php
--- a/plugins/spamx/EditHeader.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/EditHeader.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -11,6 +11,7 @@
 *
 * Licensed under GNU General Public License
 *
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditHeader.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/EditIP.Admin.class.php
--- a/plugins/spamx/EditIP.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/EditIP.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -10,6 +10,7 @@
 *
 * Licensed under GNU General Public License
 *
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIP.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/EditIPofURL.Admin.class.php
--- a/plugins/spamx/EditIPofURL.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/EditIPofURL.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -10,6 +10,7 @@
 *
 * Licensed under GNU General Public License
 *
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIPofURL.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -11,7 +11,7 @@
 *
 * Licensed under the GNU General Public License
 *
-* $Id: Header.Examine.class.php,v 1.6 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'Header.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/IP.Examine.class.php
--- a/plugins/spamx/IP.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/IP.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
 *
 * Licensed under GNU General Public License
 *
-* $Id: IP.Examine.class.php,v 1.12 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'IP.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
 *
 * Licensed under GNU General Public License
 *
-* $Id: IPofUrl.Examine.class.php,v 1.6 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'IPofUrl.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/Import.Admin.class.php
--- a/plugins/spamx/Import.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/Import.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -15,6 +15,7 @@
  * Based on MT-Blacklist Updater by
  * Cheah Chu Yeow (http://blog.codefront.net/)
  *
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'Import.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/LogView.Admin.class.php
--- a/plugins/spamx/LogView.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/LogView.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
  *
  * Licensed under GNU General Public License
  *
- * $Id: LogView.Admin.class.php,v 1.11 2008/09/21 08:37:08 dhaun Exp $
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'LogView.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -13,6 +13,7 @@
  * The MT-Blacklist was maintained by Jay Allen
  * http://www.jayallen.org/comment_spam/
  *
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MTBlackList.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/MailAdmin.Action.class.php
--- a/plugins/spamx/MailAdmin.Action.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/MailAdmin.Action.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
  * 
  * Licensed under GNU General Public License
  *
- * $Id: MailAdmin.Action.class.php,v 1.15 2008/09/21 08:37:08 dhaun Exp $
+ * @package Spam-X
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MailAdmin.Action.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/MassDelTrackback.Admin.class.php
--- a/plugins/spamx/MassDelTrackback.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/MassDelTrackback.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -12,7 +12,7 @@
 *
 * Licensed under GNU General Public License
 *
-* $Id: MassDelTrackback.Admin.class.php,v 1.11 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelTrackback.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/MassDelete.Admin.class.php
--- a/plugins/spamx/MassDelete.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/MassDelete.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -10,7 +10,7 @@
 *
 * Licensed under GNU General Public License
 *
-* $Id: MassDelete.Admin.class.php,v 1.22 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelete.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/ProjectHoneyPot.Examine.class.php
--- a/plugins/spamx/ProjectHoneyPot.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -33,8 +33,10 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: ProjectHoneyPot.Examine.class.php,v 1.4 2008/09/21 08:37:08 dhaun Exp $
+
+/**
+* @package Spam-X
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'ProjectHoneyPot.Examine.class.php') !== false) {
     die('This file can not be used on its own!');
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/SLV.Examine.class.php
--- a/plugins/spamx/SLV.Examine.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/SLV.Examine.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
 *
 * Licensed under the GNU General Public License
 *
-* $Id: SLV.Examine.class.php,v 1.2 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLV.Examine.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/SLVbase.class.php
--- a/plugins/spamx/SLVbase.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/SLVbase.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
 *
 * Licensed under the GNU General Public License
 *
-* $Id: SLVbase.class.php,v 1.7 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVbase.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/SLVreport.Action.class.php
--- a/plugins/spamx/SLVreport.Action.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/SLVreport.Action.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -9,7 +9,7 @@
 *
 * Licensed under the GNU General Public License
 *
-* $Id: SLVreport.Action.class.php,v 1.2 2008/09/21 08:37:08 dhaun Exp $
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVreport.Action.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/SLVwhitelist.Admin.class.php
--- a/plugins/spamx/SLVwhitelist.Admin.class.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/SLVwhitelist.Admin.class.php	Sat Mar 07 15:11:33 2009 +0100
@@ -10,6 +10,7 @@
 *
 * Licensed under GNU General Public License
 *
+* @package Spam-X
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVwhitelist.Admin.class.php') !== false) {
diff -r 3b4d3b5170dc -r c6b33dac067e plugins/spamx/autoinstall.php
--- a/plugins/spamx/autoinstall.php	Wed Mar 04 14:15:22 2009 +0100
+++ b/plugins/spamx/autoinstall.php	Sat Mar 07 15:11:33 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 09:42:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 09:42:08 -0500
Subject: [geeklog-cvs] geeklog: Removed incomplete PDF generator (never
	enabled in any ...
Message-ID: <hg.10166ae7b222.1236436928.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/10166ae7b222
changeset: 6819:10166ae7b222
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 15:33:28 2009 +0100
description:
Removed incomplete PDF generator (never enabled in any shipped version)

diffstat:

24 files changed, 25 insertions(+), 674 deletions(-)
language/english.php                                        |   22 
language/english_utf-8.php                                  |   22 
language/german.php                                         |   27 -
language/german_formal.php                                  |   27 -
language/german_formal_utf-8.php                            |   27 -
language/german_utf-8.php                                   |   27 -
pdfs/README.txt                                             |    8 
public_html/admin/install/config-install.php                |    1 
public_html/article.php                                     |    8 
public_html/docs/changes.html                               |    2 
public_html/docs/config.html                                |    6 
public_html/docs/history                                    |    1 
public_html/layout/professional/archivestorytext.thtml      |    1 
public_html/layout/professional/featuredstorytext.thtml     |    1 
public_html/layout/professional/pdfgenerator/pdf.thtml      |   10 
public_html/layout/professional/pdfgenerator/pdf_form.thtml |   14 
public_html/layout/professional/storytext.thtml             |    1 
public_html/lib-common.php                                  |   15 
public_html/pdfgenerator.php                                |  296 -----------
sql/updates/mssql_1.5.2_to_1.6.0.php                        |    5 
sql/updates/mysql_1.5.2_to_1.6.0.php                        |    5 
system/build/buildpackage.php                               |    3 
system/classes/conversion.class.php                         |  152 -----
system/lib-story.php                                        |   18 

diffs (truncated from 1064 to 300 lines):

diff -r c6b33dac067e -r 10166ae7b222 language/english.php
--- a/language/english.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/english.php	Sat Mar 07 15:33:28 2009 +0100
@@ -152,7 +152,7 @@
     108 => 'Clear Cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'Trackbacks',
@@ -557,7 +557,7 @@
     2 => 'Mail Story to a Friend',
     3 => 'Printable Story Format',
     4 => 'Story Options',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => "Subscribe to '%s'"
 );
 
@@ -1344,23 +1344,6 @@
     4 => 'New User'
 );
 
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all. The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => 'No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF\'s in an ad-hoc fashion.',
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => 'The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem persists.',
-    9 => 'PDF Generator',
-    10 => 'This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site',
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
 ###############################################################################
 # trackback
 
@@ -1689,7 +1672,6 @@
     'cookiedomain' => "Cookie Domain",
     'cookiesecure' => "Cookie Secure",
     'lastlogin' => "Record Last Login?",
-    'pdf_enabled' => "PDF Enabled?",
     'num_search_results' => "Number of Search Results",
     'loginrequired' => "Login Required?",
     'submitloginrequired' => "Submit Login Required?",
diff -r c6b33dac067e -r 10166ae7b222 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/english_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
@@ -152,7 +152,7 @@
     108 => 'Clear Cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'Trackbacks',
@@ -557,7 +557,7 @@
     2 => 'Mail Story to a Friend',
     3 => 'Printable Story Format',
     4 => 'Story Options',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => "Subscribe to '%s'"
 );
 
@@ -1344,23 +1344,6 @@
     4 => 'New User'
 );
 
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all. The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => 'No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF\'s in an ad-hoc fashion.',
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => 'The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem persists.',
-    9 => 'PDF Generator',
-    10 => 'This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site',
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
 ###############################################################################
 # trackback
 
@@ -1689,7 +1672,6 @@
     'cookiedomain' => "Cookie Domain",
     'cookiesecure' => "Cookie Secure",
     'lastlogin' => "Record Last Login?",
-    'pdf_enabled' => "PDF Enabled?",
     'num_search_results' => "Number of Search Results",
     'loginrequired' => "Login Required?",
     'submitloginrequired' => "Submit Login Required?",
diff -r c6b33dac067e -r 10166ae7b222 language/german.php
--- a/language/german.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/german.php	Sat Mar 07 15:33:28 2009 +0100
@@ -155,7 +155,7 @@
     108 => 'Cache l?schen',
     109 => 'Beitrag melden',
     110 => 'Site-Admin auf diesen Beitrag hinweisen',
-    111 => 'Als PDF anzeigen',
+    111 => '',
     112 => 'Registrierte User',
     113 => 'Dokumentation',
     114 => 'TRACKBACKS',
@@ -560,7 +560,7 @@
     2 => 'An einen Freund schicken',
     3 => 'Druckf?hige Version',
     4 => 'Optionen',
-    5 => 'Als PDF',
+    5 => '',
     6 => 'Feed \'%s\' abonnieren'
 );
 
@@ -1341,26 +1341,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1694,7 +1674,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Letzten Login aufzeichnen?',
-    'pdf_enabled' => 'PDF einschalten?',
     'num_search_results' => 'Anzahl Suchergebnisse',
     'loginrequired' => 'Anmelden generell n?tig?',
     'submitloginrequired' => 'Anmelden f?r Beitr?ge?',
@@ -1908,4 +1887,4 @@
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
-?>
\ No newline at end of file
+?>
diff -r c6b33dac067e -r 10166ae7b222 language/german_formal.php
--- a/language/german_formal.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/german_formal.php	Sat Mar 07 15:33:28 2009 +0100
@@ -156,7 +156,7 @@
     108 => 'Cache l?schen',
     109 => 'Beitrag melden',
     110 => 'Site-Admin auf diesen Beitrag hinweisen',
-    111 => 'Als PDF anzeigen',
+    111 => '',
     112 => 'Registrierte User',
     113 => 'Dokumentation',
     114 => 'TRACKBACKS',
@@ -561,7 +561,7 @@
     2 => 'An einen Freund schicken',
     3 => 'Druckf?hige Version',
     4 => 'Optionen',
-    5 => 'Als PDF',
+    5 => '',
     6 => 'Feed \'%s\' abonnieren'
 );
 
@@ -1342,26 +1342,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1695,7 +1675,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Letzten Login aufzeichnen?',
-    'pdf_enabled' => 'PDF einschalten?',
     'num_search_results' => 'Anzahl Suchergebnisse',
     'loginrequired' => 'Anmelden generell n?tig?',
     'submitloginrequired' => 'Anmelden f?r Beitr?ge?',
@@ -1909,4 +1888,4 @@
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
-?>
\ No newline at end of file
+?>
diff -r c6b33dac067e -r 10166ae7b222 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/german_formal_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
@@ -156,7 +156,7 @@
     108 => 'Cache l??schen',
     109 => 'Beitrag melden',
     110 => 'Site-Admin auf diesen Beitrag hinweisen',
-    111 => 'Als PDF anzeigen',
+    111 => '',
     112 => 'Registrierte User',
     113 => 'Dokumentation',
     114 => 'TRACKBACKS',
@@ -561,7 +561,7 @@
     2 => 'An einen Freund schicken',
     3 => 'Druckf??hige Version',
     4 => 'Optionen',
-    5 => 'Als PDF',
+    5 => '',
     6 => 'Feed \'%s\' abonnieren'
 );
 
@@ -1342,26 +1342,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1695,7 +1675,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Letzten Login aufzeichnen?',
-    'pdf_enabled' => 'PDF einschalten?',
     'num_search_results' => 'Anzahl Suchergebnisse',
     'loginrequired' => 'Anmelden generell n??tig?',
     'submitloginrequired' => 'Anmelden f??r Beitr??ge?',
@@ -1909,4 +1888,4 @@
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
 );
 
-?>
\ No newline at end of file
+?>
diff -r c6b33dac067e -r 10166ae7b222 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Mar 07 15:11:33 2009 +0100
+++ b/language/german_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
@@ -155,7 +155,7 @@
     108 => 'Cache l??schen',

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 09:42:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 09:42:10 -0500
Subject: [geeklog-cvs] geeklog: Removed PDF-related texts from the language
	files
Message-ID: <hg.e08e75f92937.1236436930.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e08e75f92937
changeset: 6820:e08e75f92937
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 15:40:22 2009 +0100
description:
Removed PDF-related texts from the language files

diffstat:

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

diffs (truncated from 4120 to 300 lines):

diff -r 10166ae7b222 -r e08e75f92937 language/afrikaans.php
--- a/language/afrikaans.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/afrikaans.php	Sat Mar 07 15:40:22 2009 +0100
@@ -151,7 +151,7 @@
     108 => 'Vee Kas skoon',
     109 => 'Meld misbruik aan',
     110 => 'Rapporteer hierdie plasing aan die werfadmin',
-    111 => 'Vertoon PDF Weergawe',
+    111 => '',
     112 => 'Geregistreerde Gebruikers',
     113 => 'Dokumentasie',
     114 => 'TRACKBACKS',
@@ -556,7 +556,7 @@
     2 => 'Epos Artikel aan \'n Vriend',
     3 => 'Drukbare artikelformaat',
     4 => 'Artikelopsies',
-    5 => 'PDF Artikelformaat',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );
 
@@ -1337,26 +1337,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'Die PDF funksie is gedeaktiveer',
-    2 => 'Die verskafde dokument is nie vertaal nie.  Die dokument is ontvang maar kon nie verwerk word nie.  Maak seker dat u slegs html formaat dokument voorl&ecirc; wat aan die xHTML standaard voldoen. Neem kennis dat onnodig komplekse html dokumente nie noodwendig korrek of enigsins vertaal sal word nie. Die dokument uit u poging was 0 grepe in lengte en is verwyder. As u seker is dat u dokument behoorlik vertaal behoort te word, stuur dit weereens.',
-    3 => 'Onbekende fout tydens skep van PDF',
-    4 => 'Geen bladsy is verskaf of u wil dalk die ad-hoc PDF funksie hieronder gebruik.  As u glo dat u verkeerdelik die blad gekry het, kontak die stelseladministrateur.  Andersins kan u die onderstaande vorm gebruik om die PDF op \'n ad-hoc wyse te skep.',
-    5 => 'Besig om u dokument te laai.',
-    6 => 'Wag asseblief terwyl u dokument gelaai word.',
-    7 => 'U kan met regterknop op die onderstaande knop kliek en dan kies \'save target...\' of \'save link location...\' om \'n kopie van u dokument te stoor.',
-    8 => 'Die gegewe pad wat in die konfigurasie l&ecirc;er van die HTMLDoc program is ongeldig of di&eacute; stelsel kan dit nie uitvoer nie.  Kontak die werfadministrateur as die probleem voortduur.',
-    9 => 'PDF-Skrywer',
-    10 => 'Hierdie is die Ad-hoc PDF-skrywer hulpmiddel. Dit sal poog om enige URL wat u verskaf na \'n PDF om te skakel.  Neem kennis dat sommige web-bladsye nie korrek vertaal sal word met hierdie funksie nie.  Dit is \'n beperking van die HTMLDoc PDF-skrywer program en sulke foute moet dus nie aan die administrateur van die werf gerapporteer word nie',
-    11 => 'URL',
-    12 => 'Skryf PDF!',
-    13 => 'Die PHP konfigurasie op hierde bediener laat nie toe dat URL\'le gebruik word met die fopen() bevel nie.  Die stelseladministrateur moet die php.ini l&ecirc;er wysig en die set allow_url_fopen veranderlike na On toe stel',
-    14 => 'Die PDF wat u versoek het bestaan nie of u het probeer om onregmatiglik toegang tot \'n l&ecirc;er te verkry.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1690,7 +1670,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Record Last Login?',
-    'pdf_enabled' => 'PDF Enabled?',
     'num_search_results' => 'Number of Search Results',
     'loginrequired' => 'Login Required?',
     'submitloginrequired' => 'Submit Login Required?',
diff -r 10166ae7b222 -r e08e75f92937 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/afrikaans_utf-8.php	Sat Mar 07 15:40:22 2009 +0100
@@ -151,7 +151,7 @@
     108 => 'Vee Kas skoon',
     109 => 'Meld misbruik aan',
     110 => 'Rapporteer hierdie plasing aan die werfadmin',
-    111 => 'Vertoon PDF Weergawe',
+    111 => '',
     112 => 'Geregistreerde Gebruikers',
     113 => 'Dokumentasie',
     114 => 'TRACKBACKS',
@@ -556,7 +556,7 @@
     2 => 'Epos Artikel aan \'n Vriend',
     3 => 'Drukbare artikelformaat',
     4 => 'Artikelopsies',
-    5 => 'PDF Artikelformaat',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );
 
@@ -1337,26 +1337,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'Die PDF funksie is gedeaktiveer',
-    2 => 'Die verskafde dokument is nie vertaal nie.  Die dokument is ontvang maar kon nie verwerk word nie.  Maak seker dat u slegs html formaat dokument voorl&ecirc; wat aan die xHTML standaard voldoen. Neem kennis dat onnodig komplekse html dokumente nie noodwendig korrek of enigsins vertaal sal word nie. Die dokument uit u poging was 0 grepe in lengte en is verwyder. As u seker is dat u dokument behoorlik vertaal behoort te word, stuur dit weereens.',
-    3 => 'Onbekende fout tydens skep van PDF',
-    4 => 'Geen bladsy is verskaf of u wil dalk die ad-hoc PDF funksie hieronder gebruik.  As u glo dat u verkeerdelik die blad gekry het, kontak die stelseladministrateur.  Andersins kan u die onderstaande vorm gebruik om die PDF op \'n ad-hoc wyse te skep.',
-    5 => 'Besig om u dokument te laai.',
-    6 => 'Wag asseblief terwyl u dokument gelaai word.',
-    7 => 'U kan met regterknop op die onderstaande knop kliek en dan kies \'save target...\' of \'save link location...\' om \'n kopie van u dokument te stoor.',
-    8 => 'Die gegewe pad wat in die konfigurasie l&ecirc;er van die HTMLDoc program is ongeldig of di&eacute; stelsel kan dit nie uitvoer nie.  Kontak die werfadministrateur as die probleem voortduur.',
-    9 => 'PDF-Skrywer',
-    10 => 'Hierdie is die Ad-hoc PDF-skrywer hulpmiddel. Dit sal poog om enige URL wat u verskaf na \'n PDF om te skakel.  Neem kennis dat sommige web-bladsye nie korrek vertaal sal word met hierdie funksie nie.  Dit is \'n beperking van die HTMLDoc PDF-skrywer program en sulke foute moet dus nie aan die administrateur van die werf gerapporteer word nie',
-    11 => 'URL',
-    12 => 'Skryf PDF!',
-    13 => 'Die PHP konfigurasie op hierde bediener laat nie toe dat URL\'le gebruik word met die fopen() bevel nie.  Die stelseladministrateur moet die php.ini l&ecirc;er wysig en die set allow_url_fopen veranderlike na On toe stel',
-    14 => 'Die PDF wat u versoek het bestaan nie of u het probeer om onregmatiglik toegang tot \'n l&ecirc;er te verkry.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1690,7 +1670,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Record Last Login?',
-    'pdf_enabled' => 'PDF Enabled?',
     'num_search_results' => 'Number of Search Results',
     'loginrequired' => 'Login Required?',
     'submitloginrequired' => 'Submit Login Required?',
diff -r 10166ae7b222 -r e08e75f92937 language/bosnian.php
--- a/language/bosnian.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/bosnian.php	Sat Mar 07 15:40:22 2009 +0100
@@ -155,7 +155,7 @@
     108 => 'Brisi Cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'TRACKBACKS',
@@ -560,7 +560,7 @@
     2 => 'Posalji tekst emailom',
     3 => 'Tekst za printanje',
     4 => 'Opcije teksta',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );
 
@@ -1341,26 +1341,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1694,7 +1674,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Record Last Login?',
-    'pdf_enabled' => 'PDF Enabled?',
     'num_search_results' => 'Number of Search Results',
     'loginrequired' => 'Login Required?',
     'submitloginrequired' => 'Submit Login Required?',
diff -r 10166ae7b222 -r e08e75f92937 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/bosnian_utf-8.php	Sat Mar 07 15:40:22 2009 +0100
@@ -155,7 +155,7 @@
     108 => 'Brisi Cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'TRACKBACKS',
@@ -560,7 +560,7 @@
     2 => 'Posalji tekst emailom',
     3 => 'Tekst za printanje',
     4 => 'Opcije teksta',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );
 
@@ -1341,26 +1341,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1694,7 +1674,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Record Last Login?',
-    'pdf_enabled' => 'PDF Enabled?',
     'num_search_results' => 'Number of Search Results',
     'loginrequired' => 'Login Required?',
     'submitloginrequired' => 'Submit Login Required?',
diff -r 10166ae7b222 -r e08e75f92937 language/bulgarian.php
--- a/language/bulgarian.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/bulgarian.php	Sat Mar 07 15:40:22 2009 +0100
@@ -151,7 +151,7 @@
     108 => 'Clear cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'TRACKBACKS',
@@ -556,7 +556,7 @@
     2 => '??????? ?? ???????',
     3 => '?????????',
     4 => '????? ?? ????????????',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );
 
@@ -1337,26 +1337,6 @@
 );
 
 ###############################################################################
-# pdfgenerator.php
-
-$LANG_PDF = array(
-    1 => 'The PDF feature has been disabled',
-    2 => 'The document provided was not rendered. The document was received but could not be processed.  Please make sure to submit only html formatted documents that have been written to the xHTML standard. Please note that overly complex html documents may not render correctly or at all.The document resulting from your attempt was 0 bytes in length, and has been deleted. If you\'re sure that your document should render fine, please re-submit it.',
-    3 => 'Unknown error during PDF generation',
-    4 => "No page data was given or you want to use the ad-hoc PDF generation tool below.  If you think you are getting this page\n          in error then please contact the system administrator.  Otherwise, you may use the form below to generate PDF's in an ad-hoc fashion.",
-    5 => 'Loading your document.',
-    6 => 'Please wait while your document is loaded.',
-    7 => 'You may right click the button below and choose \'save target...\' or \'save link location...\' to save a copy of your document.',
-    8 => "The path given in the configuration file to the HTMLDoc binary is invalid or this system cannot execute it.  Please contact the site administrator if this problem\n          persists.",
-    9 => 'PDF Generator',
-    10 => "This is the Ad-hoc PDF Generation tool. It will attempt to convert any URL you give into a PDF.  Please note that some web pages will not render properly with this feature.  This\n           is a limitation of the HTMLDoc PDF generation tool and such errors should not be reported to the administrators of this site",
-    11 => 'URL',
-    12 => 'Generate PDF!',
-    13 => 'The PHP configuration on this server does not allow URLs to be used with the fopen() command.  The system administrator must edit the php.ini file and set allow_url_fopen to On',
-    14 => 'The PDF you requested either does not exist or you tried to illegally access a file.'
-);
-
-###############################################################################
 # trackback.php
 
 $LANG_TRB = array(
@@ -1690,7 +1670,6 @@
     'cookiedomain' => 'Cookie Domain',
     'cookiesecure' => 'Cookie Secure',
     'lastlogin' => 'Record Last Login?',
-    'pdf_enabled' => 'PDF Enabled?',
     'num_search_results' => 'Number of Search Results',
     'loginrequired' => 'Login Required?',
     'submitloginrequired' => 'Submit Login Required?',
diff -r 10166ae7b222 -r e08e75f92937 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Sat Mar 07 15:33:28 2009 +0100
+++ b/language/bulgarian_utf-8.php	Sat Mar 07 15:40:22 2009 +0100
@@ -151,7 +151,7 @@
     108 => 'Clear cache',
     109 => 'Report abuse',
     110 => 'Report this post to the site admin',
-    111 => 'View PDF Version',
+    111 => '',
     112 => 'Registered Users',
     113 => 'Documentation',
     114 => 'TRACKBACKS',
@@ -556,7 +556,7 @@
     2 => '?????????????? ???? ??????????????',
     3 => '??????????????????',
     4 => '?????????? ???? ????????????????????????',
-    5 => 'PDF Story Format',
+    5 => '',
     6 => 'Subscribe to \'%s\''
 );

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 09:42:53 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 09:42:53 -0500
Subject: [geeklog-cvs] tools: Incomplete PDF support was removed from Geeklog
Message-ID: <hg.22efede3ca2f.1236436973.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/22efede3ca2f
changeset: 25:22efede3ca2f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 15:40:54 2009 +0100
description:
Incomplete PDF support was removed from Geeklog

diffstat:

2 files changed, 2 insertions(+), 6 deletions(-)
lm/include/core.inc |    2 --
ship/mkdist.sh      |    6 ++----

diffs (35 lines):

diff -r d1819f2e9466 -r 22efede3ca2f lm/include/core.inc
--- a/lm/include/core.inc	Sat Feb 21 19:43:00 2009 +0100
+++ b/lm/include/core.inc	Sat Mar 07 15:40:54 2009 +0100
@@ -83,7 +83,6 @@
 $ENGBT = $LANG_BUTTONS;
 $ENG404 = $LANG_404;
 $ENGLO = $LANG_LOGIN;
-$ENGPD = $LANG_PDF;
 $ENGTB = $LANG_TRB;
 $ENGDI = $LANG_DIR;
 $ENGWN = $LANG_WHATSNEW;
@@ -186,7 +185,6 @@
 mergeArrays($ENGBT,  $LANG_BUTTONS, 'LANG_BUTTONS');
 mergeArrays($ENG404, $LANG_404, 'LANG_404', '404.php');
 mergeArrays($ENGLO,  $LANG_LOGIN, 'LANG_LOGIN', 'login form');
-mergeArrays($ENGPD,  $LANG_PDF, 'LANG_PDF', 'pdfgenerator.php');
 mergeArrays($ENGTB,  $LANG_TRB, 'LANG_TRB', 'trackback.php');
 mergeArrays($ENGDI,  $LANG_DIR, 'LANG_DIR', 'directory.php');
 mergeArrays($ENGWN,  $LANG_WHATSNEW, 'LANG_WHATSNEW', "\"What's New\" Time Strings\n\nFor the first two strings, you can use the following placeholders.\nOrder them so it makes sense in your language:\n%i    item, \"Stories\"\n%n    amount, \"2\", \"20\" etc.\n%t    time, \"2\" (weeks)\n%s    scale, \"hrs\", \"weeks\"");
diff -r d1819f2e9466 -r 22efede3ca2f ship/mkdist.sh
--- a/ship/mkdist.sh	Sat Feb 21 19:43:00 2009 +0100
+++ b/ship/mkdist.sh	Sat Mar 07 15:40:54 2009 +0100
@@ -47,10 +47,8 @@
 
 cd $NEWVERSION
 
-# still no PDF support
-rm public_html/pdfgenerator.php
-rm -rf public_html/layout/professional/pdfgenerator
-rm -rf pdfs
+# Blaine's test file ...
+rm -f public_html/blaine.php
 
 # don't ship MT-Blacklist modules any more
 rm -f plugins/spamx/MTBlackList.Examine.class.php

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:41 -0500
Subject: [geeklog-cvs] geeklog: Fixed phpDocumentor warnings
Message-ID: <hg.c9bc3cf73464.1236467981.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c9bc3cf73464
changeset: 6821:c9bc3cf73464
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 17:16:51 2009 +0100
description:
Fixed phpDocumentor warnings

diffstat:

22 files changed, 103 insertions(+), 30 deletions(-)
plugins/spamx/BaseAdmin.class.php               |    6 ++----
plugins/spamx/BaseCommand.class.php             |    6 ++----
plugins/spamx/BlackList.Examine.class.php       |    3 ++-
plugins/spamx/DeleteComment.Action.class.php    |    2 ++
plugins/spamx/EditBlackList.Admin.class.php     |   11 ++++++++---
plugins/spamx/EditHeader.Admin.class.php        |    9 +++++++--
plugins/spamx/EditIP.Admin.class.php            |    9 +++++++--
plugins/spamx/EditIPofURL.Admin.class.php       |    9 +++++++--
plugins/spamx/Header.Examine.class.php          |    4 +++-
plugins/spamx/IP.Examine.class.php              |    4 +++-
plugins/spamx/IPofUrl.Examine.class.php         |    4 +++-
plugins/spamx/Import.Admin.class.php            |    9 +++++++++
plugins/spamx/LogView.Admin.class.php           |    9 +++++++++
plugins/spamx/MTBlackList.Examine.class.php     |    4 +++-
plugins/spamx/MailAdmin.Action.class.php        |    3 +++
plugins/spamx/MassDelTrackback.Admin.class.php  |    9 +++++++++
plugins/spamx/MassDelete.Admin.class.php        |    9 +++++++++
plugins/spamx/ProjectHoneyPot.Examine.class.php |    3 ++-
plugins/spamx/SLV.Examine.class.php             |    4 ++--
plugins/spamx/SLVbase.class.php                 |    4 ++--
plugins/spamx/SLVreport.Action.class.php        |    3 ++-
plugins/spamx/SLVwhitelist.Admin.class.php      |    9 +++++++--

diffs (truncated from 389 to 300 lines):

diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/BaseAdmin.class.php
--- a/plugins/spamx/BaseAdmin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/BaseAdmin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -6,11 +6,9 @@
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
  * @package Spam-X
+ * @abstract
+ *
  */
-
-/**
-* @abstract
-*/
 class BaseAdmin {
     /**
      * 
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/BaseCommand.class.php
--- a/plugins/spamx/BaseCommand.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/BaseCommand.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -6,11 +6,9 @@
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
  * @package Spam-X
+ * @abstract
+ *
  */
-
-/**
-* @abstract
-*/
 class BaseCommand {
     /**
      * 
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/BlackList.Examine.class.php
--- a/plugins/spamx/BlackList.Examine.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/BlackList.Examine.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -25,8 +25,9 @@
  * Examines Comment according to Personal BLacklist
  * 
  * @author Tom Willett tomw AT pigstye DOT net 
+ * @package Spam-X
+ *
  */
-
 class BlackList extends BaseCommand {
     /**
      * No Constructor Use BaseCommand constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/DeleteComment.Action.class.php
--- a/plugins/spamx/DeleteComment.Action.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/DeleteComment.Action.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -25,6 +25,8 @@
  * Action Class which just discards comment
  * 
  * @author Tom Willett  tomw at pigstye.net 
+ * @package Spam-X
+ *
  */
 class DeleteComment extends BaseCommand {
     /**
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -18,11 +18,16 @@
 }
 
 /**
- * Personal Black List Editor
- */
-
+* Include Abstract Base Class
+*/
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+ * Personal Black List Editor
+ *
+ * @package Spam-X
+ *
+ */
 class EditBlackList extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/EditHeader.Admin.class.php
--- a/plugins/spamx/EditHeader.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/EditHeader.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -19,11 +19,16 @@
 }
 
 /**
-* HTTP Header Editor
+* Include Abstract Base Class
 */
-
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* HTTP Header Editor
+*
+* @package Spam-X
+*
+*/
 class EditHeader extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/EditIP.Admin.class.php
--- a/plugins/spamx/EditIP.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/EditIP.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -18,11 +18,16 @@
 }
 
 /**
-* IP Black List Editor
+* Include Abstract Base Class
 */
-
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* IP Black List Editor
+*
+* @package Spam-X
+*
+*/
 class EditIP extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/EditIPofURL.Admin.class.php
--- a/plugins/spamx/EditIPofURL.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/EditIPofURL.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -18,11 +18,16 @@
 }
 
 /**
-* IP of URL Black List Editor
+* Include Abstract Base Class
 */
-
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* IP of URL Black List Editor
+*
+* @package Spam-X
+*
+*/
 class EditIPofUrl extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -27,8 +27,10 @@
 * Examines Post according to HTTP Headers
 *
 * @author Dirk Haun <dirk AT haun-online DOT de>
+*
+* @package Spam-X
+*
 */
-
 class Header extends BaseCommand {
     /**
      * No Constructor Use BaseCommand constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/IP.Examine.class.php
--- a/plugins/spamx/IP.Examine.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/IP.Examine.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -25,8 +25,10 @@
 * Examines Comment according to Personal BLacklist
 *
 * @author Tom Willett tomw AT pigstye DOT net
+*
+* @package Spam-X
+*
 */
-
 class IP extends BaseCommand {
     /**
      * No Constructor Use BaseCommand constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -25,8 +25,10 @@
 * Examines Comment according to Personal BLacklist
 *
 * @author Tom Willett tomw AT pigstye DOT net
+*
+* @package Spam-X
+*
 */
-
 class IPofUrl extends BaseCommand {
     /**
      * No Constructor Use BaseCommand constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/Import.Admin.class.php
--- a/plugins/spamx/Import.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/Import.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -22,8 +22,17 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* Include Abstract Base Class
+*/
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* MTBlacklist Import
+*
+* @package Spam-X
+*
+*/
 class Import extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/LogView.Admin.class.php
--- a/plugins/spamx/LogView.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/LogView.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -16,8 +16,17 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* Include Abstract Base Class
+*/
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* LogView class
+*
+* @package Spam-X
+*
+*/
 class LogView extends BaseAdmin {
     /**
      * Constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -29,8 +29,10 @@
  * Examines Comment according to MT-BLacklist
  * 
  * @author Tom Willett tomw AT pigstye DOT net 
+ *
+ * @package Spam-X
+ *
  */
-
 class MTBlackList extends BaseCommand {
     /**
      * No Constructor Use BaseCommand constructor
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/MailAdmin.Action.class.php
--- a/plugins/spamx/MailAdmin.Action.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/MailAdmin.Action.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -25,6 +25,9 @@
  * Action Class which emails the spam post to the site admin
  * 
  * @author Tom Willett  tomw at pigstye.net 
+ *
+ * @package Spam-X
+ *
  */
 class MailAdmin extends BaseCommand {
     /**
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/MassDelTrackback.Admin.class.php
--- a/plugins/spamx/MassDelTrackback.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/MassDelTrackback.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -19,8 +19,17 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* Include Abstract Base Class
+*/
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 
+/**
+* MassDelTrackback class: Mass-delete trackbacks
+*
+* @package Spam-X
+*
+*/
 class MassDelTrackback extends BaseAdmin {
 
     function display()
diff -r e08e75f92937 -r c9bc3cf73464 plugins/spamx/MassDelete.Admin.class.php
--- a/plugins/spamx/MassDelete.Admin.class.php	Sat Mar 07 15:40:22 2009 +0100
+++ b/plugins/spamx/MassDelete.Admin.class.php	Sat Mar 07 17:16:51 2009 +0100
@@ -17,9 +17,18 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* Include Abstract Base Class and comment library
+*/
 require_once $_CONF['path'] . 'plugins/spamx/BaseAdmin.class.php';
 require_once $_CONF['path_system'] . 'lib-comment.php';
 
+/**
+* MassDelete class: Mass-delete comments

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:42 -0500
Subject: [geeklog-cvs] geeklog: Fixed @license tags to point to GPLv2
Message-ID: <hg.b043e9fea72a.1236467982.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b043e9fea72a
changeset: 6822:b043e9fea72a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 17:22:44 2009 +0100
description:
Fixed @license tags to point to GPLv2

diffstat:

8 files changed, 8 insertions(+), 15 deletions(-)
plugins/links/language/english.php        |    2 +-
plugins/links/language/english_utf-8.php  |    2 +-
plugins/links/sql/mssql_install.php       |    3 +--
plugins/links/sql/mysql_install.php       |    4 +---
public_html/admin/plugins/links/index.php |    2 +-
public_html/links/index.php               |    4 +---
public_html/links/portal.php              |    4 +---
system/classes/story.class.php            |    2 +-

diffs (131 lines):

diff -r c9bc3cf73464 -r b043e9fea72a plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/plugins/links/language/english.php	Sat Mar 07 17:22:44 2009 +0100
@@ -35,7 +35,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Trinity Bays <trinity93 AT gmail DOT com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
diff -r c9bc3cf73464 -r b043e9fea72a plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/plugins/links/language/english_utf-8.php	Sat Mar 07 17:22:44 2009 +0100
@@ -35,7 +35,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Trinity Bays <trinity93 AT gmail DOT com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
diff -r c9bc3cf73464 -r b043e9fea72a plugins/links/sql/mssql_install.php
--- a/plugins/links/sql/mssql_install.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/plugins/links/sql/mssql_install.php	Sat Mar 07 17:22:44 2009 +0100
@@ -30,7 +30,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
 
 /**
  * Links plugin Installation SQL
@@ -40,7 +39,7 @@
  * @version 1.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
diff -r c9bc3cf73464 -r b043e9fea72a plugins/links/sql/mysql_install.php
--- a/plugins/links/sql/mysql_install.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/plugins/links/sql/mysql_install.php	Sat Mar 07 17:22:44 2009 +0100
@@ -29,8 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mysql_install.php,v 1.8 2008/04/12 13:21:34 dhaun Exp $
 
 /**
  * Links plugin Installation SQL
@@ -40,7 +38,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
diff -r c9bc3cf73464 -r b043e9fea72a public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/public_html/admin/plugins/links/index.php	Sat Mar 07 17:22:44 2009 +0100
@@ -41,7 +41,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
diff -r c9bc3cf73464 -r b043e9fea72a public_html/links/index.php
--- a/public_html/links/index.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/public_html/links/index.php	Sat Mar 07 17:22:44 2009 +0100
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.40 2008/07/13 15:03:52 dhaun Exp $
 
 /**
  * This is the links page
@@ -45,7 +43,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Mark Limburg <mlimburg AT users DOT sourceforge DOT net>
  * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
diff -r c9bc3cf73464 -r b043e9fea72a public_html/links/portal.php
--- a/public_html/links/portal.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/public_html/links/portal.php	Sat Mar 07 17:22:44 2009 +0100
@@ -31,8 +31,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: portal.php,v 1.9 2008/05/24 08:57:35 dhaun Exp $
 
 /** 
  * Geeklog portal page that tracks link click throughs. 
@@ -43,7 +41,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
  * @author Trinity Bays <trinity93 AT gmail.com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
diff -r c9bc3cf73464 -r b043e9fea72a system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Mar 07 17:16:51 2009 +0100
+++ b/system/classes/story.class.php	Sat Mar 07 17:22:44 2009 +0100
@@ -42,7 +42,7 @@
  * @version 0.1
  * @since GL 1.4.2
  * @copyright Copyright &copy; 2006
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @author Michael Jervis <mike AT fuckingbrit DOT com>
  *
  */

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:43 -0500
Subject: [geeklog-cvs] geeklog: Fixed errors reported by phpDocumentor
Message-ID: <hg.4b2e44478dd1.1236467983.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4b2e44478dd1
changeset: 6823:4b2e44478dd1
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 17:41:43 2009 +0100
description:
Fixed errors reported by phpDocumentor

diffstat:

5 files changed, 9 insertions(+), 11 deletions(-)
public_html/admin/moderation.php          |    2 +-
public_html/admin/plugins/links/index.php |    6 +++---
public_html/links/index.php               |    4 ++--
public_html/links/portal.php              |    4 ++--
system/lib-security.php                   |    4 +---

diffs (92 lines):

diff -r b043e9fea72a -r 4b2e44478dd1 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sat Mar 07 17:22:44 2009 +0100
+++ b/public_html/admin/moderation.php	Sat Mar 07 17:41:43 2009 +0100
@@ -72,7 +72,7 @@
 /**
 * Prints the command & control block at the top
 *
-* TODO: The moderation items should be displayed with the help of <ul><li>
+* TODO: The moderation items should be displayed with the help of ul/li
 * instead of div's. 
 *
 */
diff -r b043e9fea72a -r 4b2e44478dd1 public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php	Sat Mar 07 17:22:44 2009 +0100
+++ b/public_html/admin/plugins/links/index.php	Sat Mar 07 17:41:43 2009 +0100
@@ -32,6 +32,9 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+require_once '../../../lib-common.php';
+require_once '../../auth.inc.php';
+
 /**
  * Geeklog links administration page.
  *
@@ -48,9 +51,6 @@
  * @author Blaine Lang <langmail at sympatico.ca>
  * @author Dirk Haun <dirk at haun-online.de>
  */
-
-require_once '../../../lib-common.php';
-require_once '../../auth.inc.php';
 
 // Uncomment the lines below if you need to debug the HTTP variables being passed
 // to the script.  This will sometimes cause errors but it will allow you to see
diff -r b043e9fea72a -r 4b2e44478dd1 public_html/links/index.php
--- a/public_html/links/index.php	Sat Mar 07 17:22:44 2009 +0100
+++ b/public_html/links/index.php	Sat Mar 07 17:41:43 2009 +0100
@@ -34,6 +34,8 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+require_once '../lib-common.php';
+
 /**
  * This is the links page
  *
@@ -52,8 +54,6 @@
  * @author Dirk Haun <dirk AT haun-online DOT de>
  *
  */
-
-require_once '../lib-common.php';
 
 if (!in_array('links', $_PLUGINS)) {
     echo COM_refresh($_CONF['site_url'] . '/index.php');
diff -r b043e9fea72a -r 4b2e44478dd1 public_html/links/portal.php
--- a/public_html/links/portal.php	Sat Mar 07 17:22:44 2009 +0100
+++ b/public_html/links/portal.php	Sat Mar 07 17:41:43 2009 +0100
@@ -32,6 +32,8 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+require_once '../lib-common.php';
+
 /** 
  * Geeklog portal page that tracks link click throughs. 
  * 
@@ -49,8 +51,6 @@
  * @author Dirk Haun <dirk AT haun-online DOT de>
  * 
  */
-
-require_once '../lib-common.php';
 
 if (!in_array('links', $_PLUGINS)) {
     echo COM_refresh($_CONF['site_url'] . '/index.php');
diff -r b043e9fea72a -r 4b2e44478dd1 system/lib-security.php
--- a/system/lib-security.php	Sat Mar 07 17:22:44 2009 +0100
+++ b/system/lib-security.php	Sat Mar 07 17:41:43 2009 +0100
@@ -87,10 +87,8 @@
 *       be used once at the beginning of a page.  The resulting array $_GROUPS can then be
 *       used through out the page.
 *
-* @return array Array of group ID's user belongs to
-*
 * @param        int     $uid            User ID to get information for. If empty current user.
-* @return	array	Associative Array grp_name -> ug_main_grp_id
+* @return	array	Associative Array grp_name -> ug_main_grp_id of group ID's user belongs to
 *
 */
 function SEC_getUserGroups($uid='')

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:44 -0500
Subject: [geeklog-cvs] geeklog: More attempts to produce usable
	phpDocumentor output
Message-ID: <hg.3255c98b20dd.1236467984.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3255c98b20dd
changeset: 6824:3255c98b20dd
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 18:45:38 2009 +0100
description:
More attempts to produce usable phpDocumentor output

diffstat:

9 files changed, 45 insertions(+), 16 deletions(-)
plugins/links/language/english.php           |    2 +-
plugins/links/language/english_utf-8.php     |    2 +-
plugins/links/sql/mssql_install.php          |    2 +-
plugins/links/sql/mysql_install.php          |    2 +-
public_html/admin/plugins/links/category.php |   20 ++++++++++++++++++++
public_html/admin/plugins/links/index.php    |   11 +++++++----
public_html/links/index.php                  |    9 ++++++---
public_html/links/portal.php                 |    9 ++++++---
system/classes/story.class.php               |    4 ++--

diffs (192 lines):

diff -r 4b2e44478dd1 -r 3255c98b20dd plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/plugins/links/language/english.php	Sat Mar 07 18:45:38 2009 +0100
@@ -35,7 +35,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 AT gmail DOT com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
diff -r 4b2e44478dd1 -r 3255c98b20dd plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/plugins/links/language/english_utf-8.php	Sat Mar 07 18:45:38 2009 +0100
@@ -35,7 +35,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 AT gmail DOT com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
diff -r 4b2e44478dd1 -r 3255c98b20dd plugins/links/sql/mssql_install.php
--- a/plugins/links/sql/mssql_install.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/plugins/links/sql/mssql_install.php	Sat Mar 07 18:45:38 2009 +0100
@@ -39,7 +39,7 @@
  * @version 1.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
diff -r 4b2e44478dd1 -r 3255c98b20dd plugins/links/sql/mysql_install.php
--- a/plugins/links/sql/mysql_install.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/plugins/links/sql/mysql_install.php	Sat Mar 07 18:45:38 2009 +0100
@@ -38,7 +38,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
diff -r 4b2e44478dd1 -r 3255c98b20dd public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/public_html/admin/plugins/links/category.php	Sat Mar 07 18:45:38 2009 +0100
@@ -33,6 +33,26 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+ * Geeklog links categories administration page.
+ *
+ * @package Links
+ * @subpackage admin
+ * @filesource
+ * @version 2.1
+ * @since GL 1.5.0
+ * @copyright Copyright &copy; 2000-2009
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Mark Limburg, mlimburg AT users.sourceforge DOT net
+ * @author Jason Whittenburg, jwhitten AT securitygeeks DOT com
+ * @author Dirk Haun, dirk AT haun-online DOT de
+ * @author Euan McKay, info AT heatherengineering DOT com
+ */
+
+/** 
+* Geeklog common function library and Admin authentication
+*/
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
 
diff -r 4b2e44478dd1 -r 3255c98b20dd public_html/admin/plugins/links/index.php
--- a/public_html/admin/plugins/links/index.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/public_html/admin/plugins/links/index.php	Sat Mar 07 18:45:38 2009 +0100
@@ -32,9 +32,6 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
-require_once '../../../lib-common.php';
-require_once '../../auth.inc.php';
-
 /**
  * Geeklog links administration page.
  *
@@ -44,13 +41,19 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 at gmail.com>
  * @author Tony Bibbs <tony at tonybibbs.com>
  * @author Tom Willett <twillett at users.sourceforge.net>
  * @author Blaine Lang <langmail at sympatico.ca>
  * @author Dirk Haun <dirk at haun-online.de>
  */
+
+/** 
+* Geeklog common function library and Admin authentication
+*/
+require_once '../../../lib-common.php';
+require_once '../../auth.inc.php';
 
 // Uncomment the lines below if you need to debug the HTTP variables being passed
 // to the script.  This will sometimes cause errors but it will allow you to see
diff -r 4b2e44478dd1 -r 3255c98b20dd public_html/links/index.php
--- a/public_html/links/index.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/public_html/links/index.php	Sat Mar 07 18:45:38 2009 +0100
@@ -34,8 +34,6 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
-require_once '../lib-common.php';
-
 /**
  * This is the links page
  *
@@ -45,7 +43,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Mark Limburg <mlimburg AT users DOT sourceforge DOT net>
  * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
@@ -54,6 +52,11 @@
  * @author Dirk Haun <dirk AT haun-online DOT de>
  *
  */
+
+/** 
+* Geeklog common function library
+*/
+require_once '../lib-common.php';
 
 if (!in_array('links', $_PLUGINS)) {
     echo COM_refresh($_CONF['site_url'] . '/index.php');
diff -r 4b2e44478dd1 -r 3255c98b20dd public_html/links/portal.php
--- a/public_html/links/portal.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/public_html/links/portal.php	Sat Mar 07 18:45:38 2009 +0100
@@ -32,8 +32,6 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
-require_once '../lib-common.php';
-
 /** 
  * Geeklog portal page that tracks link click throughs. 
  * 
@@ -43,7 +41,7 @@
  * @version 2.0
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Trinity Bays <trinity93 AT gmail.com>
  * @author Tony Bibbs <tony AT tonybibbs DOT com>
  * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
@@ -51,6 +49,11 @@
  * @author Dirk Haun <dirk AT haun-online DOT de>
  * 
  */
+
+/**
+* Geeklog common function library 
+*/
+require_once '../lib-common.php';
 
 if (!in_array('links', $_PLUGINS)) {
     echo COM_refresh($_CONF['site_url'] . '/index.php');
diff -r 4b2e44478dd1 -r 3255c98b20dd system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Mar 07 17:41:43 2009 +0100
+++ b/system/classes/story.class.php	Sat Mar 07 18:45:38 2009 +0100
@@ -41,8 +41,8 @@
  * @filesource
  * @version 0.1
  * @since GL 1.4.2
- * @copyright Copyright &copy; 2006
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @copyright Copyright &copy; 2006-2009
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Michael Jervis <mike AT fuckingbrit DOT com>
  *
  */

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:45 -0500
Subject: [geeklog-cvs] geeklog: Whoops ... ended support for PHP *4*
Message-ID: <hg.7b950db79edb.1236467985.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7b950db79edb
changeset: 6825:7b950db79edb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 19:31:50 2009 +0100
description:
Whoops ... ended support for PHP *4*

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
public_html/docs/changes.html |    2 +-

diffs (12 lines):

diff -r 3255c98b20dd -r 7b950db79edb public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sat Mar 07 18:45:38 2009 +0100
+++ b/public_html/docs/changes.html	Sat Mar 07 19:31:50 2009 +0100
@@ -32,7 +32,7 @@
 <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
+<li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP 4 in August 2008, you should be
 looking into upgrading to PHP 5 anyway.</li>
 </ul>
 

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:46 -0500
Subject: [geeklog-cvs] geeklog: phpDocumentor doesn't support @note
Message-ID: <hg.0d2f96565eb5.1236467986.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0d2f96565eb5
changeset: 6826:0d2f96565eb5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 22:12:04 2009 +0100
description:
phpDocumentor doesn't support @note

diffstat:

12 files changed, 81 insertions(+), 67 deletions(-)
public_html/admin/configuration.php       |   10 +---
public_html/admin/database.php            |    3 -
public_html/admin/install/lib-install.php |   13 ++++-
public_html/admin/install/lib-upgrade.php |    6 +-
public_html/admin/sectest.php             |   12 ++---
public_html/lib-common.php                |   64 ++++++++++++++++-------------
public_html/usersettings.php              |    6 +-
system/classes/upload.class.php           |    7 +--
system/lib-pingback.php                   |    5 --
system/lib-plugins.php                    |   11 ++--
system/lib-security.php                   |    3 -
system/lib-user.php                       |    8 +--

diffs (truncated from 527 to 300 lines):

diff -r 7b950db79edb -r 0d2f96565eb5 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/admin/configuration.php	Sat Mar 07 22:12:04 2009 +0100
@@ -28,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: configuration.php,v 1.13 2008/05/03 15:09:13 mjervis Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -41,9 +39,9 @@
 /**
 * Helper function: Provide language dropdown
 *
+* NOTE:     Note that key/value are being swapped!
+*
 * @return   Array   Array of (filename, displayname) pairs
-*
-* @note     Note that key/value are being swapped!
 *
 */
 function configmanager_select_language_helper()
@@ -56,9 +54,9 @@
 /**
 * Helper function: Provide themes dropdown
 *
+* NOTE:     Beautifying code duplicated from usersettings.php
+*
 * @return   Array   Array of (filename, displayname) pairs
-*
-* @note     Beautifying code duplicated from usersettings.php
 *
 */
 function configmanager_select_theme_helper()
diff -r 7b950db79edb -r 0d2f96565eb5 public_html/admin/database.php
--- a/public_html/admin/database.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/admin/database.php	Sat Mar 07 22:12:04 2009 +0100
@@ -239,9 +239,10 @@
 /**
 * Download a backup file
 *
+* NOTE:     Filename should have been sanitized and checked before calling this.
+*
 * @param    string  $file   Filename (without the path)
 * @return   void
-* @note     Filename should have been sanitized and checked before calling this.
 *
 */
 function downloadbackup($file)
diff -r 7b950db79edb -r 0d2f96565eb5 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/admin/install/lib-install.php	Sat Mar 07 22:12:04 2009 +0100
@@ -328,10 +328,12 @@
 /**
  * Written to aid in install script development 
  *
+ * NOTE:    This code is a modified copy from PHP.net
+ *
  * @param   int $size       Filesize
  * @param   int $dec_places Number of decimal places
  * @return  string          Filesize string
- * @note    This code is a modified copy from PHP.net
+ *
  */
 function INST_formatSize($size, $dec_places = 0) 
 {
@@ -360,9 +362,10 @@
 /**
  * Make a nice display name from the language filename
  *
+ * NOTE:     This code is a straight copy from MBYTE_languageList()
+ *
  * @param    string  $file   filename without the extension
  * @return   string          language name to display to the user
- * @note     This code is a straight copy from MBYTE_languageList()
  *
  */
 function INST_prettifyLanguageName($filename)
@@ -505,9 +508,10 @@
 /**
  * Check if URL exists
  *
+ * NOTE:    This code is a modified copy from marufit at gmail dot com
+ *
  * @param   string  $url    URL
  * @return  bool            True if URL exists, false if not
- * @note    This code is a modified copy from marufit at gmail dot com
  *
  */
 function INST_urlExists($url) 
@@ -633,10 +637,11 @@
  * If we're doing an upgrade from 1.5.0 or later and we have the necessary
  * DB credentials, skip the forms and upgrade directly.
  *
+ * NOTE:    Will not return if upgrading from 1.5.0 or later.
+ *
  * @param   string  $dbconfig_path      path to db-config.php
  * @param   string  $siteconfig_path    path to siteconfig.php
  * @return  string                      database version, if possible
- * @note    Will not return if upgrading from 1.5.0 or later.
  *
  */
 function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path)
diff -r 7b950db79edb -r 0d2f96565eb5 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php	Sat Mar 07 22:12:04 2009 +0100
@@ -593,10 +593,11 @@
 /**
 * Change default character set to UTF-8
 *
+* NOTE:    Yes, this means that we need to patch siteconfig.php a second time.
+*
 * @param   string   $siteconfig_path  complete path to siteconfig.php
 * @param   string   $charset          default character set to use
 * @return  boolean                    true: success; false: an error occured
-* @note    Yes, this means that we need to patch siteconfig.php a second time.
 *
 */
 function INST_setDefaultCharset($siteconfig_path, $charset)
@@ -782,8 +783,9 @@
 /**
 * Upgrade any enabled plugins
 *
-* @note Needs a fully working Geeklog, so can only be done late in the upgrade
+* NOTE: Needs a fully working Geeklog, so can only be done late in the upgrade
 *       process!
+*
 * @return   int     number of failed plugin updates (0 = everything's fine)
 *
 */
diff -r 7b950db79edb -r 0d2f96565eb5 public_html/admin/sectest.php
--- a/public_html/admin/sectest.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/admin/sectest.php	Sat Mar 07 22:12:04 2009 +0100
@@ -29,8 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: sectest.php,v 1.13 2007/12/09 18:05:39 dhaun Exp $
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
@@ -193,9 +191,9 @@
 /**
 * Check for the existence of the install directory
 *
+* NOTE: This test used to be part of the "Get Bent" block in lib-custom.php
+*
 * @return   string      text explaining the result of the test
-*
-* @note This test used to be part of the "Get Bent" block in lib-custom.php
 *
 */
 function checkInstallDir ()
@@ -233,10 +231,10 @@
 /**
 * Check for accounts that still use the default password
 *
+* NOTE: If one of our users is also using "password" as their password, this
+*       test will also detect that, as it checks all accounts.
+*
 * @return   string      text explaining the result of the test
-*
-* @note If one of our users is also using "password" as their password, this
-*       test will also detect that, as it checks all accounts.
 *
 */
 function checkDefaultPassword ()
diff -r 7b950db79edb -r 0d2f96565eb5 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Mar 07 19:31:50 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 07 22:12:04 2009 +0100
@@ -1772,13 +1772,13 @@
 * of an article with a future publish date reaching it's
 * publish time and if so updates the RDF file.
 *
+* NOTE: When called without parameters, this will only check for new entries to
+*       include in the feeds. Pass the $updated_XXX parameters when the content
+*       of an existing entry has changed.
+*
 * @param    string  $updated_type   (optional) feed type to update
 * @param    string  $updated_topic  (optional) feed topic to update
 * @param    string  $updated_id     (optional) feed id to update
-*
-* @note When called without parameters, this will only check for new entries to
-*       include in the feeds. Pass the $updated_XXX parameters when the content
-*       of an existing entry has changed.
 *
 * @see file lib-syndication.php
 *
@@ -2718,10 +2718,11 @@
 * This function does a redirect using a meta refresh. This is (or at least
 * used to be) more compatible than using a HTTP Location: header.
 *
+* NOTE:     This does not need to be XHTML compliant. It may also be used
+*           in situations where the XHTML constant is not defined yet ...
+*
 * @param    string  $url    URL to send user to
 * @return   string          HTML meta redirect
-* @note     This does not need to be XHTML compliant. It may also be used
-*           in situations where the XHTML constant is not defined yet ...
 *
 */
 function COM_refresh($url)
@@ -2731,11 +2732,14 @@
 
 /**
  * DEPRECIATED -- see CMT_userComments in lib-comment.php
+ * @deprecated since Geeklog 1.4.0
  */
-function COM_userComments( $sid, $title, $type='article', $order='', $mode='', $pid = 0, $page = 1, $cid = false, $delete_option = false ) {
+function COM_userComments( $sid, $title, $type='article', $order='', $mode='', $pid = 0, $page = 1, $cid = false, $delete_option = false )
+{
     global $_CONF;
 
     require_once $_CONF['path_system'] . 'lib-comment.php';
+
     return CMT_userComments( $sid, $title, $type, $order, $mode, $pid, $page, $cid, $delete_option );
 }
 
@@ -3001,7 +3005,6 @@
 * @return   string  $sid  Story ID
 *
 */
-
 function COM_makesid()
 {
     $sid = date( 'YmdHis' );
@@ -3101,6 +3104,9 @@
 * Send an email.
 *
 * All emails sent by Geeklog are sent through this function now.
+*
+* NOTE: Please note that using the $cc parameter will expose the email addresses
+*       of all recipients. Use with care.
 *
 * @param    string      $to         recipients name and email address
 * @param    string      $subject    subject of the email
@@ -3110,9 +3116,6 @@
 * @param    int         $priority   (optional) add X-Priority header, if > 0
 * @param    string      $cc         (optional) other recipients (name + email)
 * @return   boolean                 true if successful,  otherwise false
-*
-* @note Please note that using the $cc parameter will expose the email addresses
-*       of all recipients. Use with care.
 *
 */
 function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' )
@@ -5489,6 +5492,7 @@
 * @param    string    $parameter   the parameter to test
 * @param    boolean   $isnumeric   true if $parameter is supposed to be numeric
 * @return   string    the filtered parameter (may now be empty or 0)
+* @see COM_applyBasicFilter
 *
 */
 function COM_applyFilter( $parameter, $isnumeric = false )
@@ -5500,13 +5504,14 @@
 
 /**
 * Filter parameters
+*
+* NOTE:     Use this function instead of COM_applyFilter for parameters
+*           _not_ coming in through a GET or POST request.
 *
 * @param    string    $parameter   the parameter to test
 * @param    boolean   $isnumeric   true if $parameter is supposed to be numeric
 * @return   string    the filtered parameter (may now be empty or 0)
-*
-* @note     Use this function instead of COM_applyFilter for parameters
-*           _not_ coming in through a GET or POST request.
+* @see COM_applyFilter
 *
 */
 function COM_applyBasicFilter( $parameter, $isnumeric = false )
@@ -5635,11 +5640,12 @@
 /**
 * Sanitize a filename.
 *
+* NOTE:     This function is pretty strict in what it allows. Meant to be used
+*           for files to be included where part of the filename is dynamic.
+*
 * @param    string  $filename   the filename to clean up
 * @param    boolean $allow_dots whether to allow dots in the filename or not
 * @return   string              sanitized filename
-* @note     This function is pretty strict in what it allows. Meant to be used
-*           for files to be included where part of the filename is dynamic.
 *
 */
 function COM_sanitizeFilename($filename, $allow_dots = false)
@@ -5968,6 +5974,7 @@
 * the inverted return values, it has been deprecated and is only provided for
 * backward compatibility - use COM_onFrontpage() instead.
 *
+* @deprecated since Geeklog 1.4.1
 * @see COM_onFrontpage
 *
 */
@@ -5976,11 +5983,13 @@
     return !COM_onFrontpage();

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:47 -0500
Subject: [geeklog-cvs] geeklog: About time we fix this typo :)
Message-ID: <hg.b2981dcaccaa.1236467987.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b2981dcaccaa
changeset: 6827:b2981dcaccaa
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 22:24:22 2009 +0100
description:
About time we fix this typo :)

diffstat:

2 files changed, 24 insertions(+), 14 deletions(-)
system/classes/search.class.php |    2 +-
system/classes/timer.class.php  |   36 +++++++++++++++++++++++-------------

diffs (126 lines):

diff -r 0d2f96565eb5 -r b2981dcaccaa system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Mar 07 22:12:04 2009 +0100
+++ b/system/classes/search.class.php	Sat Mar 07 22:24:22 2009 +0100
@@ -530,7 +530,7 @@
 
         // Start search timer
         $searchtimer = new timerobject();
-        $searchtimer->setPercision(4);
+        $searchtimer->setPrecision(4);
         $searchtimer->startTimer();
 
         // Have plugins do their searches
diff -r 0d2f96565eb5 -r b2981dcaccaa system/classes/timer.class.php
--- a/system/classes/timer.class.php	Sat Mar 07 22:12:04 2009 +0100
+++ b/system/classes/timer.class.php	Sat Mar 07 22:24:22 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | timer.class.php                                                           |
 // |                                                                           |
 // | Geeklog timer class.  Use this to do performance testing.                 |
 // +---------------------------------------------------------------------------+
-// | 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,17 +28,15 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: timer.class.php,v 1.8 2008/05/23 07:35:11 dhaun Exp $
 
 /* EXAMPLE  USAGE
 
     // Instantiate new timer object
     $mytimer = new timerobject();
 
-    // Set percision of the results to 4 significan't digits
+    // Set precision of the results to 4 significan't digits
     // NOTE: this call is optional, code defaults to 2 
-    $mytimer->setPercision(4);
+    $mytimer->setPrecision(4);
 
     // Start the timer
     $mytimer->startTimer();
@@ -74,7 +72,7 @@
     /**
     * @access private
     */
-    var $_percision = 2;
+    var $_precision = 2;
 
     // PUBLIC METHODS
 
@@ -82,7 +80,7 @@
     * Constructor
     *
     * This initializes the timerobject and sets the default
-    * percision of results to two decimal places
+    * precision of results to two decimal places
     *
     */
     function timerobject()
@@ -90,7 +88,7 @@
     }
 
     /**
-    * Set percision on timer results
+    * Set precision on timer results
     *
     * This sets how many significant digits get
     * sent back when elapsedTime is called
@@ -98,10 +96,22 @@
     * @param    int     $num_dec_places     Number of significant digits
     *
     */
+    function setPrecision($num_dec_places)
+    {
+        $this->_precision = $num_dec_places;
+    }
+
+    /**
+    * Deprecated - use setPrecision instead
+    *
+    * @deprecated since Geeklog 1.6.0
+    * @see setPrecision
+    */
     function setPercision($num_dec_places)
     {
-        $this->_percision = $num_dec_places;
+        $this->_precision = $num_dec_places;
     }
+
 
     /**
     * Starts the timer
@@ -118,7 +128,7 @@
     /**
     * Stops the timer
     *
-    * @return   float   elapsed time to degree of percision specified
+    * @return   float   elapsed time to degree of precision specified
     *
     */
     function stopTimer()
@@ -154,12 +164,12 @@
     * This returns the elapsed time with the proper number of 
     * significant digits
     *
-    * @return   float   Elasped time in seconds formatted to degree of percision specified
+    * @return   float   Elasped time in seconds formatted to degree of precision specified
     *
     */
     function getElapsedTime()
     {
-        return sprintf("%.{$this->_percision}f", $this->_elapsedtime);
+        return sprintf("%.{$this->_precision}f", $this->_elapsedtime);
     }
 
     // PRIVATE METHODS

From geeklog-cvs at lists.geeklog.net  Sat Mar  7 18:19:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 07 Mar 2009 18:19:48 -0500
Subject: [geeklog-cvs] geeklog: Fixed parameter and return value description
Message-ID: <hg.208605932f48.1236467988.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/208605932f48
changeset: 6828:208605932f48
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 07 23:24:16 2009 +0100
description:
Fixed parameter and return value description

diffstat:

1 file changed, 12 insertions(+), 12 deletions(-)
system/lib-plugins.php |   24 ++++++++++++------------

diffs (48 lines):

diff -r b2981dcaccaa -r 208605932f48 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Mar 07 22:24:22 2009 +0100
+++ b/system/lib-plugins.php	Sat Mar 07 23:24:16 2009 +0100
@@ -472,13 +472,13 @@
 *
 * @author Tony Bibbs <tony at geeklog.net>
 * @access public
-* @param integer $uid User ID
-* @param string $title Comment title
-* @param string $sid Story ID (not always a story, remember!)
-* @param integer $pid Parent comment ID
-* @param string $type Type of comment
-* @param string $postmode HTML or text
-* @return an error otherwise false if no errors were encountered
+* @param  integer   $uid User ID
+* @param  string    $title Comment title
+* @param  string    $sid Story ID (not always a story, remember!)
+* @param  integer   $pid Parent comment ID
+* @param  string    $type Type of comment
+* @param  string    $postmode HTML or text
+* @return mixed     an error otherwise false if no errors were encountered
 *
 */
 function PLG_commentPreSave($uid, &$title, &$comment, $sid, $pid, $type, &$postmode)
@@ -1055,10 +1055,10 @@
 * It will be display before any news and after any defined staticpage content.
 * The plugin is responsible to format the output correctly.
 *
-* @param   where   int      1 = top, 2 = after feat. story, 3 = bottom of page
-* @param   page    int      page number (1, ...)
-* @param   topic   string   topic ID or empty string == front page
-* @return  Formatted center block content
+* @param   int      $where  1 = top, 2 = after feat. story, 3 = bottom of page
+* @param   int      $page   page number (1, ...)
+* @param   string   $topic  topic ID or empty string == front page
+* @return  string           Formatted center block content
 *
 */
 function PLG_showCenterblock($where = 1, $page = 1, $topic = '')
@@ -2346,7 +2346,7 @@
 *
 * @param  string  $item_url   the url of the item saved
 * @param  string  $plugin     the name of the plugin that saved the item
-* @return the url where the user will be forwarded to
+* @return string              the url where the user will be forwarded to
 *
 */
 function PLG_afterSaveSwitch($target, $item_url, $plugin, $message = '')

From geeklog-cvs at lists.geeklog.net  Sun Mar  8 10:56:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Mar 2009 10:56:37 -0400
Subject: [geeklog-cvs] geeklog: Another MIME type for .tar files
Message-ID: <hg.d3aad7fa7a94.1236524197.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d3aad7fa7a94
changeset: 6829:d3aad7fa7a94
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 08 15:56:26 2009 +0100
description:
Another MIME type for .tar files

diffstat:

1 file changed, 1 insertion(+)
system/classes/upload.class.php |    1 +

diffs (11 lines):

diff -r 208605932f48 -r d3aad7fa7a94 system/classes/upload.class.php
--- a/system/classes/upload.class.php	Sat Mar 07 23:24:16 2009 +0100
+++ b/system/classes/upload.class.php	Sun Mar 08 15:56:26 2009 +0100
@@ -263,6 +263,7 @@
                 'application/x-gzip-compressed'     => '.tar.gz,.tgz',
                 'application/x-zip-compressed'      => '.zip',
                 'application/x-tar'                 => '.tar',
+                'application/x-gtar'                => '.tar',
                 'text/plain'                        => '.phps,.txt,.inc',
                 'text/html'                         => '.html,.htm',
                 'image/bmp'                         => '.bmp,.ico',

From geeklog-cvs at lists.geeklog.net  Sun Mar  8 13:26:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Mar 2009 13:26:58 -0400
Subject: [geeklog-cvs] tools: Added project.geeklog.net cronjobs
Message-ID: <hg.c50d62875764.1236533218.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c50d62875764
changeset: 26:c50d62875764
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 08 18:26:17 2009 +0100
description:
Added project.geeklog.net cronjobs

diffstat:

5 files changed, 115 insertions(+), 1 deletion(-)
README              |    2 -
cronjobs/README     |    8 ++++
cronjobs/nightly.sh |   84 +++++++++++++++++++++++++++++++++++++++++++++++++++
cronjobs/phpdoc.sh  |   21 ++++++++++++
ship/mkdist.sh      |    1 

diffs (142 lines):

diff -r 22efede3ca2f -r c50d62875764 README
--- a/README	Sat Mar 07 15:40:54 2009 +0100
+++ b/README	Sun Mar 08 18:26:17 2009 +0100
@@ -1,1 +1,1 @@
-A collection of tools for development and deployment of Geeklog 1.x
+A collection of tools for development and deployment of Geeklog
diff -r 22efede3ca2f -r c50d62875764 cronjobs/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cronjobs/README	Sun Mar 08 18:26:17 2009 +0100
@@ -0,0 +1,8 @@
+These are the bash scripts that run from cronjobs on project.geeklog.net:
+
+- nightly.sh -- creates the nightly tarball at
+                http://project.geeklog.net/nightly/geeklog-nightly.tar.gz
+
+- phpdoc.sh  -- updates the phpDocumentor documentation of the Geeklog source
+                code at http://project.geeklog.net/src/
+
diff -r 22efede3ca2f -r c50d62875764 cronjobs/nightly.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cronjobs/nightly.sh	Sun Mar 08 18:26:17 2009 +0100
@@ -0,0 +1,84 @@
+#!/usr/local/bin/bash
+#
+# nightly.sh - create nightly tarball for Geeklog
+#
+# Also see the mkdist.sh script - some pieces have been copied from there.
+#
+# To be called from a cronjob, hence the use of complete paths in some places.
+
+# do this once:
+# mkdir /usr/home/geeklog2/nightly
+# cd /usr/home/geeklog2/nightly
+# hg clone http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/ geeklog
+
+cd /usr/home/geeklog2/nightly/geeklog-nightly
+
+# update repository
+/usr/local/bin/hg -q pull > /dev/null 2>&1
+/usr/local/bin/hg -q up > /dev/null 2>&1
+
+# fix config names
+mv db-config.php.dist db-config.php
+mv public_html/siteconfig.php.dist public_html/siteconfig.php
+
+# add PEAR classes
+cd system/pear
+cp /usr/www/users/geeklog2/www/nightly/geeklog-pear.tar.gz .
+tar xfz geeklog-pear.tar.gz
+rm -f geeklog-pear.tar.gz
+cd ../..
+
+# remove unused files
+
+# Blaine's test file ...
+rm -f public_html/blaine.php
+
+# don't ship MT-Blacklist modules any more
+rm -f plugins/spamx/MTBlackList.Examine.class.php
+rm -f plugins/spamx/Import.Admin.class.php
+# only used by the Import class
+rm -rf plugins/spamx/magpierss
+rm -f plugins/spamx/rss.inc.php
+# you'd need to set up a honeypot to use it
+rm -f plugins/spamx/ProjectHoneyPot.Examine.class.php
+# about time we clean up the install directory ...
+rm -f public_html/admin/install/addindex.php
+rm -f system/lib-custom.php.dist
+
+# PEAR buildpackage files
+rm -f plugins/calendar/buildpackage.php
+rm -f plugins/links/buildpackage.php
+rm -f plugins/polls/buildpackage.php
+rm -f plugins/spamx/buildpackage.php
+rm -f plugins/staticpages/buildpackage.php
+rm -rf system/build
+
+# fix permissions
+find . -type f -exec chmod a-x \{\} \;
+chmod a+x emailgeeklogstories
+
+# set the default permissions
+chmod 775 backups
+chmod 775 data
+chmod 775 logs
+chmod 664 logs/*.log
+chmod 775 public_html/backend
+chmod 644 public_html/backend/*.rss
+chmod 775 public_html/images/articles
+chmod 664 public_html/images/articles/*
+chmod 775 public_html/images/topics
+chmod 664 public_html/images/topics/*
+chmod 775 public_html/images/userphotos
+chmod 664 public_html/images/userphotos/*
+
+cd ..
+
+tar cf geeklog-nightly.tar '--exclude=\.hg' geeklog-nightly
+gzip geeklog-nightly.tar
+
+# rename config files back to their names in the repository
+mv geeklog-nightly/db-config.php geeklog-nightly/db-config.php.dist
+mv geeklog-nightly/public_html/siteconfig.php geeklog-nightly/public_html/siteconfig.php.dist
+
+mv geeklog-nightly.tar.gz /usr/www/users/geeklog2/www/nightly/
+
diff -r 22efede3ca2f -r c50d62875764 cronjobs/phpdoc.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cronjobs/phpdoc.sh	Sun Mar 08 18:26:17 2009 +0100
@@ -0,0 +1,21 @@
+#!/usr/local/bin/bash
+#
+# phpdoc.sh - create phpDocumentor documentation from Geeklog's source code
+#
+# For use from a cronjob - you may want to leave out the "-q &" when calling
+# manually.
+
+# where to put the created documentation
+OUTPUT=/usr/www/users/geeklog2/www/src
+
+# path to Geeklog source code (e.g. a Mercurial repository)
+GL_PATH=/usr/home/geeklog2/nightly/geeklog-nightly
+
+# location of phpDocumentor
+PHPDOC_PATH=/usr/home/geeklog2/phpDocumentator
+
+# seems to help when called from a cronjob
+export PHP=/usr/local/bin/php
+
+$PHPDOC_PATH/phpdoc -t $OUTPUT -o HTML:Smarty:PHP -d $GL_PATH -i *language/*,system/build/,buildpackage.*,system/pear/,public_html/fckeditor/ -dc Geeklog -dn Geeklog -ti "Geeklog Source Code Documentation" -q &
+
diff -r 22efede3ca2f -r c50d62875764 ship/mkdist.sh
--- a/ship/mkdist.sh	Sat Mar 07 15:40:54 2009 +0100
+++ b/ship/mkdist.sh	Sun Mar 08 18:26:17 2009 +0100
@@ -55,6 +55,7 @@
 rm -f plugins/spamx/Import.Admin.class.php
 # only used by the Import class
 rm -rf plugins/spamx/magpierss
+rm -f plugins/spamx/rss.inc.php
 # you'd need to set up a honeypot to use it
 rm -f plugins/spamx/ProjectHoneyPot.Examine.class.php
 

From geeklog-cvs at lists.geeklog.net  Sun Mar  8 17:20:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 08 Mar 2009 17:20:51 -0400
Subject: [geeklog-cvs] geeklog: Removed text strings that have since been
	moved to the ...
Message-ID: <hg.a18c4846f4a4.1236547251.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a18c4846f4a4
changeset: 6830:a18c4846f4a4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 08 21:21:28 2009 +0100
description:
Removed text strings that have since been moved to the Polls plugin's language file

diffstat:

6 files changed, 18 insertions(+), 18 deletions(-)
language/english.php             |    6 +++---
language/english_utf-8.php       |    6 +++---
language/german.php              |    6 +++---
language/german_formal.php       |    6 +++---
language/german_formal_utf-8.php |    6 +++---
language/german_utf-8.php        |    6 +++---

diffs (102 lines):

diff -r d3aad7fa7a94 -r a18c4846f4a4 language/english.php
--- a/language/english.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/english.php	Sun Mar 08 21:21:28 2009 +0100
@@ -46,10 +46,10 @@
     2 => 'read more',
     3 => 'comments',
     4 => 'Edit',
-    5 => 'Vote',
-    6 => 'Results',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'votes',
+    8 => '',
     9 => 'Admin Functions:',
     10 => 'Submissions',
     11 => 'Stories',
diff -r d3aad7fa7a94 -r a18c4846f4a4 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/english_utf-8.php	Sun Mar 08 21:21:28 2009 +0100
@@ -46,10 +46,10 @@
     2 => 'read more',
     3 => 'comments',
     4 => 'Edit',
-    5 => 'Vote',
-    6 => 'Results',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'votes',
+    8 => '',
     9 => 'Admin Functions:',
     10 => 'Submissions',
     11 => 'Stories',
diff -r d3aad7fa7a94 -r a18c4846f4a4 language/german.php
--- a/language/german.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/german.php	Sun Mar 08 21:21:28 2009 +0100
@@ -49,10 +49,10 @@
     2 => '(mehr)',
     3 => 'Kommentar(e)',
     4 => '?ndern',
-    5 => 'Umfrage',
-    6 => 'Ergebnisse',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'Stimmen',
+    8 => '',
     9 => 'Admin-Funktionen:',
     10 => 'Beitr?ge',
     11 => 'Artikel',
diff -r d3aad7fa7a94 -r a18c4846f4a4 language/german_formal.php
--- a/language/german_formal.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/german_formal.php	Sun Mar 08 21:21:28 2009 +0100
@@ -50,10 +50,10 @@
     2 => '(mehr)',
     3 => 'Kommentar(e)',
     4 => '?ndern',
-    5 => 'Umfrage',
-    6 => 'Ergebnisse',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'Stimmen',
+    8 => '',
     9 => 'Admin-Funktionen:',
     10 => 'Beitr?ge',
     11 => 'Artikel',
diff -r d3aad7fa7a94 -r a18c4846f4a4 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/german_formal_utf-8.php	Sun Mar 08 21:21:28 2009 +0100
@@ -50,10 +50,10 @@
     2 => '(mehr)',
     3 => 'Kommentar(e)',
     4 => '??ndern',
-    5 => 'Umfrage',
-    6 => 'Ergebnisse',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'Stimmen',
+    8 => '',
     9 => 'Admin-Funktionen:',
     10 => 'Beitr??ge',
     11 => 'Artikel',
diff -r d3aad7fa7a94 -r a18c4846f4a4 language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Mar 08 15:56:26 2009 +0100
+++ b/language/german_utf-8.php	Sun Mar 08 21:21:28 2009 +0100
@@ -49,10 +49,10 @@
     2 => '(mehr)',
     3 => 'Kommentar(e)',
     4 => '??ndern',
-    5 => 'Umfrage',
-    6 => 'Ergebnisse',
+    5 => '',
+    6 => '',
     7 => '',
-    8 => 'Stimmen',
+    8 => '',
     9 => 'Admin-Funktionen:',
     10 => 'Beitr??ge',
     11 => 'Artikel',

From geeklog-cvs at lists.geeklog.net  Sat Mar 14 13:51:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 14 Mar 2009 13:51:44 -0400
Subject: [geeklog-cvs] geeklog: Typo
Message-ID: <hg.b92f477b2b2c.1237053104.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b92f477b2b2c
changeset: 6831:b92f477b2b2c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 14 18:51:34 2009 +0100
description:
Typo

diffstat:

1 file changed, 2 insertions(+), 2 deletions(-)
plugins/spamx/autoinstall.php |    4 ++--

diffs (14 lines):

diff -r a18c4846f4a4 -r b92f477b2b2c plugins/spamx/autoinstall.php
--- a/plugins/spamx/autoinstall.php	Sun Mar 08 21:21:28 2009 +0100
+++ b/plugins/spamx/autoinstall.php	Sat Mar 14 18:51:34 2009 +0100
@@ -60,8 +60,8 @@
     );
 
     $features = array(
-        $pi_name . '.admint'    => 'Full access to ' . $pi_display_name
-                                    .' plugin'
+        $pi_name . '.admin'    => 'Full access to ' . $pi_display_name
+                                  . ' plugin'
     );
 
     $mappings = array(

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 11:31:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 11:31:19 -0400
Subject: [geeklog-cvs] geeklog: Removed extra double quote from upcoming
	events block (...
Message-ID: <hg.03a33f7d96e3.1237131079.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/03a33f7d96e3
changeset: 6833:03a33f7d96e3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 16:24:56 2009 +0100
description:
Removed extra double quote from upcoming events block (bug #0000827)

diffstat:

2 files changed, 2 insertions(+), 1 deletion(-)
plugins/calendar/functions.inc |    2 +-
public_html/docs/history       |    1 +

diffs (23 lines):

diff -r bd67e6d75d28 -r 03a33f7d96e3 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Mar 15 09:17:14 2009 +0100
+++ b/plugins/calendar/functions.inc	Sun Mar 15 16:24:56 2009 +0100
@@ -259,7 +259,7 @@
                             $newevent_url .= 'mode=personal&amp;';
                         }
 
-                        $newevent_url .= 'eid=' . $theEvent['eid'] . '"';
+                        $newevent_url .= 'eid=' . $theEvent['eid'];
                         $attr = array();
                         if( $todaysEvent ) {
                             $attr = array('class' => $todaysClassName);
diff -r bd67e6d75d28 -r 03a33f7d96e3 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 15 09:17:14 2009 +0100
+++ b/public_html/docs/history	Sun Mar 15 16:24:56 2009 +0100
@@ -72,6 +72,7 @@
 
 Calendar plugin
 ---------------
+- Removed extra double quote from upcoming events block (bug #0000827)
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 11:31:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 11:31:18 -0400
Subject: [geeklog-cvs] geeklog: Fixed comment: error.log -> access.log
Message-ID: <hg.bd67e6d75d28.1237131078.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bd67e6d75d28
changeset: 6832:bd67e6d75d28
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 09:17:14 2009 +0100
description:
Fixed comment: error.log -> access.log

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
public_html/admin/plugins/calendar/index.php |    2 +-

diffs (12 lines):

diff -r b92f477b2b2c -r bd67e6d75d28 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php	Sat Mar 14 18:51:34 2009 +0100
+++ b/public_html/admin/plugins/calendar/index.php	Sun Mar 15 09:17:14 2009 +0100
@@ -48,7 +48,7 @@
              . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
              . COM_siteFooter();
 
-    // Log attempt to error.log
+    // Log attempt to access.log
     COM_accessLog("User {$_USER['username']} tried to illegally access the event administration screen.");
 
     echo $display;

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 11:31:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 11:31:19 -0400
Subject: [geeklog-cvs] geeklog: Fixed wrong use of '&amp;
	' when sending a trackback (bu...
Message-ID: <hg.4304c303cc45.1237131079.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4304c303cc45
changeset: 6834:4304c303cc45
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 16:31:07 2009 +0100
description:
Fixed wrong use of '&amp;' when sending a trackback (bug #0000825)

diffstat:

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

diffs (27 lines):

diff -r 03a33f7d96e3 -r 4304c303cc45 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 15 16:24:56 2009 +0100
+++ b/public_html/docs/history	Sun Mar 15 16:31:07 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed wrong use of '&amp;' when sending a trackback (bug #0000825)
 - Removed incomplete PDF generator (never enabled in any shipped version) [Dirk]
 - Fixed a problem with words being merged together in newsfeeds when the article
   was written with CR as the line separator [Dirk]
diff -r 03a33f7d96e3 -r 4304c303cc45 system/lib-trackback.php
--- a/system/lib-trackback.php	Sun Mar 15 16:24:56 2009 +0100
+++ b/system/lib-trackback.php	Sun Mar 15 16:31:07 2009 +0100
@@ -766,9 +766,9 @@
         return $LANG_TRB['error_socket'];
     }
 
-    $toSend = 'url=' . rawurlencode ($url) . '&amp;title=' . rawurlencode ($title)
-            . '&amp;blog_name=' . rawurlencode ($blog) . '&amp;excerpt='
-            . rawurlencode ($excerpt);
+    $toSend = 'url=' . rawurlencode($url) . '&title=' . rawurlencode($title)
+            . '&blog_name=' . rawurlencode($blog) . '&excerpt='
+            . rawurlencode($excerpt);
     $charset = COM_getCharset ();
 
     fputs ($sock, 'POST ' . $target['path'] . $target['query'] . " HTTP/1.0\r\n");

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:20 -0400
Subject: [geeklog-cvs] geeklog: Some more phpDocumentor tags for the Links
	plugin
Message-ID: <hg.2fe75e6e9505.1237150520.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2fe75e6e9505
changeset: 6835:2fe75e6e9505
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 16:50:01 2009 +0100
description:
Some more phpDocumentor tags for the Links plugin

diffstat:

3 files changed, 36 insertions(+), 4 deletions(-)
plugins/links/autoinstall.php      |   26 ++++++++++++++++++++++++++
plugins/links/functions.inc        |    4 ++++
plugins/links/install_defaults.php |   10 ++++++----

diffs (98 lines):

diff -r 4304c303cc45 -r 2fe75e6e9505 plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Sun Mar 15 16:31:07 2009 +0100
+++ b/plugins/links/autoinstall.php	Sun Mar 15 16:50:01 2009 +0100
@@ -29,6 +29,17 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* @package Links
+*/
+
+/**
+* Plugin autoinstall function
+*
+* @param    string  $pi_name    Plugin name
+* @return   array               Plugin information
+*
+*/
 function plugin_autoinstall_links($pi_name)
 {
     $pi_name         = 'links';
@@ -76,6 +87,14 @@
     return $inst_parms;
 }
 
+/**
+* Load plugin configuration from database
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true on success, otherwise false
+* @see      plugin_initconfig_links
+*
+*/
 function plugin_load_configuration_links($pi_name)
 {
     global $_CONF;
@@ -133,6 +152,13 @@
     return true;
 }
 
+/**
+* Check if the plugin is compatible with this Geeklog version
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true: plugin compatible; false: not compatible
+*
+*/
 function plugin_compatible_with_this_version_links($pi_name)
 {
     if (!function_exists('COM_truncate') || !function_exists('MBYTE_strpos')) {
diff -r 4304c303cc45 -r 2fe75e6e9505 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Mar 15 16:31:07 2009 +0100
+++ b/plugins/links/functions.inc	Sun Mar 15 16:50:01 2009 +0100
@@ -35,6 +35,10 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+
+/**
+* @package Links
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
diff -r 4304c303cc45 -r 2fe75e6e9505 plugins/links/install_defaults.php
--- a/plugins/links/install_defaults.php	Sun Mar 15 16:31:07 2009 +0100
+++ b/plugins/links/install_defaults.php	Sun Mar 15 16:50:01 2009 +0100
@@ -2,7 +2,7 @@
 
 // Reminder: always indent with 4 spaces (no tabs).
 // +---------------------------------------------------------------------------+
-// | Links Plugin 2.0                                                          |
+// | Links Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | install_defaults.php                                                      |
 // |                                                                           |
@@ -10,7 +10,7 @@
 // | records. These settings are only used during the initial installation     |
 // | and not referenced any more once the plugin is installed.                 |
 // +---------------------------------------------------------------------------+
-// | 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       |
@@ -35,8 +35,10 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: install_defaults.php,v 1.8 2008/09/22 07:53:40 dhaun Exp $
+
+/**
+* @package Links
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'install_defaults.php') !== false) {
     die('This file can not be used on its own!');

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:21 -0400
Subject: [geeklog-cvs] geeklog: Some more phpDocumentor tags for the Spam-X
	plugin
Message-ID: <hg.e32ce84d5839.1237150521.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e32ce84d5839
changeset: 6836:e32ce84d5839
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 17:15:48 2009 +0100
description:
Some more phpDocumentor tags for the Spam-X plugin

diffstat:

3 files changed, 22 insertions(+), 4 deletions(-)
plugins/spamx/sql/mssql_install.php       |    6 +++++-
plugins/spamx/sql/mysql_install.php       |    6 +++++-
public_html/admin/plugins/spamx/index.php |   14 ++++++++++++--

diffs (82 lines):

diff -r 2fe75e6e9505 -r e32ce84d5839 plugins/spamx/sql/mssql_install.php
--- a/plugins/spamx/sql/mssql_install.php	Sun Mar 15 16:50:01 2009 +0100
+++ b/plugins/spamx/sql/mssql_install.php	Sun Mar 15 17:15:48 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | Installation SQL                                                          |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tom Willett       - tomw AT pigstye DOT net                      |
 // |          Randy Kolenko     - randy AT nextide DOT ca                      |
@@ -27,6 +27,10 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* @package Spam-X
+*/
+
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['spamx']}] (
     [name] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
diff -r 2fe75e6e9505 -r e32ce84d5839 plugins/spamx/sql/mysql_install.php
--- a/plugins/spamx/sql/mysql_install.php	Sun Mar 15 16:50:01 2009 +0100
+++ b/plugins/spamx/sql/mysql_install.php	Sun Mar 15 17:15:48 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | Installation SQL                                                          |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tom Willett       - tomw AT pigstye DOT net                      |
 // +---------------------------------------------------------------------------+
@@ -26,6 +26,10 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* @package Spam-X
+*/
+
 $_SQL[] = "
 CREATE TABLE {$_TABLES['spamx']} (
   name varchar(20) NOT NULL default '',
diff -r 2fe75e6e9505 -r e32ce84d5839 public_html/admin/plugins/spamx/index.php
--- a/public_html/admin/plugins/spamx/index.php	Sun Mar 15 16:50:01 2009 +0100
+++ b/public_html/admin/plugins/spamx/index.php	Sun Mar 15 17:15:48 2009 +0100
@@ -1,13 +1,13 @@
 <?php
 
 // +---------------------------------------------------------------------------+
-// | Spam-X plugin 1.0.2                                                       |
+// | Spam-X plugin 1.2                                                         |
 // +---------------------------------------------------------------------------+
 // | admin/index.php                                                           |
 // |                                                                           |
 // | Administration page.                                                      |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002-2004 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Author:                                                                   |
 // | Constructed with the Universal Plugin                                     |
@@ -34,6 +34,16 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Spam-X administration page
+*
+* @package Spam-X
+* @subpackage admin
+*/
+
+/**
+* Geeklog common function library and Admin authentication
+*/
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:21 -0400
Subject: [geeklog-cvs] geeklog: Moved Developer.txt to the wiki
Message-ID: <hg.bc2e579f5041.1237150521.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bc2e579f5041
changeset: 6837:bc2e579f5041
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 17:16:21 2009 +0100
description:
Moved Developer.txt to the wiki

diffstat:

1 file changed, 58 deletions(-)
plugins/spamx/Developer.txt |   58 -------------------------------------------

diffs (62 lines):

diff -r e32ce84d5839 -r bc2e579f5041 plugins/spamx/Developer.txt
--- a/plugins/spamx/Developer.txt	Sun Mar 15 17:15:48 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-The Spam-X plugin interface has been designed so that other modules and
-plugins can use the Spam-X engine to examine user submitted text.
-
-The code from lib-comment.php can be used as an example of the call.
-
-    // Let plugins have a chance to check for SPAM
-    $result = PLG_checkforSpam($comment, $_CONF['Spam-X']);
-    
-    // Now check the result and display message if spam action was taken
-    if ($result > 0) {
-        COM_displayMessageAndAbort($result, 'spamx', 403, 'Forbidden');
-    }
-
-Alternatively, you could redirect them to the site's index page:
-
-    / Now check the result and display message if spam action was taken
-    if ($result > 0) {
-        echo COM_refresh($_CONF['site_url'] . '/index.php?msg='
-                         . $result . '&amp;plugin=spamx');
-        exit;
-    }
-
-The use of COM_displayMessageAndAbort is recommended, as that will also send
-a proper HTTP status code (403, i.e. "Access denied", in the above example)
-and abort immediately while COM_refresh will cause another page load and put
-additional load on the webserver.
-
-All that is required is to send the comment to Spam-X with the
-PLG_checkforSpam call.  The two parameters are the comment text itself and
-an action number which tells Spam-X what actions to take if spam is found. 
-You can use the built in actions by passing the sum of the numbers of the
-Spam-X action modules for those actions you want to use.  The actions are
-performed in numerical order.  The current action modules are:
-
-    Mail admin     -> 8
-    Ignore comment -> 128
-
-So to Ignore the comment pass 128, to mail the admin pass 8, to do both pass
-136.  All action module numbers are multiples of 2 and each modules number
-is AND'ed with the value you pass to the plugin.  The modules are executed in
-numerical order so Mail Admin would happen before Ignore Comment.  Best
-practices require that you put this action number in a configuration
-variable, so that the site admin can change it if necessary.  If you do not
-want to use any of the Spam-X action modules then pass 0 as the action and
-check the return from the function call.  If spam is found it will return
-true if not false.  If you do not pass anything as the action then the
-system default will be used.
-
-Spam-X has three types of modules: admin, examine, and action.  Each module
-is contained within a class file.  The name of the file the module is in is
-critical.  For example: an admin module must end with .Admin.class.php.  The
-first part of the file name must be the name of the class contained within
-the file.  So if the class was named MassDelete then the file would be named
-MassDelete.Admin.class.php.  Examine modules end in .Examine.class.php and
-Action modules end in .Action.class.php.  If you add a new action to Spam-X,
-you must assign it a number.  Pick a number not used by other action modules
-and in the correct numerical sequence.
-

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:22 -0400
Subject: [geeklog-cvs] geeklog: Stick all the Spam-X modules in a
	@subpackage Modules
Message-ID: <hg.cb1ba8d99085.1237150522.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cb1ba8d99085
changeset: 6838:cb1ba8d99085
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 17:29:16 2009 +0100
description:
Stick all the Spam-X modules in a @subpackage Modules

diffstat:

22 files changed, 22 insertions(+)
plugins/spamx/BaseAdmin.class.php               |    1 +
plugins/spamx/BaseCommand.class.php             |    1 +
plugins/spamx/BlackList.Examine.class.php       |    1 +
plugins/spamx/DeleteComment.Action.class.php    |    1 +
plugins/spamx/EditBlackList.Admin.class.php     |    1 +
plugins/spamx/EditHeader.Admin.class.php        |    1 +
plugins/spamx/EditIP.Admin.class.php            |    1 +
plugins/spamx/EditIPofURL.Admin.class.php       |    1 +
plugins/spamx/Header.Examine.class.php          |    1 +
plugins/spamx/IP.Examine.class.php              |    1 +
plugins/spamx/IPofUrl.Examine.class.php         |    1 +
plugins/spamx/Import.Admin.class.php            |    1 +
plugins/spamx/LogView.Admin.class.php           |    1 +
plugins/spamx/MTBlackList.Examine.class.php     |    1 +
plugins/spamx/MailAdmin.Action.class.php        |    1 +
plugins/spamx/MassDelTrackback.Admin.class.php  |    1 +
plugins/spamx/MassDelete.Admin.class.php        |    1 +
plugins/spamx/ProjectHoneyPot.Examine.class.php |    1 +
plugins/spamx/SLV.Examine.class.php             |    1 +
plugins/spamx/SLVbase.class.php                 |    1 +
plugins/spamx/SLVreport.Action.class.php        |    1 +
plugins/spamx/SLVwhitelist.Admin.class.php      |    1 +

diffs (242 lines):

diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/BaseAdmin.class.php
--- a/plugins/spamx/BaseAdmin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/BaseAdmin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -6,6 +6,7 @@
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
  * @package Spam-X
+ * @subpackage Modules
  * @abstract
  *
  */
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/BaseCommand.class.php
--- a/plugins/spamx/BaseCommand.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/BaseCommand.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -6,6 +6,7 @@
  * @author Tom Willett	tomw AT pigstye DOT net 
  *
  * @package Spam-X
+ * @subpackage Modules
  * @abstract
  *
  */
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/BlackList.Examine.class.php
--- a/plugins/spamx/BlackList.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/BlackList.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
  * Licensed under GNU General Public License
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'BlackList.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/DeleteComment.Action.class.php
--- a/plugins/spamx/DeleteComment.Action.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/DeleteComment.Action.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
  * Licensed under GNU General Public License
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'DeleteComment.Action.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/EditBlackList.Admin.class.php
--- a/plugins/spamx/EditBlackList.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/EditBlackList.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -11,6 +11,7 @@
  * Licensed under GNU General Public License
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditBlackList.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/EditHeader.Admin.class.php
--- a/plugins/spamx/EditHeader.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/EditHeader.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -12,6 +12,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditHeader.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/EditIP.Admin.class.php
--- a/plugins/spamx/EditIP.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/EditIP.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -11,6 +11,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIP.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/EditIPofURL.Admin.class.php
--- a/plugins/spamx/EditIPofURL.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/EditIPofURL.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -11,6 +11,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'EditIPofURL.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -12,6 +12,7 @@
 * Licensed under the GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'Header.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/IP.Examine.class.php
--- a/plugins/spamx/IP.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/IP.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'IP.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/IPofUrl.Examine.class.php
--- a/plugins/spamx/IPofUrl.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/IPofUrl.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'IPofUrl.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/Import.Admin.class.php
--- a/plugins/spamx/Import.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/Import.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -16,6 +16,7 @@
  * Cheah Chu Yeow (http://blog.codefront.net/)
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'Import.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/LogView.Admin.class.php
--- a/plugins/spamx/LogView.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/LogView.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
  * Licensed under GNU General Public License
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'LogView.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/MTBlackList.Examine.class.php
--- a/plugins/spamx/MTBlackList.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/MTBlackList.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -14,6 +14,7 @@
  * http://www.jayallen.org/comment_spam/
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MTBlackList.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/MailAdmin.Action.class.php
--- a/plugins/spamx/MailAdmin.Action.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/MailAdmin.Action.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
  * Licensed under GNU General Public License
  *
  * @package Spam-X
+ * @subpackage Modules
  */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MailAdmin.Action.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/MassDelTrackback.Admin.class.php
--- a/plugins/spamx/MassDelTrackback.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/MassDelTrackback.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -13,6 +13,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelTrackback.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/MassDelete.Admin.class.php
--- a/plugins/spamx/MassDelete.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/MassDelete.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -11,6 +11,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'MassDelete.Admin.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/ProjectHoneyPot.Examine.class.php
--- a/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -36,6 +36,7 @@
 
 /**
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'ProjectHoneyPot.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/SLV.Examine.class.php
--- a/plugins/spamx/SLV.Examine.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/SLV.Examine.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
 * Licensed under the GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLV.Examine.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/SLVbase.class.php
--- a/plugins/spamx/SLVbase.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/SLVbase.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
 * Licensed under the GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVbase.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/SLVreport.Action.class.php
--- a/plugins/spamx/SLVreport.Action.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/SLVreport.Action.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -10,6 +10,7 @@
 * Licensed under the GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVreport.Action.class.php') !== false) {
diff -r bc2e579f5041 -r cb1ba8d99085 plugins/spamx/SLVwhitelist.Admin.class.php
--- a/plugins/spamx/SLVwhitelist.Admin.class.php	Sun Mar 15 17:16:21 2009 +0100
+++ b/plugins/spamx/SLVwhitelist.Admin.class.php	Sun Mar 15 17:29:16 2009 +0100
@@ -11,6 +11,7 @@
 * Licensed under GNU General Public License
 *
 * @package Spam-X
+* @subpackage Modules
 */
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'SLVwhitelist.Admin.class.php') !== false) {

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:24 -0400
Subject: [geeklog-cvs] geeklog: Some minor additions for phpDocumentor
	documentation
Message-ID: <hg.05f2aee29a2d.1237150524.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05f2aee29a2d
changeset: 6840:05f2aee29a2d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 18:57:47 2009 +0100
description:
Some minor additions for phpDocumentor documentation

diffstat:

5 files changed, 10 insertions(+)
plugins/links/autoinstall.php      |    2 ++
plugins/links/functions.inc        |    2 ++
plugins/links/install_defaults.php |    2 ++
plugins/spamx/autoinstall.php      |    2 ++
plugins/spamx/install_defaults.php |    2 ++

diffs (60 lines):

diff -r da16bb625546 -r 05f2aee29a2d plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Sun Mar 15 18:50:42 2009 +0100
+++ b/plugins/links/autoinstall.php	Sun Mar 15 18:57:47 2009 +0100
@@ -30,6 +30,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
+* Autoinstall API functions for the Links plugin
+*
 * @package Links
 */
 
diff -r da16bb625546 -r 05f2aee29a2d plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Mar 15 18:50:42 2009 +0100
+++ b/plugins/links/functions.inc	Sun Mar 15 18:57:47 2009 +0100
@@ -37,6 +37,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
+* Implementation of the Plugin API for the Links plugin
+*
 * @package Links
 */
 
diff -r da16bb625546 -r 05f2aee29a2d plugins/links/install_defaults.php
--- a/plugins/links/install_defaults.php	Sun Mar 15 18:50:42 2009 +0100
+++ b/plugins/links/install_defaults.php	Sun Mar 15 18:57:47 2009 +0100
@@ -37,6 +37,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
+* Install data and defaults for the Links plugin configuration
+*
 * @package Links
 */
 
diff -r da16bb625546 -r 05f2aee29a2d plugins/spamx/autoinstall.php
--- a/plugins/spamx/autoinstall.php	Sun Mar 15 18:50:42 2009 +0100
+++ b/plugins/spamx/autoinstall.php	Sun Mar 15 18:57:47 2009 +0100
@@ -30,6 +30,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
+* Autoinstall API functions for the Spam-X plugin
+*
 * @package Spam-X
 */
 
diff -r da16bb625546 -r 05f2aee29a2d plugins/spamx/install_defaults.php
--- a/plugins/spamx/install_defaults.php	Sun Mar 15 18:50:42 2009 +0100
+++ b/plugins/spamx/install_defaults.php	Sun Mar 15 18:57:47 2009 +0100
@@ -32,6 +32,8 @@
 // +---------------------------------------------------------------------------+
 
 /**
+* Install data and defaults for the Spam-X plugin configuration
+*
 * @package Spam-X
 */
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:22 -0400
Subject: [geeklog-cvs] geeklog: phpDocumentor tags for the Polls plugin
Message-ID: <hg.da16bb625546.1237150522.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/da16bb625546
changeset: 6839:da16bb625546
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 18:50:42 2009 +0100
description:
phpDocumentor tags for the Polls plugin

diffstat:

9 files changed, 91 insertions(+), 17 deletions(-)
plugins/polls/autoinstall.php             |   35 ++++++++++++++++++++++++-----
plugins/polls/functions.inc               |    8 +++++-
plugins/polls/install_defaults.php        |    8 +++++-
plugins/polls/sql/mssql_install.php       |    8 +++++-
plugins/polls/sql/mssql_updates.php       |    8 +++++-
plugins/polls/sql/mysql_install.php       |    8 +++++-
plugins/polls/sql/mysql_updates.php       |    8 +++++-
public_html/admin/plugins/polls/index.php |   12 +++++++++
public_html/polls/index.php               |   13 +++++++---

diffs (277 lines):

diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/autoinstall.php
--- a/plugins/polls/autoinstall.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/autoinstall.php	Sun Mar 15 18:50:42 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -29,6 +29,19 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Autoinstall API functions for the Polls plugin
+*
+* @package Polls
+*/
+
+/**
+* Plugin autoinstall function
+*
+* @param    string  $pi_name    Plugin name
+* @return   array               Plugin information
+*
+*/
 function plugin_autoinstall_polls($pi_name)
 {
     $pi_name         = 'polls';
@@ -73,6 +86,14 @@
     return $inst_parms;
 }
 
+/**
+* Load plugin configuration from database
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true on success, otherwise false
+* @see      plugin_initconfig_polls
+*
+*/
 function plugin_load_configuration_polls($pi_name)
 {
     global $_CONF;
@@ -85,11 +106,13 @@
     return plugin_initconfig_polls();
 }
 
-function plugin_postinstall_polls($pi_name)
-{
-    return true;
-}
-
+/**
+* Check if the plugin is compatible with this Geeklog version
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true: plugin compatible; false: not compatible
+*
+*/
 function plugin_compatible_with_this_version_polls($pi_name)
 {
     if (function_exists('COM_showPoll') || function_exists('COM_pollVote')) {
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/functions.inc	Sun Mar 15 18:50:42 2009 +0100
@@ -10,7 +10,7 @@
 // | API method and 2) implements all the common code needed by the Polls      |
 // | plugin' PHP files.                                                        |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -33,6 +33,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+
+/**
+* Implementation of the Plugin API for the Polls plugin
+*
+* @package Polls
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/install_defaults.php
--- a/plugins/polls/install_defaults.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/install_defaults.php	Sun Mar 15 18:50:42 2009 +0100
@@ -31,11 +31,17 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Install data and defaults for the Polls plugin configuration
+*
+* @package Polls
+*/
+
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'install_defaults.php') !== false) {
     die('This file can not be used on its own!');
 }
 
-/*
+/**
  * Polls default settings
  *
  * Initial Installation Defaults used when loading the online configuration
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/sql/mssql_install.php
--- a/plugins/polls/sql/mssql_install.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/sql/mssql_install.php	Sun Mar 15 18:50:42 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mssql_install.php                                                         |
 // +---------------------------------------------------------------------------+
-// | 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    |
@@ -30,6 +30,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+
+/**
+* MS SQL install data and tables
+*
+* @package Polls
+*/
 
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/sql/mssql_updates.php	Sun Mar 15 18:50:42 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mssql_updates.php                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -26,6 +26,12 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* MS SQL updates
+*
+* @package Polls
+*/
+
 $_UPDATES = array(
 
     '2.0.1' => array(
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/sql/mysql_install.php	Sun Mar 15 18:50:42 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mysql_install.php                                                         |
 // +---------------------------------------------------------------------------+
-// | 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    |
@@ -29,6 +29,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+
+/**
+* MySQL install data and tables
+*
+* @package Polls
+*/
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pollanswers']} (
diff -r cb1ba8d99085 -r da16bb625546 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/plugins/polls/sql/mysql_updates.php	Sun Mar 15 18:50:42 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | mysql_updates.php                                                         |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -26,6 +26,12 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* MySQL updates
+*
+* @package Polls
+*/
+
 $_UPDATES = array(
 
     '2.0.1' => array(
diff -r cb1ba8d99085 -r da16bb625546 public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/public_html/admin/plugins/polls/index.php	Sun Mar 15 18:50:42 2009 +0100
@@ -6,7 +6,7 @@
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
-// | Geeklog poll administration page                                          |
+// | Polls plugin administration page                                          |
 // +---------------------------------------------------------------------------+
 // | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
@@ -32,6 +32,16 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Polls plugin administration page
+*
+* @package Polls
+* @subpackage admin
+*/
+
+/**
+* Geeklog common function library and Admin authentication
+*/
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
 
diff -r cb1ba8d99085 -r da16bb625546 public_html/polls/index.php
--- a/public_html/polls/index.php	Sun Mar 15 17:29:16 2009 +0100
+++ b/public_html/polls/index.php	Sun Mar 15 18:50:42 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Polls Plugin 2.0                                                          |
+// | Polls Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | Display poll results and past polls.                                      |
 // +---------------------------------------------------------------------------+
-// | 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,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.29 2008/05/24 09:04:59 dhaun Exp $
+
+/**
+* Display poll results and past polls
+*
+* @package Polls
+* @subpackage public_html
+*/
 
 require_once '../lib-common.php';
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:25 -0400
Subject: [geeklog-cvs] geeklog: phpDocumentor tags for the Static Pages
	plugin
Message-ID: <hg.8d868290493d.1237150525.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8d868290493d
changeset: 6841:8d868290493d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 20:06:29 2009 +0100
description:
phpDocumentor tags for the Static Pages plugin

diffstat:

6 files changed, 70 insertions(+), 16 deletions(-)
plugins/staticpages/autoinstall.php             |   35 +++++++++++++++++++----
plugins/staticpages/functions.inc               |    6 +++
plugins/staticpages/install_defaults.php        |   14 +++++----
plugins/staticpages/services.inc.php            |    8 ++++-
public_html/admin/plugins/staticpages/index.php |   10 ++++++
public_html/staticpages/index.php               |   13 +++++---

diffs (202 lines):

diff -r 05f2aee29a2d -r 8d868290493d plugins/staticpages/autoinstall.php
--- a/plugins/staticpages/autoinstall.php	Sun Mar 15 18:57:47 2009 +0100
+++ b/plugins/staticpages/autoinstall.php	Sun Mar 15 20:06:29 2009 +0100
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -29,6 +29,19 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Autoinstall API functions for the Static Pages plugin
+*
+* @package StaticPages
+*/
+
+/**
+* Plugin autoinstall function
+*
+* @param    string  $pi_name    Plugin name
+* @return   array               Plugin information
+*
+*/
 function plugin_autoinstall_staticpages($pi_name)
 {
     $pi_name         = 'staticpages';
@@ -75,6 +88,14 @@
     return $inst_parms;
 }
 
+/**
+* Load plugin configuration from database
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true on success, otherwise false
+* @see      plugin_initconfig_staticpages
+*
+*/
 function plugin_load_configuration_staticpages($pi_name)
 {
     global $_CONF;
@@ -87,11 +108,13 @@
     return plugin_initconfig_staticpages();
 }
 
-function plugin_postinstall_staticpages($pi_name)
-{
-    return true;
-}
-
+/**
+* Check if the plugin is compatible with this Geeklog version
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             true: plugin compatible; false: not compatible
+*
+*/
 function plugin_compatible_with_this_version_staticpages($pi_name)
 {
     if (! function_exists('SEC_getGroupDropdown')) {
diff -r 05f2aee29a2d -r 8d868290493d plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Mar 15 18:57:47 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sun Mar 15 20:06:29 2009 +0100
@@ -33,6 +33,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+
+/**
+* Implementation of the Plugin API for the Static Pages plugin
+*
+* @package StaticPages
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
diff -r 05f2aee29a2d -r 8d868290493d plugins/staticpages/install_defaults.php
--- a/plugins/staticpages/install_defaults.php	Sun Mar 15 18:57:47 2009 +0100
+++ b/plugins/staticpages/install_defaults.php	Sun Mar 15 20:06:29 2009 +0100
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Plugin 1.5                                                   |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
 // | install_defaults.php                                                      |
 // |                                                                           |
@@ -10,7 +10,7 @@
 // | records. These settings are only used during the initial installation     |
 // | and not referenced any more once the plugin is installed.                 |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Blaine Lang      - blaine AT portalparts DOT com                 |
 // |          Dirk Haun        - dirk AT haun-online DOT de                    |
@@ -31,14 +31,18 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: install_defaults.php,v 1.9 2008/09/21 08:37:08 dhaun Exp $
+
+/**
+* Install data and defaults for the Static Pages plugin configuration
+*
+* @package StaticPages
+*/
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'install_defaults.php') !== false) {
     die('This file can not be used on its own!');
 }
 
-/*
+/**
  * Static Pages default settings
  *
  * Initial Installation Defaults used when loading the online configuration
diff -r 05f2aee29a2d -r 8d868290493d plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sun Mar 15 18:57:47 2009 +0100
+++ b/plugins/staticpages/services.inc.php	Sun Mar 15 20:06:29 2009 +0100
@@ -33,11 +33,17 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Functions related to the webservices and the internal plugin API
+*
+* @package StaticPages
+*/
+
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'services.inc.php') !== false) {
     die('This file can not be used on its own.');
 }
 
-// this must be kept in synch with the actual size of 'sp_id' in the db ...
+// this must be kept in sync with the actual size of 'sp_id' in the db ...
 define('STATICPAGE_MAX_ID_LENGTH', 40);
 
 /**
diff -r 05f2aee29a2d -r 8d868290493d public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sun Mar 15 18:57:47 2009 +0100
+++ b/public_html/admin/plugins/staticpages/index.php	Sun Mar 15 20:06:29 2009 +0100
@@ -32,6 +32,16 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Static Pages plugin administration page
+*
+* @package StaticPages
+* @subpackage admin
+*/
+
+/**
+* Geeklog common function library and Admin authentication
+*/
 require_once '../../../lib-common.php';
 require_once '../../auth.inc.php';
 
diff -r 05f2aee29a2d -r 8d868290493d public_html/staticpages/index.php
--- a/public_html/staticpages/index.php	Sun Mar 15 18:57:47 2009 +0100
+++ b/public_html/staticpages/index.php	Sun Mar 15 20:06:29 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog Static Pages Plugin 1.5                                           |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | This is the main page for the Geeklog Static Pages 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                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -30,8 +30,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.48 2008/06/20 15:12:36 dhaun Exp $
+
+/**
+* Display a Static Page
+*
+* @package StaticPages
+* @subpackage public_html
+*/
 
 require_once '../lib-common.php';
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 15 16:55:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 15 Mar 2009 16:55:26 -0400
Subject: [geeklog-cvs] geeklog: phpDocumentor messes up obfuscated email
	addresses in a...
Message-ID: <hg.e08747bfab7c.1237150526.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e08747bfab7c
changeset: 6842:e08747bfab7c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 15 21:54:28 2009 +0100
description:
phpDocumentor messes up obfuscated email addresses in angle brackets, so use a different style

diffstat:

21 files changed, 75 insertions(+), 81 deletions(-)
plugins/links/language/english.php              |    6 ++--
plugins/links/language/english_utf-8.php        |    6 ++--
plugins/spamx/Header.Examine.class.php          |    4 +--
plugins/spamx/ProjectHoneyPot.Examine.class.php |    2 -
public_html/admin/group.php                     |    2 -
public_html/admin/install/configinfo.php        |    8 ++----
public_html/admin/story.php                     |    2 -
public_html/article.php                         |    4 +--
public_html/comment.php                         |   10 +++----
public_html/getimage.php                        |    8 ++----
public_html/links/index.php                     |   16 ++++++------
public_html/links/portal.php                    |   14 +++++-----
system/classes/calendar.class.php               |    2 -
system/classes/listfactory.class.php            |    2 -
system/classes/plugin.class.php                 |   12 +++------
system/classes/search.class.php                 |   30 +++++++++++------------
system/classes/story.class.php                  |    2 -
system/classes/upload.class.php                 |    6 ++--
system/lib-comment.php                          |    4 +--
system/lib-plugins.php                          |   14 +++++-----
system/lib-security.php                         |    2 -

diffs (truncated from 630 to 300 lines):

diff -r 8d868290493d -r e08747bfab7c plugins/links/language/english.php
--- a/plugins/links/language/english.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/links/language/english.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,9 +36,9 @@
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c plugins/links/language/english_utf-8.php
--- a/plugins/links/language/english_utf-8.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/links/language/english_utf-8.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,9 +36,9 @@
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2007
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c plugins/spamx/Header.Examine.class.php
--- a/plugins/spamx/Header.Examine.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/spamx/Header.Examine.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -4,7 +4,7 @@
 * File: Header.Examine.class.php
 * This is the HTTP Header Examine class for the Geeklog Spam-X plugin
 *
-* Copyright (C) 2005-2006 by the following authors:
+* Copyright (C) 2005-2009 by the following authors:
 * Author    Dirk Haun <dirk AT haun-online DOT de>
 *
 * based on the works of Tom Willett <tomw AT pigstye DOT net>
@@ -27,7 +27,7 @@
 /**
 * Examines Post according to HTTP Headers
 *
-* @author Dirk Haun <dirk AT haun-online DOT de>
+* @author Dirk Haun, dirk AT haun-online DOT de
 *
 * @package Spam-X
 *
diff -r 8d868290493d -r e08747bfab7c plugins/spamx/ProjectHoneyPot.Examine.class.php
--- a/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/plugins/spamx/ProjectHoneyPot.Examine.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -100,7 +100,7 @@
 * ProjectHoneyPot.org. This involves performing a special DNS query using a
 * special Project Honey Pot access key. See this plugins config.php for use.
 *
-* @author Mike Jervis <mike AT fuckingbrit DOT com>
+* @author Mike Jervis, mike AT fuckingbrit DOT com
 * @package Spam-X
 *
 */
diff -r 8d868290493d -r e08747bfab7c public_html/admin/group.php
--- a/public_html/admin/group.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/group.php	Sun Mar 15 21:54:28 2009 +0100
@@ -35,7 +35,7 @@
 /**
 * This file is the Geeklog Group administration page
 *
-* @author   Tony Bibbs  <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/admin/install/configinfo.php
--- a/public_html/admin/install/configinfo.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/install/configinfo.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | configinfo.php                                                            |
 // |                                                                           |
 // | Display current configuration settings                                    |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Jeffrey Schoolcraft  - dream AT dr3amscap3 DOT com               |
 // |          Dirk Haun            - dirk AT haun-online DOT de                |
@@ -29,15 +29,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: configinfo.php,v 1.7 2008/05/11 07:25:08 dhaun Exp $
 
 /**
 * This script will display file and permission information based on settings in
 * the configuration.  This is meant to be used as a support tool when asked
 * questions in #geeklog.
 *
-* @author   Jeffrey Schoolcraft <dream AT dr3amscap3 DOT com>
+* @author   Jeffrey Schoolcraft, dream AT dr3amscap3 DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/admin/story.php
--- a/public_html/admin/story.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/admin/story.php	Sun Mar 15 21:54:28 2009 +0100
@@ -36,7 +36,7 @@
 * This is the Geeklog story administration page.
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbs <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/article.php
--- a/public_html/article.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/article.php	Sun Mar 15 21:54:28 2009 +0100
@@ -37,8 +37,8 @@
 * may, or may not, include the comments attached
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbbs <tony AT tonybibbs DOT com>
-* @author   Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+* @author   Tony Bibbbs, tony AT tonybibbs DOT com
+* @author   Vincent Furia, vinny01 AT users DOT sourceforge DOT net
 */
 
 /**
diff -r 8d868290493d -r e08747bfab7c public_html/comment.php
--- a/public_html/comment.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/comment.php	Sun Mar 15 21:54:28 2009 +0100
@@ -38,8 +38,8 @@
 * comments to the DB.  All comment display stuff is in lib-common.php
 *
 * @author   Jason Whittenburg
-* @author   Tony Bibbs    <tonyAT tonybibbs DOT com>
-* @author   Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+* @author   Tony Bibbs, tonyAT tonybibbs DOT com
+* @author   Vincent Furia, vinny01 AT users DOT sourceforge DOT net
 *
 */
 
@@ -62,7 +62,7 @@
  * Handles a comment submission
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @return string HTML (possibly a refresh)
  */
 function handleSubmit()
@@ -117,7 +117,7 @@
  * Handles a comment submission
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @return string HTML (possibly a refresh)
  */
 function handleDelete()
@@ -166,7 +166,7 @@
  * Handles a comment view request
  *
  * @copyright Vincent Furia 2005
- * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @author Vincent Furia, vinny01 AT users DOT sourceforge DOT net
  * @param boolean $view View or display (true for view)
  * @return string HTML (possibly a refresh)
  */
diff -r 8d868290493d -r e08747bfab7c public_html/getimage.php
--- a/public_html/getimage.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/getimage.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | getimage.php                                                              |
 // |                                                                           |
 // | Shows images outside of the webtree                                       |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2008 by the following authors:                         |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Dirk Haun         - dirk AT haun-online DOT de                   |
@@ -29,15 +29,13 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: getimage.php,v 1.8 2007/11/25 06:55:07 ospiess Exp $
 
 /**
 * For really strict webhosts, this file an be used to show images in pages that
 * serve the images from outside of the webtree to a place that the webserver
 * user can actually write too
 *
-* @author   Tony Bibbs <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 *
 */
 
diff -r 8d868290493d -r e08747bfab7c public_html/links/index.php
--- a/public_html/links/index.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/links/index.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Links Plugin 2.0                                                          |
+// | Links Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | This is the main page for the Geeklog Links 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    |
@@ -44,12 +44,12 @@
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Mark Limburg <mlimburg AT users DOT sourceforge DOT net>
- * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
- * @author Tom Willett <tomw AT pigstye DOT net>
- * @author Trinity Bays <trinity93 AT gmail DOT com>
- * @author Dirk Haun <dirk AT haun-online DOT de>
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Mark Limburg, mlimburg AT users DOT sourceforge DOT net
+ * @author Jason Whittenburg, jwhitten AT securitygeeks DOT com
+ * @author Tom Willett, tomw AT pigstye DOT net
+ * @author Trinity Bays, trinity93 AT gmail DOT com
+ * @author Dirk Haun, dirk AT haun-online DOT de
  *
  */
 
diff -r 8d868290493d -r e08747bfab7c public_html/links/portal.php
--- a/public_html/links/portal.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/public_html/links/portal.php	Sun Mar 15 21:54:28 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | portal.php                                                                |
 // |                                                                           |
 // | Geeklog portal page that tracks link click throughs.                      |
 // +---------------------------------------------------------------------------+
-// | 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        |
@@ -42,11 +42,11 @@
  * @since GL 1.4.0
  * @copyright Copyright &copy; 2005-2008
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * @author Trinity Bays <trinity93 AT gmail.com>
- * @author Tony Bibbs <tony AT tonybibbs DOT com>
- * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
- * @author Blaine Lang <langmail AT sympatico DOT ca>
- * @author Dirk Haun <dirk AT haun-online DOT de>
+ * @author Trinity Bays, trinity93 AT gmail.com
+ * @author Tony Bibbs, tony AT tonybibbs DOT com
+ * @author Tom Willett, twillett AT users DOT sourceforge DOT net
+ * @author Blaine Lang, langmail AT sympatico DOT ca
+ * @author Dirk Haun, dirk AT haun-online DOT de
  * 
  */
 
diff -r 8d868290493d -r e08747bfab7c system/classes/calendar.class.php
--- a/system/classes/calendar.class.php	Sun Mar 15 20:06:29 2009 +0100
+++ b/system/classes/calendar.class.php	Sun Mar 15 21:54:28 2009 +0100
@@ -39,7 +39,7 @@
 * Those files along with this class need to be reworked to be easier 
 * to maintain and support rich calendaring features
 *
-* @author   Tony Bibbs  <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
 */

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 13:50:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 13:50:06 -0400
Subject: [geeklog-cvs] geeklog: Added canonical link to
	article/printable.thtml
Message-ID: <hg.c38f594e6af1.1237657806.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c38f594e6af1
changeset: 6844:c38f594e6af1
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 16:01:39 2009 +0100
description:
Added canonical link to article/printable.thtml

diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
public_html/article.php                                 |    7 +++++--
public_html/layout/professional/article/printable.thtml |    1 +

diffs (28 lines):

diff -r 619109d9b69f -r c38f594e6af1 public_html/article.php
--- a/public_html/article.php	Sat Mar 21 15:01:34 2009 +0100
+++ b/public_html/article.php	Sat Mar 21 16:01:39 2009 +0100
@@ -209,8 +209,11 @@
             $story_template->set_var('comments_with_count',
                                      $comments_with_count);
         }
-        $story_template->set_var ('lang_full_article', $LANG08[33]);
-        $story_template->set_var ('article_url', $articleUrl);
+        $story_template->set_var('lang_full_article', $LANG08[33]);
+        $story_template->set_var('article_url', $articleUrl);
+        $printable = COM_buildUrl($_CONF['site_url'] . '/article.php?story='
+                                  . $story->getSid() . '&amp;mode=print');
+        $story_template->set_var('printable_url', $printable);
 
         COM_setLangIdAndAttribute($story_template);
 
diff -r 619109d9b69f -r c38f594e6af1 public_html/layout/professional/article/printable.thtml
--- a/public_html/layout/professional/article/printable.thtml	Sat Mar 21 15:01:34 2009 +0100
+++ b/public_html/layout/professional/article/printable.thtml	Sat Mar 21 16:01:39 2009 +0100
@@ -4,6 +4,7 @@
   <title>{page_title}</title>
   <link rel="stylesheet" type="text/css" href="{layout_url}/print.css"{xhtml}>
   <link rel="stylesheet" type="text/css" media="print" href="{layout_url}/print.css"{xhtml}>
+  <link rel="canonical" href="{printable_url}"{xhtml}>
 </head>
 <body dir="{direction}">
     <h1>{story_title}</h1>

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 13:50:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 13:50:06 -0400
Subject: [geeklog-cvs] geeklog: Define {xmlns} when using XHTML for XHTML
	compliance
Message-ID: <hg.619109d9b69f.1237657806.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/619109d9b69f
changeset: 6843:619109d9b69f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 15:01:34 2009 +0100
description:
Define {xmlns} when using XHTML for XHTML compliance

diffstat:

9 files changed, 49 insertions(+), 16 deletions(-)
plugins/staticpages/functions.inc                       |    3 +
plugins/staticpages/templates/printable.thtml           |    2 -
public_html/article.php                                 |   29 ++++++++++++---
public_html/docs/history                                |    3 +
public_html/docs/theme.html                             |    5 ++
public_html/layout/professional/article/printable.thtml |    8 +---
public_html/layout/professional/header.thtml            |    2 -
public_html/lib-common.php                              |    7 ++-
system/lib-story.php                                    |    6 +--

diffs (178 lines):

diff -r e08747bfab7c -r 619109d9b69f plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Mar 15 21:54:28 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Mar 21 15:01:34 2009 +0100
@@ -300,6 +300,9 @@
 
     $spage = new Template( $_CONF['path'] . 'plugins/staticpages/templates/' );
     $spage->set_var('xhtml', XHTML);
+    if (XHTML != '') {
+        $spage->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
+    }
     $spage->set_var('site_url', $_CONF['site_url']);
     $spage->set_var('layout_url', $_CONF['layout_url']);
     $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
diff -r e08747bfab7c -r 619109d9b69f plugins/staticpages/templates/printable.thtml
--- a/plugins/staticpages/templates/printable.thtml	Sun Mar 15 21:54:28 2009 +0100
+++ b/plugins/staticpages/templates/printable.thtml	Sat Mar 21 15:01:34 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html {lang_attribute}>
+<html{lang_attribute}{xmlns}>
 <head>
   <title>{page_title}</title>
   <link rel="stylesheet" type="text/css" href="{layout_url}/print.css"{xhtml}>
diff -r e08747bfab7c -r 619109d9b69f public_html/article.php
--- a/public_html/article.php	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/article.php	Sat Mar 21 15:01:34 2009 +0100
@@ -139,6 +139,10 @@
         $story_template = new Template($_CONF['path_layout'] . 'article');
         $story_template->set_file('article', 'printable.thtml');
         $story_template->set_var('xhtml', XHTML);
+        if (XHTML != '') {
+            $story_template->set_var('xmlns',
+                                     ' xmlns="http://www.w3.org/1999/xhtml"');
+        }
         $story_template->set_var('direction', $LANG_DIRECTION);
         $story_template->set_var('page_title',
                 $_CONF['site_name'] . ': ' . $story->displayElements('title'));
@@ -156,10 +160,27 @@
                                      $story->DisplayElements('username'));
         }
 
-        $story_template->set_var('story_introtext',
-                                 $story->DisplayElements('introtext'));
-        $story_template->set_var('story_bodytext',
-                                 $story->DisplayElements('bodytext'));
+        $introtext = $story->DisplayElements('introtext');
+        $bodytext  = $story->DisplayElements('bodytext');
+        if (empty($bodytext)) {
+            $fulltext = $introtext;
+            $fulltext_no_br = $introtext;
+        } else {
+            $fulltext = $introtext . '<br' . XHTML . '><br' . XHTML . '/>'
+                      . $bodytext;
+            $fulltext_no_br = $introtext . ' ' . $bodytext;
+        }
+        if ($story->DisplayElements('postmode') == 'plaintext') {
+            $introtext = '<p>' . $introtext . '</p>';
+            $bodytext = '<p>' . $bodytext . '</p>';
+            $fulltext = '<p>' . $fulltext . '</p>';
+            $fulltext_no_br = '<p>' . $fulltext_no_br . '</p>';
+        }
+
+        $story_template->set_var('story_introtext', $introtext);
+        $story_template->set_var('story_bodytext',  $bodytext);
+        $story_template->set_var('story_text', $fulltext);
+        $story_template->set_var('story_text_no_br', $fulltext_no_br);
 
         $story_template->set_var('site_url', $_CONF['site_url']);
         $story_template->set_var('site_admin_url', $_CONF['site_admin_url']);
diff -r e08747bfab7c -r 619109d9b69f public_html/docs/history
--- a/public_html/docs/history	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/docs/history	Sat Mar 21 15:01:34 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Define {xmlns} when using XHTML for XHTML compliance. Updated header.thtml
+  and article/printable.thtml template files to include that variable [Dirk]
 - Fixed wrong use of '&amp;' when sending a trackback (bug #0000825)
 - Removed incomplete PDF generator (never enabled in any shipped version) [Dirk]
 - Fixed a problem with words being merged together in newsfeeds when the article
@@ -101,6 +103,7 @@
 
 Static Pages plugin
 -------------------
+- The printable.thtml template file now uses the {xmlns} variable [Dirk]
 - Added canonical link [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
diff -r e08747bfab7c -r 619109d9b69f public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/docs/theme.html	Sat Mar 21 15:01:34 2009 +0100
@@ -198,6 +198,11 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.0</a></h2>
 
 <ul>
+<li>When using <a href="#xhtml">XHTML</a>, the variable <tt>{xmlns}</tt> now
+    contains <tt>xmlns="http://www.w3.org/1999/xhtml"</tt> for XHTML compliance
+    (to be used in the <tt>&lt;html&gt;</tt> element).</li>
+<li>Added a space between a story's intro text and body text when using the
+    <tt>{story_text_no_br}</tt> variable.</li>
 <li>Bugfix: The variables <tt>{contributedby_user}</tt> and
     <tt>{contributedby_fullname}</tt> were always empty.</li>
 <li>The two variables <tt>{start_contributedby_anchortag}</tt> and
diff -r e08747bfab7c -r 619109d9b69f public_html/layout/professional/article/printable.thtml
--- a/public_html/layout/professional/article/printable.thtml	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/layout/professional/article/printable.thtml	Sat Mar 21 15:01:34 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html {lang_attribute}>
+<html{lang_attribute}{xmlns}>
 <head>
   <title>{page_title}</title>
   <link rel="stylesheet" type="text/css" href="{layout_url}/print.css"{xhtml}>
@@ -8,11 +8,9 @@
 <body dir="{direction}">
     <h1>{story_title}</h1>
     <h3>{story_date}</h3>
-    <b>{lang_contributedby} {story_author}</b>
+    <p><b>{lang_contributedby} {story_author}</b></p>
 
-    <p>{story_introtext}</p>
-
-    <p>{story_bodytext}</p>
+    {story_text_no_br}
 
     <p>{comments_with_count}</p>
 
diff -r e08747bfab7c -r 619109d9b69f public_html/layout/professional/header.thtml
--- a/public_html/layout/professional/header.thtml	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/layout/professional/header.thtml	Sat Mar 21 15:01:34 2009 +0100
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html {lang_attribute}>
+<html{lang_attribute}{xmlns}>
 <head>
 <title>{page_title_and_site_name}</title>
 <meta http-equiv="Content-Script-Type" content="text/javascript"{xhtml}>
diff -r e08747bfab7c -r 619109d9b69f public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 15 21:54:28 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 21 15:01:34 2009 +0100
@@ -847,7 +847,10 @@
         'leftblocks'    => 'leftblocks.thtml',
         'rightblocks'   => 'rightblocks.thtml'
         ));
-    $header->set_var( 'xhtml', XHTML );
+    $header->set_var('xhtml', XHTML);
+    if (XHTML != '') {
+        $header->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
+    }
 
     // get topic if not on home page
     if( !isset( $_GET['topic'] ))
@@ -6770,7 +6773,7 @@
     $template->set_var('lang_id', $langId);
 
     if (!empty($_CONF['languages']) && !empty($_CONF['language_files'])) {
-        $template->set_var('lang_attribute', $langAttr);
+        $template->set_var('lang_attribute', ' ' . $langAttr);
     } else {
         $template->set_var('lang_attribute', '');
     }
diff -r e08747bfab7c -r 619109d9b69f system/lib-story.php
--- a/system/lib-story.php	Sun Mar 15 21:54:28 2009 +0100
+++ b/system/lib-story.php	Sat Mar 21 15:01:34 2009 +0100
@@ -286,9 +286,9 @@
                 $article->set_var( 'story_page', $story_page );
             }
 
-            $article->set_var( 'story_introtext', $introtext . '<br' . XHTML . '><br' . XHTML . '>'
-                               . $bodytext );
-            $article->set_var( 'story_text_no_br', $introtext . $bodytext );
+            $article->set_var('story_introtext', $introtext
+                    . '<br' . XHTML . '><br' . XHTML . '>' . $bodytext);
+            $article->set_var('story_text_no_br', $introtext . ' ' . $bodytext);
         }
         $article->set_var( 'story_introtext_only', $introtext );
         $article->set_var( 'story_bodytext_only', $bodytext );

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 13:50:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 13:50:06 -0400
Subject: [geeklog-cvs] geeklog: Use DB_change instead of DB_query("UPDATE")
Message-ID: <hg.ec56b7a42fbc.1237657806.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ec56b7a42fbc
changeset: 6846:ec56b7a42fbc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 16:45:41 2009 +0100
description:
Use DB_change instead of DB_query("UPDATE")

diffstat:

1 file changed, 8 insertions(+), 4 deletions(-)
public_html/admin/plugins.php |   12 ++++++++----

diffs (38 lines):

diff -r 4becf2221952 -r ec56b7a42fbc public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sat Mar 21 16:10:04 2009 +0100
+++ b/public_html/admin/plugins.php	Sat Mar 21 16:45:41 2009 +0100
@@ -175,10 +175,12 @@
         $P = DB_fetchArray($rst);
         if (isset($pi_name_arr[$P['pi_name']]) && ($P['pi_enabled'] == 0)) { // enable it
             PLG_enableStateChange($P['pi_name'], true);
-            DB_query("UPDATE {$_TABLES['plugins']} SET pi_enabled = 1 WHERE pi_name = '{$P['pi_name']}'");
+            DB_change($_TABLES['plugins'], 'pi_enabled', 1,
+                                           'pi_name', $P['pi_name']);
         } elseif (!isset($pi_name_arr[$P['pi_name']]) && $P['pi_enabled'] == 1) {  // disable it
             PLG_enableStateChange($P['pi_name'], false);
-            DB_query("UPDATE {$_TABLES['plugins']} SET pi_enabled = 0 WHERE pi_name = '{$P['pi_name']}'");
+            DB_change($_TABLES['plugins'], 'pi_enabled', 0,
+                                           'pi_name', $P['pi_name']);
         }
     }
 }
@@ -611,7 +613,8 @@
 
                 if ($pi_was_enabled) {
                     // disable temporarily while we move the files around
-                    DB_query("UPDATE {$_TABLES['plugins']} SET pi_enabled = 0 WHERE pi_name = '$dirname'");
+                    DB_change($_TABLES['plugins'], 'pi_enabled', 0,
+                                                   'pi_name', $dirname);
                 }
 
                 require_once 'System.php';
@@ -748,7 +751,8 @@
                 }
 
                 if ($pi_was_enabled) {
-                    DB_query("UPDATE {$_TABLES['plugins']} SET pi_enabled = 1 WHERE pi_name = '$dirname'");
+                    DB_change($_TABLES['plugins'], 'pi_enabled', 1,
+                                                   'pi_name', $dirname);
                 }
             }
 

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 13:50:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 13:50:06 -0400
Subject: [geeklog-cvs] geeklog: Added canonical link to the static pages
	printable.thtml
Message-ID: <hg.4becf2221952.1237657806.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4becf2221952
changeset: 6845:4becf2221952
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 16:10:04 2009 +0100
description:
Added canonical link to the static pages printable.thtml

diffstat:

2 files changed, 4 insertions(+)
plugins/staticpages/functions.inc             |    3 +++
plugins/staticpages/templates/printable.thtml |    1 +

diffs (24 lines):

diff -r c38f594e6af1 -r 4becf2221952 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Mar 21 16:01:39 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Mar 21 16:10:04 2009 +0100
@@ -431,6 +431,9 @@
     $print->set_var('sp_content',
             SP_render_content(stripslashes($A['sp_content']), $A['sp_php']));
     $print->set_var('sp_hits', COM_numberFormat($A['sp_hits']));
+    $printable = COM_buildURL($_CONF['site_url']
+               . '/staticpages/index.php?page=' . $page . '&amp;mode=print');
+    $print->set_var('printable_url', $printable);
     if ($A['commentcode'] >= 0) {
         $commentsUrl = $sp_url . '#comments';
         $comments = DB_count($_TABLES['comments'],
diff -r c38f594e6af1 -r 4becf2221952 plugins/staticpages/templates/printable.thtml
--- a/plugins/staticpages/templates/printable.thtml	Sat Mar 21 16:01:39 2009 +0100
+++ b/plugins/staticpages/templates/printable.thtml	Sat Mar 21 16:10:04 2009 +0100
@@ -4,6 +4,7 @@
   <title>{page_title}</title>
   <link rel="stylesheet" type="text/css" href="{layout_url}/print.css"{xhtml}>
   <link rel="stylesheet" type="text/css" media="print" href="{layout_url}/print.css"{xhtml}>
+  <link rel="canonical" href="{printable_url}"{xhtml}>
 </head>
 <body dir="{direction}">
     <h1>{sp_title}</h1>

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 18:35:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 18:35:31 -0400
Subject: [geeklog-cvs] geeklog: Include information about the remote service
	used (if a...
Message-ID: <hg.a8037a55dbd6.1237674931.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a8037a55dbd6
changeset: 6847:a8037a55dbd6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 19:09:10 2009 +0100
description:
Include information about the remote service used (if any) in the notification email about new user submissions

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
public_html/docs/history |    2 ++
system/lib-user.php      |    4 +++-

diffs (26 lines):

diff -r ec56b7a42fbc -r a8037a55dbd6 public_html/docs/history
--- a/public_html/docs/history	Sat Mar 21 16:45:41 2009 +0100
+++ b/public_html/docs/history	Sat Mar 21 19:09:10 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- The notification email about new user submissions didn't include information
+  about the remote service used (if any) [Dirk]
 - Define {xmlns} when using XHTML for XHTML compliance. Updated header.thtml
   and article/printable.thtml template files to include that variable [Dirk]
 - Fixed wrong use of '&amp;' when sending a trackback (bug #0000825)
diff -r ec56b7a42fbc -r a8037a55dbd6 system/lib-user.php
--- a/system/lib-user.php	Sat Mar 21 16:45:41 2009 +0100
+++ b/system/lib-user.php	Sat Mar 21 19:09:10 2009 +0100
@@ -331,7 +331,9 @@
         } else {
             $mode = 'active';
         }
-        USER_sendNotification ($username, $email, $uid, $mode);
+        $username = COM_getDisplayName($uid, $username, $fullname,
+                                       $remoteusername, $service);
+        USER_sendNotification($username, $email, $uid, $mode);
     }
 
     return $uid;

From geeklog-cvs at lists.geeklog.net  Sat Mar 21 18:35:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 21 Mar 2009 18:35:32 -0400
Subject: [geeklog-cvs] geeklog: Allow switching the DOCTYPE from the
	Configuration. Req...
Message-ID: <hg.b68c7068c056.1237674932.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b68c7068c056
changeset: 6848:b68c7068c056
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 21 23:32:53 2009 +0100
description:
Allow switching the DOCTYPE from the Configuration. Requires a theme that uses {doctype} instead of a hard-coded DOCTYPE declaration (feature request #0000745)

diffstat:

15 files changed, 86 insertions(+), 19 deletions(-)
language/english.php                          |    4 +
language/english_utf-8.php                    |    4 +
language/german.php                           |    4 +
language/german_formal.php                    |    4 +
language/german_formal_utf-8.php              |    4 +
language/german_utf-8.php                     |    4 +
public_html/admin/install/config-install.php  |    1 
public_html/docs/config.html                  |    8 +++
public_html/docs/history                      |    3 +
public_html/docs/theme.html                   |    6 ++
public_html/layout/professional/functions.php |    4 -
public_html/layout/professional/header.thtml  |    2 
public_html/lib-common.php                    |   51 +++++++++++++++++++++----
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 (truncated from 325 to 300 lines):

diff -r a8037a55dbd6 -r b68c7068c056 language/english.php
--- a/language/english.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/english.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1627,6 +1627,7 @@
     'mysqldump_options' => "MySQL Dump Options",
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => "Theme",
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => "Menu Elements",
     'path_themes' => "Themes Path",
     'disable_new_user_registration' => "Disable New Registrations",
@@ -1889,7 +1890,8 @@
     17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
     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')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/english_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1627,6 +1627,7 @@
     'mysqldump_options' => "MySQL Dump Options",
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => "Theme",
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => "Menu Elements",
     'path_themes' => "Themes Path",
     'disable_new_user_registration' => "Disable New Registrations",
@@ -1889,7 +1890,8 @@
     17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
     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')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 language/german.php
--- a/language/german.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/german.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1629,6 +1629,7 @@
     'mysqldump_options' => 'MySQL Dump Optionen',
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => 'Theme',
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men?s ',
     'path_themes' => 'Pfad zu Themes',
     'disable_new_user_registration' => 'Registrieren neuer User abschalten',
@@ -1884,7 +1885,8 @@
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
     18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
-    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 language/german_formal.php
--- a/language/german_formal.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/german_formal.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1630,6 +1630,7 @@
     'mysqldump_options' => 'MySQL Dump Optionen',
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => 'Theme',
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men?s ',
     'path_themes' => 'Pfad zu Themes',
     'disable_new_user_registration' => 'Registrieren neuer User abschalten',
@@ -1885,7 +1886,8 @@
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
     18 => array('Aus' => 0, 'Ein (Exakte ?bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
-    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/german_formal_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1630,6 +1630,7 @@
     'mysqldump_options' => 'MySQL Dump Optionen',
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => 'Theme',
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men??s ',
     'path_themes' => 'Pfad zu Themes',
     'disable_new_user_registration' => 'Registrieren neuer User abschalten',
@@ -1885,7 +1886,8 @@
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
     18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
-    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/language/german_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
@@ -1629,6 +1629,7 @@
     'mysqldump_options' => 'MySQL Dump Optionen',
     'mysqldump_filename_mask' => 'Backup File Name Mask',
     'theme' => 'Theme',
+    'doctype' => 'DOCTYPE Declaration',
     'menu_elements' => 'Elemente des Men??s ',
     'path_themes' => 'Pfad zu Themes',
     'disable_new_user_registration' => 'Registrieren neuer User abschalten',
@@ -1884,7 +1885,8 @@
     17 => array('Kommentare eingeschaltet' => 0, 'Kommentare ausgeschaltet' => -1),
     18 => array('Aus' => 0, 'Ein (Exakte ??bereinstimmung)' => 1, 'Ein (Wortanfang)' => 2, 'Ein (Teilwort)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
-    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any')
+    20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
 );
 
 ?>
diff -r a8037a55dbd6 -r b68c7068c056 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/admin/install/config-install.php	Sat Mar 21 23:32:53 2009 +0100
@@ -139,6 +139,7 @@
 
     $c->add('fs_theme', NULL, 'fieldset', 2, 10, NULL, 0, TRUE);
     $c->add('theme','professional','select',2,10,NULL,190,TRUE);
+    $c->add('doctype','html401strict','select',2,10,21,195,TRUE);
     $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,10,NULL,200,TRUE);
     $c->add('path_themes','','text',2,10,NULL,210,TRUE);
 
diff -r a8037a55dbd6 -r b68c7068c056 public_html/docs/config.html
--- a/public_html/docs/config.html	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/docs/config.html	Sat Mar 21 23:32:53 2009 +0100
@@ -505,6 +505,14 @@
   <td valign="top">professional</td>
   <td valign="top">Default theme to use on the site</td></tr>
 <tr>
+  <td valign="top"><a name="desc_doctype">doctype</a></td>
+  <td valign="top">HTML 4.01 Strict</td>
+  <td valign="top"><a
+    href="http://en.wikipedia.org/wiki/Document_Type_Declaration">Document Type
+    Declaration</a> (aka DOCTYPE aka DTD) to use for all the themes on your
+    site, assuming they use the <tt>{doctype}</tt> variable instead of a
+    hard-coded DOCTYPE in their <tt>header.thtml</tt>.</td></tr>
+<tr>
   <td valign="top"><a name="desc_menu_elements">menu_elements</a></td>
   <td valign="top"><code>array('contribute', 'calendar', 'search', 'stats',
     'directory', 'plugins')</code></td>
diff -r a8037a55dbd6 -r b68c7068c056 public_html/docs/history
--- a/public_html/docs/history	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/docs/history	Sat Mar 21 23:32:53 2009 +0100
@@ -11,6 +11,9 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Allow switching the DOCTYPE from the Configuration. Requires a theme that
+  uses {doctype} instead of a hard-coded DOCTYPE declaration (feature request
+  #0000745) [Dirk]
 - The notification email about new user submissions didn't include information
   about the remote service used (if any) [Dirk]
 - Define {xmlns} when using XHTML for XHTML compliance. Updated header.thtml
diff -r a8037a55dbd6 -r b68c7068c056 public_html/docs/theme.html
--- a/public_html/docs/theme.html	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/docs/theme.html	Sat Mar 21 23:32:53 2009 +0100
@@ -198,6 +198,12 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.0</a></h2>
 
 <ul>
+<li>Themes can now opt to use a <tt>{doctype}</tt> variable in their
+    <tt>header.thtml</tt> instead of using a hard-coded DOCTYPE declaration.
+    The DOCTYPE will then be set from the configuration (currently available:
+    HTML 4.01 Strict and Transitional, XHTML 1.0 Strict and Transitional). Such
+    a theme should <em>not</em> set the <code>XHTML</code> constant in its
+    <tt>functions.php</tt> file!</li>
 <li>When using <a href="#xhtml">XHTML</a>, the variable <tt>{xmlns}</tt> now
     contains <tt>xmlns="http://www.w3.org/1999/xhtml"</tt> for XHTML compliance
     (to be used in the <tt>&lt;html&gt;</tt> element).</li>
diff -r a8037a55dbd6 -r b68c7068c056 public_html/layout/professional/functions.php
--- a/public_html/layout/professional/functions.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/layout/professional/functions.php	Sat Mar 21 23:32:53 2009 +0100
@@ -6,10 +6,6 @@
 }
 
 $_IMAGE_TYPE = 'png';
-
-if (!defined('XHTML')) {
-    define('XHTML', ''); // change this to ' /' for XHTML
-}
 
 /*
  * For left/right block support there is no longer any need for the theme to
diff -r a8037a55dbd6 -r b68c7068c056 public_html/layout/professional/header.thtml
--- a/public_html/layout/professional/header.thtml	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/layout/professional/header.thtml	Sat Mar 21 23:32:53 2009 +0100
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+{doctype}
 <html{lang_attribute}{xmlns}>
 <head>
 <title>{page_title_and_site_name}</title>
diff -r a8037a55dbd6 -r b68c7068c056 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Mar 21 19:09:10 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 21 23:32:53 2009 +0100
@@ -302,7 +302,16 @@
 // ensure XHTML constant is defined to avoid problems elsewhere
 
 if (!defined('XHTML')) {
-    define('XHTML', '');
+    switch ($_CONF['doctype']) {
+    case 'xhtml10transitional':
+    case 'xhtml10strict':
+        define('XHTML', ' /');
+        break;
+
+    default:
+        define('XHTML', '');
+        break;
+    }
 }
 
 // themes can now specify the default image type
@@ -832,11 +841,33 @@
         return $function( $what, $pagetitle, $headercode );
     }
 
-    // send out the charset header
-    header( 'Content-Type: text/html; charset=' . COM_getCharset());
-
     // If we reach here then either we have the default theme OR
     // the current theme only needs the default variable substitutions
+
+    switch ($_CONF['doctype']) {
+    case 'html401transitional':
+        $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+        break;
+
+    case 'html401strict':
+        $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
+        break;
+
+    case 'xhtml10transitional':
+        $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
+        break;
+
+    case 'xhtml10strict':
+        $doctype = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+        break;
+
+    default: // fallback: HTML 4.01 Transitional w/o system identifier
+        $doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
+        break;
+    }
+
+    // send out the charset header
+    header('Content-Type: text/html; charset=' . COM_getCharset());
 
     $header = new Template( $_CONF['path_layout'] );
     $header->set_file( array(
@@ -847,8 +878,11 @@
         'leftblocks'    => 'leftblocks.thtml',
         'rightblocks'   => 'rightblocks.thtml'
         ));
+    $header->set_var('doctype', $doctype);
     $header->set_var('xhtml', XHTML);
-    if (XHTML != '') {
+    if (XHTML == '') {
+        $header->set_var('xmlns', '');
+    } else {
         $header->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
     }
 
@@ -2153,7 +2187,7 @@
         {
             $imageurl = COM_getTopicImageUrl( $A['imageurl'] );
             $topicimage = '<img src="' . $imageurl . '" alt="' . $topicname
-                        . '" title="' . $topicname . '" border="0"' . XHTML . '>';
+                        . '" title="' . $topicname . '"' . XHTML . '>';
         }
         $sections->set_var( 'topic_image', $topicimage );
 
@@ -4734,8 +4768,9 @@
 
             if( !empty( $A['photo'] ) AND $_CONF['allow_user_photo'] == 1)
             {
-                $usrimg = '<img src="' . $_CONF['layout_url'] . '/images/smallcamera.'
-                    . $_IMAGE_TYPE . '" border="0" alt=""' . XHTML . '>';
+                $usrimg = '<img src="' . $_CONF['layout_url']
+                        . '/images/smallcamera.' . $_IMAGE_TYPE
+                        . '" alt=""' . XHTML . '>';
                 $retval .= '&nbsp;' . COM_createLink($usrimg, $url);
             }
             $retval .= '<br' . XHTML . '>';
diff -r a8037a55dbd6 -r b68c7068c056 sql/updates/mssql_1.5.2_to_1.6.0.php

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 05:53:30 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 05:53:30 -0400
Subject: [geeklog-cvs] geeklog: Removed '(hard-coded in theme)' option -
	doesn't make s...
Message-ID: <hg.fa9ae71649c2.1237715610.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fa9ae71649c2
changeset: 6849:fa9ae71649c2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 22 09:05:08 2009 +0100
description:
Removed '(hard-coded in theme)' option - doesn't make sense

diffstat:

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

diffs (72 lines):

diff -r b68c7068c056 -r fa9ae71649c2 language/english.php
--- a/language/english.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/english.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1891,7 +1891,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>
diff -r b68c7068c056 -r fa9ae71649c2 language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/english_utf-8.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1891,7 +1891,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>
diff -r b68c7068c056 -r fa9ae71649c2 language/german.php
--- a/language/german.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/german.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1886,7 +1886,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>
diff -r b68c7068c056 -r fa9ae71649c2 language/german_formal.php
--- a/language/german_formal.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/german_formal.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1887,7 +1887,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>
diff -r b68c7068c056 -r fa9ae71649c2 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/german_formal_utf-8.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1887,7 +1887,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>
diff -r b68c7068c056 -r fa9ae71649c2 language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Mar 21 23:32:53 2009 +0100
+++ b/language/german_utf-8.php	Sun Mar 22 09:05:08 2009 +0100
@@ -1886,7 +1886,7 @@
     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'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', '(hard-coded in theme)' => '')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 05:53:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 05:53:31 -0400
Subject: [geeklog-cvs] geeklog: Introduced new plugin API function
	PLG_migrate
Message-ID: <hg.d734244b9ef5.1237715611.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d734244b9ef5
changeset: 6850:d734244b9ef5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 22 10:49:26 2009 +0100
description:
Introduced new plugin API function PLG_migrate

diffstat:

9 files changed, 176 insertions(+), 6 deletions(-)
plugins/calendar/functions.inc            |   24 ++++++++++++++++++++++++
plugins/links/functions.inc               |   24 ++++++++++++++++++++++++
plugins/polls/functions.inc               |   24 ++++++++++++++++++++++++
plugins/spamx/functions.inc               |   28 ++++++++++++++++++++++++++++
plugins/staticpages/functions.inc         |   21 +++++++++++++++++++++
public_html/admin/install/lib-upgrade.php |   18 +++++++++++++++---
public_html/admin/install/migrate.php     |   13 ++++++++++++-
public_html/docs/history                  |    6 ++++++
system/lib-plugins.php                    |   24 ++++++++++++++++++++++--

diffs (truncated from 333 to 300 lines):

diff -r fa9ae71649c2 -r d734244b9ef5 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Mar 22 09:05:08 2009 +0100
+++ b/plugins/calendar/functions.inc	Sun Mar 22 10:49:26 2009 +0100
@@ -1464,6 +1464,30 @@
 }
 
 /**
+* Called during site migration - handle changed URLs or paths
+*
+* @param    array   $old_conf   contents of the $_CONF array on the old site
+* @param    boolean             true on success, otherwise false
+*
+*/
+function plugin_migrate_calendar($old_conf)
+{
+    global $_CONF;
+
+    $tables = array(
+        'events'            => 'eid, description, url',
+        'eventsubmission'   => 'eid, description, url',
+        'personal_events'   => 'eid, description, url'
+    );
+
+    if ($old_conf['site_url'] != $_CONF['site_url']) {
+        INST_updateSiteUrl($old_conf['site_url'], $_CONF['site_url'], $tables);
+    }
+
+    return true;
+}
+
+/**
 * Geeklog informs us that we're about to be enabled or disabled
 *
 * @param    boolean     $enabled    true = we're being enabled, false = disabled
diff -r fa9ae71649c2 -r d734244b9ef5 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Mar 22 09:05:08 2009 +0100
+++ b/plugins/links/functions.inc	Sun Mar 22 10:49:26 2009 +0100
@@ -663,6 +663,30 @@
     }
 
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'links'");
+
+    return true;
+}
+
+/**
+* Called during site migration - handle changed URLs or paths
+*
+* @param    array   $old_conf   contents of the $_CONF array on the old site
+* @param    boolean             true on success, otherwise false
+*
+*/
+function plugin_migrate_links($old_conf)
+{
+    global $_CONF;
+
+    $tables = array(
+        'linkcategories'    => 'cid, description',
+        'links'             => 'lid, description, url',
+        'linksubmission'    => 'lid, description, url'
+    );
+
+    if ($old_conf['site_url'] != $_CONF['site_url']) {
+        INST_updateSiteUrl($old_conf['site_url'], $_CONF['site_url'], $tables);
+    }
 
     return true;
 }
diff -r fa9ae71649c2 -r d734244b9ef5 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Mar 22 09:05:08 2009 +0100
+++ b/plugins/polls/functions.inc	Sun Mar 22 10:49:26 2009 +0100
@@ -1165,6 +1165,30 @@
 }
 
 /**
+* Called during site migration - handle changed URLs or paths
+*
+* @param    array   $old_conf   contents of the $_CONF array on the old site
+* @param    boolean             true on success, otherwise false
+*
+*/
+function plugin_migrate_polls($old_conf)
+{
+    global $_CONF;
+
+    $tables = array(
+        'pollanswers'   => 'aid, answer',
+        'pollquestions' => 'qid, question',
+        'polltopics'    => 'pid, topic'
+    );
+
+    if ($old_conf['site_url'] != $_CONF['site_url']) {
+        INST_updateSiteUrl($old_conf['site_url'], $_CONF['site_url'], $tables);
+    }
+
+    return true;
+}
+
+/**
 * Return information for a poll
 *
 * @param    string  $pid        poll ID or '*'
diff -r fa9ae71649c2 -r d734244b9ef5 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sun Mar 22 09:05:08 2009 +0100
+++ b/plugins/spamx/functions.inc	Sun Mar 22 10:49:26 2009 +0100
@@ -187,6 +187,34 @@
     $pi_gl_version = $inst_parms['info']['pi_gl_version'];
 
     DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '$code_version', pi_gl_version = '$pi_gl_version' WHERE pi_name = 'spamx'");
+
+    return true;
+}
+
+/**
+* Called during site migration - handle changed URLs or paths
+*
+* @param    array   $old_conf   contents of the $_CONF array on the old site
+* @param    boolean             true on success, otherwise false
+*
+*/
+function plugin_migrate_spamx($old_conf)
+{
+    global $_CONF, $_TABLES;
+
+    // only update the SLV whitelist, so we don't use INST_updateSiteUrl
+    $old_url = addslashes($old_conf['site_url']);
+    $result = DB_query("SELECT name, value FROM {$_TABLES['spamx']} WHERE name = 'SLVwhitelist' AND value LIKE '{$old_url}%'");
+    $num = DB_numRows($result);
+
+    for ($i = 0; $i < $num; $i++) {
+        list($name, $value) = DB_fetchArray($result);
+        $new_value = addslashes(str_replace($old_conf['site_url'],
+                                            $_CONF['site_url'], $value));
+        $old_value = addslashes($value);
+
+        DB_query("UPDATE {$_TABLES['spamx']} SET value = '$new_value' WHERE name = 'SLVwhitelist' AND value = '$old_value'");
+    }
 
     return true;
 }
diff -r fa9ae71649c2 -r d734244b9ef5 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Mar 22 09:05:08 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sun Mar 22 10:49:26 2009 +0100
@@ -1011,6 +1011,27 @@
     return true;
 }
 
+/**
+* Called during site migration - handle changed URLs or paths
+*
+* @param    array   $old_conf   contents of the $_CONF array on the old site
+* @param    boolean             true on success, otherwise false
+*
+*/
+function plugin_migrate_staticpages($old_conf)
+{
+    global $_CONF;
+
+    $tables = array(
+        'staticpage'    => 'sp_id, sp_content'
+    );
+
+    if ($old_conf['site_url'] != $_CONF['site_url']) {
+        INST_updateSiteUrl($old_conf['site_url'], $_CONF['site_url'], $tables);
+    }
+
+    return true;
+}
 
 /**
 * Automatic uninstall function for plugins
diff -r fa9ae71649c2 -r d734244b9ef5 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sun Mar 22 09:05:08 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php	Sun Mar 22 10:49:26 2009 +0100
@@ -786,10 +786,11 @@
 * NOTE: Needs a fully working Geeklog, so can only be done late in the upgrade
 *       process!
 *
+* @param    boolean $migration  whether the upgrade is part of a site migration
 * @return   int     number of failed plugin updates (0 = everything's fine)
 *
 */
-function INST_pluginUpgrades()
+function INST_pluginUpgrades($migration = false, $old_conf = array())
 {
     global $_CONF, $_TABLES;
 
@@ -803,9 +804,20 @@
 
         $code_version = PLG_chkVersion($pi_name);
         if (! empty($code_version) && ($code_version != $pi_version)) {
-            if (PLG_upgrade($pi_name) !== true) {
+            $success = true;
+
+            if ($migration) {
+                $success = PLG_migrate($pi_name, $old_conf);
+            }
+
+            if ($success === true) {
+                $success = PLG_upgrade($pi_name);
+            }
+
+            if ($success !== true) {
                 // upgrade failed - disable plugin
-                DB_query("UPDATE {$_TABLES['plugins']} SET pi_enabled = 0 WHERE pi_name = '$pi_name'");
+                DB_change($_TABLES['plugins'], 'pi_enabled', 0,
+                                               'pi_name', $pi_name);
                 COM_errorLog("Upgrade for '$pi_name' plugin failed - plugin disabled");
                 $failed++;
             }
diff -r fa9ae71649c2 -r d734244b9ef5 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sun Mar 22 09:05:08 2009 +0100
+++ b/public_html/admin/install/migrate.php	Sun Mar 22 10:49:26 2009 +0100
@@ -48,6 +48,9 @@
 * list contains the text fields to be searched and the table's index field
 * as the first(!) entry.
 *
+* NOTE: This function may be used by plugins during PLG_migrate. Changes should
+*       ensure backward compatibility.
+*
 */
 function INST_updateSiteUrl($old_url, $new_url, $tablespec = '')
 {
@@ -64,6 +67,14 @@
 
     if (empty($tablespec) || (! is_array($tablespec))) {
         $tablespec = $tables;
+    }
+
+    if (empty($old_url) || empty($new_url)) {
+        return;
+    }
+
+    if ($old_url == $new_url) {
+        return;
     }
 
     foreach ($tablespec as $table => $fieldlist) {
@@ -825,7 +836,7 @@
             // We did a database upgrade above. Now that any missing plugins
             // have been disabled and we've loaded lib-common.php, perform
             // upgrades for the remaining plugins.
-            $disabled_plugins = INST_pluginUpgrades();
+            $disabled_plugins = INST_pluginUpgrades(true, $_OLD_CONF);
 
         }
 
diff -r fa9ae71649c2 -r d734244b9ef5 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 22 09:05:08 2009 +0100
+++ b/public_html/docs/history	Sun Mar 22 10:49:26 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Introduced new plugin API function PLG_migrate [Dirk]
 - Allow switching the DOCTYPE from the Configuration. Requires a theme that
   uses {doctype} instead of a hard-coded DOCTYPE declaration (feature request
   #0000745) [Dirk]
@@ -80,12 +81,14 @@
 
 Calendar plugin
 ---------------
+- Added migration support [Dirk]
 - Removed extra double quote from upcoming events block (bug #0000827)
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
 
 Links plugin
 ------------
+- Added migration support [Dirk]
 - Added category default permissions [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
@@ -97,6 +100,7 @@
 
 Polls plugin
 ------------
+- Added migration support [Dirk]
 - Set the page title when viewing a poll [Dirk]
 - Added auto installation support [Dirk]
 - Added support for PLG_getItemInfo, PLG_itemSaved, PLG_itemDeleted [Dirk]
@@ -104,10 +108,12 @@
 
 Spam-X
 ------
+- Added migration support [Dirk]
 - Added auto installation support [Dirk]
 
 Static Pages plugin
 -------------------
+- Added migration support [Dirk]
 - The printable.thtml template file now uses the {xmlns} variable [Dirk]
 - Added canonical link [Dirk]
 - Added auto installation support [Dirk]
diff -r fa9ae71649c2 -r d734244b9ef5 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 22 09:05:08 2009 +0100
+++ b/system/lib-plugins.php	Sun Mar 22 10:49:26 2009 +0100
@@ -154,13 +154,33 @@
 /**
 * Upgrades a plugin. Tells a plugin to upgrade itself.

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 16:57:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 16:57:21 -0400
Subject: [geeklog-cvs] geeklog: Minor speedup of the story list by caching
	the results ...
Message-ID: <hg.5e8fb0521910.1237755441.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5e8fb0521910
changeset: 6851:5e8fb0521910
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 22 15:36:21 2009 +0100
description:
Minor speedup of the story list by caching the results of SEC_hasTopicAccess; plus some source code cosmetics

diffstat:

1 file changed, 91 insertions(+), 75 deletions(-)
system/lib-admin.php |  166 +++++++++++++++++++++++++++-----------------------

diffs (186 lines):

diff -r d734244b9ef5 -r 5e8fb0521910 system/lib-admin.php
--- a/system/lib-admin.php	Sun Mar 22 10:49:26 2009 +0100
+++ b/system/lib-admin.php	Sun Mar 22 15:36:21 2009 +0100
@@ -848,91 +848,107 @@
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG24, $LANG_ACCESS, $_IMAGE_TYPE;
 
-    static $topics;
+    static $topics, $topic_access;
 
-    if (!isset ($topics)) {
-        $topics = array ();
+    if (!isset($topics)) {
+        $topics = array();
+    }
+    if (!isset($topic_access)) {
+        $topic_access = array();
     }
 
     $retval = '';
 
-    switch($fieldname) {
-        case "unixdate":
-            $curtime = COM_getUserDateTimeFormat ($A['unixdate']);
-            $retval = strftime($_CONF['daytime'], $curtime[1]);
-            break;
-        case "title":
-            $A['title'] = str_replace('$', '&#36;', $A['title']);
-            $article_url = COM_buildUrl ($_CONF['site_url'] . '/article.php?story='
-                                  . $A['sid']);
-            $retval = COM_createLink(stripslashes($A['title']), $article_url);
-            break;
-        case "draft_flag":
-            if ($A['draft_flag'] == 1) {
-                $retval = $LANG24[35];
-            } else {
-                $retval = $LANG24[36];
+    switch ($fieldname) {
+    case 'unixdate':
+        $curtime = COM_getUserDateTimeFormat($A['unixdate']);
+        $retval = strftime($_CONF['daytime'], $curtime[1]);
+        break;
+
+    case 'title':
+        $A['title'] = str_replace('$', '&#36;', $A['title']);
+        $article_url = COM_buildUrl($_CONF['site_url'] . '/article.php?story='
+                                    . $A['sid']);
+        $retval = COM_createLink(stripslashes($A['title']), $article_url);
+        break;
+
+    case 'draft_flag':
+        if ($A['draft_flag'] == 1) {
+            $retval = $LANG24[35];
+        } else {
+            $retval = $LANG24[36];
+        }
+        break;
+
+    case 'access':
+    case 'edit':
+    case 'edit_adv':
+        $access = SEC_hasAccess($A['owner_id'], $A['group_id'],
+                                $A['perm_owner'], $A['perm_group'],
+                                $A['perm_members'], $A['perm_anon']);
+        if ($access == 3) {
+            if (!isset($topic_access[$A['tid']])) {
+                $topic_access[$A['tid']] = SEC_hasTopicAccess($A['tid']);
             }
-            break;
-        case "access":
-        case "edit":
-        case "edit_adv":
-            $access = SEC_hasAccess ($A['owner_id'], $A['group_id'],
-                                     $A['perm_owner'], $A['perm_group'],
-                                     $A['perm_members'], $A['perm_anon']);
-            if ($access == 3) {
-                if (SEC_hasTopicAccess ($A['tid']) == 3) {
-                    $access = $LANG_ACCESS['edit'];
-                } else {
-                    $access = $LANG_ACCESS['readonly'];
-                }
+            if ($topic_access[$A['tid']] == 3) {
+                $access = $LANG_ACCESS['edit'];
             } else {
                 $access = $LANG_ACCESS['readonly'];
             }
-            if ($fieldname == 'access') {
-                $retval = $access;
-            } else if ($access == $LANG_ACCESS['edit']) {
-                if ($fieldname == 'edit_adv') {
-                    $retval = COM_createLink($icon_arr['edit'],
-                        "{$_CONF['site_admin_url']}/story.php?mode=edit&amp;editor=adv&amp;sid={$A['sid']}");
-                } else if ($fieldname == 'edit') {
-                    $retval = COM_createLink($icon_arr['edit'],
-                        "{$_CONF['site_admin_url']}/story.php?mode=edit&amp;editor=std&amp;sid={$A['sid']}");
-                }
+        } else {
+            $access = $LANG_ACCESS['readonly'];
+        }
+        if ($fieldname == 'access') {
+            $retval = $access;
+        } elseif ($access == $LANG_ACCESS['edit']) {
+            if ($fieldname == 'edit_adv') {
+                $editmode = 'adv';
+            } elseif ($fieldname == 'edit') {
+                $editmode = 'std';
             }
-            break;
-        case "featured":
-            if ($A['featured'] == 1) {
-                $retval = $LANG24[35];
-            } else {
-                $retval = $LANG24[36];
-            }
-            break;
-        case "ping":
-            $pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
-                     . $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
-                     . $LANG24[21] . '"' . XHTML . '>';
-            if (($A['draft_flag'] == 0) && ($A['unixdate'] < time())) {
-                $url = $_CONF['site_admin_url']
-                     . '/trackback.php?mode=sendall&amp;id=' . $A['sid'];
-                $retval = COM_createLink($pingico, $url);
-            } else {
-                $retval = '';
-            }
-            break;
-        case 'tid':
-            if (!isset ($topics[$A['tid']])) {
-                $topics[$A['tid']] = DB_getItem ($_TABLES['topics'], 'topic',
-                                                 "tid = '{$A['tid']}'");
-            }
-            $retval = $topics[$A['tid']];
-            break;
-        case 'username':
-            $retval = COM_getDisplayName ($A['uid'], $A['username'], $A['fullname']);
-            break;
-        default:
-            $retval = $fieldvalue;
-            break;
+            $editurl = $_CONF['site_admin_url']
+                     . '/story.php?mode=edit&amp;editor=' . $editmode
+                     . '&amp;sid=' . $A['sid'];
+            $retval = COM_createLink($icon_arr['edit'], $editurl);
+        }
+        break;
+
+    case 'featured':
+        if ($A['featured'] == 1) {
+            $retval = $LANG24[35];
+        } else {
+            $retval = $LANG24[36];
+        }
+        break;
+
+    case 'ping':
+        $pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
+                 . $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
+                 . $LANG24[21] . '"' . XHTML . '>';
+        if (($A['draft_flag'] == 0) && ($A['unixdate'] < time())) {
+            $url = $_CONF['site_admin_url']
+                 . '/trackback.php?mode=sendall&amp;id=' . $A['sid'];
+            $retval = COM_createLink($pingico, $url);
+        } else {
+            $retval = '';
+        }
+        break;
+
+    case 'tid':
+        if (!isset($topics[$A['tid']])) {
+            $topics[$A['tid']] = DB_getItem($_TABLES['topics'], 'topic',
+                                            "tid = '{$A['tid']}'");
+        }
+        $retval = $topics[$A['tid']];
+        break;
+
+    case 'username':
+        $retval = COM_getDisplayName($A['uid'], $A['username'], $A['fullname']);
+        break;
+
+    default:
+        $retval = $fieldvalue;
+        break;
     }
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 16:57:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 16:57:24 -0400
Subject: [geeklog-cvs] geeklog: The Wiki-style format broke national special
	characters...
Message-ID: <hg.fc1a9e2f5449.1237755444.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fc1a9e2f5449
changeset: 6852:fc1a9e2f5449
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 22 21:56:55 2009 +0100
description:
The Wiki-style format broke national special characters, e.g. Japanese and German umlauts (bug #0000823)

diffstat:

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

diffs (23 lines):

diff -r 5e8fb0521910 -r fc1a9e2f5449 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 22 15:36:21 2009 +0100
+++ b/public_html/docs/history	Sun Mar 22 21:56:55 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- The Wiki-style format broke national special characters, e.g. Japanese and
+  German umlauts (bug #0000823) [Dirk]
 - Introduced new plugin API function PLG_migrate [Dirk]
 - Allow switching the DOCTYPE from the Configuration. Requires a theme that
   uses {doctype} instead of a hard-coded DOCTYPE declaration (feature request
diff -r 5e8fb0521910 -r fc1a9e2f5449 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 22 15:36:21 2009 +0100
+++ b/public_html/lib-common.php	Sun Mar 22 21:56:55 2009 +0100
@@ -6755,6 +6755,7 @@
     require_once 'Text/Wiki.php';
 
     $wiki = new Text_Wiki();
+    $wiki->setFormatConf('Xhtml', 'translate', HTML_SPECIALCHARS);
     $wiki->disableRule('wikilink');
     $wiki->disableRule('freelink');
     $wiki->disableRule('interwiki');

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 22:46:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 22:46:06 -0400
Subject: [geeklog-cvs] geeklog: Updated FCKeditor to version 2.6.4 Final
Message-ID: <hg.9495a2763437.1237776366.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9495a2763437
changeset: 6853:9495a2763437
user:      blaine Lang <blaine at portalparts.com>
date:      Sun Mar 22 22:45:32 2009 -0400
description:
Updated FCKeditor to version 2.6.4 Final

diffstat:

43 files changed, 4167 insertions(+), 2277 deletions(-)
public_html/fckeditor/_documentation.html                             |    2 
public_html/fckeditor/_upgrade.html                                   |    2 
public_html/fckeditor/_whatsnew.html                                  |   22 
public_html/fckeditor/editor/_source/classes/fckdomrange.js           |    4 
public_html/fckeditor/editor/_source/fckeditorapi.js                  |    4 
public_html/fckeditor/editor/_source/internals/fckdebug_empty.js      |   31 
public_html/fckeditor/editor/_source/internals/fcktablehandler.js     |   11 
public_html/fckeditor/editor/dialog/fck_about.html                    |    4 
public_html/fckeditor/editor/dialog/fck_div.html                      |  396 ++++
public_html/fckeditor/editor/dtd/fck_dtd_test.html                    |   82 
public_html/fckeditor/editor/fckdebug.html                            |  306 +--
public_html/fckeditor/editor/fckeditor.html                           |  634 +++----
public_html/fckeditor/editor/fckeditor.original.html                  |  848 +++++-----
public_html/fckeditor/editor/filemanager/connectors/php/basexml.php   |  186 +-
public_html/fckeditor/editor/filemanager/connectors/php/commands.php  |  546 +++---
public_html/fckeditor/editor/filemanager/connectors/php/config.php    |  310 +--
public_html/fckeditor/editor/filemanager/connectors/php/connector.php |  174 +-
public_html/fckeditor/editor/filemanager/connectors/php/io.php        |  590 +++---
public_html/fckeditor/editor/filemanager/connectors/php/phpcompat.php |   34 
public_html/fckeditor/editor/filemanager/connectors/php/upload.php    |  125 -
public_html/fckeditor/editor/filemanager/connectors/php/util.php      |  440 ++---
public_html/fckeditor/editor/js/fckeditorcode_gecko.js                |    6 
public_html/fckeditor/editor/js/fckeditorcode_ie.js                   |    6 
public_html/fckeditor/editor/lang/_translationstatus.txt              |   10 
public_html/fckeditor/editor/lang/fr.js                               |   16 
public_html/fckeditor/editor/lang/gu.js                               |  534 ++++++
public_html/fckeditor/editor/lang/he.js                               |   16 
public_html/fckeditor/editor/lang/is.js                               |  534 ++++++
public_html/fckeditor/editor/lang/ru.js                               |   32 
public_html/fckeditor/editor/lang/tr.js                               |   64 
public_html/fckeditor/editor/lang/zh-cn.js                            |   38 
public_html/fckeditor/editor/wsc/ciframe.html                         |   65 
public_html/fckeditor/editor/wsc/tmpFrameset.html                     |   67 
public_html/fckeditor/editor/wsc/w.html                               |  227 ++
public_html/fckeditor/fckeditor.js                                    |    4 
public_html/fckeditor/fckeditor.php                                   |    2 
public_html/fckeditor/fckeditor_php4.php                              |    2 
public_html/fckeditor/fckeditor_php5.php                              |    2 
public_html/fckeditor/fckpackager.xml                                 |    4 
public_html/fckeditor/fckstyles.xml                                   |    2 
public_html/fckeditor/fcktemplates.xml                                |    2 
public_html/fckeditor/license.txt                                     |    2 
public_html/fckeditor/myconfig.js                                     |   58 

diffs (truncated from 6950 to 300 lines):

diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_documentation.html
--- a/public_html/fckeditor/_documentation.html	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_documentation.html	Sun Mar 22 22:45:32 2009 -0400
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_upgrade.html
--- a/public_html/fckeditor/_upgrade.html	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_upgrade.html	Sun Mar 22 22:45:32 2009 -0400
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_whatsnew.html
--- a/public_html/fckeditor/_whatsnew.html	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_whatsnew.html	Sun Mar 22 22:45:32 2009 -0400
@@ -32,6 +32,28 @@
 <body>
 	<h1>
 		FCKeditor ChangeLog - What's New?</h1>
+	<h3>
+		Version 2.6.4</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging
+			cells between table header and body is no longer possible.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed
+			WSC issues at slow connection speed. Added SSL support.</li>
+		<li>Language file updates for the following languages:
+			<ul>
+				<li>Chinese (Traditional)</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li>
+			</ul>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed
+			a minor bug which causes selection positions to be improperly restored during undos
+			and redos.</li>
+	</ul>
 	<h3>
 		Version 2.6.4 Beta</h3>
 	<p>
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/classes/fckdomrange.js
--- a/public_html/fckeditor/editor/_source/classes/fckdomrange.js	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/classes/fckdomrange.js	Sun Mar 22 22:45:32 2009 -0400
@@ -469,13 +469,13 @@
 		// Also note that the node that we use for "address base" would change during backtracking.
 		var addrStart = this._Range.startContainer ;
 		var addrEnd = this._Range.endContainer ;
-		while ( curStart && addrStart.nodeType == 3 )
+		while ( curStart && curStart.nodeType == 3 && addrStart.nodeType == 3 )
 		{
 			bookmark.Start[0] += curStart.length ;
 			addrStart = curStart ;
 			curStart = curStart.previousSibling ;
 		}
-		while ( curEnd && addrEnd.nodeType == 3 )
+		while ( curEnd && curEnd.nodeType == 3 && addrEnd.nodeType == 3 )
 		{
 			bookmark.End[0] += curEnd.length ;
 			addrEnd = curEnd ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/fckeditorapi.js
--- a/public_html/fckeditor/editor/_source/fckeditorapi.js	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/fckeditorapi.js	Sun Mar 22 22:45:32 2009 -0400
@@ -40,8 +40,8 @@
 		// objects that aren't really FCKeditor instances.
 		var sScript =
 			'window.FCKeditorAPI = {' +
-				'Version : "2.6.4 Beta",' +
-				'VersionBuild : "21469",' +
+				'Version : "2.6.4",' +
+				'VersionBuild : "21629",' +
 				'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
 				'GetInstance : function( name )' +
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/internals/fckdebug_empty.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/fckeditor/editor/_source/internals/fckdebug_empty.js	Sun Mar 22 22:45:32 2009 -0400
@@ -0,0 +1,31 @@
+???/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Debug window control and operations (empty for the compressed files - #2043).
+ */
+
+var FCKDebug =
+{
+	Output : function()
+	{},
+
+	OutputObject : function()
+	{}
+} ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/internals/fcktablehandler.js
--- a/public_html/fckeditor/editor/_source/internals/fcktablehandler.js	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/internals/fcktablehandler.js	Sun Mar 22 22:45:32 2009 -0400
@@ -287,6 +287,13 @@
 	var cells = FCKTableHandler.GetSelectedCells() ;
 	if ( cells.length < 1 )
 		return false ;
+
+	// Check if the selected cells are all in the same table section (thead, tfoot or tbody)
+	for (var i = 0; i < cells.length; i++)
+	{
+		if ( cells[i].parentNode.parentNode != cells[0].parentNode.parentNode )
+			return false ;
+	}
 
 	this._MarkCells( cells, '_CellSelected' ) ;
 
@@ -839,6 +846,10 @@
 	if ( ! nextCell )
 		return null ;
 
+	// Check if the selected cells are both in the same table section (thead, tfoot or tbody).
+	if ( refCell.parentNode.parentNode != nextCell.parentNode.parentNode )
+		return null ;
+
 	// The two cells must have the same horizontal geometry, otherwise merging does not makes sense.
 	this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
 	var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/dialog/fck_about.html
--- a/public_html/fckeditor/editor/dialog/fck_about.html	Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/dialog/fck_about.html	Sun Mar 22 22:45:32 2009 -0400
@@ -78,8 +78,8 @@
 								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
-								<b>2.6.4 Beta</b><br />
-								Build 21469</td>
+								<b>2.6.4</b><br />
+								Build 21629</td>
 						</tr>
 					</table>
 				</td>
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/dialog/fck_div.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/fckeditor/editor/dialog/fck_div.html	Sun Mar 22 22:45:32 2009 -0400
@@ -0,0 +1,396 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Form dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var FCK = oEditor.FCK ;
+var FCKLang = oEditor.FCKLang ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
+var FCKStyles = oEditor.FCKStyles ;
+var FCKElementPath = oEditor.FCKElementPath ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRangeIterator = oEditor.FCKDomRangeIterator ;
+var FCKListsLib = oEditor.FCKListsLib ;
+var AlwaysCreate = dialog.Args().CustomValue ;
+
+String.prototype.IEquals = function()
+{
+	var thisUpper = this.toUpperCase() ;
+
+	var aArgs = arguments ;
+
+	// The arguments could also be a single array.
+	if ( aArgs.length == 1 && aArgs[0].pop )
+		aArgs = aArgs[0] ;
+
+	for ( var i = 0 ; i < aArgs.length ; i++ )
+	{
+		if ( thisUpper == aArgs[i].toUpperCase() )
+			return true ;
+	}
+	return false ;
+}
+
+var CurrentContainers = [] ;
+if ( !AlwaysCreate )
+{
+	dialog.Selection.EnsureSelection() ;
+	CurrentContainers = FCKDomTools.GetSelectedDivContainers() ;
+}
+
+// Add some tabs
+dialog.AddTab( 'General', FCKLang.DlgDivGeneralTab );
+dialog.AddTab( 'Advanced', FCKLang.DlgDivAdvancedTab ) ;
+
+function AddStyleOption( styleName )
+{
+	var el = GetE( 'selStyle' ) ;
+	var opt = document.createElement( 'option' ) ;
+	opt.text = opt.value = styleName ;
+
+	if ( FCKBrowserInfo.IsIE )
+		el.add( opt ) ;
+	else
+		el.add( opt, null ) ;
+}
+
+function OnDialogTabChange( tabCode )
+{
+	ShowE( 'divGeneral', tabCode == 'General' ) ;
+	ShowE( 'divAdvanced', tabCode == 'Advanced' ) ;
+	dialog.SetAutoSize( true ) ;
+}
+
+function GetNearestAncestorDirection( node )
+{
+	var dir = 'ltr' ;	// HTML default.
+	while ( ( node = node.parentNode ) )
+	{
+		if ( node.dir )
+			dir = node.dir ;
+	}
+	return dir ;
+}
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+
+	// Popuplate the style menu
+	var styles = FCKStyles.GetStyles() ;
+	var selectableStyles = {} ;
+	for ( var i in styles )
+	{
+		if ( ! /^_FCK_/.test( i ) && styles[i].Element == 'div' )
+			selectableStyles[i] = styles[i] ;
+	}
+	if ( CurrentContainers.length <= 1 )
+	{
+		var target = CurrentContainers[0] ;
+		var match = null ;
+		for ( var i in selectableStyles )
+		{
+			if ( target && styles[i].CheckElementRemovable( target, true ) )
+				match = i ;
+		}
+		if ( !match )
+			AddStyleOption( "" ) ;
+		for ( var i in selectableStyles )

From geeklog-cvs at lists.geeklog.net  Sun Mar 22 22:52:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 22 Mar 2009 22:52:43 -0400
Subject: [geeklog-cvs] geeklog: - Added a method to set a new option to
	ignoreMimeType ...
Message-ID: <hg.70f99dbc0544.1237776763.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/70f99dbc0544
changeset: 6854:70f99dbc0544
user:      blaine Lang <blaine at portalparts.com>
date:      Sun Mar 22 22:52:17 2009 -0400
description:
- Added a method to set a new option to ignoreMimeType Check for upload
- Download will default to allow all available Mime Types
- Added method to add a new MIME type to the download class
$download->addAvailableExtensions(array('pdf' => 'application/pdf'));

diffstat:

2 files changed, 37 insertions(+), 3 deletions(-)
system/classes/downloader.class.php |    7 ++++++-
system/classes/upload.class.php     |   33 +++++++++++++++++++++++++++++++--

diffs (88 lines):

diff -r 9495a2763437 -r 70f99dbc0544 system/classes/downloader.class.php
--- a/system/classes/downloader.class.php	Sun Mar 22 22:45:32 2009 -0400
+++ b/system/classes/downloader.class.php	Sun Mar 22 22:52:17 2009 -0400
@@ -521,7 +521,12 @@
         // OK, file is valid, get file extension
         $pos = strrpos($fileName,'.') + 1;
         $fextension = substr($fileName, $pos);
-        
+
+        // If application has not set the allowedExtensions then initialize to the default
+        if(sizeof($this->_allowedExtensions) == 0) {
+            $this->_allowedExtensions = array_flip($this->_availableExtensions);
+        }
+
         // Send headers.
         if ($this->checkExtension($fextension)) {
             // Display file inside browser.
diff -r 9495a2763437 -r 70f99dbc0544 system/classes/upload.class.php
--- a/system/classes/upload.class.php	Sun Mar 22 22:45:32 2009 -0400
+++ b/system/classes/upload.class.php	Sun Mar 22 22:52:17 2009 -0400
@@ -156,6 +156,10 @@
     * @access private
     */
     var $_imageIndex = 0;                 // Integer
+    /**
+    * @access private
+    */
+    var $_ignoreMimeTest = false;       // Boolean
 
     /**
     * @access private
@@ -992,6 +996,22 @@
     }
 
     /**
+    * If enabled will ignore the MIME checks on file uploads
+    *
+    * @param    boolean     $switch     flag, true or false
+    *
+    */
+    function setIgnoreMimeCheck($switch)
+    {
+        if ($switch) {
+            $this->_ignoreMimeTest = true;
+        } else {
+            $this->_ignoreMimeTest = false;
+        }
+    }
+
+
+    /**
     * This function will print any errors out.  This is useful in debugging
     *
     * @param    boolean     $verbose    whether or not to print immediately or return only a string
@@ -1093,6 +1113,10 @@
     */
     function checkMimeType()
     {
+        if ($this->_ignoreMimeTest) {
+            return true;
+        }
+
         $sc = strpos ($this->_currentFile['type'], ';');
         if ($sc > 0) {
             $this->_currentFile['type'] = substr ($this->_currentFile['type'], 0, $sc);
@@ -1100,7 +1124,12 @@
         $mimeTypes = $this->getAllowedMimeTypes ();
         foreach ($mimeTypes as $mimeT => $extList) {
             if ($mimeT == $this->_currentFile['type']) {
-                $extensions = explode (',', $extList);
+                // Each defined Mime Type can have multiple possible extesions - need to test each
+                if (is_array($extList)) {   // Used if allowedMimeTypes is being defined using the Online Config Manager
+                    $extensions = array_keys($extList);
+                } else {
+                    $extensions = explode (',', $extList);
+                }
                 $fileName = $this->_currentFile['name'];
                 foreach ($extensions as $ext) {
                     $ext = trim($ext);
@@ -1256,7 +1285,7 @@
         }
 
         // Verify allowed mime types exist
-        if (!$this->_allowedMimeTypes) {
+        if (!$this->_ignoreMimeTest AND !$this->_allowedMimeTypes) {
             $this->_addError('No allowed mime types specified, use setAllowedMimeTypes() method');
         }
 

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 05:34:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 05:34:23 -0400
Subject: [geeklog-cvs] geeklog: On a login failure,
	the user registration form showed u...
Message-ID: <hg.b09db899c7dc.1238232863.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b09db899c7dc
changeset: 6858:b09db899c7dc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 10:31:38 2009 +0100
description:
On a login failure, the user registration form showed up even when new user registration was disabled (bug #0000843)

diffstat:

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

diffs (49 lines):

diff -r cd2ea91b48a1 -r b09db899c7dc public_html/docs/history
--- a/public_html/docs/history	Sat Mar 28 10:22:08 2009 +0100
+++ b/public_html/docs/history	Sat Mar 28 10:31:38 2009 +0100
@@ -11,6 +11,8 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- On a login failure, the user registration form showed up even when new user
+  registration was disabled (bug #0000843)
 - The Wiki-style format broke national special characters, e.g. Japanese and
   German umlauts (bug #0000823) [Dirk]
 - Introduced new plugin API function PLG_migrate [Dirk]
diff -r cd2ea91b48a1 -r b09db899c7dc public_html/users.php
--- a/public_html/users.php	Sat Mar 28 10:22:08 2009 +0100
+++ b/public_html/users.php	Sat Mar 28 10:31:38 2009 +0100
@@ -775,24 +775,23 @@
 * @return   string  HTML for form
 *
 */
-function defaultform ($msg)
+function defaultform($msg)
 {
-    global $LANG04;
+    global $_CONF, $LANG04;
 
     $retval = '';
 
-    if (!empty ($msg)) {
-        $retval .= COM_startBlock ($LANG04[21], '',
-                           COM_getBlockTemplate ('_msg_block', 'header'))
-                . $msg
-                . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+    if (! empty($msg)) {
+        $retval .= COM_showMessageText($msg, $LANG04[21]);
     }
 
-    $retval .= loginform (true);
+    $retval .= loginform(true);
 
-    $retval .= newuserform ();
+    if (! $_CONF['disable_new_user_registration']) {
+        $retval .= newuserform();
+    }
 
-    $retval .= getpasswordform ();
+    $retval .= getpasswordform();
 
     return $retval;
 }

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 12:01:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 12:01:47 -0400
Subject: [geeklog-cvs] geeklog: Documentation updates
Message-ID: <hg.f90390360557.1238256107.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f90390360557
changeset: 6859:f90390360557
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 14:15:00 2009 +0100
description:
Documentation updates

diffstat:

10 files changed, 156 insertions(+), 83 deletions(-)
public_html/admin/moderation.php                |   21 ++
public_html/admin/plugins/staticpages/index.php |    8 -
public_html/directory.php                       |    2 
public_html/usersettings.php                    |   14 +
system/lib-plugins.php                          |  172 +++++++++++++++--------
system/lib-security.php                         |    6 
system/lib-story.php                            |    4 
system/lib-trackback.php                        |    2 
system/lib-user.php                             |    2 
system/lib-webservices.php                      |    8 -

diffs (truncated from 735 to 300 lines):

diff -r b09db899c7dc -r f90390360557 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sat Mar 28 10:31:38 2009 +0100
+++ b/public_html/admin/moderation.php	Sat Mar 28 14:15:00 2009 +0100
@@ -72,7 +72,9 @@
 /**
 * Prints the command & control block at the top
 *
-* TODO: The moderation items should be displayed with the help of ul/li
+* @param    string  $token  CSRF token
+* @return   string          HTML for the C&C block
+* @todo The moderation items should be displayed with the help of ul/li
 * instead of div's. 
 *
 */
@@ -233,7 +235,9 @@
 *
 * Displays the moderation list of items from the submission tables
 *
-* @type     string      Type of object to build list for
+* @param    string  $type   Type of object to build list for
+* @param    string  $token  CSRF token
+* @return   string          HTML for the list of items
 *
 */
 function itemlist($type, $token)
@@ -333,8 +337,11 @@
 * site membership. When approving an application, an email containing the
 * password is sent out immediately.
 *
+* @param    string  $token  CSRF token
+* @return   string          HTML for the list of users
+*
 */
-function userlist ($token)
+function userlist($token)
 {
     global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
 
@@ -396,8 +403,11 @@
 * 'draft'. Approving a story from this list will clear the draft flag and
 * thus publish the story.
 *
+* @param    string  $token  CSRF token
+* @return   string          HTML for the list of draft stories
+*
 */
-function draftlist ($token)
+function draftlist($token)
 {
     global $_CONF, $_TABLES, $LANG24, $LANG29, $LANG_ADMIN;
 
@@ -643,8 +653,9 @@
 /**
 * Display a reminder to execute the security check script
 *
+* @return   string      HTML for security reminder (or empty string)
 */
-function security_check_reminder ()
+function security_check_reminder()
 {
     global $_CONF, $_TABLES, $_IMAGE_TYPE, $MESSAGE;
 
diff -r b09db899c7dc -r f90390360557 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sat Mar 28 10:31:38 2009 +0100
+++ b/public_html/admin/plugins/staticpages/index.php	Sat Mar 28 14:15:00 2009 +0100
@@ -440,11 +440,13 @@
 /**
 * Displays the Static Page Editor
 *
-* @sp_id        string      ID of static page to edit
-* @mode         string      Mode
+* @param    string  $sp_id      ID of static page to edit
+* @param    string  $mode       Mode
+* @param    string  $editor     Editor mode? (unused?)
+* @return   string              HTML for static pages editor
 *
 */
-function staticpageeditor ($sp_id, $mode = '', $editor = '')
+function staticpageeditor($sp_id, $mode = '', $editor = '')
 {
     global $_CONF, $_TABLES, $_USER;
 
diff -r b09db899c7dc -r f90390360557 public_html/directory.php
--- a/public_html/directory.php	Sat Mar 28 10:31:38 2009 +0100
+++ b/public_html/directory.php	Sat Mar 28 14:15:00 2009 +0100
@@ -68,7 +68,7 @@
 * @param    int     $month  Month
 * @param    int     $year   Year
 * @return   int             Number of days in that month
-* @bugs     Will fail from 2038 onwards ...
+* @todo     Bug: Will fail from 2038 onwards ...
 *
 * "The last day of any given month can be expressed as the "0" day
 * of the next month", http://www.php.net/manual/en/function.mktime.php
diff -r b09db899c7dc -r f90390360557 public_html/usersettings.php
--- a/public_html/usersettings.php	Sat Mar 28 10:31:38 2009 +0100
+++ b/public_html/usersettings.php	Sat Mar 28 14:15:00 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | usersettings.php                                                          |
 // |                                                                           |
 // | Geeklog user settings 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    |
@@ -853,7 +853,8 @@
 /**
 * Saves the user's information back to the database
 *
-* @A        array       User's data
+* @param    array   $A  User's data
+* @return   string      HTML error message or meta redirect
 *
 */
 function saveuser($A)
@@ -899,7 +900,7 @@
                     function_exists ('CUSTOM_userCheck')) {
             $ret = CUSTOM_userCheck ($A['username'], $A['email']);
             if (!empty($ret)) {
-                // Need a numeric return for the default message hander
+                // Need a numeric return for the default message handler
                 // - if not numeric use default message
                 if (!is_numeric($ret['number'])) {
                     $ret['number'] = 400;
@@ -911,7 +912,7 @@
                 function_exists ('CUSTOM_userCheck')) {
         $ret = CUSTOM_userCheck ($A['username'], $A['email']);
         if (!empty($ret)) {
-            // Need a numeric return for the default message hander
+            // Need a numeric return for the default message handler
             // - if not numeric use default message
             if (!is_numeric($ret['number'])) {
                 $ret['number'] = 400;
@@ -1323,7 +1324,8 @@
 /**
 * Saves user's preferences back to the database
 *
-* @A        array       User's data to save
+* @param    array   $A  User's data to save
+* @return   void
 *
 */
 function savepreferences($A)
diff -r b09db899c7dc -r f90390360557 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Mar 28 10:31:38 2009 +0100
+++ b/system/lib-plugins.php	Sat Mar 28 14:15:00 2009 +0100
@@ -42,21 +42,30 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* Include plugin class
+*/
 require_once $_CONF['path_system'] . 'classes/plugin.class.php';
 
-// Response codes for the service invocation PLG_invokeService()
-define('PLG_RET_OK',                   0);
-define('PLG_RET_ERROR',               -1);
-define('PLG_RET_PERMISSION_DENIED',   -2);
-define('PLG_RET_AUTH_FAILED',         -3);
-define('PLG_RET_PRECONDITION_FAILED', -4);
+/**
+* Response codes for the service invocation PLG_invokeService(). Note that
+* these are intentionally vague so as not to give away too much information.
+*/
+define('PLG_RET_OK',                   0);  // success
+define('PLG_RET_ERROR',               -1);  // generic error
+define('PLG_RET_PERMISSION_DENIED',   -2);  // access to item or object denied
+define('PLG_RET_AUTH_FAILED',         -3);  // authentication failed
+define('PLG_RET_PRECONDITION_FAILED', -4);  // a precondition was not met
 
 // buffer for function names for the center block API
-$PLG_bufferCenterAPI = array ();
+$PLG_bufferCenterAPI = array();
 $PLG_buffered = false;
 
 // buffer enabled plugins
 $result = DB_query("SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_enabled = 1");
+/**
+* @global array List of all active plugins
+*/
 $_PLUGINS = array();
 while ($A = DB_fetchArray($result)) {
     $_PLUGINS[] = $A['pi_name'];
@@ -65,7 +74,9 @@
 /**
 * Calls a function for all enabled plugins
 *
-* @param     string     $function_name      holds name of function to call
+* @param    string  $function_name  holds name of function to call
+* @return   void
+* @internal not to be used by plugins
 *
 */
 function PLG_callFunctionForAllPlugins($function_name)
@@ -95,6 +106,7 @@
 * @param        string      $function       holds name of function to call
 * @param        array       $args           arguments to send to function
 * @return       mixed       returns result of function call, otherwise false
+* @internal not to be used by plugins
 *
 */
 function PLG_callFunctionForOnePlugin($function, $args='')
@@ -140,10 +152,12 @@
 }
 
 /**
-* Tells a plugin to install itself. NOTE: not currently used anymore
+* Tells a plugin to install itself. NOTE: not currently used any more
 *
-* @param        string      $type       Plugin name
-* @return       boolean     Returns true on success otherwise false
+* @param    string      $type   Plugin name
+* @return   boolean             Returns true on success otherwise false
+* @deprecated deprecated since Geeklog 1.6.0
+* @link     http://wiki.geeklog.net/index.php/Plugin_Autoinstall
 *
 */
 function PLG_install($type)
@@ -169,6 +183,7 @@
 * @param    string  $type       Plugin name
 * @param    array   $old_conf   contents of $_CONF before the migration
 * @return   boolean             true on success, otherwise false
+* @link     http://wiki.geeklog.net/index.php/PLG_migrate
 *
 */
 function PLG_migrate($type, $old_conf)
@@ -199,8 +214,9 @@
 /**
 * Tells a plugin to uninstall itself.
 *
-* @param        string      $type       Plugin to uninstall
-* @return       boolean     Returns true on success otherwise false
+* @param    string      $type   Plugin to uninstall
+* @return   boolean             Returns true on success otherwise false
+* @link     http://wiki.geeklog.net/index.php/Plugin_Auto-Uninstall
 *
 */
 function PLG_uninstall ($type)
@@ -823,10 +839,12 @@
 * The plugin has to provide an array for the menuitem of the format:
 * array (menuitem_title, item_url, submission_count)
 * or an array of arrays in case there are several entries:
+* <code>
 * array (
 *   array (menuitem1_title, item1_url, submission1_count),
 *   array (menuitem2_title, item2_url, submission2_count),
 *   array (menuitem3_title, item3_url, submission3_count))
+* </code>
 * Plugin function can return a single record array or multiple records
 *
 *
@@ -839,6 +857,7 @@
 * @param    string $function_name A string that gives the name of the function
 *                                 at the plugin that will return the values.
 * @return   array Returns options to add to the given menu that is calling this
+* @internal not to be used by plugins
 *
 */
 function PLGINT_getOptionsforMenus($var_names, $required_names, $function_name)
@@ -895,12 +914,16 @@
 * This supports that a plugin can have several lines in the CC menu.
 * The plugin has to provide simply a set arrays with 3 variables in order to
 * get n lines in the menu such as
+* <code>
 * array(
 *   array("first line", "url1", "1"),
 *   array("second line", "url2", "44"),
 *            etc, etc)
+* </code>
 * If there is only one item, a single array is enough:
+* <code>
 * array("first line", "url1", "1")
+* </code>
 *
 * @return   array   Returns Command and Control options for moderation.php
 *
@@ -924,12 +947,16 @@
 * This supports that a plugin can have several lines in the Admin menu.
 * The plugin has to provide simply a set arrays with 3 variables in order to
 * get n lines in the menu such as
+* <code>
 * array(
 *   array("first line", "url1", "1"),
 *   array("second line", "url2", "44"),,
 *            etc, etc)
+* </code>
 * If there is only one item, a single array is enough:
+* <code>
 * array("first line", "url1", "1")
+* </code>
 *

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 12:01:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 12:01:47 -0400
Subject: [geeklog-cvs] geeklog: @param integer -> @param int,
	since "int" is used more ...
Message-ID: <hg.cd2f21ae7173.1238256107.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cd2f21ae7173
changeset: 6860:cd2f21ae7173
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 15:55:37 2009 +0100
description:
@param integer -> @param int, since "int" is used more often in the existing code

diffstat:

7 files changed, 17 insertions(+), 17 deletions(-)
public_html/lib-common.php                          |    2 +-
system/classes/listfactory.class.php                |    6 +++---
system/classes/search.class.php                     |    4 ++--
system/classes/syndication/feedparserbase.class.php |    2 +-
system/lib-comment.php                              |    4 ++--
system/lib-plugins.php                              |   12 ++++++------
system/lib-security.php                             |    4 ++--

diffs (150 lines):

diff -r f90390360557 -r cd2f21ae7173 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 28 15:55:37 2009 +0100
@@ -5003,7 +5003,7 @@
 * Gets the <option> values for clock minutes
 *
 * @param    string      $selected   Selected minutes
-* @param    integer     $step       number of minutes between options, e.g. 15
+* @param    int         $step       number of minutes between options, e.g. 15
 * @see function COM_getMonthFormOptions
 * @see function COM_getDayFormOptions
 * @see function COM_getHourFormOptions
diff -r f90390360557 -r cd2f21ae7173 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/classes/listfactory.class.php	Sat Mar 28 15:55:37 2009 +0100
@@ -154,7 +154,7 @@
     * @access public
     * @param string $url The URL of the page the table appears on
     * @param array $limits The avaliable page limits
-    * @param integer $per_page The default number or rows per page
+    * @param int $per_page The default number or rows per page
     *
     */
     function ListFactory( $url, $limits = '10,15,20,25,30,35', $per_page = 20 )
@@ -217,7 +217,7 @@
     * @param string $title The text that's displayed to the user
     * @param string $name The local name given to the query
     * @param string $sql The SQL string without the ORDER BY or LIMIT clauses
-    * @param integer $rank The rating that determins how many results will be returned
+    * @param int $rank The rating that determins how many results will be returned
     *
     */
     function setQuery( $title, $name, $sql, $rank )
@@ -270,7 +270,7 @@
     *
     * @access private
     * @param string $sql The query
-    * @return integer Total number of rows
+    * @return int Total number of rows
     *
     */
     function _numRows( $sql )
diff -r f90390360557 -r cd2f21ae7173 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/classes/search.class.php	Sat Mar 28 15:55:37 2009 +0100
@@ -750,7 +750,7 @@
     * @access private
     * @param string $keyword The word to centre around
     * @param string $text The complete text string
-    * @param integer $num_words The number of words to display, best to use an odd number
+    * @param int $num_words The number of words to display, best to use an odd number
     * @return string A short version of the text
     *
     */
@@ -821,7 +821,7 @@
     * @access private
     * @param array $headings All the headings
     * @param array $find An array of alternative headings to find
-    * @return integer The index of the alternative heading
+    * @return int The index of the alternative heading
     *
     */
     function _findColumn( $headings, $find )
diff -r f90390360557 -r cd2f21ae7173 system/classes/syndication/feedparserbase.class.php
--- a/system/classes/syndication/feedparserbase.class.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/classes/syndication/feedparserbase.class.php	Sat Mar 28 15:55:37 2009 +0100
@@ -133,7 +133,7 @@
       * for an article.
       *
       * @param string $fileName The fully qualified path to the file to create.
-      * @param integer $limit (optional) max number of items to write.
+      * @param int $limit (optional) max number of items to write.
       */
     function createFeed( $fileName, $limit='' )
     {
diff -r f90390360557 -r cd2f21ae7173 system/lib-comment.php
--- a/system/lib-comment.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/lib-comment.php	Sat Mar 28 15:55:37 2009 +0100
@@ -1000,10 +1000,10 @@
 *
 * @param    $title      string      comment title
 * @param    $comment    string      text of the comment
-* @param    $uid        integer     user id
+* @param    $uid        int         user id
 * @param    $ipaddress  string      poster's IP address
 * @param    $type       string      type of comment ('article', 'poll', ...)
-* @param    $cid        integer     comment id
+* @param    $cid        int         comment id
 *
 */
 function CMT_sendNotification ($title, $comment, $uid, $ipaddress, $type, $cid)
diff -r f90390360557 -r cd2f21ae7173 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/lib-plugins.php	Sat Mar 28 15:55:37 2009 +0100
@@ -508,10 +508,10 @@
 *
 * @author Tony Bibbs, tony AT tonybibbs DOT com
 * @access public
-* @param  integer   $uid User ID
+* @param  int       $uid User ID
 * @param  string    $title Comment title
 * @param  string    $sid Story ID (not always a story, remember!)
-* @param  integer   $pid Parent comment ID
+* @param  int       $pid Parent comment ID
 * @param  string    $type Type of comment
 * @param  string    $postmode HTML or text
 * @return mixed     an error otherwise false if no errors were encountered
@@ -1971,8 +1971,8 @@
 * will also send an HTTP status code 403 with the message.
 *
 * @param    string  $content    Text to be filtered or checked for spam
-* @param    integer $action     what to do if spam found
-* @return   integer             > 0: spam detected, == 0: no spam detected
+* @param    int     $action     what to do if spam found
+* @return   int                 > 0: spam detected, == 0: no spam detected
 * @link     http://wiki.geeklog.net/index.php/Filtering_Spam_with_Spam-X
 *
 */
@@ -2016,8 +2016,8 @@
 * spam action explicitly.
 *
 * @param    string  $content    Text to be filtered or checked for spam
-* @param    integer $action     what to do if spam found
-* @return   integer             > 0: spam detected, == 0: no spam detected
+* @param    int     $action     what to do if spam found
+* @return   int                 > 0: spam detected, == 0: no spam detected
 * @see      PLG_checkforSpam
 *
 */
diff -r f90390360557 -r cd2f21ae7173 system/lib-security.php
--- a/system/lib-security.php	Sat Mar 28 14:15:00 2009 +0100
+++ b/system/lib-security.php	Sat Mar 28 15:55:37 2009 +0100
@@ -592,7 +592,7 @@
 * to prepare the permissions to be save to the database
 *
 * @param        array       $perm_x     Array of permission values
-* @return       int         integer representation of a permission array 2 = read 3 = edit/read
+* @return       int         int representation of a permission array 2 = read 3 = edit/read
 * @see SEC_getPermissionValues
 *
 */
@@ -1067,7 +1067,7 @@
   * added to forms and urls in the admin section as a non-cookie double-check
   * that the admin user really wanted to do that...
   *
-  * @param $ttl integer Time to live for token in seconds. Default is 20 minutes.
+  * @param $ttl int Time to live for token in seconds. Default is 20 minutes.
   *
   * @return string  Generated token, it'll be an MD5 hash (32chars)
   */

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 12:01:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 12:01:48 -0400
Subject: [geeklog-cvs] geeklog: @param bool -> @param boolean,
	since "boolean" is used ...
Message-ID: <hg.7af95656ab91.1238256108.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7af95656ab91
changeset: 6861:7af95656ab91
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 16:02:55 2009 +0100
description:
@param bool -> @param boolean, since "boolean" is used more often in the existing code

diffstat:

7 files changed, 30 insertions(+), 27 deletions(-)
public_html/admin/install/lib-install.php |    6 +++---
public_html/directory.php                 |   11 +++++++----
public_html/lib-common.php                |    8 ++++----
system/lib-security.php                   |    6 +++---
system/lib-syndication.php                |   10 +++++-----
system/lib-trackback.php                  |    8 ++++----
system/lib-user.php                       |    8 ++++----

diffs (257 lines):

diff -r cd2f21ae7173 -r 7af95656ab91 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/public_html/admin/install/lib-install.php	Sat Mar 28 16:02:55 2009 +0100
@@ -111,9 +111,9 @@
 /**
  * Written to aid in install script debugging, will be removed later
  *
- * @param   any   $var      The variable you want to print, can be any datatype
- * @param   bool  $stop_exec Either echo $var or die $var 
- * @return  string          The datatype and value of $var
+ * @param  any     $var       The variable you want to print, can be any datatype
+ * @param  boolean $die_after Either echo $var or die $var 
+ * @return string             The datatype and value of $var
  *
  */
 function sanity($var = 'test', $die_after = false)
diff -r cd2f21ae7173 -r 7af95656ab91 public_html/directory.php
--- a/public_html/directory.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/public_html/directory.php	Sat Mar 28 16:02:55 2009 +0100
@@ -29,6 +29,9 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Geeklog common function library
+*/
 require_once 'lib-common.php';
 
 // configuration option:
@@ -93,7 +96,7 @@
 * @param    string  $topic          current topic
 * @param    int     $year           current year
 * @param    int     $month          current month
-* @param    bool    $standalone     true: don't display form inline
+* @param    boolean $standalone     true: don't display form inline
 *
 */
 function DIR_topicList ($topic = 'all', $year = 0, $month = 0, $standalone = false)
@@ -241,7 +244,7 @@
 * @param    string  $topic  current topic
 * @param    int     $year   year to display
 * @param    int     $month  month to display
-* @param    bool    $main   true: display view on its own page
+* @param    boolean $main   true: display view on its own page
 * @return   string          list of articles for the given month
 *
 */
@@ -316,7 +319,7 @@
 *
 * @param    string  $topic  current topic
 * @param    int     $year   year to display
-* @param    bool    $main   true: display view on its own page
+* @param    boolean $main   true: display view on its own page
 * @return   string          list of months (+ number of stories) for given year
 *
 */
@@ -405,7 +408,7 @@
 * the stories for the current month at the top of the page.
 *
 * @param    string  $topic                  current topic
-* @param    bool    $list_current_month     true = list stories f. current month
+* @param    boolean $list_current_month     true = list stories f. current month
 * @return   string                          list of all the years in the db
 *
 */
diff -r cd2f21ae7173 -r 7af95656ab91 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 28 16:02:55 2009 +0100
@@ -525,7 +525,7 @@
 * Returns a list of all the directory names in $_CONF['path_themes'], i.e.
 * a list of all the theme names.
 *
-* @param    bool    $all    if true, return all themes even if users aren't allowed to change their default themes
+* @param    boolean $all    if true, return all themes even if users aren't allowed to change their default themes
 * @return   array           All installed themes
 *
 */
@@ -3511,7 +3511,7 @@
 * COM_showBlocks OR from plugin code
 *
 * @param        array     $A          Block Record
-* @param        bool      $noboxes    Set to true if userpref is no blocks
+* @param        boolean   $noboxes    Set to true if userpref is no blocks
 * @return       string    HTML Formated block
 *
 */
@@ -4525,7 +4525,7 @@
 * @param        int         $curpage        current page we are on
 * @param        int         $num_pages      Total number of pages
 * @param        string      $page_str       page-variable name AND '='
-* @param        bool        $do_rewrite     if true, url-rewriting is respected
+* @param        boolean     $do_rewrite     if true, url-rewriting is respected
 * @param        string      $msg            to be displayed with the navigation
 * @param        string      $open_ended     replace next/last links with this
 * @return   string   HTML formatted widget
@@ -5974,7 +5974,7 @@
 *
 * See if we're on the main index page (first page, no topics selected).
 *
-* @return   bool    true = we're on the frontpage, false = we're not
+* @return   boolean     true = we're on the frontpage, false = we're not
 *
 */
 function COM_onFrontpage()
diff -r cd2f21ae7173 -r 7af95656ab91 system/lib-security.php
--- a/system/lib-security.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/system/lib-security.php	Sat Mar 28 16:02:55 2009 +0100
@@ -891,7 +891,7 @@
   *
   * @param  string  $uid Their user id
   * @param  string  $gname The group name
-  * @return bool    status, true or false.
+  * @return boolean status, true or false.
   */
 function SEC_addUserToGroup($uid, $gname)
 {
@@ -970,7 +970,7 @@
 * This function can be used by plugins during uninstall.
 *
 * @param    string  $feature_name   name of the feature, e.g. 'foo.edit'
-* @param    bool    $logging        whether to log progress in error.log
+* @param    boolean $logging        whether to log progress in error.log
 * @return   void
 *
 */
@@ -1120,7 +1120,7 @@
   * Checks the POST and GET data for a security token, if one exists, validates that it's for this
   * user and URL.
   *
-  * @return bool    true iff the token is valid and for this user.
+  * @return boolean     true if the token is valid and for this user.
   */
 function SEC_checkToken()
 {
diff -r cd2f21ae7173 -r 7af95656ab91 system/lib-syndication.php
--- a/system/lib-syndication.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/system/lib-syndication.php	Sat Mar 28 16:02:55 2009 +0100
@@ -44,12 +44,12 @@
 /**
 * Check if a feed for all stories needs to be updated.
 *
-* @param    bool    $frontpage_only true: only articles shown on the frontpage
+* @param    boolean $frontpage_only true: only articles shown on the frontpage
 * @param    string  $update_info    list of story ids
 * @param    string  $limit          number of entries or number of hours
 * @param    string  $updated_topic  (optional) topic to be updated
 * @param    string  $updated_id     (optional) entry id to be updated
-* @return   bool                    false = feed needs to be updated
+* @return   boolean                 false = feed needs to be updated
 *
 */
 function SYND_feedUpdateCheckAll( $frontpage_only, $update_info, $limit, $updated_topic = '', $updated_id = '' )
@@ -129,7 +129,7 @@
 * @param    string  $limit          number of entries or number of hours
 * @param    string  $updated_topic  (optional) topic to be updated
 * @param    string  $updated_id     (optional) entry id to be updated
-* @return   bool                    false = feed needs to be updated
+* @return   boolean                 false = feed needs to be updated
 *
 */
 function SYND_feedUpdateCheckTopic( $tid, $update_info, $limit, $updated_topic = '', $updated_id = '' )
@@ -187,7 +187,7 @@
 * @param    string  limit           number of entries or number of hours
 * @param    string  updated_topic   (optional) specific topic to update
 * @param    string  updated_id      (optional) specific id to update
-* @return   bool                    false = feed has to be updated, true = ok
+* @return   boolean                 false = feed has to be updated, true = ok
 *
 */
 function SYND_feedUpdateCheck($topic, $update_data, $limit, $updated_topic = '', $updated_id = '')
@@ -320,7 +320,7 @@
 /**
 * Get content for a feed that holds all stories.
 *
-* @param    bool     $frontpage_only true: only articles shown on the frontpage
+* @param    boolean  $frontpage_only true: only articles shown on the frontpage
 * @param    string   $limit    number of entries or number of stories
 * @param    string   $link     link to homepage
 * @param    string   $update   list of story ids
diff -r cd2f21ae7173 -r 7af95656ab91 system/lib-trackback.php
--- a/system/lib-trackback.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/system/lib-trackback.php	Sat Mar 28 16:02:55 2009 +0100
@@ -195,7 +195,7 @@
 *
 * @param    string  $sid    ID of the parent object of the comment
 * @param    string  $type   type of the parent object ('article' = story, etc.)
-* @return   bool            true = user can delete the comment, false = nope
+* @return   boolean         true = user can delete the comment, false = nope
 *
 */
 function TRB_allowDelete ($sid, $type)
@@ -340,7 +340,7 @@
 * @param    string      $blog       name of the blog that sent the comment
 * @param    string      $excerpt    excerpt from the comment
 * @param    timestamp   $date       date and time when the comment was sent
-* @param    bool        $delete_option  whether to display a link to delete the trackback comment
+* @param    boolean     $delete_option  whether to display a link to delete the trackback comment
 * @param    string      $cid        id of this trackback comment
 * @param    string      $ipaddress  IP address the comment was sent from
 * @param    string      $token      security token
@@ -469,7 +469,7 @@
 * @param    string  $sid        ID of entry that got pinged
 * @param    string  $type       type of that entry ('article' for stories, etc.)
 * @param    string  $urlToGet   URL of the page that supposedly links to us
-* @return   bool                true = links to us, false = doesn't
+* @return   boolean             true = links to us, false = doesn't
 *
 */
 function TRB_linksToUs ($sid, $type, $urlToGet)
@@ -528,7 +528,7 @@
 *
 * @param    string  $sid    ID of entry that got pinged
 * @param    string  $type   type of that entry ('article' for stories, etc.)
-* @return   bool            true = success, false = an error occured
+* @return   boolean         true = success, false = an error occured
 *
 * P.S. "Critical" errors are rejected with a HTTP 403 Forbidden status code.
 *      According to RFC2616, this status code means
diff -r cd2f21ae7173 -r 7af95656ab91 system/lib-user.php
--- a/system/lib-user.php	Sat Mar 28 15:55:37 2009 +0100
+++ b/system/lib-user.php	Sat Mar 28 16:02:55 2009 +0100
@@ -133,7 +133,7 @@
 *
 * @param    string  $username   user's login name
 * @param    string  $useremail  user's email address
-* @return   bool                true = success, false = an error occured
+* @return   boolean             true = success, false = an error occured
 *
 */
 function USER_createAndSendPassword ($username, $useremail, $uid)
@@ -188,7 +188,7 @@
 *
 * @param    string  $username   user's login name
 * @param    string  $useremail  user's email address
-* @return   bool                true = success, false = an error occured
+* @return   boolean             true = success, false = an error occured
 *
 */
 function USER_sendActivationEmail ($username, $useremail)
@@ -346,7 +346,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
+* @return         boolean     true = success, false = an error occured
 *
 */
 function USER_sendNotification ($username, $email, $uid, $mode='inactive')
@@ -471,7 +471,7 @@
 * NOTE:     Will silently ignore non-existing files.
 *
 * @param    string  $photo          name of the photo (without the path)
-* @param    bool    $abortonerror   true: abort script on error, false: don't
+* @param    boolean $abortonerror   true: abort script on error, false: don't
 * @return   void
 *
 */

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 12:01:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 12:01:49 -0400
Subject: [geeklog-cvs] geeklog: Fixed phpDocumentor warnings
Message-ID: <hg.e0c7423ea657.1238256109.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e0c7423ea657
changeset: 6862:e0c7423ea657
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 17:00:42 2009 +0100
description:
Fixed phpDocumentor warnings

diffstat:

8 files changed, 40 insertions(+), 15 deletions(-)
plugins/links/functions.inc          |    7 +++++--
plugins/polls/functions.inc          |    7 +++++--
plugins/spamx/functions.inc          |    2 +-
plugins/staticpages/functions.inc    |    7 +++++--
plugins/staticpages/services.inc.php |    5 ++++-
public_html/lib-common.php           |   21 ++++++++++++++-------
public_html/polls/index.php          |    3 +++
public_html/staticpages/index.php    |    3 +++

diffs (188 lines):

diff -r 7af95656ab91 -r e0c7423ea657 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sat Mar 28 16:02:55 2009 +0100
+++ b/plugins/links/functions.inc	Sat Mar 28 17:00:42 2009 +0100
@@ -47,15 +47,18 @@
 }
 
 $plugin_path = $_CONF['path'] . 'plugins/links/';
+
+/**
+* Language file include
+*/
 $langfile = $plugin_path . 'language/' . $_CONF['language'] . '.php';
-
 if (file_exists($langfile)) {
     require_once $langfile;
 } else {
     require_once $plugin_path . 'language/english.php';
 }
 
-/*
+/**
 * Check and see if we need to load the plugin configuration
 */
 if (!isset($_LI_CONF['linksloginrequired'])) {
diff -r 7af95656ab91 -r e0c7423ea657 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Mar 28 16:02:55 2009 +0100
+++ b/plugins/polls/functions.inc	Sat Mar 28 17:00:42 2009 +0100
@@ -45,15 +45,18 @@
 }
 
 $plugin_path = $_CONF['path'] . 'plugins/polls/';
+
+/**
+* Language file include
+*/
 $langfile = $plugin_path . 'language/' . $_CONF['language'] . '.php';
-
 if (file_exists($langfile)) {
     require_once $langfile;
 } else {
     require_once $plugin_path . 'language/english.php';
 }
 
-/*
+/**
 * Check and see if we need to load the plugin configuration
 */ 
 if (!isset($_PO_CONF['pollsloginrequired'])) {
diff -r 7af95656ab91 -r e0c7423ea657 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sat Mar 28 16:02:55 2009 +0100
+++ b/plugins/spamx/functions.inc	Sat Mar 28 17:00:42 2009 +0100
@@ -29,7 +29,7 @@
     include_once $plugin_path . 'language/english.php';
 }
 
-/*
+/**
 * Check and see if we need to load the plugin configuration
 */
 if (!isset($_SPX_CONF['timeout'])) {
diff -r 7af95656ab91 -r e0c7423ea657 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Mar 28 16:02:55 2009 +0100
+++ b/plugins/staticpages/functions.inc	Sat Mar 28 17:00:42 2009 +0100
@@ -45,15 +45,18 @@
 }
 
 $plugin_path = $_CONF['path'] . 'plugins/staticpages/';
+
+/**
+* Language file include
+*/
 $langfile = $plugin_path . 'language/' . $_CONF['language'] . '.php';
-
 if (file_exists($langfile)) {
     require_once $langfile;
 } else {
     require_once $plugin_path . 'language/english.php';
 }
 
-/*
+/**
 * Check and see if we need to load the plugin configuration
 */
 if (!isset($_SP_CONF['allow_php'])) {
diff -r 7af95656ab91 -r e0c7423ea657 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Mar 28 16:02:55 2009 +0100
+++ b/plugins/staticpages/services.inc.php	Sat Mar 28 17:00:42 2009 +0100
@@ -43,7 +43,10 @@
     die('This file can not be used on its own.');
 }
 
-// this must be kept in sync with the actual size of 'sp_id' in the db ...
+/**
+* Max. length of the ID for a static page.
+* This must be kept in sync with the actual size of 'sp_id' in the db.
+*/
 define('STATICPAGE_MAX_ID_LENGTH', 40);
 
 /**
diff -r 7af95656ab91 -r e0c7423ea657 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Mar 28 16:02:55 2009 +0100
+++ b/public_html/lib-common.php	Sat Mar 28 17:00:42 2009 +0100
@@ -80,11 +80,14 @@
     }
 }
 
-/*
+/**
 * Configuration Include:
 * You do NOT need to modify anything here any more!
 */
 require_once 'siteconfig.php' ;
+/**
+* Configuration class
+*/
 require_once $_CONF['path_system'] . 'classes/config.class.php';
 
 $config =& config::get_instance();
@@ -172,7 +175,7 @@
 
 /**
 * This is our HTML template class.  It is the same one found in PHPLib and is
-* licensed under the LGPL.  See that file for details
+* licensed under the LGPL.  See that file for details.
 *
 */
 
@@ -214,8 +217,9 @@
 * This is the custom library.
 *
 * It is the sandbox for every Geeklog Admin to play in.
-* We will never modify this file.  This should hold all custom
-* hacks to make upgrading easier.
+* The lib-custom.php as shipped will never contain required code,
+* so it's safe to always use your own copy.
+* This should hold all custom hacks to make upgrading easier.
 *
 */
 
@@ -299,8 +303,9 @@
     require_once $_CONF['path_layout'] . 'functions.php';
 }
 
-// ensure XHTML constant is defined to avoid problems elsewhere
-
+/**
+* ensure XHTML constant is defined to avoid problems elsewhere
+*/
 if (!defined('XHTML')) {
     switch ($_CONF['doctype']) {
     case 'xhtml10transitional':
@@ -6816,7 +6821,9 @@
     }
 }
 
-// Now include all plugin functions
+/**
+* Now include all plugin functions
+*/
 foreach ($_PLUGINS as $pi_name) {
     require_once $_CONF['path'] . 'plugins/' . $pi_name . '/functions.inc';
 }
diff -r 7af95656ab91 -r e0c7423ea657 public_html/polls/index.php
--- a/public_html/polls/index.php	Sat Mar 28 16:02:55 2009 +0100
+++ b/public_html/polls/index.php	Sat Mar 28 17:00:42 2009 +0100
@@ -39,6 +39,9 @@
 * @subpackage public_html
 */
 
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
 
 if (!in_array('polls', $_PLUGINS)) {
diff -r 7af95656ab91 -r e0c7423ea657 public_html/staticpages/index.php
--- a/public_html/staticpages/index.php	Sat Mar 28 16:02:55 2009 +0100
+++ b/public_html/staticpages/index.php	Sat Mar 28 17:00:42 2009 +0100
@@ -38,6 +38,9 @@
 * @subpackage public_html
 */
 
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
 
 if (!in_array('staticpages', $_PLUGINS)) {

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 14:59:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 14:59:42 -0400
Subject: [geeklog-cvs] geeklog: Make the Batch Add form look less out of
	place ...
Message-ID: <hg.616c07cd2cf8.1238266782.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/616c07cd2cf8
changeset: 6863:616c07cd2cf8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 19:37:13 2009 +0100
description:
Make the Batch Add form look less out of place ...

diffstat:

1 file changed, 26 insertions(+), 9 deletions(-)
public_html/admin/user.php |   35 ++++++++++++++++++++++++++---------

diffs (69 lines):

diff -r e0c7423ea657 -r 616c07cd2cf8 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Mar 28 17:00:42 2009 +0100
+++ b/public_html/admin/user.php	Sat Mar 28 19:37:13 2009 +0100
@@ -32,6 +32,9 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
 require_once $_CONF['path_system'] . 'lib-user.php';
@@ -1084,10 +1087,27 @@
 */
 function display_batchAddform()
 {
-    global $_CONF, $LANG28;
+    global $_CONF, $LANG28, $LANG_ADMIN, $_IMAGE_TYPE;
+
+    require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $token = SEC_createToken();
-    $retval = '<form action="' . $_CONF['site_admin_url']
+    $retval .= COM_siteHeader('menu', $LANG28[24]);
+    $retval .= COM_startBlock ($LANG28[24], '',
+                        COM_getBlockTemplate ('_admin_block', 'header'));
+
+    $menu_arr = array(
+        array('url'  => $_CONF['site_admin_url'] . '/user.php',
+              'text' => $LANG28[11]),
+        array('url'  => $_CONF['site_admin_url'],
+              'text' => $LANG_ADMIN['admin_home'])
+    );
+
+    $desc = '<p>' . $LANG28[25] . '</p>';
+    $icon = $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE;
+    $retval .= ADMIN_createMenu($menu_arr, $desc, $icon);
+
+    $retval .= '<form action="' . $_CONF['site_admin_url']
             . '/user.php" method="post" enctype="multipart/form-data"><div>'
             . $LANG28[29]
             . ': <input type="file" dir="ltr" name="importfile" size="40"'
@@ -1095,7 +1115,10 @@
             . '<input type="hidden" name="mode" value="import"' . XHTML . '>'
             . '<input type="submit" name="submit" value="' . $LANG28[30]
             . '"' . XHTML . '><input type="hidden" name="' . CSRF_TOKEN
-            . "\" value=\"{$token}\"" . XHTML . '></div></form>';
+            . "\" value=\"{$token}\"" . XHTML . '></div></form>' . LB;
+
+    $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
+    $retval .= COM_siteFooter();
 
     return $retval;
 }
@@ -1194,13 +1217,7 @@
 } elseif (($mode == 'import') && SEC_checkToken()) {
     $display .= importusers();
 } elseif ($mode == 'importform') {
-    $display .= COM_siteHeader('menu', $LANG28[24]);
-    $display .= COM_startBlock ($LANG28[24], '',
-                        COM_getBlockTemplate ('_admin_block', 'header'));
-    $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
     $display .= display_batchAddform();
-    $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
-    $display .= COM_siteFooter();
 } elseif ($mode == 'batchdelete') {
     $display .= COM_siteHeader ('menu', $LANG28[54]);
     $display .= batchdelete();

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 14:59:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 14:59:43 -0400
Subject: [geeklog-cvs] geeklog: Fixed layout of the Batch Admin screen
Message-ID: <hg.7c3f8a72d64a.1238266783.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c3f8a72d64a
changeset: 6864:7c3f8a72d64a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 19:59:33 2009 +0100
description:
Fixed layout of the Batch Admin screen

diffstat:

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

diffs (86 lines):

diff -r 616c07cd2cf8 -r 7c3f8a72d64a public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Mar 28 19:37:13 2009 +0100
+++ b/public_html/admin/user.php	Sat Mar 28 19:59:33 2009 +0100
@@ -649,9 +649,10 @@
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG01, $LANG28, $_IMAGE_TYPE;
 
-    $display = '';
-    if (!$_CONF['lastlogin']) {
-        $retval = '<br' . XHTML . '>'. $_LANG28[55];
+    $retval = '';
+
+    if (! $_CONF['lastlogin']) {
+        $retval .= '<p>'. $_LANG28[55] . '</p>';
         return $retval;
     }
 
@@ -668,10 +669,11 @@
     if (isset($_REQUEST['usr_time'])) {
         $usr_time_arr = $_REQUEST['usr_time'];
     } else {
-        $usr_time_arr['phantom'] = 2;
-        $usr_time_arr['short'] = 6;
-        $usr_time_arr['old'] = 24;
-        $usr_time_arr['recent'] = 1;
+        // default values, in months
+        $usr_time_arr['phantom'] =  2;
+        $usr_time_arr['short']   =  6;
+        $usr_time_arr['old']     = 24;
+        $usr_time_arr['recent']  =  1;
     }
     $usr_time = $usr_time_arr[$usr_type];
 
@@ -771,8 +773,8 @@
 
     $text_arr = array('has_menu'     => true,
                       'has_extras'   => true,
-                      'title'        => $LANG28[54],
-                      'instructions' => "$desc",
+                      'title'        => '',
+                      'instructions' => $desc,
                       'icon'         => $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE,
                       'form_url'     => $_CONF['site_admin_url'] . "/user.php?mode=batchdelete&amp;usr_type=$usr_type&amp;usr_time=$usr_time",
                       'help_url'     => ''
@@ -804,7 +806,10 @@
               'text' => $LANG_ADMIN['admin_home'])
     );
 
-    $display .= ADMIN_createMenu(
+    $retval .= COM_startBlock($LANG28[54], '',
+                           COM_getBlockTemplate('_admin_block', 'header'));
+
+    $retval .= ADMIN_createMenu(
         $menu_arr,
         $desc,
         $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE
@@ -818,13 +823,12 @@
     $token = SEC_createToken();
     $form_arr['bottom'] = "<input type=\"hidden\" name=\"" . CSRF_TOKEN
                         . "\" value=\"{$token}\"" . XHTML . ">";
-    $display .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
-                           $text_arr, $query_arr, $defsort_arr, '', '',
-                           $listoptions, $form_arr);
+    $retval .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
+                          $text_arr, $query_arr, $defsort_arr, '', '',
+                          $listoptions, $form_arr);
+    $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
 
-    // $display .= "<input type=\"hidden\" name=\"mode\" value=\"batchdeleteexec\"" . XHTML . "></form>" . LB;
-
-    return $display;
+    return $retval;
 }
 
 /**
diff -r 616c07cd2cf8 -r 7c3f8a72d64a public_html/docs/history
--- a/public_html/docs/history	Sat Mar 28 19:37:13 2009 +0100
+++ b/public_html/docs/history	Sat Mar 28 19:59:33 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed layout of Batch Add and Batch Admin options of the User Manager [Dirk]
 - On a login failure, the user registration form showed up even when new user
   registration was disabled (bug #0000843)
 - The Wiki-style format broke national special characters, e.g. Japanese and

From geeklog-cvs at lists.geeklog.net  Sat Mar 28 15:04:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 28 Mar 2009 15:04:48 -0400
Subject: [geeklog-cvs] geeklog: For consistency: Added a link to Batch Admin
	from the B...
Message-ID: <hg.1d4790466047.1238267088.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1d4790466047
changeset: 6865:1d4790466047
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 20:04:38 2009 +0100
description:
For consistency: Added a link to Batch Admin from the Batch Add screen

diffstat:

1 file changed, 2 insertions(+)
public_html/admin/user.php |    2 ++

diffs (12 lines):

diff -r 7c3f8a72d64a -r 1d4790466047 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Mar 28 19:59:33 2009 +0100
+++ b/public_html/admin/user.php	Sat Mar 28 20:04:38 2009 +0100
@@ -1103,6 +1103,8 @@
     $menu_arr = array(
         array('url'  => $_CONF['site_admin_url'] . '/user.php',
               'text' => $LANG28[11]),
+        array('url'  => $_CONF['site_admin_url'] . '/user.php?mode=batchdelete',
+              'text' => $LANG28[54]),
         array('url'  => $_CONF['site_admin_url'],
               'text' => $LANG_ADMIN['admin_home'])
     );

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 05:18:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 05:18:35 -0400
Subject: [geeklog-cvs] geeklog: New plugin API function PLG_configChange
	(feature reque...
Message-ID: <hg.35f33c620315.1238318315.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/35f33c620315
changeset: 6866:35f33c620315
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 11:18:09 2009 +0200
description:
New plugin API function PLG_configChange (feature request #0000694)

diffstat:

3 files changed, 54 insertions(+), 11 deletions(-)
public_html/admin/configuration.php |   34 +++++++++++++++++++++++-----------
public_html/docs/history            |    1 +
system/lib-plugins.php              |   30 ++++++++++++++++++++++++++++++

diffs (140 lines):

diff -r 1d4790466047 -r 35f33c620315 public_html/admin/configuration.php
--- a/public_html/admin/configuration.php	Sat Mar 28 20:04:38 2009 +0100
+++ b/public_html/admin/configuration.php	Sun Mar 29 11:18:09 2009 +0200
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | configuration.php                                                         |
 // |                                                                           |
@@ -29,19 +29,18 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Geeklog common function library
+*/
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
-
-$conf_group = array_key_exists('conf_group', $_POST) ? $_POST['conf_group'] : 'Core';
-
-$config =& config::get_instance();
 
 /**
 * Helper function: Provide language dropdown
 *
 * NOTE:     Note that key/value are being swapped!
 *
-* @return   Array   Array of (filename, displayname) pairs
+* @return   array   Array of (filename, displayname) pairs
 *
 */
 function configmanager_select_language_helper()
@@ -56,7 +55,7 @@
 *
 * NOTE:     Beautifying code duplicated from usersettings.php
 *
-* @return   Array   Array of (filename, displayname) pairs
+* @return   array   Array of (filename, displayname) pairs
 *
 */
 function configmanager_select_theme_helper()
@@ -85,9 +84,15 @@
     return $themes;
 }
 
+
+// MAIN
+$display = '';
+
+$conf_group = array_key_exists('conf_group', $_POST)
+            ? $_POST['conf_group'] : 'Core';
+$config =& config::get_instance();
 $tokenstate = SEC_checkToken();
 
-// MAIN
 if (array_key_exists('set_action', $_POST) && $tokenstate){
     if (SEC_inGroup('Root')) {
         if ($_POST['set_action'] == 'restore') {
@@ -102,11 +107,18 @@
     $result = null;
     if (! array_key_exists('form_reset', $_POST)) {
         $result = $config->updateConfig($_POST, $conf_group);
+
+        // notify plugins
+        if (is_array($result) && (count($result) > 0)) {
+            PLG_configChange($conf_group, array_keys($result));
+        }
     }
-    echo $config->get_ui($conf_group, $_POST['sub_group'], $result);
+    $display = $config->get_ui($conf_group, $_POST['sub_group'], $result);
 } else {
-    echo $config->get_ui($conf_group, array_key_exists('subgroup', $_POST) ?
-                         $_POST['subgroup'] : null);
+    $display = $config->get_ui($conf_group, array_key_exists('subgroup', $_POST)
+                                            ?  $_POST['subgroup'] : null);
 }
 
+echo $display;
+
 ?>
diff -r 1d4790466047 -r 35f33c620315 public_html/docs/history
--- a/public_html/docs/history	Sat Mar 28 20:04:38 2009 +0100
+++ b/public_html/docs/history	Sun Mar 29 11:18:09 2009 +0200
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- New plugin API function PLG_configChange (feature request #0000694) [Dirk]
 - Fixed layout of Batch Add and Batch Admin options of the User Manager [Dirk]
 - On a login failure, the user registration form showed up even when new user
   registration was disabled (bug #0000843)
diff -r 1d4790466047 -r 35f33c620315 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat Mar 28 20:04:38 2009 +0100
+++ b/system/lib-plugins.php	Sun Mar 29 11:18:09 2009 +0200
@@ -77,6 +77,7 @@
 * @param    string  $function_name  holds name of function to call
 * @return   void
 * @internal not to be used by plugins
+* @todo     only supports functions without any parameters
 *
 */
 function PLG_callFunctionForAllPlugins($function_name)
@@ -2494,4 +2495,33 @@
     return COM_refresh($url);
 }
 
+/**
+* Inform plugins of configuration changes
+*
+* NOTE: Plugins will only be notified of 'Core' changes and changes in their
+*       own configuration. Changes in other plugins will not be sent.
+*
+* @param    string  $group      plugin name or 'Core' for $_CONF changes
+* @param    array   $changes    names of config values that changed
+* @return   void
+* @link     http://wiki.geeklog.net/index.php/PLG_configChange
+*
+*/
+function PLG_configChange($group, $changes)
+{
+    global $_PLUGINS;
+
+    $args[1] = $group;
+    $args[2] = $changes;
+
+    if ($group == 'Core') {
+        foreach ($_PLUGINS as $pi_name) {
+            PLG_callFunctionForOnePlugin('plugin_configchange_' . $pi_name,
+                                         $args);
+        }
+    } else {
+        PLG_callFunctionForOnePlugin('plugin_configchange_' . $group, $args);
+    }
+}
+
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 07:32:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 07:32:11 -0400
Subject: [geeklog-cvs] geeklog: Added a couple of @since tags
Message-ID: <hg.5a349707df77.1238326331.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5a349707df77
changeset: 6867:5a349707df77
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 11:47:23 2009 +0200
description:
Added a couple of @since tags

diffstat:

1 file changed, 6 insertions(+)
system/lib-plugins.php |    6 ++++++

diffs (44 lines):

diff -r 35f33c620315 -r 5a349707df77 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 29 11:18:09 2009 +0200
+++ b/system/lib-plugins.php	Sun Mar 29 11:47:23 2009 +0200
@@ -185,6 +185,7 @@
 * @param    array   $old_conf   contents of $_CONF before the migration
 * @return   boolean             true on success, otherwise false
 * @link     http://wiki.geeklog.net/index.php/PLG_migrate
+* @since    Geeklog 1.6.0
 *
 */
 function PLG_migrate($type, $old_conf)
@@ -1463,6 +1464,8 @@
 * or extra Metatags
 *
 * @return   string      returns a concatenated string of all plugins extra header code
+* @since    Geeklog 1.3.8
+*
 */
 function PLG_getHeaderCode()
 {
@@ -2020,6 +2023,7 @@
 * @param    int     $action     what to do if spam found
 * @return   int                 > 0: spam detected, == 0: no spam detected
 * @see      PLG_checkforSpam
+* @since    Geeklog 1.4.1
 *
 */
 function PLG_spamAction($content, $action = -1)
@@ -2192,6 +2196,7 @@
 * @param    string  $id     ID of the item
 * @param    string  $type   type of the item, e.g. 'article'
 * @return   void
+* @since    Geeklog 1.6.0
 *
 */
 function PLG_itemDeleted($id, $type)
@@ -2505,6 +2510,7 @@
 * @param    array   $changes    names of config values that changed
 * @return   void
 * @link     http://wiki.geeklog.net/index.php/PLG_configChange
+* @since    Geeklog 1.6.0
 *
 */
 function PLG_configChange($group, $changes)

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 07:32:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 07:32:11 -0400
Subject: [geeklog-cvs] geeklog: Added support for a CUSTOM_configchange
	function; use u...
Message-ID: <hg.70ad559e93dc.1238326331.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/70ad559e93dc
changeset: 6868:70ad559e93dc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 11:58:22 2009 +0200
description:
Added support for a CUSTOM_configchange function; use uppercase CUSTOM_xxx for all custom function calls

diffstat:

1 file changed, 43 insertions(+), 38 deletions(-)
system/lib-plugins.php |   81 +++++++++++++++++++++++++-----------------------

diffs (truncated from 331 to 300 lines):

diff -r 5a349707df77 -r 70ad559e93dc system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 29 11:47:23 2009 +0200
+++ b/system/lib-plugins.php	Sun Mar 29 11:58:22 2009 +0200
@@ -90,7 +90,7 @@
             $function();
         }
     }
-    $function = 'custom_' . $function_name;
+    $function = 'CUSTOM_' . $function_name;
     if (function_exists($function)) {
         $function();
     }
@@ -534,7 +534,7 @@
         }
     }
 
-    $function = 'custom_commentPreSave';
+    $function = 'CUSTOM_commentPreSave';
     if (function_exists($function)) {
         $someError = $function($uid, $title, $comment, $sid, $pid, $type, $postmode);
         if ($someError) {
@@ -575,7 +575,7 @@
         }
     }
 
-    $function = 'custom_itemPreSave';
+    $function = 'CUSTOM_itemPreSave';
     if (function_exists ($function)) {
         $msgError = $function ($type, $content);
         if (!empty ($msgError)) {
@@ -639,7 +639,7 @@
                     $retval[$pi_name] = $summary;
                 }
             }
-        } else if ($showsitestats == 1) {
+        } elseif ($showsitestats == 1) {
             $function1 = 'plugin_showstats_' . $pi_name;
             $function2 = 'plugin_statssummary_' . $pi_name;
             if (!function_exists ($function2)) {
@@ -647,7 +647,7 @@
                     $retval .= $function1 ($showsitestats);
                 }
             }
-        } else if ($showsitestats == 2) {
+        } elseif ($showsitestats == 2) {
             $function = 'plugin_showstats_' . $pi_name;
             if (function_exists ($function)) {
                 $retval .= $function ($showsitestats);
@@ -656,23 +656,23 @@
     }
 
     if ($showsitestats == 3) {
-        $function = 'custom_statssummary';
+        $function = 'CUSTOM_statssummary';
         if (function_exists ($function)) {
             $summary = $function ();
             if (is_array ($summary)) {
                 $retval['Custom'] = $summary;
             }
         }
-    } else if ($showsitestats == 1) {
-        $function1 = 'custom_showstats';
-        $function2 = 'custom_statssummary';
+    } elseif ($showsitestats == 1) {
+        $function1 = 'CUSTOM_showstats';
+        $function2 = 'CUSTOM_statssummary';
         if (!function_exists ($function2)) {
             if (function_exists ($function1)) {
                 $retval .= $function1 ($showsitestats);
             }
         }
-    } else if ($showsitestats == 2) {
-        $function = 'custom_showstats';
+    } elseif ($showsitestats == 2) {
+        $function = 'CUSTOM_showstats';
         if (function_exists ($function)) {
             $retval .= $function ($showsitestats);
         }
@@ -706,7 +706,7 @@
         } // no else because this is not a required API function
     }
 
-    $function = 'custom_searchtypes';
+    $function = 'CUSTOM_searchtypes';
     if (function_exists ($function)) {
         $cur_types = $function ();
         if (is_array ($cur_types) && (count ($cur_types) > 0)) {
@@ -799,7 +799,7 @@
         // no else because implementation of this API function not required
     }
 
-    $function = 'custom_dopluginsearch';
+    $function = 'CUSTOM_dopluginsearch';
     if (function_exists($function)) {
         $search_results[] = $function($query, $datestart, $dateend, $topic, $type, $author, $keyType, $page, $perpage);
     }
@@ -1139,7 +1139,7 @@
             break;
         }
     }
-    $function = 'custom_centerblock';
+    $function = 'CUSTOM_centerblock';
     if (function_exists($function)) {
         $retval .= $function($where, $page, $topic);
     }
@@ -1165,7 +1165,7 @@
         }
     }
 
-    $function = 'custom_user_create';
+    $function = 'CUSTOM_user_create';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1189,7 +1189,7 @@
         }
     }
 
-    $function = 'custom_user_delete';
+    $function = 'CUSTOM_user_delete';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1217,7 +1217,7 @@
         }
     }
 
-    $function = 'custom_user_login';
+    $function = 'CUSTOM_user_login';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1243,7 +1243,7 @@
         }
     }
 
-    $function = 'custom_user_logout';
+    $function = 'CUSTOM_user_logout';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1268,7 +1268,7 @@
         }
     }
 
-    $function = 'custom_user_changed';
+    $function = 'CUSTOM_user_changed';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1294,7 +1294,7 @@
         }
     }
 
-    $function = 'custom_group_changed';
+    $function = 'CUSTOM_group_changed';
     if (function_exists($function)) {
         $function($uid);
     }
@@ -1320,7 +1320,7 @@
         }
     }
 
-    $function = 'custom_profilevariablesedit';
+    $function = 'CUSTOM_profilevariablesedit';
     if (function_exists($function)) {
         $function($uid, $template);
     }
@@ -1347,7 +1347,7 @@
         }
     }
 
-    $function = 'custom_profileblocksedit';
+    $function = 'CUSTOM_profileblocksedit';
     if (function_exists($function)) {
         $retval .= $function($uid);
     }
@@ -1375,7 +1375,7 @@
         }
     }
 
-    $function = 'custom_profilevariablesdisplay';
+    $function = 'CUSTOM_profilevariablesdisplay';
     if (function_exists($function)) {
         $function($uid, $template);
     }
@@ -1402,7 +1402,7 @@
         }
     }
 
-    $function = 'custom_profileblocksdisplay';
+    $function = 'CUSTOM_profileblocksdisplay';
     if (function_exists($function)) {
         $retval .= $function($uid);
     }
@@ -1480,7 +1480,7 @@
         }
     }
 
-    $function = 'custom_getheadercode';
+    $function = 'CUSTOM_getheadercode';
     if (function_exists($function)) {
         $headercode .= $function();
     }
@@ -1630,7 +1630,7 @@
                     $content = str_replace ($autotag['tagstr'], $filelink,
                                             $content);
                 }
-            } else if (function_exists ($function) AND
+            } elseif (function_exists ($function) AND
                     (empty ($plugin) OR ($plugin == $autotag['module']))) {
                 $content = $function ('parse', $content, $autotag);
             }
@@ -1665,7 +1665,7 @@
         }
     }
 
-    $function = 'custom_getfeednames';
+    $function = 'CUSTOM_getfeednames';
     if (function_exists($function)) {
         $feeds = $function();
         if (is_array($feeds) && (sizeof($feeds) > 0)) {
@@ -1693,7 +1693,7 @@
 
     if ($plugin == 'custom')
     {
-        $function = 'custom_getfeednames';
+        $function = 'CUSTOM_getfeednames';
         if (function_exists($function)) {
             $feeds = $function();
         }
@@ -1734,7 +1734,7 @@
     $content = array ();
 
     if ($plugin == 'custom') {
-        $function = 'custom_getfeedcontent';
+        $function = 'CUSTOM_getfeedcontent';
         if (function_exists($function)) {
             $content = $function($feed, $link, $update_data, $feedType, $feedVersion);
         }
@@ -1778,7 +1778,7 @@
         }
     }
 
-    $function = 'custom_feedElementExtensions';
+    $function = 'CUSTOM_feedElementExtensions';
     if (function_exists($function))
     {
         $extensions = array_merge($extensions, $function($contentType, $contentID, $feedType, $feedVersion, $topic, $fid));
@@ -1814,7 +1814,7 @@
         }
     }
 
-    $function = 'custom_feedNSExtensions';
+    $function = 'CUSTOM_feedNSExtensions';
     if (function_exists($function))
     {
         $namespaces = array_merge($namespaces, $function($contentType, $feedType, $feedVersion, $topic, $fid));
@@ -1849,7 +1849,7 @@
         }
     }
 
-    $function = 'custom_feedExtensionTags';
+    $function = 'CUSTOM_feedExtensionTags';
     if (function_exists($function))
     {
         $tags = array_merge($tags, $function($contentType, $feedType, $feedVersion, $topic, $fid));
@@ -1884,7 +1884,7 @@
     $is_current = true;
 
     if ($plugin == 'custom') {
-        $function = 'custom_feedupdatecheck';
+        $function = 'CUSTOM_feedupdatecheck';
         if (function_exists($function)) {
             $is_current = $function ($feed, $topic, $update_data, $limit,
                             $updated_type, $updated_topic, $updated_id);
@@ -1934,13 +1934,13 @@
         }
     }
 
-    $fn_head = 'custom_whatsnewsupported';
+    $fn_head = 'CUSTOM_whatsnewsupported';
     if (function_exists($fn_head)) {
         $supported = $fn_head();
         if (is_array($supported)) {
             list($headline, $byline) = $supported;
 
-            $fn_new = 'custom_getwhatsnew';
+            $fn_new = 'CUSTOM_getwhatsnew';
             if (function_exists($fn_new)) {
                 $whatsnew = $fn_new ();
                 $newcontent[] = $whatsnew;
@@ -1997,7 +1997,7 @@
         }
     }
 
-    $function = 'custom_checkforSpam';
+    $function = 'CUSTOM_checkforSpam';
     if (function_exists($function)) {
         $result = $function($content, $action);

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 07:32:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 07:32:12 -0400
Subject: [geeklog-cvs] geeklog: Documentation additions and corrections
Message-ID: <hg.fcec3e4bbb06.1238326332.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fcec3e4bbb06
changeset: 6869:fcec3e4bbb06
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 13:31:43 2009 +0200
description:
Documentation additions and corrections

diffstat:

1 file changed, 24 insertions(+), 13 deletions(-)
system/lib-webservices.php |   37 ++++++++++++++++++++++++-------------

diffs (80 lines):

diff -r 70ad559e93dc -r fcec3e4bbb06 system/lib-webservices.php
--- a/system/lib-webservices.php	Sun Mar 29 11:58:22 2009 +0200
+++ b/system/lib-webservices.php	Sun Mar 29 13:31:43 2009 +0200
@@ -30,10 +30,18 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* Implementation of the Webservices functions for the Atom Publishing Protocol
+* (AtomPub).
+*/
+
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'lib-webservices.php') !== false) {
     die('This file can not be used on its own!');
 }
 
+/**
+* Namespaces
+*/
 define('WS_ATOM_NS', 'http://www.w3.org/2005/Atom');
 define('WS_APP_NS',  'http://www.w3.org/2007/app');
 define('WS_APP_NS2', 'http://purl.org/atom/app#');
@@ -54,7 +62,7 @@
 /**
  * Displays an error message with the appropriate HTTP error-code
  *
- * @param   string  $error_name     the name of the error
+ * @param   string  $error_code     the name of the error
  * @param   string  $error_desc     a short description of the actual error (optional)
  */
 function WS_error($error_code, $error_desc = '')
@@ -107,7 +115,7 @@
 /**
  * Dissects the URI and obtains parameters
  *
- * @param   array   $args       the array to store any input parameters
+ * @param   array   &$args       the array to store any input parameters
  */
 function WS_dissectURI(&$args)
 {
@@ -643,8 +651,10 @@
 /**
  * Converts an array into an XML entry node
  *
+ * @param   array       $arr        the array which is to be converted into XML
+ * @param   array       $extn_elements Geeklog-specific extension elements
+ * @param   object      &$entry_elem   entry to append to
  * @param   DOMDocument &$atom_doc  the Atom document to which the entry should be appended
- * @param   array       $arr        the array which is to be converted into XML
  */
 function WS_arrayToEntryXML($arr, $extn_elements, &$entry_elem, &$atom_doc)
 {
@@ -974,16 +984,17 @@
     echo $WS_TEXT;
 }
 
-/*
-* Create a new ID, preferrably from a provided 'Slug:' header
-*
-* @param    string  $slug           Content of the 'Slug:' header
-* @param    int     $max_length     max. length of the created ID
-* @return   string                  new ID
-* 
-* For more information on the 'Slug:' header, see RFC 5023, section 9.7
-*
-*/
+/**
+ * Create a new ID, preferrably from a provided 'Slug:' header
+ *
+ * For more information on the 'Slug:' header, see RFC 5023, section 9.7
+ *
+ * @param    string  $slug           Content of the 'Slug:' header
+ * @param    int     $max_length     max. length of the created ID
+ * @return   string                  new ID
+ * @link     http://tools.ietf.org/html/rfc5023#section-9.7
+ * 
+ */
 function WS_makeId($slug = '', $max_length = 40)
 {
     $sid = COM_makeSid();

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 15:53:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 15:53:26 -0400
Subject: [geeklog-cvs] geeklog: More CUSTOM_ function support;
	ensure PLG_ functions ar...
Message-ID: <hg.65e07783f408.1238356406.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/65e07783f408
changeset: 6870:65e07783f408
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 16:42:32 2009 +0200
description:
More CUSTOM_ function support; ensure PLG_ functions are called first

diffstat:

1 file changed, 16 insertions(+), 7 deletions(-)
system/lib-plugins.php |   23 ++++++++++++++++-------

diffs (64 lines):

diff -r fcec3e4bbb06 -r 65e07783f408 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 29 13:31:43 2009 +0200
+++ b/system/lib-plugins.php	Sun Mar 29 16:42:32 2009 +0200
@@ -1446,15 +1446,15 @@
 {
     global $_PLUGINS;
 
-    if (function_exists ('CUSTOM_templateSetVars')) {
-        CUSTOM_templatesetvars($templatename, $template);
-    }
-
     foreach ($_PLUGINS as $pi_name) {
         $function = 'plugin_templatesetvars_' . $pi_name;
         if (function_exists($function)) {
             $function ($templatename, $template);
         }
+    }
+
+    if (function_exists('CUSTOM_templateSetVars')) {
+        CUSTOM_templatesetvars($templatename, $template);
     }
 }
 
@@ -2142,14 +2142,15 @@
 {
     global $_PLUGINS;
 
-    if (function_exists ('CUSTOM_runScheduledTask')) {
-        CUSTOM_runScheduledTask();
-    }
     foreach ($_PLUGINS as $pi_name) {
         $function = 'plugin_runScheduledTask_' . $pi_name;
         if (function_exists ($function)) {
             $function ();
         }
+    }
+
+    if (function_exists('CUSTOM_runScheduledTask')) {
+        CUSTOM_runScheduledTask();
     }
 }
 
@@ -2183,6 +2184,10 @@
         }
     }
 
+    if (function_exists('CUSTOM_itemsaved')) {
+        CUSTOM_itemsaved($id, $type, $old_id);
+    }
+
     return false; // for backward compatibility
 }
 
@@ -2211,6 +2216,10 @@
                 $function($id, $type);
             }
         }
+    }
+
+    if (function_exists('CUSTOM_itemdeleted')) {
+        CUSTOM_itemdeleted($id, $type);
     }
 }
 

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 15:53:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 15:53:26 -0400
Subject: [geeklog-cvs] geeklog: Allow subtypes for PLG_itemSaved and
	PLG_itemDeleted an...
Message-ID: <hg.123e4e95721b.1238356406.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/123e4e95721b
changeset: 6871:123e4e95721b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 17:38:54 2009 +0200
description:
Allow subtypes for PLG_itemSaved and PLG_itemDeleted and implemented them for links categories

diffstat:

2 files changed, 32 insertions(+), 17 deletions(-)
public_html/admin/plugins/links/category.php |   22 ++++++++++++++-------
system/lib-plugins.php                       |   27 ++++++++++++++++----------

diffs (117 lines):

diff -r 65e07783f408 -r 123e4e95721b public_html/admin/plugins/links/category.php
--- a/public_html/admin/plugins/links/category.php	Sun Mar 29 16:42:32 2009 +0200
+++ b/public_html/admin/plugins/links/category.php	Sun Mar 29 17:38:54 2009 +0200
@@ -40,7 +40,7 @@
  * @subpackage admin
  * @filesource
  * @version 2.1
- * @since GL 1.5.0
+ * @since Geeklog 1.5.0
  * @copyright Copyright &copy; 2000-2009
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * @author Tony Bibbs, tony AT tonybibbs DOT com
@@ -102,18 +102,19 @@
 
     $defsort_arr = array('field' => 'category', 'direction' => 'asc');
 
+    $links_url = $_CONF['site_admin_url'] . '/plugins/links';
     $menu_arr = array (
-        array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
+        array('url'  => $links_url . '/index.php',
               'text' => $LANG_LINKS_ADMIN[53]),
-        array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
+        array('url'  => $links_url . '/index.php?mode=edit',
               'text' => $LANG_LINKS_ADMIN[51]),
-        array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=enabled',
+        array('url'  => $links_url . '/index.php?validate=enabled',
               'text' => $LANG_LINKS_ADMIN[26]),
-        array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
+        array('url'  => $links_url . '/category.php',
               'text' => $LANG_LINKS_ADMIN[50]),
-        array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
+        array('url'  => $links_url . '/category.php?mode=edit',
               'text' => $LANG_LINKS_ADMIN[52]),
-        array('url' => $_CONF['site_admin_url'],
+        array('url'  => $_CONF['site_admin_url'],
               'text' => $LANG_ADMIN['admin_home'])
     );
 
@@ -431,6 +432,12 @@
                     '{$perm_group}','{$perm_members}','{$perm_anon}')";
             $result = DB_query($sql);
         }
+
+        if (($update == 'existing') && ($cid != $old_cid)) {
+            PLG_itemSaved($cid, 'links.category', $old_cid);
+        } else {
+            PLG_itemSaved($cid, 'links.category');
+        }
     }
 
     return 10; // success message
@@ -464,6 +471,7 @@
             if (($sf == 0) && ($sl == 0)) {
                 // No subfolder/links so OK to delete
                 DB_delete($_TABLES['linkcategories'], 'cid', $cid);
+                PLG_itemDeleted($cid, 'links.category');
                 return 13;
             } else {
                 // Subfolders and/or sublinks exist so return a message
diff -r 65e07783f408 -r 123e4e95721b system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Mar 29 16:42:32 2009 +0200
+++ b/system/lib-plugins.php	Sun Mar 29 17:38:54 2009 +0200
@@ -2107,17 +2107,18 @@
 * for the plugin but since it doesn't know about the plugin's access control,
 * it has to ask the plugin to approve / reject such an operation.
 *
+* $operation can be one of the following:
+* - 'acceptByID':  accept a trackback comment on item with ID $id
+*                  returns: true for accept, false for reject
+* - 'acceptByURI': accept a pingback comment on item at URL $id
+*                  returns: the item's ID for accept, false for reject
+* - 'delete':      is the current user allowed to delete item with ID $id?
+*                  returns: true for accept, false for reject
+*
 * @param    string  $type       plugin type
 * @param    string  $id         an ID or URL, depending on the operation
 * @param    string  $operation  operation to perform
-*
-* $operation can be one of the following:
-* 'acceptByID'  - accept a trackback comment on item with ID $id
-*                 returns: true for accept, false for reject
-* 'acceptByURI' - accept a pingback comment on item at URL $id
-*                 returns: the item's ID for accept, false for reject
-* 'delete'      - is the current user allowed to delete item with ID $id?
-*                 returns: true for accept, false for reject
+* @return   mixed               depends on $operation
 *
 */
 function PLG_handlePingComment ($type, $id, $operation)
@@ -2174,9 +2175,12 @@
 {
     global $_PLUGINS;
 
+    $t = explode('.', $type);
+    $plg_type = $t[0];
+
     $plugins = count($_PLUGINS);
     for ($save = 0; $save < $plugins; $save++) {
-        if ($_PLUGINS[$save] != $type) {
+        if ($_PLUGINS[$save] != $plg_type) {
             $function = 'plugin_itemsaved_' . $_PLUGINS[$save];
             if (function_exists($function)) {
                 $function($id, $type, $old_id);
@@ -2208,9 +2212,12 @@
 {
     global $_PLUGINS;
 
+    $t = explode('.', $type);
+    $plg_type = $t[0];
+
     $plugins = count($_PLUGINS);
     for ($del = 0; $del < $plugins; $del++) {
-        if ($_PLUGINS[$del] != $type) {
+        if ($_PLUGINS[$del] != $plg_type) {
             $function = 'plugin_itemdeleted_' . $_PLUGINS[$del];
             if (function_exists($function)) {
                 $function($id, $type);

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 15:53:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 15:53:27 -0400
Subject: [geeklog-cvs] geeklog: Fixed handling of special characters in the
	list query
Message-ID: <hg.7237b4518928.1238356407.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7237b4518928
changeset: 6872:7237b4518928
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 20:13:51 2009 +0200
description:
Fixed handling of special characters in the list query

diffstat:

1 file changed, 31 insertions(+), 21 deletions(-)
system/lib-admin.php |   52 +++++++++++++++++++++++++++++---------------------

diffs (128 lines):

diff -r 123e4e95721b -r 7237b4518928 system/lib-admin.php
--- a/system/lib-admin.php	Sun Mar 29 17:38:54 2009 +0200
+++ b/system/lib-admin.php	Sun Mar 29 20:13:51 2009 +0200
@@ -33,6 +33,12 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+/**
+* This file contains functions used in the admin panels (mostly for the
+* various lists of stories, users, etc.).
+*
+*/
+
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'lib-admin.php') !== false) {
     die('This file can not be used on its own!');
 }
@@ -45,6 +51,7 @@
 * @param    array   $text_arr       array with different text strings
 * @param    array   $data_arr       array with sql query data - array of list records
 * @param    array   $options        array of options - intially just used for the Check-All feature
+* @param    array   $form_arr       optional extra forms at top or bottom
 * @return   string                  HTML output of function
 *
 */
@@ -198,6 +205,8 @@
 * @param    array   $defsort_arr    default sorting values
 * @param    string  $filter         additional drop-down filters
 * @param    string  $extra          additional values passed to fieldfunction
+* @param    array   $options        array of options - intially just used for the Check-All feature
+* @param    array   $form_arr       optional extra forms at top or bottom
 * @return   string                  HTML output of function
 *
 */
@@ -218,14 +227,16 @@
     }
 
     $query = '';
-    if (isset ($_REQUEST['q'])) { # get query (text-search)
-        $query = $_REQUEST['q'];
+    if (isset ($_REQUEST['q'])) { // get query (text-search)
+COM_errorLog($_REQUEST['q']);
+        $query = strip_tags(COM_stripslashes($_REQUEST['q']));
+COM_errorLog($query);
     }
 
-    $query_limit = "";
-    if (isset($_REQUEST['query_limit'])) { # get query-limit (list-length)
-        $query_limit = COM_applyFilter ($_REQUEST['query_limit'], true);
-        if($query_limit == 0) {
+    $query_limit = '';
+    if (isset($_REQUEST['query_limit'])) { // get query-limit (list-length)
+        $query_limit = COM_applyFilter($_REQUEST['query_limit'], true);
+        if ($query_limit == 0) {
             $query_limit = 50;
         }
     }
@@ -242,11 +253,6 @@
     if ($curpage <= 0) {
         $curpage = 1; #current page has to be larger 0
     }
-
-    #$unfiltered='';
-    #if (!empty($query_arr['unfiltered'])) {
-    #    $unfiltered = $query_arr['unfiltered'];
-    #}
 
     $help_url = ''; # do we have a help url for the block-header?
     if (!empty ($text_arr['help_url'])) {
@@ -319,13 +325,14 @@
     if ($has_extras) { // show search
         $admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
         $admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
-        $admin_templates->set_var('lang_limit_results', $LANG_ADMIN['limit_results']);
-        $admin_templates->set_var('last_query', COM_applyFilter($query));
+        $admin_templates->set_var('lang_limit_results',
+                                  $LANG_ADMIN['limit_results']);
+        $admin_templates->set_var('last_query', htmlspecialchars($query));
         $admin_templates->set_var('filter', $filter);
     }
 
-    $sql_query = addslashes ($query); # replace quotes etc for security
-    $sql = $query_arr['sql']; # get sql from array that builds data
+    $sql_query = addslashes($query); // replace quotes etc for security
+    $sql = $query_arr['sql']; // get sql from array that builds data
 
     $order_var = ''; # number that is displayed in URL
     $order = '';     # field that is used in SQL
@@ -374,6 +381,7 @@
 
     if (!empty ($order_for_query)) { # concat order string
         $order_sql = "ORDER BY $order_for_query $direction";
+COM_errorLog("order_sql: $order_sql");
     }
     $th_subtags = ''; // other tags in the th, such as onclick and mouseover
     $header_text = ''; // title as displayed to the user
@@ -395,15 +403,15 @@
             } else {
                 $separator = '?';
             }
-            $th_subtags .= " onclick=\"window.location.href='$form_url$separator" #onclick action
+            $th_subtags .= " onclick=\"window.location.href='$form_url$separator" // onclick action
                     ."order=$order_var&amp;prevorder=$order&amp;direction=$direction";
-            if (!empty ($page)) {
+            if (!empty($page)) {
                 $th_subtags .= '&amp;' . $component . 'listpage=' . $page;
             }
-            if (!empty ($query)) {
-                $th_subtags .= '&amp;q=' . $query;
+            if (!empty($query)) {
+                $th_subtags .= '&amp;q=' . urlencode($query);
             }
-            if (!empty ($query_limit)) {
+            if (!empty($query_limit)) {
                 $th_subtags .= '&amp;query_limit=' . $query_limit;
             }
             $th_subtags .= "';\"";
@@ -570,8 +578,10 @@
 * @return   string                  HTML output of function
 *
 */
-function ADMIN_createMenu($menu_arr, $text, $icon = '') {
+function ADMIN_createMenu($menu_arr, $text, $icon = '')
+{
     global $_CONF;
+
     $admin_templates = new Template($_CONF['path_layout'] . 'admin/lists');
     $admin_templates->set_file (
         array ('top_menu' => 'topmenu.thtml')

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 15:53:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 15:53:29 -0400
Subject: [geeklog-cvs] geeklog: Fixed @see references
Message-ID: <hg.0fbb66f7326c.1238356409.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0fbb66f7326c
changeset: 6874:0fbb66f7326c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 21:53:14 2009 +0200
description:
Fixed @see references

diffstat:

1 file changed, 4 insertions(+), 4 deletions(-)
system/lib-comment.php |    8 ++++----

diffs (32 lines):

diff -r 73f4f325d5b8 -r 0fbb66f7326c system/lib-comment.php
--- a/system/lib-comment.php	Sun Mar 29 21:43:32 2009 +0200
+++ b/system/lib-comment.php	Sun Mar 29 21:53:14 2009 +0200
@@ -39,7 +39,9 @@
 
 if( $_CONF['allow_user_photo'] )
 {
-    // only needed for the USER_getPhoto function
+    /**
+    * only needed for the USER_getPhoto function
+    */
     require_once $_CONF['path_system'] . 'lib-user.php';
 }
 
@@ -56,7 +58,6 @@
 * @param    int     $ccode  Comment code: -1=no comments, 0=allowed, 1=closed
 * @return   string          HTML Formated comment bar
 * @see CMT_userComments
-* @see CMT_commentChildren
 *
 */
 function CMT_commentBar( $sid, $title, $type, $order, $mode, $ccode = 0 )
@@ -474,8 +475,7 @@
 * @param    boolean     $delete_option   if current user can delete comments
 * @param    int         $ccode     Comment code: -1=no comments, 0=allowed, 1=closed
 * @return   string  HTML Formated Comments
-* @see function CMT_commentBar
-* @see function CMT_commentChildren
+* @see CMT_commentBar
 *
 */
 function CMT_userComments( $sid, $title, $type='article', $order='', $mode='', $pid = 0, $page = 1, $cid = false, $delete_option = false, $ccode = 0 )

From geeklog-cvs at lists.geeklog.net  Sun Mar 29 15:53:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 29 Mar 2009 15:53:28 -0400
Subject: [geeklog-cvs] geeklog: Various corrections and fixes for unexpected
	phpDocumen...
Message-ID: <hg.73f4f325d5b8.1238356408.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/73f4f325d5b8
changeset: 6873:73f4f325d5b8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Mar 29 21:43:32 2009 +0200
description:
Various corrections and fixes for unexpected phpDocumentor behaviour

diffstat:

1 file changed, 79 insertions(+), 58 deletions(-)
public_html/lib-common.php |  137 +++++++++++++++++++++++++-------------------

diffs (truncated from 348 to 300 lines):

diff -r 7237b4518928 -r 73f4f325d5b8 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Mar 29 20:13:51 2009 +0200
+++ b/public_html/lib-common.php	Sun Mar 29 21:43:32 2009 +0200
@@ -53,28 +53,32 @@
 * Turn this on to get various debug messages from the code in this library
 * @global Boolean $_COM_VERBOSE
 */
-
 $_COM_VERBOSE = false;
 
 /**
-  * Here, we shall establish an error handler. This will mean that whenever a
-  * php level error is encountered, our own code handles it. This will hopefuly
-  * go someway towards preventing nasties like path exposures from ever being
-  * possible. That is, unless someone has overridden our error handler with one
-  * with a path exposure issue...
-  *
-  * Must make sure that the function hasn't been disabled before calling it.
-  *
-  */
-if( function_exists('set_error_handler') )
-{
-    if( PHP_VERSION >= 5 )
-    {
+* Prevent getting any surprise values. But we should really stop
+* using $_REQUEST altogether.
+*/
+$_REQUEST = array_merge($_GET, $_POST);
+
+/**
+* Here, we shall establish an error handler. This will mean that whenever a
+* php level error is encountered, our own code handles it. This will hopefuly
+* go someway towards preventing nasties like path exposures from ever being
+* possible. That is, unless someone has overridden our error handler with one
+* with a path exposure issue...
+*
+* Must make sure that the function hasn't been disabled before calling it.
+*
+*/
+if (function_exists('set_error_handler')) {
+    if (PHP_VERSION >= 5) {
         /* Tell the error handler to use the default error reporting options.
-         * you may like to change this to use it in more/less cases, if so,
+         * You may like to change this to use it in more/less cases, if so,
          * just use the syntax used in the call to error_reporting() above.
          */
-        $defaultErrorHandler = set_error_handler('COM_handleError', error_reporting());
+        $defaultErrorHandler = set_error_handler('COM_handleError',
+                                                 error_reporting());
     } else {
         $defaultErrorHandler = set_error_handler('COM_handleError');
     }
@@ -85,6 +89,7 @@
 * You do NOT need to modify anything here any more!
 */
 require_once 'siteconfig.php' ;
+
 /**
 * Configuration class
 */
@@ -570,7 +575,7 @@
 * Create the menu, i.e. replace {menu_elements} in the site header with the
 * actual menu entries.
 *
-* @param    Template    $header     reference to the header template
+* @param    Template    &$header        reference to the header template
 * @param    array       $plugin_menu    array of plugin menu entries, if any
 *
 */
@@ -798,21 +803,23 @@
 * and the footer.  You use them like a sandwich.  Thus the following code will
 * display a Geeklog page with both right and left blocks displayed.
 *
-* -------------------------------------------------------------------------------------
+* <code>
 * <?php
-* require_once('lib-common.php');
-* $display .= COM_siteHeader(); //Change to COM_siteHeader('none') to not display left blocks
+* require_once 'lib-common.php';
+* // Change to COM_siteHeader('none') to not display left blocks
+* $display .= COM_siteHeader();
 * $display .= "Here is your html for display";
-* $display .= COM_siteFooter(true);  // Change to COM_siteFooter() to not display right blocks
+* // Change to COM_siteFooter() to not display right blocks
+* $display .= COM_siteFooter(true);
 * echo $display;
 * ? >
-* ---------------------------------------------------------------------------------------
+* </code>
 *
 * Note that the default for the header is to display the left blocks and the
 * default of the footer is to not display the right blocks.
 *
 * This sandwich produces code like this (greatly simplified)
-*
+* <code>
 * // COM_siteHeader
 * <table><tr><td colspan="3">Header</td></tr>
 * <tr><td>Left Blocks</td><td>
@@ -823,6 +830,7 @@
 * // COM_siteFooter
 * </td><td>Right Blocks</td></tr>
 * <tr><td colspan="3">Footer</td></table>
+* </code>
 *
 * @param    string  $what       If 'none' then no left blocks are returned, if 'menu' (default) then right blocks are returned
 * @param    string  $pagetitle  optional content for the page's <title>
@@ -831,7 +839,6 @@
 * @see function COM_siteFooter
 *
 */
-
 function COM_siteHeader( $what = 'menu', $pagetitle = '', $headercode = '' )
 {
     global $_CONF, $_TABLES, $_USER, $LANG01, $LANG_BUTTONS, $LANG_DIRECTION,
@@ -1450,13 +1457,12 @@
 * but anything that uses that format, e.g. Stats page.  They are used like
 * COM_siteHeader and COM_siteFooter but for internal page elements.
 *
-*
-* @param        string      $title      Value to set block title to
-* @param        string      $helpfile   Help file, if one exists
-* @param        string      $template   HTML template file to use to format the block
+* @param    string  $title      Value to set block title to
+* @param    string  $helpfile   Help file, if one exists
+* @param    string  $template   HTML template file to use to format the block
+* @return   string              Formatted HTML containing block header
 * @see COM_endBlock
-* @see COM_siteHeader  For similiar construct
-* @return   string  Formatted HTML containing block header
+* @see COM_siteHeader
 *
 */
 
@@ -1899,7 +1905,7 @@
 * or both.
 *
 * @param        string      $logentry       Text to log to error log
-* @param        int         $actionid       1 = write to log file, 2 = write to screen (default) both
+* @param        int         $actionid       where 1 = write to log file, 2 = write to screen (default) both
 * @see function COM_accessLog
 * @return   string  If $actionid = 2 or '' then HTML formatted string (wrapped in block) else nothing
 *
@@ -1982,7 +1988,7 @@
 *
 * This will print a message to the Geeklog access log
 *
-* @param        string      $string         Message to write to access log
+* @param        string      $logentry       Message to write to access log
 * @see COM_errorLog
 *
 */
@@ -2775,6 +2781,7 @@
 /**
  * DEPRECIATED -- see CMT_userComments in lib-comment.php
  * @deprecated since Geeklog 1.4.0
+ * @see CMT_userComments
  */
 function COM_userComments( $sid, $title, $type='article', $order='', $mode='', $pid = 0, $page = 1, $cid = false, $delete_option = false )
 {
@@ -3388,7 +3395,7 @@
 * Shows Geeklog blocks
 *
 * Returns HTML for blocks on a given side and, potentially, for
-* a given topic. Currentlly only used by static pages.
+* a given topic. Currently only used by static pages.
 *
 * @param        string      $side       Side to get blocks for (right or left for now)
 * @param        string      $topic      Only get blocks for this topic
@@ -3910,10 +3917,11 @@
 * Allows the siteAdmin to determine if loginname (username) or fullname
 * should be displayed.
 *
-* @param    int  $uid  site member id
+* @param    int     $uid        site member id
 * @param    string  $username   Username, if this is set no lookup is done.
 * @param    string  $fullname   Users full name.
-* @param    string  $service    Remote login service.
+* @param    string  $remoteusername  Username on remote service
+* @param    string  $remoteservice   Remote login service.
 * @return   string  Username, fullname or username at Service
 *
 */
@@ -4433,6 +4441,8 @@
 * @param    string  $message    Message text; may contain HTML
 * @param    string  $title      (optional) alternative block title
 * @return   string              HTML block with message
+* @see      COM_showMessage
+* @see      COM_showMessageFromParameter
 *
 */
 function COM_showMessageText($message, $title = '')
@@ -4460,12 +4470,15 @@
 /**
 * Displays a message on the webpage
 *
-* Pulls $msg off the URL string and gets the corresponding message and returns
-* it for display on the calling page
-*
+* Display one of the predefined messages from the $MESSAGE array. If a plugin
+* name is provided, display that plugin's message instead.
+* 
 * @param    int     $msg        ID of message to show
-* @param    string  $plugin     Optional Name of plugin to lookup plugin defined message
+* @param    string  $plugin     Optional name of plugin to lookup plugin defined message
 * @return   string              HTML block with message
+* @see      COM_showMessageFromParameter
+* @see      COM_showMessageText
+*
 */
 function COM_showMessage($msg, $plugin = '')
 {
@@ -4503,6 +4516,8 @@
 * everywhere anyway.
 *
 * @return   string  HTML block with message
+* @see      COM_showMessage
+* @see      COM_showMessageText
 *
 */
 function COM_showMessageFromParameter()
@@ -5050,9 +5065,9 @@
 }
 
 /**
-* for backward compatibility only
-* - this function should always have been called COM_getMinuteFormOptions
-*
+* For backward compatibility only.
+* This function should always have been called COM_getMinuteFormOptions
+* @see COM_getMinuteFormOptions
 */
 function COM_getMinuteOptions( $selected = '', $step = 1 )
 {
@@ -5107,6 +5122,7 @@
 * and listitem.thtml templates.
 *
 * @param    array   $listofitems    Items to list out
+* @param    string  $classname      optional CSS class name for the list
 * @return   string                  HTML unordered list of array items
 */
 function COM_makeList($listofitems, $classname = '')
@@ -5733,7 +5749,7 @@
 /**
 * Callback function to help format links in COM_makeClickableLinks
 *
-* @param    string  $http   set to 'http://' when not aleady in the url
+* @param    string  $http   set to 'http://' when not already in the url
 * @param    string  $link   the url
 * @return   string          link enclosed in <a>...</a> tags
 *
@@ -5749,8 +5765,8 @@
 * Undo the conversion of URLs to clickable links (in plain text posts),
 * e.g. so that we can present the user with the post as they entered them.
 *
-* @param    string  $txt    story text
-* @param    string          story text without links
+* @param    string  $text   story text
+* @return   string          story text without links
 *
 */
 function COM_undoClickableLinks( $text )
@@ -5807,7 +5823,7 @@
 * automatically do the date diff on the more recent of the two dates (e.g. the
 * order of the two dates given doesn't matter).
 *
-* @author Tony Bibbs <tony.bibbs at iowa.gov
+* @author Tony Bibbs, tony DOT bibbs AT iowa DOT gov
 * @access public
 * @param string $interval Can be:
 * y = year
@@ -6259,12 +6275,11 @@
 * "Accept-Language" header sent by their browser (assuming they bothered
 * to select a preferred language there).
 *
+* Sample header: Accept-Language: en-us,en;q=0.7,de-de;q=0.3
+*
 * @return   string  name of the language file to use or an empty string
-*
-* Bugs: Does not take the quantity ('q') parameter into account, but only
-*       looks at the order of language codes.
-*
-* Sample header: Accept-Language: en-us,en;q=0.7,de-de;q=0.3
+* @todo     Bugs: Does not take the quantity ('q') parameter into account,
+*           but only looks at the order of language codes.
 *
 */
 function COM_getLanguageFromBrowser()
@@ -6397,9 +6412,14 @@
 }
 
 /**
+* Provide a block to switch languages
+*
 * Provides a drop-down menu (or simple link, if you only have two languages)
 * to switch languages. This can be used as a PHP block or called from within
-* your theme's header.thtml: <?php print phpblock_switch_language(); ?>
+* your theme's header.thtml:
+* <code>
+* <?php print phpblock_switch_language(); ?>

From geeklog-cvs at lists.geeklog.net  Mon Mar 30 04:07:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 30 Mar 2009 04:07:35 -0400
Subject: [geeklog-cvs] geeklog: Removed COM_errorLog calls left over from a
	debugging s...
Message-ID: <hg.be6712ba04de.1238400455.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/be6712ba04de
changeset: 6875:be6712ba04de
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Mar 30 10:07:26 2009 +0200
description:
Removed COM_errorLog calls left over from a debugging session ...

diffstat:

1 file changed, 4 deletions(-)
system/lib-admin.php |    4 ----

diffs (29 lines):

diff -r 0fbb66f7326c -r be6712ba04de system/lib-admin.php
--- a/system/lib-admin.php	Sun Mar 29 21:53:14 2009 +0200
+++ b/system/lib-admin.php	Mon Mar 30 10:07:26 2009 +0200
@@ -228,9 +228,7 @@
 
     $query = '';
     if (isset ($_REQUEST['q'])) { // get query (text-search)
-COM_errorLog($_REQUEST['q']);
         $query = strip_tags(COM_stripslashes($_REQUEST['q']));
-COM_errorLog($query);
     }
 
     $query_limit = '';
@@ -381,7 +379,6 @@
 
     if (!empty ($order_for_query)) { # concat order string
         $order_sql = "ORDER BY $order_for_query $direction";
-COM_errorLog("order_sql: $order_sql");
     }
     $th_subtags = ''; // other tags in the th, such as onclick and mouseover
     $header_text = ''; // title as displayed to the user
@@ -460,7 +457,6 @@
             $filter_str .= ")";
         }
         $num_pages_sql = $sql . $filter_str;
-        // COM_errorLog($num_pages_sql);
         $num_pages_result = DB_query($num_pages_sql);
         $num_rows = DB_numRows($num_pages_result);
         $num_pages = ceil ($num_rows / $limit);

From geeklog-cvs at lists.geeklog.net  Mon Mar 30 07:14:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 30 Mar 2009 07:14:58 -0400
Subject: [geeklog-cvs] geeklog: Some minor corrections in the source code
	comments
Message-ID: <hg.f0fc9736cfc6.1238411698.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f0fc9736cfc6
changeset: 6876:f0fc9736cfc6
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Mar 30 13:14:42 2009 +0200
description:
Some minor corrections in the source code comments

diffstat:

3 files changed, 16 insertions(+), 21 deletions(-)
public_html/lib-common.php          |    6 ++----
system/classes/downloader.class.php |   25 +++++++++++--------------
system/classes/upload.class.php     |    6 +++---

diffs (157 lines):

diff -r be6712ba04de -r f0fc9736cfc6 public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Mar 30 10:07:26 2009 +0200
+++ b/public_html/lib-common.php	Mon Mar 30 13:14:42 2009 +0200
@@ -2218,7 +2218,7 @@
 /**
 * Shows the user their menu options
 *
-* This shows the average joe use their menu options. This is the user block on right side
+* This shows the average Joe User their menu options. This is the user block on the left side
 *
 * @param        string      $help       Help file to show
 * @param        string      $title      Title of Menu
@@ -2226,7 +2226,6 @@
 * @see function COM_adminMenu
 *
 */
-
 function COM_userMenu( $help='', $title='', $position='' )
 {
     global $_TABLES, $_USER, $_CONF, $LANG01, $LANG04, $_BLOCK_TEMPLATE;
@@ -2399,7 +2398,7 @@
 * Prints administration menu
 *
 * This will return the administration menu items that the user has
-* sufficient rights to -- Admin Block on right side.
+* sufficient rights to -- Admin Block on the left side.
 *
 * @param        string      $help       Help file to show
 * @param        string      $title      Menu Title
@@ -2407,7 +2406,6 @@
 * @see function COM_userMenu
 *
 */
-
 function COM_adminMenu( $help = '', $title = '', $position = '' )
 {
     global $_TABLES, $_USER, $_CONF, $LANG01, $_BLOCK_TEMPLATE,
diff -r be6712ba04de -r f0fc9736cfc6 system/classes/downloader.class.php
--- a/system/classes/downloader.class.php	Mon Mar 30 10:07:26 2009 +0200
+++ b/system/classes/downloader.class.php	Mon Mar 30 13:14:42 2009 +0200
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | downloader.class.php                                                      |
 // |                                                                           |
 // | Geeklog file download class library.                                      |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2002-2008 by the following authors:                         |
+// | Copyright (C) 2002-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: downloader.class.php,v 1.15 2008/08/11 14:11:21 dhaun Exp $
 
 /**
 * This class allows you to download a file from outside the web tree.  Many
@@ -104,7 +102,6 @@
         $this->_limitByIP = false;
 
         $this->_setAvailableExtensions ();
-
     }
 
     // PRIVATE METHODS
@@ -232,11 +229,11 @@
     // Public Methods
 
     /**
-    * Extra security option that forces all attempts to upload a file to be done
-    * so from a set of VERY specific IP's.  This is only good for those who are
-    * paranoid
+    * Extra security option that forces all attempts to download a file to be
+    * done so from a set of VERY specific IP's.  This is only good for those
+    * who are paranoid
     *
-    * @param    $array      $validIPS   Array of valid IP addresses to allow file uploads from
+    * @param    array       $validIPS   Array of valid IP addresses to allow file uploads from
     * @return   boolean     returns true on success otherwise false
     *
     */
@@ -255,8 +252,8 @@
     /**
     * Sets log file
     *
-    * @param        string      $fileName       fully qualified path to log files
-    * @return       boolean     true on success otherwise false
+    * @param        string      $logFile    fully qualified path to log files
+    * @return       boolean                 true on success otherwise false
     *
     */
     function setLogFile($logFile = '')
@@ -360,7 +357,7 @@
     }
 
     /**
-    * This function will print any debmug messages out.
+    * This function will print any debug messages out.
     *
     */
     function printDebugMsgs()
@@ -393,7 +390,7 @@
     /**
     * Sets allowed mime types for this instance
     *
-    * @param    array       $allowedMimeTypes   Array of allowed mime types
+    * @param  array  $validExtensions  Array of allowed extensions and mime types
     *
     */
     function setAllowedExtensions($validExtensions = array())
@@ -476,7 +473,7 @@
     /**
     * Attempts to dowload a file
     *
-    * @param    $string     $fileName       file to download without path
+    * @param    string      $fileName       file to download without path
     * @return   boolean     true on success otherwise false
     *
     */
diff -r be6712ba04de -r f0fc9736cfc6 system/classes/upload.class.php
--- a/system/classes/upload.class.php	Mon Mar 30 10:07:26 2009 +0200
+++ b/system/classes/upload.class.php	Mon Mar 30 13:14:42 2009 +0200
@@ -756,7 +756,7 @@
     }
 
     /**
-    * Sets the path to where the mogrify ImageMagic function is
+    * Sets the path to where the mogrify ImageMagick function is
     *
     * @param     string    $path_to_mogrify    Absolute path to mogrify
     * @return    boolean   True if set, false otherwise
@@ -932,7 +932,7 @@
     /**
     * Sets log file
     *
-    * @param    string  $fileName   fully qualified path to log files
+    * @param    string  $logFile    fully qualified path to log files
     * @return   boolean returns true if we set the log file, otherwise false
     *
     */
@@ -1053,7 +1053,7 @@
     }
 
     /**
-    * This function will print any debmug messages out.
+    * This function will print any debug messages out.
     *
     */
     function printDebugMsgs()

From geeklog-cvs at lists.geeklog.net  Mon Mar 30 14:43:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 30 Mar 2009 14:43:09 -0400
Subject: [geeklog-cvs] geeklog: Fernando Munoz reported a possible XSS in
	the query for...
Message-ID: <hg.e8be41d4f5d1.1238438589.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e8be41d4f5d1
changeset: 6877:e8be41d4f5d1
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Mar 30 19:56:28 2009 +0200
description:
Fernando Munoz reported a possible XSS in the query form on most admin panels (bug #0000841).

diffstat:

5 files changed, 19 insertions(+), 5 deletions(-)
public_html/admin/install/index.php |    2 +-
public_html/docs/changes.html       |    5 +++++
public_html/docs/history            |    9 +++++++++
public_html/siteconfig.php.dist     |    2 +-
system/lib-admin.php                |    6 +++---

diffs (86 lines):

diff -r f8fe2b0d0c69 -r e8be41d4f5d1 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Feb 08 18:28:01 2009 +0100
+++ b/public_html/admin/install/index.php	Mon Mar 30 19:56:28 2009 +0200
@@ -48,7 +48,7 @@
     define("LB", "\n");
 }
 if (!defined('VERSION')) {
-    define('VERSION', '1.5.2');
+    define('VERSION', '1.5.2sr1');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r f8fe2b0d0c69 -r e8be41d4f5d1 public_html/docs/changes.html
--- a/public_html/docs/changes.html	Sun Feb 08 18:28:01 2009 +0100
+++ b/public_html/docs/changes.html	Mon Mar 30 19:56:28 2009 +0200
@@ -15,6 +15,11 @@
 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="changes152sr1">Geeklog 1.5.2sr1</a></h2>
+
+<p>Fernando Mu&ntilde;oz reported a possible <a href="http://en.wikipedia.org/wiki/XSS" title="Click to look up 'XSS' on Wikipedia" style="text-decoration: none; color: black; border-bottom: 1px dotted black;">XSS</a> in the query form on most admin panels that we are fixing with this release.</p>
+
 
 <h2><a name="changes152">Geeklog 1.5.2</a></h2>
 
diff -r f8fe2b0d0c69 -r e8be41d4f5d1 public_html/docs/history
--- a/public_html/docs/history	Sun Feb 08 18:28:01 2009 +0100
+++ b/public_html/docs/history	Mon Mar 30 19:56:28 2009 +0200
@@ -1,4 +1,13 @@
 Geeklog History/Changes:
+
+Mar 30, 2009 (1.5.2sr1)
+------------
+
+This release addresses the following security issue:
+
+Fernando Munoz reported a possible XSS in the query form on most admin panels
+that we are fixing with this release (bug #0000841).
+
 
 Feb 8, 2009 (1.5.2)
 -----------
diff -r f8fe2b0d0c69 -r e8be41d4f5d1 public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist	Sun Feb 08 18:28:01 2009 +0100
+++ b/public_html/siteconfig.php.dist	Mon Mar 30 19:56:28 2009 +0200
@@ -38,7 +38,7 @@
   define('LB',"\n");
 }
 if (!defined('VERSION')) {
-  define('VERSION', '1.5.2');
+  define('VERSION', '1.5.2sr1');
 }
 
 ?>
diff -r f8fe2b0d0c69 -r e8be41d4f5d1 system/lib-admin.php
--- a/system/lib-admin.php	Sun Feb 08 18:28:01 2009 +0100
+++ b/system/lib-admin.php	Mon Mar 30 19:56:28 2009 +0200
@@ -221,7 +221,7 @@
 
     $query = '';
     if (isset ($_REQUEST['q'])) { # get query (text-search)
-        $query = $_REQUEST['q'];
+        $query = strip_tags(COM_stripslashes($_REQUEST['q']));
     }
 
     $query_limit = "";
@@ -317,7 +317,7 @@
         $admin_templates->set_var('lang_search', $LANG_ADMIN['search']);
         $admin_templates->set_var('lang_submit', $LANG_ADMIN['submit']);
         $admin_templates->set_var('lang_limit_results', $LANG_ADMIN['limit_results']);
-        $admin_templates->set_var('last_query', COM_applyFilter($query));
+        $admin_templates->set_var('last_query', htmlspecialchars($query));
         $admin_templates->set_var('filter', $filter);
     }
 
@@ -398,7 +398,7 @@
                 $th_subtags .= '&amp;' . $component . 'listpage=' . $page;
             }
             if (!empty ($query)) {
-                $th_subtags .= '&amp;q=' . $query;
+                $th_subtags .= '&amp;q=' . urlencode($query);
             }
             if (!empty ($query_limit)) {
                 $th_subtags .= '&amp;query_limit=' . $query_limit;

From geeklog-cvs at lists.geeklog.net  Mon Mar 30 14:43:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 30 Mar 2009 14:43:09 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_5_2sr1 for changeset
	e8be41d4f5d1
Message-ID: <hg.d7bb5b8d4145.1238438589.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d7bb5b8d4145
changeset: 6878:d7bb5b8d4145
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Mar 30 20:42:58 2009 +0200
description:
Added tag geeklog_1_5_2sr1 for changeset e8be41d4f5d1

diffstat:

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

diffs (8 lines):

diff -r e8be41d4f5d1 -r d7bb5b8d4145 .hgtags
--- a/.hgtags	Mon Mar 30 19:56:28 2009 +0200
+++ b/.hgtags	Mon Mar 30 20:42:58 2009 +0200
@@ -2,3 +2,4 @@
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
 b3eeb545eec477cc120336f895e31a34fd64a486 geeklog_1_5_2rc1
 70c2ed57cfa5808ee0859f113dfa77d867720b5c geeklog_1_5_2_stable
+e8be41d4f5d184142659a2d74b15e400e8c542a7 geeklog_1_5_2sr1

From geeklog-cvs at lists.geeklog.net  Mon Mar 30 19:32:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 30 Mar 2009 19:32:14 -0400
Subject: [geeklog-cvs] geeklog: Fixed sql injection exploit with the
	listfactory class
Message-ID: <hg.5bd37d01b2d5.1238455934.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5bd37d01b2d5
changeset: 6879:5bd37d01b2d5
user:      Sami Barakat
date:      Tue Mar 31 00:30:44 2009 +0100
description:
Fixed sql injection exploit with the listfactory class

diffstat:

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

diffs (25 lines):

diff -r f0fc9736cfc6 -r 5bd37d01b2d5 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Mon Mar 30 13:14:42 2009 +0200
+++ b/system/classes/listfactory.class.php	Tue Mar 31 00:30:44 2009 +0100
@@ -354,7 +354,11 @@
     {
         // Get the details for sorting the list
         $this->_sort_arr['field'] = isset($_REQUEST['order']) ? COM_applyFilter($_REQUEST['order']) : $this->_def_sort_arr['field'];
-        $this->_sort_arr['direction'] = isset($_REQUEST['direction']) ? COM_applyFilter($_REQUEST['direction']) : $this->_def_sort_arr['direction'];
+        if (isset($_REQUEST['direction']))
+            $this->_sort_arr['direction'] = $_REQUEST['direction'] == 'asc' ? 'asc' : 'desc';
+        else
+            $this->_sort_arr['direction'] = $this->_def_sort_arr['direction'];
+
         if (is_numeric($this->_sort_arr['field']))
         {
             $ord = $this->_def_sort_arr['field'];
@@ -364,7 +368,7 @@
         {
             $ord = $this->_sort_arr['field'];
         }
-        $order_sql = ' ORDER BY ' . $ord . ' ' . strtoupper($this->_sort_arr['direction']);
+        $order_sql = ' ORDER BY "' . addslashes($ord) . '" ' . strtoupper($this->_sort_arr['direction']);
 
         $this->_page = isset($_REQUEST['page']) ? COM_applyFilter($_REQUEST['page'], true) : 1;
         if (isset($_REQUEST['results'])) {

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 05:02:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 05:02:17 -0400
Subject: [geeklog-cvs] tools: Geeklog 1.5.2sr1 is the current version now
Message-ID: <hg.63121fb1dc48.1238490137.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/63121fb1dc48
changeset: 28:63121fb1dc48
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Mar 31 11:01:58 2009 +0200
description:
Geeklog 1.5.2sr1 is the current version now

diffstat:

1 file changed, 13 insertions(+), 10 deletions(-)
versionchecker/versionchecker.php |   23 +++++++++++++----------

diffs (41 lines):

diff -r 70341d2869a3 -r 63121fb1dc48 versionchecker/versionchecker.php
--- a/versionchecker/versionchecker.php	Tue Mar 31 10:59:24 2009 +0200
+++ b/versionchecker/versionchecker.php	Tue Mar 31 11:01:58 2009 +0200
@@ -9,7 +9,7 @@
 <p align="left"><a href="http://www.geeklog.net/" title="go to the Geeklog homepage"><img src="http://www.geeklog.net/docs/images/newlogo.gif" alt="" width="243" height="90" border="0"></a></p>
 <?php
 
-$current = '1.5.2';
+$current = '1.5.2sr1';
 $version = '';
 if (isset ($_GET['version'])) {
     $version = strip_tags ($_GET['version']);
@@ -31,16 +31,19 @@
     '1.3.11sr6' => '1.3.11sr7-1',
     '1.3.11sr7' => '1.3.11sr7-1',
 */
-    '1.4.0'     => '1.4.0sr6',
-    '1.4.0sr1'  => '1.4.0sr6',
-    '1.4.0sr2'  => '1.4.0sr5',
-    '1.4.0sr3'  => '1.4.0sr6',
-    '1.4.0sr4'  => '1.4.0sr6',
-    '1.4.0sr5'  => '1.4.0sr6',
-    '1.4.0sr5-1' => '1.4.0sr6',
+    '1.4.0'     => '1.5.2sr1',
+    '1.4.0sr1'  => '1.5.2sr1',
+    '1.4.0sr2'  => '1.5.2sr1',
+    '1.4.0sr3'  => '1.5.2sr1',
+    '1.4.0sr4'  => '1.5.2sr1',
+    '1.4.0sr5'  => '1.5.2sr1',
+    '1.4.0sr5-1' => '1.5.2sr1',
+    '1.4.0sr6'  => '1.5.2sr1',
+    '1.4.1'     => '1.5.2sr1',
 
-    '1.5.0'     => '1.5.2',
-    '1.5.1'     => '1.5.2'
+    '1.5.0'     => '1.5.2sr1',
+    '1.5.1'     => '1.5.2sr1',
+    '1.5.2'     => '1.5.2sr1'
 );
 
 $v = explode ('.', $version);

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 05:02:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 05:02:17 -0400
Subject: [geeklog-cvs] tools: Had to put the rm commands to remove the
	incomplete PDF g...
Message-ID: <hg.70341d2869a3.1238490137.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/70341d2869a3
changeset: 27:70341d2869a3
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Mar 31 10:59:24 2009 +0200
description:
Had to put the rm commands to remove the incomplete PDF generator from the distribution back in for the 1.5.2sr1 release

diffstat:

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

diffs (14 lines):

diff -r c50d62875764 -r 70341d2869a3 ship/mkdist.sh
--- a/ship/mkdist.sh	Sun Mar 08 18:26:17 2009 +0100
+++ b/ship/mkdist.sh	Tue Mar 31 10:59:24 2009 +0200
@@ -67,6 +67,10 @@
 rm -f plugins/staticpages/buildpackage.php
 rm -rf system/build
 
+rm -rf pdfs
+rm -f public_html/pdfgenerator.php
+rm -rf public_html/layout/professional/pdfgenerator
+
 # about time we clean up the install directory ...
 rm -f public_html/admin/install/addindex.php
 

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 10:52:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 10:52:28 -0400
Subject: [geeklog-cvs] geeklog: Zip/Tar Unpacker
Message-ID: <hg.15db5ecc0f2d.1238511148.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/15db5ecc0f2d
changeset: 6880:15db5ecc0f2d
user:      jcarlson <justin.carlson at gmail.com>
date:      Tue Mar 31 09:47:35 2009 -0500
description:
Zip/Tar Unpacker

diffstat:

1 file changed, 457 insertions(+)
system/classes/unpacker.class.php |  457 +++++++++++++++++++++++++++++++++++++

diffs (truncated from 462 to 300 lines):

diff -r 5bd37d01b2d5 -r 15db5ecc0f2d system/classes/unpacker.class.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/classes/unpacker.class.php	Tue Mar 31 09:47:35 2009 -0500
@@ -0,0 +1,457 @@
+<?php
+
+/*Reminder: always indent with 4 spaces (no tabs). */
+//+---------------------------------------------------------------------------+
+//| Geeklog 1.6                                                               |
+//+---------------------------------------------------------------------------+
+//| unpacker.php                                                              |
+//|                                                                           |
+//| unpacker - archive libs wrapper                                           |
+//| This class wraps calls to pecl Zip, pear Zip, pear Tar, using the best    |
+//| package available to unpack or list information about the archive.        |
+//+---------------------------------------------------------------------------+
+//| Copyright (C) 2009 by the following authors:                              |
+//|                                                                           |
+//| Authors: Justin Carlson        - justin DOT carlson 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.           |
+//|                                                                           |
+//+---------------------------------------------------------------------------+
+
+
+/**
+ * geeklog plugin unpacker - Archive Libs Wrapper
+ * 
+ * This class wraps calls to pecl Zip, pear Zip, pear Tar, using the best 
+ * package available to unpack or list information about the archive.
+ * 
+ * @author Justin Carlson <justin DOT carlson AT gmail DOT com>
+ * 
+ */
+class unpacker {
+    
+    // mime types ( these are not very reliable, varies browser to browser )
+    // for the best results, pass the real filename as well as the mime type
+    var $mime_def = array('application/zip' => 'zip', 'application/x-zip' => 'zip', 'application/x-zip-compressed' => 'zip', 'multipart/x-zip' => 'zip', 'application/gzip' => 'tar', 'application/tar' => 'tar', 'application/x-tar' => 'tar', 'application/x-gzip' => 'tar', 'application/octet-stream' => 'tar', 'application/x-compress' => 'tar', 'application/x-compressed' => 'tar');
+    
+    var $file = null; // archive name 
+    var $filesize = null; // archive size (in bytes)
+    var $ext = null; // archive ext 
+    var $contents = null; // archive contents 
+    var $archive = null; // archive resource handle
+    var $errorno = null; // error number ( set when returned false )
+    var $error = null; // error text ( set when returned false )
+    var $u_size = null; // uncompressed archive size 
+    var $d_sep = null; // directory separator default
+    var $type = null; // archive type  
+    var $comp = null; // archive compression type (private)
+
+    
+    /**
+     * Constructor
+     * 
+     * @param string $file full path to archive
+     * @param string $optional_type mime type ( application/zip, /tar, etc )
+     * @return bool $success result of loading archive passed
+     */
+    function unpacker($file, $mime_type = null) {
+
+        // default directory separator
+        if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+            $this->d_sep = '\\';
+        } else {
+            $this->d_sep = '/';
+        }
+        
+        // if the file doesn't have it's path, assume local
+        if (! strstr($file, $this->d_sep)) {
+            $file = getcwd() . $this->d_sep . $file;
+        }
+        
+        // make sure the file exists
+        if (file_exists($file)) {
+            
+            // copy vars
+            $this->file = $file;
+            $this->filesize = filesize($file);
+            $this->ext = strtolower(substr($file, - 4));
+            
+            // if the type is passed, store it
+            if ($mime_type != null) {
+                
+                if (isset($this->mime_def[$mime_type])) {
+                    $this->type = $this->mime_def[$mime_type];
+                } else {
+                    return $this->setError('400', 'Invalid MIME Type');
+                }
+            
+            }
+            
+            if ($this->type == null || $this->type == 'other') {
+                
+                // if a known mime type was not provided, expect real filename
+                // mime types are not reliable so this is the reccommended way
+                // for example: unpacker($_FILES['foo']['name'],$type); 
+                // .tar, .tgz, .tar.gz, .tar.bz2, and .tar.bz are supported
+                if ($this->ext == 'r.gz' || $this->ext == '.tgz') {
+                    $this->type = 'tar';
+                    $this->comp = 'gz';
+                } elseif ($this->ext == 'r.bz' || $this->ext == '.bz2') {
+                    $this->type = 'tar';
+                    $this->comp = 'bz2';
+                } else {
+                    $this->type = str_replace('.', '', $this->ext);
+                }
+                
+                // see if we know of a mime type for this ext
+                if (in_array($this->type, $this->mime_def) === false) {
+                    return $this->setError('400', 'Invalid File Extension');
+                }
+            }
+            
+            // call the load wrapper, return result
+            return $this->load_file();
+        
+        } else {
+            // file did not exist
+            return false;
+        }
+    
+    }
+
+    /**
+     * Open - Constructor Wrapper
+     * This clears the vars and loads another file.
+     * ( May never be used )
+     * 
+     * @param string $file full path to archive
+     * @param string $optional_type mime type ( application/zip, /tar, etc )
+     * @return bool $success result of loading archive passed
+     */
+    function open($file, $optional_type = false) {
+
+        $this->ext = null;
+        $this->file = null;
+        $this->filesize = null;
+        $this->contents = null;
+        $this->archive = null;
+        $this->errorno = null;
+        $this->error = null;
+        $this->u_size = null;
+        $this->d_sep = null;
+        $this->type = null;
+        return $this->unpacker($file, $optional_type);
+    }
+
+    /**
+     * 
+     * Decides which loader to call, or returns false if one isn't found.
+     * 
+     * @return bool $success result of loading archive passed
+     */
+    function load_file() {
+
+        $handler = 'load_' . $this->type;
+        if (method_exists($this, $handler)) {
+            return $this->$handler();
+        } else {
+            return $this->setError('406', 'Unacceptable archive.');
+        }
+    }
+
+    /**
+     * load a zip archive
+     * 
+     * @return bool $success result of loading archive passed
+     */
+    function load_zip() {
+
+        if (function_exists('zip_open')) {
+            
+            // Use PECL ZIP
+            $this->archive = new ZipArchive();
+            $result = $this->archive->open($this->file);
+            if ($result === false) {
+                return $this->setError($result, 'ZipArchive Error');
+            }
+        
+        } else {
+            
+            // use Pear Archive_Zip     
+            require_once 'Archive/Zip.php';
+            $this->archive = new Archive_Zip($this->file);
+            // unfortunaty, we can't tell if it succeeded
+        
+
+        }
+        
+        // return resource handle or result
+        return true;
+    }
+
+    /**
+     * load a tar archive
+     * 
+     * @return bool $success result of loading archive passed
+     */
+    function load_tar() {
+
+        // use Pear Archive_Tar 
+        require_once 'Archive/Tar.php';
+        $this->archive = new Archive_Tar($this->file, $this->comp);
+        
+        // unfortunaty, we can't tell if it succeeded
+        return ($this->archive);
+    
+    }
+
+    /**
+     * return contents of archive (wrapper)
+     * 
+     * @return array(array('filename','size','etc')) archive contents
+     */
+    function getlist() {
+
+        // see if content are cached
+        if (is_array($this->contents)) {
+            return $this->contents;
+        }        
+        
+        // not cached, load and cache the content list
+        $handler = 'list_' . $this->type;
+        if (method_exists($this, $handler)) {
+            $this->contents = $this->$handler();
+            return $this->contents;
+        } else {
+            return $this->setError('405', 'Unpacker called getlist ' . 'with unknown handler.');
+        }
+    
+    }
+
+    /**
+     * return contents of zip archive
+     * 
+     * @return array(array('filename','size','etc')) archive contents
+     */
+    function list_zip() {
+
+        // using PECL::ZipArchive
+        if (function_exists('zip_open')) {
+            
+            // catch empty archive
+            if ($this->archive->numFiles < 1) {
+                return $this->setError('411', 'Archive is empty.');
+            }
+            
+            // reset cache
+            $this->contents = array();
+            for ($i = 0; $i < $this->archive->numFiles; $i ++) {
+                
+                // Make ZipArchive's info look like Archive_Zip's 
+                $zip_entry = $this->archive->statIndex($i);
+                $this->contents[$i]['filename'] = $zip_entry['name'];
+                $this->contents[$i]['size'] = $zip_entry['size'];
+                $this->contents[$i]['compressed'] = $zip_entry['comp_size'];
+                $this->contents[$i]['method'] = $zip_entry['comp_method'];
+            
+            }
+            // return the contents list            
+            return $this->contents;
+            
+        // using PEAR::Archive_Zip
+        } else {
+            
+            $this->contents = $this->archive->listContent();
+            if (is_array($this->contents)) {
+                return $this->contents;
+            } else {
+                return $this->setError('411', 'Archive is empty.');
+            }
+        
+        }
+    }
+
+    /**
+     * return contents of tar archive
+     * 
+     * @return array(array('filename','size','etc')) archive contents
+     */
+    function list_tar() {
+
+        $this->contents = $this->archive->listContent();
+        if (is_array($this->contents)) {
+            return $this->contents;

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 11:02:07 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 11:02:07 -0400
Subject: [geeklog-cvs] geeklog: Spelling, Formatting
Message-ID: <hg.c0bb15d51a63.1238511727.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c0bb15d51a63
changeset: 6881:c0bb15d51a63
user:      jcarlson <justin.carlson at gmail.com>
date:      Tue Mar 31 10:01:30 2009 -0500
description:
Spelling, Formatting

diffstat:

1 file changed, 13 insertions(+), 3 deletions(-)
system/classes/unpacker.class.php |   16 +++++++++++++---

diffs (40 lines):

diff -r 15db5ecc0f2d -r c0bb15d51a63 system/classes/unpacker.class.php
--- a/system/classes/unpacker.class.php	Tue Mar 31 09:47:35 2009 -0500
+++ b/system/classes/unpacker.class.php	Tue Mar 31 10:01:30 2009 -0500
@@ -45,7 +45,17 @@
     
     // mime types ( these are not very reliable, varies browser to browser )
     // for the best results, pass the real filename as well as the mime type
-    var $mime_def = array('application/zip' => 'zip', 'application/x-zip' => 'zip', 'application/x-zip-compressed' => 'zip', 'multipart/x-zip' => 'zip', 'application/gzip' => 'tar', 'application/tar' => 'tar', 'application/x-tar' => 'tar', 'application/x-gzip' => 'tar', 'application/octet-stream' => 'tar', 'application/x-compress' => 'tar', 'application/x-compressed' => 'tar');
+    var $mime_def = array('application/zip'              => 'zip',
+    					  'application/x-zip'            => 'zip',
+    					  'application/x-zip-compressed' => 'zip',
+    					  'multipart/x-zip'              => 'zip',
+    					  'application/gzip'             => 'tar',
+    					  'application/tar'              => 'tar',
+    					  'application/x-tar'            => 'tar',
+    					  'application/x-gzip'           => 'tar',
+    					  'application/octet-stream'     => 'tar',
+    					  'application/x-compress'       => 'tar',
+    					  'application/x-compressed'     => 'tar');
     
     var $file = null; // archive name 
     var $filesize = null; // archive size (in bytes)
@@ -193,7 +203,7 @@
             // use Pear Archive_Zip     
             require_once 'Archive/Zip.php';
             $this->archive = new Archive_Zip($this->file);
-            // unfortunaty, we can't tell if it succeeded
+            // unfortunately, we can't tell if it succeeded
         
 
         }
@@ -213,7 +223,7 @@
         require_once 'Archive/Tar.php';
         $this->archive = new Archive_Tar($this->file, $this->comp);
         
-        // unfortunaty, we can't tell if it succeeded
+        // unfortunately, we can't tell if it succeeded
         return ($this->archive);
     
     }

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 14:40:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 14:40:19 -0400
Subject: [geeklog-cvs] geeklog: Another tar variation
Message-ID: <hg.0ee08cd12a7f.1238524819.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0ee08cd12a7f
changeset: 6882:0ee08cd12a7f
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Mar 31 20:35:56 2009 +0200
description:
Another tar variation

diffstat:

1 file changed, 2 insertions(+), 1 deletion(-)
system/classes/unpacker.class.php |    3 ++-

diffs (18 lines):

diff -r c0bb15d51a63 -r 0ee08cd12a7f system/classes/unpacker.class.php
--- a/system/classes/unpacker.class.php	Tue Mar 31 10:01:30 2009 -0500
+++ b/system/classes/unpacker.class.php	Tue Mar 31 20:35:56 2009 +0200
@@ -52,6 +52,7 @@
     					  'application/gzip'             => 'tar',
     					  'application/tar'              => 'tar',
     					  'application/x-tar'            => 'tar',
+    					  'application/x-gtar'           => 'tar',
     					  'application/x-gzip'           => 'tar',
     					  'application/octet-stream'     => 'tar',
     					  'application/x-compress'       => 'tar',
@@ -464,4 +465,4 @@
     }
 
 }
-?>
\ No newline at end of file
+?>

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 14:40:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 14:40:20 -0400
Subject: [geeklog-cvs] geeklog: Added Geeklog 1.5.2sr1 to the changelog
Message-ID: <hg.8effbffba587.1238524820.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8effbffba587
changeset: 6883:8effbffba587
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Mar 31 20:39:43 2009 +0200
description:
Added Geeklog 1.5.2sr1 to the changelog

diffstat:

2 files changed, 14 insertions(+)
public_html/docs/changes.html |    5 +++++
public_html/docs/history      |    9 +++++++++

diffs (34 lines):

diff -r 0ee08cd12a7f -r 8effbffba587 public_html/docs/changes.html
--- a/public_html/docs/changes.html	Tue Mar 31 20:35:56 2009 +0200
+++ b/public_html/docs/changes.html	Tue Mar 31 20:39:43 2009 +0200
@@ -35,6 +35,11 @@
 <li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP 4 in August 2008, you should be
 looking into upgrading to PHP 5 anyway.</li>
 </ul>
+
+
+<h2><a name="changes152sr1">Geeklog 1.5.2sr1</a></h2>
+
+<p>Fernando Mu&ntilde;oz reported a possible <a href="http://en.wikipedia.org/wiki/XSS" title="Click to look up 'XSS' on Wikipedia" style="text-decoration: none; color: black; border-bottom: 1px dotted black;">XSS</a> in the query form on most admin panels that we are fixing with this release.</p>
 
 
 <h2><a name="changes152">Geeklog 1.5.2</a></h2>
diff -r 0ee08cd12a7f -r 8effbffba587 public_html/docs/history
--- a/public_html/docs/history	Tue Mar 31 20:35:56 2009 +0200
+++ b/public_html/docs/history	Tue Mar 31 20:39:43 2009 +0200
@@ -128,6 +128,15 @@
   now [Dirk]
 - Display "successfully saved" and "successfully deleted" messages, just like
   every other plugin and built-in function does (bug #0000644) [Dirk]
+
+ 
+Mar 30, 2009 (1.5.2sr1)
+------------
+
+This release addresses the following security issue:
+
+Fernando Munoz reported a possible XSS in the query form on most admin panels
+that we are fixing with this release (bug #0000841).
 
 
 Feb 8, 2009 (1.5.2)

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 18:47:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 18:47:59 -0400
Subject: [geeklog-cvs] geeklog: Changing $_REQUEST to $_GET in the search
	engine
Message-ID: <hg.c641bc40ac18.1238539679.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c641bc40ac18
changeset: 6884:c641bc40ac18
user:      Sami Barakat
date:      Tue Mar 31 21:45:20 2009 +0100
description:
Changing $_REQUEST to $_GET in the search engine

diffstat:

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

diffs (83 lines):

diff -r 8effbffba587 -r c641bc40ac18 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Tue Mar 31 20:39:43 2009 +0200
+++ b/system/classes/listfactory.class.php	Tue Mar 31 21:45:20 2009 +0100
@@ -353,9 +353,9 @@
     function ExecuteQueries()
     {
         // Get the details for sorting the list
-        $this->_sort_arr['field'] = isset($_REQUEST['order']) ? COM_applyFilter($_REQUEST['order']) : $this->_def_sort_arr['field'];
-        if (isset($_REQUEST['direction']))
-            $this->_sort_arr['direction'] = $_REQUEST['direction'] == 'asc' ? 'asc' : 'desc';
+        $this->_sort_arr['field'] = isset($_GET['order']) ? COM_applyFilter($_GET['order']) : $this->_def_sort_arr['field'];
+        if (isset($_GET['direction']))
+            $this->_sort_arr['direction'] = $_GET['direction'] == 'asc' ? 'asc' : 'desc';
         else
             $this->_sort_arr['direction'] = $this->_def_sort_arr['direction'];
 
@@ -370,9 +370,9 @@
         }
         $order_sql = ' ORDER BY "' . addslashes($ord) . '" ' . strtoupper($this->_sort_arr['direction']);
 
-        $this->_page = isset($_REQUEST['page']) ? COM_applyFilter($_REQUEST['page'], true) : 1;
-        if (isset($_REQUEST['results'])) {
-            $this->_per_page = COM_applyFilter($_REQUEST['results'], true);
+        $this->_page = isset($_GET['page']) ? COM_applyFilter($_GET['page'], true) : 1;
+        if (isset($_GET['results'])) {
+            $this->_per_page = COM_applyFilter($_GET['results'], true);
         }
 
         // Calculate the limits for each query
diff -r 8effbffba587 -r c641bc40ac18 system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Mar 31 20:39:43 2009 +0200
+++ b/system/classes/search.class.php	Tue Mar 31 21:45:20 2009 +0100
@@ -75,20 +75,20 @@
         global $_CONF, $_TABLES;
 
         // Set search criteria
-        if (isset ($_REQUEST['query'])) {
-            $this->_query = strip_tags (COM_stripslashes ($_REQUEST['query']));
+        if (isset ($_GET['query'])) {
+            $this->_query = strip_tags (COM_stripslashes ($_GET['query']));
         }
-        if (isset ($_REQUEST['topic'])) {
-            $this->_topic = COM_applyFilter ($_REQUEST['topic']);
+        if (isset ($_GET['topic'])) {
+            $this->_topic = COM_applyFilter ($_GET['topic']);
         }
-        if (isset ($_REQUEST['datestart'])) {
-            $this->_dateStart = COM_applyFilter ($_REQUEST['datestart']);
+        if (isset ($_GET['datestart'])) {
+            $this->_dateStart = COM_applyFilter ($_GET['datestart']);
         }
-        if (isset ($_REQUEST['dateend'])) {
-            $this->_dateEnd = COM_applyFilter ($_REQUEST['dateend']);
+        if (isset ($_GET['dateend'])) {
+            $this->_dateEnd = COM_applyFilter ($_GET['dateend']);
         }
-        if (isset ($_REQUEST['author'])) {
-            $this->_author = COM_applyFilter($_REQUEST['author']);
+        if (isset ($_GET['author'])) {
+            $this->_author = COM_applyFilter($_GET['author']);
 
             // In case we got a username instead of uid, convert it.  This should
             // make custom themes for search page easier.
@@ -100,8 +100,8 @@
                 $this->_author = '';
             }
         }
-        $this->_type = isset($_REQUEST['type']) ? COM_applyFilter($_REQUEST['type']) : 'all';
-        $this->_keyType = isset($_REQUEST['keyType']) ? COM_applyFilter($_REQUEST['keyType']) : $_CONF['search_def_keytype'];
+        $this->_type = isset($_GET['type']) ? COM_applyFilter($_GET['type']) : 'all';
+        $this->_keyType = isset($_GET['keyType']) ? COM_applyFilter($_GET['keyType']) : $_CONF['search_def_keytype'];
     }
 
     /**
@@ -532,7 +532,7 @@
         $searchtimer->startTimer();
 
         // Have plugins do their searches
-        $page = isset($_REQUEST['page']) ? COM_applyFilter($_REQUEST['page'], true) : 1;
+        $page = isset($_GET['page']) ? COM_applyFilter($_GET['page'], true) : 1;
         $result_plugins = PLG_doSearch($this->_query, $this->_dateStart, $this->_dateEnd, $this->_topic, $this->_type, $this->_author, $this->_keyType, $page, 5);
 
         // Add core searches

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 18:47:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 18:47:59 -0400
Subject: [geeklog-cvs] geeklog: Search now uses pre-existing $_CONF
	variables instead o...
Message-ID: <hg.798b4a89704c.1238539679.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/798b4a89704c
changeset: 6885:798b4a89704c
user:      Sami Barakat
date:      Tue Mar 31 23:45:11 2009 +0100
description:
Search now uses pre-existing $_CONF variables instead of its own (bug #0000839)

diffstat:

7 files changed, 2 insertions(+), 20 deletions(-)
language/english.php                         |    2 --
language/english_utf-8.php                   |    2 --
public_html/admin/install/config-install.php |    2 --
public_html/docs/config.html                 |    8 --------
sql/updates/mssql_1.5.2_to_1.6.0.php         |    2 --
sql/updates/mysql_1.5.2_to_1.6.0.php         |    2 --
system/classes/search.class.php              |    4 ++--

diffs (92 lines):

diff -r c641bc40ac18 -r 798b4a89704c language/english.php
--- a/language/english.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/language/english.php	Tue Mar 31 23:45:11 2009 +0100
@@ -1798,8 +1798,6 @@
     '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",
diff -r c641bc40ac18 -r 798b4a89704c language/english_utf-8.php
--- a/language/english_utf-8.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/language/english_utf-8.php	Tue Mar 31 23:45:11 2009 +0100
@@ -1798,8 +1798,6 @@
     '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",
diff -r c641bc40ac18 -r 798b4a89704c public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/public_html/admin/install/config-install.php	Tue Mar 31 23:45:11 2009 +0100
@@ -92,8 +92,6 @@
     $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);
diff -r c641bc40ac18 -r 798b4a89704c public_html/docs/config.html
--- a/public_html/docs/config.html	Tue Mar 31 21:45:20 2009 +0100
+++ b/public_html/docs/config.html	Tue Mar 31 23:45:11 2009 +0100
@@ -296,14 +296,6 @@
   <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>
diff -r c641bc40ac18 -r 798b4a89704c sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php	Tue Mar 31 23:45:11 2009 +0100
@@ -43,8 +43,6 @@
     $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);
diff -r c641bc40ac18 -r 798b4a89704c sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Tue Mar 31 23:45:11 2009 +0100
@@ -44,8 +44,6 @@
     $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);
diff -r c641bc40ac18 -r 798b4a89704c system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Mar 31 21:45:20 2009 +0100
+++ b/system/classes/search.class.php	Tue Mar 31 23:45:11 2009 +0100
@@ -493,8 +493,8 @@
 
         $show_num  = $_CONF['search_show_num'];
         $show_type = $_CONF['search_show_type'];
-        $show_user = $_CONF['search_show_user'];
-        $show_hits = $_CONF['search_show_hits'];
+        $show_user = $_CONF['contributedbyline'];
+        $show_hits = !$_CONF['hideviewscount'];
         $style = isset($_CONF['search_style']) ? $_CONF['search_style'] : 'google';
 
         if ($style == 'table')

From geeklog-cvs at lists.geeklog.net  Tue Mar 31 19:41:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 31 Mar 2009 19:41:29 -0400
Subject: [geeklog-cvs] geeklog: Implemented standard PHP callback function
	into the lis...
Message-ID: <hg.08364e03181e.1238542889.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/08364e03181e
changeset: 6886:08364e03181e
user:      Sami Barakat
date:      Wed Apr 01 00:39:22 2009 +0100
description:
Implemented standard PHP callback function into the listfactory, provided by jmucchiello (bug #0000755)

diffstat:

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

diffs (75 lines):

diff -r 798b4a89704c -r 08364e03181e system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Tue Mar 31 23:45:11 2009 +0100
+++ b/system/classes/listfactory.class.php	Wed Apr 01 00:39:22 2009 +0100
@@ -140,7 +140,6 @@
     var $_per_page = 0;
     var $_page_limits = array();
     var $_function = '';
-    var $_class_instance = null;
     var $_preset_rows = array();
     var $_page_url = '';
     var $_style = 'table';
@@ -230,14 +229,12 @@
     * Sets the callback function that gets called when formatting a row
     *
     * @access public
-    * @param string $function The name given to a call back function that can format the results
-    * @param object $inst The instance of the class that contains the function
+    * @param callback $function Any callable function, method or lambda
     *
     */
-    function setRowFunction( $function, $inst = null )
+    function setRowFunction( $callback )
     {
-        $this->_function = $function;
-        $this->_class_instance = $inst;
+        $this->_function = $callback;
     }
 
     /**
@@ -430,14 +427,8 @@
 
                 // Need to call the format function before and after
                 // sorting the results.
-                $function = $this->_function;
-                if ($function != '')
-                {
-                    if (function_exists($function)) {
-                        $col = $function(true, $col);
-                    } else if ($this->_class_instance != null) {
-                        $col = $this->_class_instance->$function(true, $col);
-                    }
+                if (is_callable($this->_function)) {
+                    $col = call_user_func_array($this->_function, array(true, $col));
                 }
 
                 $rows_arr[] = $col;
@@ -587,14 +578,8 @@
         $r = 1;
         foreach ($rows_arr as $row)
         {
-            $function = $this->_function;
-            if ($function != '')
-            {
-                if (function_exists($function)) {
-                    $row = $function(false, $row);
-                } else if ($this->_class_instance != null) {
-                    $row = $this->_class_instance->$function(false, $row);
-                }
+            if (is_callable($this->_function)) {
+                $row = call_user_func_array($this->_function, array(false, $row));
             }
 
             foreach ($this->_fields as $field)
diff -r 798b4a89704c -r 08364e03181e system/classes/search.class.php
--- a/system/classes/search.class.php	Tue Mar 31 23:45:11 2009 +0100
+++ b/system/classes/search.class.php	Wed Apr 01 00:39:22 2009 +0100
@@ -487,7 +487,7 @@
 
         $url = "{$this->_searchURL}&amp;type={$this->_type}&amp;mode=";
         $obj = new ListFactory($url.'search', $_CONF['search_limits'], $_CONF['num_search_results']);
-        $obj->setRowFunction('searchFormatCallBack', $this);
+        $obj->setRowFunction(array($this, 'searchFormatCallBack'));
         $obj->setField('ID', 'id', false);
         $obj->setField('URL', 'url', false);