From geeklog-cvs at lists.geeklog.net  Fri May  1 03:33:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 03:33:46 -0400
Subject: [geeklog-cvs] geeklog: Fixed hard-coded drop-down for the number of
	search res...
Message-ID: <hg.570f7f58074a.1241163226.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/570f7f58074a
changeset: 7003:570f7f58074a
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 09:33:36 2009 +0200
description:
Fixed hard-coded drop-down for the number of search results per page

diffstat:

2 files changed, 13 insertions(+), 4 deletions(-)
public_html/docs/english/theme.html                     |   12 ++++++++++++
public_html/layout/professional/search/searchform.thtml |    5 +----

diffs (37 lines):

diff -r eaf8afaa2ef1 -r 570f7f58074a public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Thu Apr 30 23:23:42 2009 +0100
+++ b/public_html/docs/english/theme.html	Fri May 01 09:33:36 2009 +0200
@@ -244,6 +244,18 @@
     generated by Geeklog. The <tt>&lt;table&gt;</tt> that contained these
     elements has been removed from the template file.</li>
 </ul>
+
+<h3>Search</h3>
+
+<p>The templates for the search form and search results have been changed and
+new template files have been added for the new display modes of the search
+results. We suggest to replace the entire <tt>search</tt> subdirectory in your
+theme with a copy of the directory from the Professional theme as it ships
+with Geeklog.</p>
+
+<h3>Comments</h3>
+
+<p><i>TBD</i></p>
 
 <h3>Plugins</h3>
 
diff -r eaf8afaa2ef1 -r 570f7f58074a public_html/layout/professional/search/searchform.thtml
--- a/public_html/layout/professional/search/searchform.thtml	Thu Apr 30 23:23:42 2009 +0100
+++ b/public_html/layout/professional/search/searchform.thtml	Fri May 01 09:33:36 2009 +0200
@@ -44,10 +44,7 @@
                                         <td class="alignright">{lang_results}:</td>
                                         <td>
                                         <select name="results">
-                                            <option value="10" {10_selected}>10</option>
-                                            <option value="15" {15_selected}>15</option>
-                                            <option value="25" {25_selected}>25</option>
-                                            <option value="50" {50_selected}>50</option>
+                                            {search_limits}
                                         </select>&nbsp; {lang_per_page}</td>
                                     </tr>
                                     <tr>

From geeklog-cvs at lists.geeklog.net  Fri May  1 10:03:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 10:03:06 -0400
Subject: [geeklog-cvs] geeklog: New XMLSitemap plugin, provided by mystral-kk
Message-ID: <hg.fc202669ac90.1241186586.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fc202669ac90
changeset: 7005:fc202669ac90
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 11:23:44 2009 +0200
description:
New XMLSitemap plugin, provided by mystral-kk

diffstat:

11 files changed, 1682 insertions(+)
plugins/xmlsitemap/autoinstall.php             |  131 +++++
plugins/xmlsitemap/functions.inc               |  554 ++++++++++++++++++++++++
plugins/xmlsitemap/install_defaults.php        |  119 +++++
plugins/xmlsitemap/language/english.php        |   74 +++
plugins/xmlsitemap/language/english_utf-8.php  |   74 +++
plugins/xmlsitemap/language/japanese_utf-8.php |   74 +++
plugins/xmlsitemap/sql/mssql_install.php       |   49 ++
plugins/xmlsitemap/sql/mysql_install.php       |   49 ++
plugins/xmlsitemap/xmlsitemap.class.php        |  553 +++++++++++++++++++++++
public_html/docs/english/changes.html          |    3 
public_html/docs/history                       |    2 

diffs (truncated from 1738 to 300 lines):

diff -r 895386b8afcb -r fc202669ac90 plugins/xmlsitemap/autoinstall.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/xmlsitemap/autoinstall.php	Fri May 01 11:23:44 2009 +0200
@@ -0,0 +1,131 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | XMLSitemap Plugin 1.0                                                     |
+// +---------------------------------------------------------------------------+
+// | autoinstall.php                                                           |
+// |                                                                           |
+// | This file provides helper functions for the automatic plugin install.     |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Authors: Kenji ITO         - geeklog AT mystral-kk DOT net                |
+// |          Dirk Haun         - dirk AT haun-online DOT de                   |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is free software; you can redistribute it and/or             |
+// | modify it under the terms of the GNU General Public License               |
+// | as published by the Free Software Foundation; either version 2            |
+// | of the License, or (at your option) any later version.                    |
+// |                                                                           |
+// | This program is distributed in the hope that it will be useful,           |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
+// | GNU General Public License for more details.                              |
+// |                                                                           |
+// | You should have received a copy of the GNU General Public License         |
+// | along with this program; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* Autoinstall API functions for the XMLSitemap plugin
+*
+* @package XMLSitemap
+*/
+
+/**
+* Plugin autoinstall function
+*
+* @param    string  $pi_name    Plugin name
+* @return   array               Plugin information
+*
+*/
+function plugin_autoinstall_xmlsitemap($pi_name)
+{
+    $pi_name         = 'xmlsitemap';
+    $pi_display_name = 'XMLSitemap';
+    $pi_admin        = $pi_display_name . ' Admin';
+    $feature         = 'xmlsitemap.edit';
+    
+    $info = array(
+        'pi_name'         => $pi_name,
+        'pi_display_name' => $pi_display_name,
+        'pi_version'      => '1.0.0',
+        'pi_gl_version'   => '1.6.0',
+        'pi_homepage'     => 'http://www.geeklog.net/',
+    );
+    
+    $groups = array(
+        $pi_admin => 'Users in this group can administer the ' . $pi_display_name . ' plugin'
+    );
+    $features = array(
+        $feature => 'Access to ' . $pi_admin,
+    );
+    $mappings = array(
+        $feature => array($pi_admin),
+    );
+    $tables = array();
+    
+    $inst_parms = array(
+        'info'      => $info,
+        'groups'    => $groups,
+        'features'  => $features,
+        'mappings'  => $mappings,
+        'tables'    => $tables,
+    );
+    
+    return $inst_parms;
+}
+
+/**
+* Load plugin configuration from database
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             TRUE on success, otherwise FALSE
+* @see      plugin_initconfig_glsitemap
+*
+*/
+function plugin_load_configuration_xmlsitemap($pi_name)
+{
+    global $_CONF;
+    
+    $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
+    
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+    require_once $base_path . 'install_defaults.php';
+    
+    return plugin_initconfig_xmlsitemap();
+}
+
+/**
+* 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_xmlsitemap($pi_name)
+{
+    return function_exists('PLG_itemDeleted');
+}
+
+/**
+* Perform post-install operations
+*
+* @param    string  $pi_name    Plugin name
+* @return   boolean             TRUE: plugin compatible; FALSE: not compatible
+*/
+function plugin_postinstall_xmlsitemap($pi_name)
+{
+    global $_CONF, $_XMLSMAP_CONF;
+    
+    require_once $_CONF['path'] . 'plugins/xmlsitemap/functions.inc';
+    
+    // Create an XML sitemap for the first time
+    return XMLSMAP_update();
+}
+
+?>
diff -r 895386b8afcb -r fc202669ac90 plugins/xmlsitemap/functions.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/xmlsitemap/functions.inc	Fri May 01 11:23:44 2009 +0200
@@ -0,0 +1,554 @@
+<?php
+
+/* Reminder: always indent with 4 spaces (no tabs). */
+// +---------------------------------------------------------------------------+
+// | XMLSitemap Plugin 1.0                                                     |
+// +---------------------------------------------------------------------------+
+// | functions.inc                                                             |
+// |                                                                           |
+// | This file does two things: 1) it implements the necessary Geeklog Plugin  |
+// | API method and 2) implements all the common code needed by the Links      |
+// | Plugins' PHP files.                                                       |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2009 by the following authors:                              |
+// |                                                                           |
+// | Authors: Kenji ITO         - geeklog AT mystral-kk DOT net                |
+// |          Dirk Haun         - dirk AT haun-online DOT de                   |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | This program is free software; you can redistribute it and/or             |
+// | modify it under the terms of the GNU General Public License               |
+// | as published by the Free Software Foundation; either version 2            |
+// | of the License, or (at your option) any later version.                    |
+// |                                                                           |
+// | This program is distributed in the hope that it will be useful,           |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
+// | GNU General Public License for more details.                              |
+// |                                                                           |
+// | You should have received a copy of the GNU General Public License         |
+// | along with this program; if not, write to the Free Software Foundation,   |
+// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+
+/**
+* Implementation of the Plugin API for the XMLSitemap plugin
+*
+* @package XMLSitemap
+*/
+
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== FALSE) {
+    die ('This file can not be used on its own.');
+}
+
+/**
+* Language file Include
+*/
+$langfile = $_CONF['path'] . 'plugins/xmlsitemap/language/' . $_CONF['language'] . '.php';
+clearstatcache();
+if (file_exists($langfile)) {
+    include_once $langfile;
+} else {
+    include_once $_CONF['path'] . 'plugins/xmlsitemap/language/english.php';
+}
+
+/**
+* Load the plugin configuration
+*/
+$_XMLSMAP_CONF = XMLSMAP_loadConfig();
+
+// +---------------------------------------------------------------------------+
+// | Geeklog Plugin API Implementations                                        |
+// +---------------------------------------------------------------------------+
+
+/**
+* Return the version for this plugin
+*
+* @return string VersionNo
+*/
+function plugin_chkVersion_xmlsitemap()
+{
+    global $_CONF;
+    
+    require_once $_CONF['path'] . 'plugins/xmlsitemap/autoinstall.php';
+    
+    $inst_parms = plugin_autoinstall_xmlsitemap('xmlsitemap');
+    
+    return $inst_parms['info']['pi_version'];
+}
+
+/**
+* Upgrade the plugin
+*
+* @return   boolean TRUE (= success)
+*/
+function plugin_upgrade_xmlsitemap()
+{
+    global $_CONF, $_TABLES;
+    
+    $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
+                                    "pi_name = 'xmlsitemap'");
+    $code_version = plugin_chkVersion_xmlsitemap();
+    if ($installed_version == $code_version) {
+        // nothing to do
+        return TRUE;
+    }
+    
+    require_once $_CONF['path'] . 'plugins/xmlsitemap/autoinstall.php';
+    
+    if (! plugin_compatible_with_this_version_xmlsitemap('xmlsitemap')) {
+        return 3002;
+    }
+    
+    $inst_parms = plugin_autoinstall_xmlsitemap('xmlsitemap');
+    $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 = 'xmlsitemap'");
+    
+    return TRUE;
+}
+
+/**
+* Automatic uninstall function for plugins
+*
+* @return   array
+*/
+function plugin_autouninstall_xmlsitemap()
+{
+    global $_XMLSMAP_CONF;
+    
+    $out = array (
+        /* give the name of the tables, without $_TABLES[] */
+        'tables' => array(),
+        /* give the full name of the group, as in the db */
+        'groups' => array('XMLSitemap Admin'),
+        /* give the full name of the feature, as in the db */
+        'features' => array('xmlsitemap.edit'),
+        /* give the full name of the block, including 'phpblock_', etc */
+        'php_blocks' => array(),
+        /* give all vars with their name */
+        'vars' => array('xmlsitemap_filename', 'xmlsitemap_mobile'),
+    );
+    return $out;
+}
+
+/**
+* Loads config infor with config.class.php
+*/
+function XMLSMAP_loadConfig()
+{
+    global $_CONF;
+    
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+    
+    $config = config::get_instance();
+    if ($config->group_exists('xmlsitemap')) {
+        return $config->get_config('xmlsitemap');
+    } else {
+        return FALSE;
+    }
+}
+
+/**
+* Return a string escaped for HTML output
+*/
+function XMLSMAP_esc($str)
+{
+    static $encoding = NULL;
+    
+    if ($encoding === NULL) {
+        $encoding = COM_getCharset();;

From geeklog-cvs at lists.geeklog.net  Fri May  1 10:03:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 10:03:06 -0400
Subject: [geeklog-cvs] geeklog: Documentation updates
Message-ID: <hg.895386b8afcb.1241186586.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/895386b8afcb
changeset: 7004:895386b8afcb
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 10:05:04 2009 +0200
description:
Documentation updates

diffstat:

3 files changed, 20 insertions(+), 6 deletions(-)
public_html/docs/english/changes.html |   12 ++++++++++++
public_html/docs/english/theme.html   |    1 +
public_html/docs/history              |   13 +++++++------

diffs (91 lines):

diff -r 570f7f58074a -r 895386b8afcb public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Fri May 01 09:33:36 2009 +0200
+++ b/public_html/docs/english/changes.html	Fri May 01 10:05:04 2009 +0200
@@ -35,7 +35,19 @@
 <li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP 4 in August 2008, you should be
 looking into upgrading to PHP 5 anyway.</li>
 <li>Includes <a href="http://www.fckeditor.net/">FCKeditor</a> 2.6.4</li>
+<li>Several <a href="http://wiki.geeklog.net/index.php/New_Plugin_API_Functions_in_Geeklog_1.6.0">new plugin API functions</a> have been added and existing
+    functions have been extended.</li>
+<li>The included documentation has been moved to <tt>docs/english</tt> to allow
+    for translations. Links to the documentation from within Geeklog will link
+    to existing translations for the current language automatically (or fall
+    back to the English documentation if no suitable translation can be found).</li>
+<li>There were a variety of <a href="theme.html#changes">theme changes</a> to
+    support new functionality and fix inconsistencies in the layout.</li>
 </ul>
+
+<p>This release also includes a number of patches and improvements made by
+students applying for participation in the Google Summer of Code 2009. Thank
+you!</p>
 
 
 <h2><a name="changes152sr4">Geeklog 1.5.2sr4</a></h2>
diff -r 570f7f58074a -r 895386b8afcb public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Fri May 01 09:33:36 2009 +0200
+++ b/public_html/docs/english/theme.html	Fri May 01 10:05:04 2009 +0200
@@ -282,6 +282,7 @@
 </ul>
 <p>Template files using the alternative names will continue to work, but new
 files should use the above names from now on.</p>
+
 
 <h2><a name="changes152">Theme changes in Geeklog 1.5.2</a></h2>
 
diff -r 570f7f58074a -r 895386b8afcb public_html/docs/history
--- a/public_html/docs/history	Fri May 01 09:33:36 2009 +0200
+++ b/public_html/docs/history	Fri May 01 10:05:04 2009 +0200
@@ -1,7 +1,7 @@
 Geeklog History/Changes:
 
-Apr ??, 2009 (1.6.0)
-------------
+May 1, 2009 (1.6.0b1)
+-----------
 
 Geeklog 1.6.0 incorporates the following projects implemented during
 the 2008 Google Summer of Code:
@@ -25,6 +25,7 @@
   * Cronjob emulation is off
   * Default sort for topics is alphabetically
   * Default comment mode is nested
+  These settings are _not_ changed when upgrading from an earlier version.
 - Experimental: Compress HTML output before sending it to the browser (disabled
   by default; has to be supported by both the browser and the webserver) [Dirk]
 - Moved hard-coded texts from admin/sectest.php to the language files (bug
@@ -32,7 +33,7 @@
 - Added an option to send a copy of the email to a user to self (feature request
   #0000771, based on a patch by Roshan Singh)
 - COM_checkList would use the table name for the name of the checkbox array in
-  the HTML(!) - added a new parameter for the name (pointed out by Bookoo in
+  the HTML(!). Added a new parameter for the name (pointed out by Bookoo in
   the exploit for usersettings.php, cf. Geeklog 1.5.2sr4) [Dirk]
 - Fixed wrong use of COM_allowedHTML and COM_checkHTML in plugins: Functions
   were called without specific permissions, so they defaulted to 'story.edit'.
@@ -411,7 +412,7 @@
 - Re-introduced function get_SP_Ver in the install script, which is still needed
   when upgrading from old Geeklog releases (reported by libexec) [Dirk]
 - Fixed issue where you can post a comment to an unpublished story (bug
-  #0000705) [Mystral_KK/Mike]
+  #0000705) [mystral-kk/Mike]
 - Fixed make clickable links with quotes (bug #0000691) plus truncated long
   urls. [Sami]
 - Fixed table prefix issues with constraints (bug #0000702) [Mike/Sami]
@@ -421,7 +422,7 @@
 - Moved remove() (config JavaScript) to gl_cfg_remove (bug #0000681) [Mike]
 - Change for CUSTOM_usercreate to support passing in $batchimport, 
   set true if called via the Admin->Users Batch_Add [Blaine]
-- Fix for date formatting in RSS fields (bug #0000696) [mystral_kk]
+- Fix for date formatting in RSS fields (bug #0000696) [mystral-kk]
 - A small tweak to the Professional theme's commentbar to make the "Post a
   comment" option easier to find [Dirk]
 - Renamed the syndication feed type "geeklog" to "article" since that's what
@@ -721,7 +722,7 @@
 - Avoid division by zero error when $_CONF['limitnews'] == 0
   (reported by Samuel M. Stone) [Dirk]
 - Bugfix: Atom always assumes 0.3 and doesn't handle article dates. (Reported by
-  mystral kk on the forums). [Mike]
+  mystral-kk on the forums). [Mike]
 - Added OpenID 1.1 support, provided by Choplair
 - Pass site_name into story templates so advanced linking to items like digg.com
   can be templated cross-site. [Mike]

From geeklog-cvs at lists.geeklog.net  Fri May  1 10:03:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 10:03:09 -0400
Subject: [geeklog-cvs] geeklog: Always set version number from the install
	script. The ...
Message-ID: <hg.0c7d10cbc6bf.1241186589.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0c7d10cbc6bf
changeset: 7008:0c7d10cbc6bf
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 15:57:50 2009 +0200
description:
Always set version number from the install script. The constant in lib-install.php now defines the Geeklog version number.

diffstat:

4 files changed, 47 insertions(+), 35 deletions(-)
public_html/admin/install/index.php       |    3 -
public_html/admin/install/lib-install.php |   46 ++++++++++++++++++++++++++++-
public_html/admin/install/lib-upgrade.php |   31 -------------------
public_html/siteconfig.php.dist           |    2 -

diffs (134 lines):

diff -r 8682136933a3 -r 0c7d10cbc6bf public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Fri May 01 14:38:59 2009 +0200
+++ b/public_html/admin/install/index.php	Fri May 01 15:57:50 2009 +0200
@@ -485,8 +485,7 @@
                             $config->set('language', $lng);
                         }
 
-                        DB_change($_TABLES['vars'], 'value', VERSION,
-                                                    'name', 'database_version');
+                        INST_setVersion($siteconfig_path);
 
                         if (! $install_plugins) {
                             // do a default install of all available plugins
diff -r 8682136933a3 -r 0c7d10cbc6bf public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Fri May 01 14:38:59 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Fri May 01 15:57:50 2009 +0200
@@ -52,7 +52,11 @@
     define('LB', "\n");
 }
 if (!defined('VERSION')) {
-    define('VERSION', '1.6.0');
+    /**
+    * This constant defines Geeklog's version number. It will be written to
+    * siteconfig.php and the database (in the latter case minus any suffix).
+    */
+    define('VERSION', '1.6.0b1');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
@@ -1105,4 +1109,44 @@
     return $language;
 }
 
+/**
+* Set Geeklog version number in siteconfig.php and in the database
+*
+* @param   string  $siteconfig_path    path to siteconfig.php
+* @return  void
+*
+*/
+function INST_setVersion($siteconfig_path)
+{
+    global $_TABLES, $LANG_INSTALL;
+
+    $siteconfig_file = fopen($siteconfig_path, 'r');
+    $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
+    fclose($siteconfig_file);
+
+    $siteconfig_data = preg_replace
+            (
+             '/define\s*\(\'VERSION\',[^;]*;/',
+             "define('VERSION', '" . VERSION . "');",
+             $siteconfig_data
+            );
+
+    $siteconfig_file = @fopen($siteconfig_path, 'w');
+    if (! fwrite($siteconfig_file, $siteconfig_data)) {
+        exit($LANG_INSTALL[26] . ' ' . $LANG_INSTALL[28]);
+    }
+    fclose($siteconfig_file);
+
+    // for the database version, get rid of any appendices ('sr1' etc.)
+    $version = VERSION;
+    $v = explode('.', VERSION);
+    if (count($v) == 3) {
+        $v[2] = (int) $v[2];
+        $version = implode('.', $v);
+    }
+    $version = addslashes($version);
+
+    DB_change($_TABLES['vars'], 'value', $version, 'name', 'database_version');
+}
+
 ?>
diff -r 8682136933a3 -r 0c7d10cbc6bf public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Fri May 01 14:38:59 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Fri May 01 15:57:50 2009 +0200
@@ -485,8 +485,6 @@
     // to run admin/sectest.php again
     DB_delete($_TABLES['vars'], 'name', 'security_check');
 
-    DB_change($_TABLES['vars'], 'value', VERSION, 'name', 'database_version');
-
     return true;
 }
 
@@ -641,35 +639,6 @@
     return $result;
 }
 
-
-/**
- * Set VERSION constant in siteconfig.php after successful upgrade
- *
- * @param   string  $siteconfig_path    path to siteconfig.php
- * @return  void
- *
- */
-function INST_setVersion($siteconfig_path)
-{
-    global $LANG_INSTALL;
-
-    $siteconfig_file = fopen($siteconfig_path, 'r');
-    $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
-    fclose($siteconfig_file);
-
-    $siteconfig_data = preg_replace
-            (
-             '/define\s*\(\'VERSION\',[^;]*;/',
-             "define('VERSION', '" . VERSION . "');",
-             $siteconfig_data
-            );
-
-    $siteconfig_file = fopen($siteconfig_path, 'w');
-    if (!fwrite($siteconfig_file, $siteconfig_data)) {
-        exit($LANG_INSTALL[26] . ' ' . $LANG_INSTALL[28]);
-    }
-    fclose($siteconfig_file);
-}
 
 
 /**
diff -r 8682136933a3 -r 0c7d10cbc6bf public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist	Fri May 01 14:38:59 2009 +0200
+++ b/public_html/siteconfig.php.dist	Fri May 01 15:57:50 2009 +0200
@@ -38,7 +38,7 @@
   define('LB',"\n");
 }
 if (!defined('VERSION')) {
-  define('VERSION', '1.6.0hg');
+  define('VERSION', '1.6.0');
 }
 
 ?>

From geeklog-cvs at lists.geeklog.net  Fri May  1 10:03:08 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 10:03:08 -0400
Subject: [geeklog-cvs] geeklog: Disable postinstall for now (causes problems
	on fresh i...
Message-ID: <hg.8682136933a3.1241186588.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8682136933a3
changeset: 7007:8682136933a3
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 14:38:59 2009 +0200
description:
Disable postinstall for now (causes problems on fresh install)

diffstat:

1 file changed, 2 insertions(+), 1 deletion(-)
plugins/xmlsitemap/autoinstall.php |    3 ++-

diffs (18 lines):

diff -r cb14f78341a2 -r 8682136933a3 plugins/xmlsitemap/autoinstall.php
--- a/plugins/xmlsitemap/autoinstall.php	Fri May 01 13:18:23 2009 +0200
+++ b/plugins/xmlsitemap/autoinstall.php	Fri May 01 14:38:59 2009 +0200
@@ -118,6 +118,7 @@
 * @param    string  $pi_name    Plugin name
 * @return   boolean             TRUE: plugin compatible; FALSE: not compatible
 */
+/*
 function plugin_postinstall_xmlsitemap($pi_name)
 {
     global $_CONF, $_XMLSMAP_CONF;
@@ -127,5 +128,5 @@
     // Create an XML sitemap for the first time
     return XMLSMAP_update();
 }
-
+*/
 ?>

From geeklog-cvs at lists.geeklog.net  Fri May  1 10:03:07 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 10:03:07 -0400
Subject: [geeklog-cvs] geeklog: Auto-install new plugins during upgrade and
	migrate
Message-ID: <hg.cb14f78341a2.1241186587.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cb14f78341a2
changeset: 7006:cb14f78341a2
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 13:18:23 2009 +0200
description:
Auto-install new plugins during upgrade and migrate

diffstat:

3 files changed, 74 insertions(+)
public_html/admin/install/index.php       |    6 ++
public_html/admin/install/lib-upgrade.php |   65 +++++++++++++++++++++++++++++
public_html/admin/install/migrate.php     |    3 +

diffs (104 lines):

diff -r fc202669ac90 -r cb14f78341a2 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Fri May 01 11:23:44 2009 +0200
+++ b/public_html/admin/install/index.php	Fri May 01 13:18:23 2009 +0200
@@ -591,6 +591,12 @@
                                 !empty($_GET['install_plugins'])) 
                          ? true 
                          : false);
+
+        if (! $install_plugins) {
+            // if we don't do the manual selection, install all new plugins now
+            INST_autoinstallNewPlugins();
+        }
+
         $next_link = ($install_plugins
                    ? 'install-plugins.php?language=' . $language
                    : 'success.php?type=' . $install_type
diff -r fc202669ac90 -r cb14f78341a2 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Fri May 01 11:23:44 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Fri May 01 13:18:23 2009 +0200
@@ -867,6 +867,71 @@
 }
 
 /**
+* Pick up and install any new plugins
+*
+* Search for plugins that exist in the filesystem but are not registered with
+* Geeklog. If they support auto install, install them now.
+*
+* @return void
+*
+*/
+function INST_autoinstallNewPlugins()
+{
+    global $_CONF, $_TABLES;
+
+    $newplugins = array();
+
+    clearstatcache ();
+    $plugins_dir = $_CONF['path'] . 'plugins/';
+    $fd = opendir($plugins_dir);
+    while (($plugin = @readdir($fd)) == TRUE) {
+
+        if (($plugin <> '.') && ($plugin <> '..') && ($plugin <> 'CVS') &&
+                (substr($plugin, 0, 1) <> '.') &&
+                (substr($plugin, 0, 1) <> '_') &&
+                is_dir($plugins_dir . $plugin)) {
+
+            if (DB_count($_TABLES['plugins'], 'pi_name', $plugin) == 0) {
+
+                // found a new plugin: remember name, keep on searching
+                $newplugins[] = $plugin;
+
+            }
+        }
+    }
+
+    // automatically install all new plugins that come with a autoinstall.php
+    foreach ($newplugins as $pi_name) {
+        $plugin_inst = $_CONF['path'] . 'plugins/' . $pi_name
+                     . '/autoinstall.php';
+        if (file_exists($plugin_inst)) {
+
+            require_once $plugin_inst;
+
+            $check_compatible = 'plugin_compatible_with_this_version_'
+                              . $pi_name;
+            if (function_exists($check_compatible)) {
+                if (! $check_compatible($pi_name)) {
+                    continue; // with next plugin
+                }
+            }
+
+            $auto_install = 'plugin_autoinstall_' . $pi_name;
+            if (! function_exists($auto_install)) {
+                continue; // with next plugin
+            }
+
+            $inst_parms = $auto_install($pi_name);
+            if (($inst_parms === false) || empty($inst_parms)) {
+                continue; // with next plugin
+            }
+
+            INST_pluginAutoinstall($pi_name, $inst_parms);
+        }
+    }
+}
+
+/**
 * Make sure optional config options can be disabled
 *
 * Back when Geeklog used a config.php file, some of the comment options were
diff -r fc202669ac90 -r cb14f78341a2 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Fri May 01 11:23:44 2009 +0200
+++ b/public_html/admin/install/migrate.php	Fri May 01 13:18:23 2009 +0200
@@ -840,6 +840,9 @@
 
         }
 
+        // finally, check for any new plugins and install them
+        INST_autoinstallNewPlugins();
+
         /**
          * Check for other missing files
          * e.g. images/articles, images/topics, images/userphotos

From geeklog-cvs at lists.geeklog.net  Fri May  1 13:31:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 01 May 2009 13:31:09 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0b1 for changeset
	0c7d10cbc6bf
Message-ID: <hg.b88b42219ce6.1241199069.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b88b42219ce6
changeset: 7009:b88b42219ce6
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri May 01 19:30:50 2009 +0200
description:
Added tag geeklog_1_6_0b1 for changeset 0c7d10cbc6bf

diffstat:

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

diffs (7 lines):

diff -r 0c7d10cbc6bf -r b88b42219ce6 .hgtags
--- a/.hgtags	Fri May 01 15:57:50 2009 +0200
+++ b/.hgtags	Fri May 01 19:30:50 2009 +0200
@@ -1,2 +1,3 @@
 f51a1417bd7041bea96370434142498438d4e558 geeklog_1_5_0_stable
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
+0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1

From geeklog-cvs at lists.geeklog.net  Sat May  2 02:56:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 02 May 2009 02:56:28 -0400
Subject: [geeklog-cvs] geeklog: Fixed a typo that prevented the
	[staticpage:] autotag f...
Message-ID: <hg.d60bf2d05792.1241247388.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d60bf2d05792
changeset: 7010:d60bf2d05792
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 02 08:56:18 2009 +0200
description:
Fixed a typo that prevented the [staticpage:] autotag from working

diffstat:

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

diffs (38 lines):

diff -r b88b42219ce6 -r d60bf2d05792 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Fri May 01 19:30:50 2009 +0200
+++ b/plugins/staticpages/functions.inc	Sat May 02 08:56:18 2009 +0200
@@ -944,7 +944,7 @@
     } else if ($op == 'parse') {
         if ($autotag['tag'] == 'staticpage' ) {
             $sp_id = COM_applyFilter($autotag['parm1']);
-            if (! empty($sp_is)) {
+            if (! empty($sp_id)) {
                 $url = COM_buildUrl($_CONF['site_url']
                                 . '/staticpages/index.php?page=' . $sp_id);
                 if (empty($autotag['parm2'])) {
diff -r b88b42219ce6 -r d60bf2d05792 public_html/docs/history
--- a/public_html/docs/history	Fri May 01 19:30:50 2009 +0200
+++ b/public_html/docs/history	Sat May 02 08:56:18 2009 +0200
@@ -1,7 +1,7 @@
 Geeklog History/Changes:
 
-May 1, 2009 (1.6.0b1)
------------
+May ??, 2009 (1.6.0b2)
+------------
 
 Geeklog 1.6.0 incorporates the following projects implemented during
 the 2008 Google Summer of Code:
@@ -11,6 +11,12 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed a typo that prevented the [staticpage:] autotag from working [Dirk]
+
+
+May 1, 2009 (1.6.0b1)
+-----------
+
 - New XMLSitemap plugin that creates a XML sitemaps file as supported by all
   major search engines, provided by mystral-kk
 - Don't allow to add/remove users to/from the All Users and Logged-in Users

From geeklog-cvs at lists.geeklog.net  Sat May  2 05:55:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 02 May 2009 05:55:35 -0400
Subject: [geeklog-cvs] geeklog: Added a verbose logging option to the search
	class and ...
Message-ID: <hg.6c74bf38fcd5.1241258135.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6c74bf38fcd5
changeset: 7011:6c74bf38fcd5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 02 11:09:55 2009 +0200
description:
Added a verbose logging option to the search class and make it default to off

diffstat:

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

diffs (56 lines):

diff -r d60bf2d05792 -r 6c74bf38fcd5 public_html/docs/history
--- a/public_html/docs/history	Sat May 02 08:56:18 2009 +0200
+++ b/public_html/docs/history	Sat May 02 11:09:55 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Added a verbose logging option to the search class and make it default to off
+  [Dirk]
 - Fixed a typo that prevented the [staticpage:] autotag from working [Dirk]
 
 
diff -r d60bf2d05792 -r 6c74bf38fcd5 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat May 02 08:56:18 2009 +0200
+++ b/system/classes/search.class.php	Sat May 02 11:09:55 2009 +0200
@@ -61,6 +61,7 @@
     var $_append_query = array();
     var $_searchURL = '';
     var $_wordlength;
+    var $_verbose = false; // verbose logging
 
     /**
     * Constructor
@@ -572,7 +573,9 @@
                 $sql = $this->_convertsql($sql);
 
                 $debug_info .= "SQL = " . print_r($sql,1);
-                COM_errorLog($debug_info);
+                if ($this->_verbose) {
+                    COM_errorLog($debug_info);
+                }
 
                 $obj->setQuery($result->getLabel(), $result->getName(), $sql, $result->getRank());
                 $this->_url_rewrite[ $result->getName() ] = $result->UrlRewriteEnable();
@@ -585,7 +588,9 @@
                 $debug_info = $result->plugin_name . " using APIv1 with backwards compatibility.";
                 $debug_info .= " Count: " . $result->num_searchresults;
                 $debug_info .= " Headings: " . implode(",", $result->searchheading);
-                COM_errorLog($debug_info);
+                if ($this->_verbose) {
+                    COM_errorLog($debug_info);
+                }
 
                 // Find the column heading names that closely match what we are looking for
                 // There may be issues here on different languages, but this _should_ capture most of the data
@@ -641,7 +646,9 @@
         }
 
         // Find out how many plugins are on the old/new system
-        COM_errorLog("Search Plugins using APIv1: $old_api APIv2: $new_api");
+        if ($this->_verbose) {
+            COM_errorLog("Search Plugins using APIv1: $old_api APIv2: $new_api");
+        }
 
         // Execute the queries
         $results = $obj->ExecuteQueries();

From geeklog-cvs at lists.geeklog.net  Sat May  2 05:55:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 02 May 2009 05:55:35 -0400
Subject: [geeklog-cvs] geeklog: Fixed "missing argument 2" error when
	changing config o...
Message-ID: <hg.6d6351820714.1241258135.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6d6351820714
changeset: 7012:6d6351820714
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 02 11:51:40 2009 +0200
description:
Fixed "missing argument 2" error when changing config options (reported by Markus Wollschl?ger)

diffstat:

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

diffs (31 lines):

diff -r 6c74bf38fcd5 -r 6d6351820714 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sat May 02 11:09:55 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sat May 02 11:51:40 2009 +0200
@@ -428,7 +428,7 @@
 * @param  group    string          - 'Core' or 'xmlsitemap'
 * @param  changes  array of string - config var key
 */
-function plugin_configchange_xmlsitemap($group, $changes)
+function plugin_configchange_xmlsitemap($group, $changes = array())
 {
     global $_XMLSMAP_CONF;
 	
diff -r 6c74bf38fcd5 -r 6d6351820714 public_html/docs/history
--- a/public_html/docs/history	Sat May 02 11:09:55 2009 +0200
+++ b/public_html/docs/history	Sat May 02 11:51:40 2009 +0200
@@ -13,7 +13,15 @@
 Other changes:
 - Added a verbose logging option to the search class and make it default to off
   [Dirk]
+
+Static Pages plugin
+-------------------
 - Fixed a typo that prevented the [staticpage:] autotag from working [Dirk]
+
+XMLSitemap plugin
+-----------------
+- Fixed "missing argument 2" error when changing config options (reported by
+  Markus Wollschl?ger) [Dirk]
 
 
 May 1, 2009 (1.6.0b1)

From geeklog-cvs at lists.geeklog.net  Mon May  4 04:30:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 04 May 2009 04:30:51 -0400
Subject: [geeklog-cvs] geeklog: Typo - missing #
Message-ID: <hg.886277aabf83.1241425851.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/886277aabf83
changeset: 7013:886277aabf83
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 04 10:10:31 2009 +0200
description:
Typo - missing #

diffstat:

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

diffs (12 lines):

diff -r 6d6351820714 -r 886277aabf83 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sat May 02 11:51:40 2009 +0200
+++ b/public_html/docs/english/config.html	Mon May 04 10:10:31 2009 +0200
@@ -935,7 +935,7 @@
   <td valign="top"><a name="desc_comment_edittime">comment_edittime</a></td>
   <td valign="top">1800</td>
   <td valign="top">How long (in seconds) a comment is editable for the user who
-    submitted it. Requires that comments are editable (see <a href="desc_comment_edit">above</a>). Anonymous users (those that did not register an account) can
+    submitted it. Requires that comments are editable (see <a href="#desc_comment_edit">above</a>). Anonymous users (those that did not register an account) can
     never edit their comments while admins can always edit comments.</td></tr>
 <tr>
   <td valign="top"><a name="desc_article_comment_close_days">article_comment_close_days</a></td>

From geeklog-cvs at lists.geeklog.net  Mon May  4 04:30:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 04 May 2009 04:30:51 -0400
Subject: [geeklog-cvs] geeklog: Clarified comment_edit option
Message-ID: <hg.31e2e1ea5a34.1241425851.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/31e2e1ea5a34
changeset: 7014:31e2e1ea5a34
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 04 10:17:58 2009 +0200
description:
Clarified comment_edit option

diffstat:

1 file changed, 2 insertions(+), 1 deletion(-)
public_html/docs/english/config.html |    3 ++-

diffs (13 lines):

diff -r 886277aabf83 -r 31e2e1ea5a34 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Mon May 04 10:10:31 2009 +0200
+++ b/public_html/docs/english/config.html	Mon May 04 10:17:58 2009 +0200
@@ -926,7 +926,8 @@
 <tr>
   <td valign="top"><a name="desc_comment_edit">comment_edit</a></td>
   <td valign="top">0</td>
-  <td valign="top">Whether to allow users and admins to edit comments.</td></tr>
+  <td valign="top">Whether to allow users and admins (i.e. those with
+    comment.edit permission) to edit comments.</td></tr>
 <tr>
   <td valign="top"><a name="desc_commentsubmission">commentsubmission</a></td>
   <td valign="top">0</td>

From geeklog-cvs at lists.geeklog.net  Thu May  7 06:22:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 07 May 2009 06:22:49 -0400
Subject: [geeklog-cvs] geeklog: Fixed link to the changelog
Message-ID: <hg.9925b80d9681.1241691769.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9925b80d9681
changeset: 7015:9925b80d9681
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 07 12:22:39 2009 +0200
description:
Fixed link to the changelog

diffstat:

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

diffs (14 lines):

diff -r 31e2e1ea5a34 -r 9925b80d9681 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Mon May 04 10:17:58 2009 +0200
+++ b/public_html/docs/english/changes.html	Thu May 07 12:22:39 2009 +0200
@@ -13,8 +13,8 @@
 
 <p>This document is intended to give a quick overview over the most important
 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>
+<a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
+list of files that have been changed since the last release.</p>
 
 <h2><a name="changes160">Geeklog 1.6.0</a></h2>
 

From geeklog-cvs at lists.geeklog.net  Sat May  9 10:45:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 09 May 2009 10:45:34 -0400
Subject: [geeklog-cvs] geeklog: Fixed handling of multi-byte encoded texts
	when limitin...
Message-ID: <hg.5aca2dbf9ac3.1241880334.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5aca2dbf9ac3
changeset: 7016:5aca2dbf9ac3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 09 16:44:43 2009 +0200
description:
Fixed handling of multi-byte encoded texts when limiting the content of feed entries to a certain amount of characters

diffstat:

3 files changed, 34 insertions(+), 35 deletions(-)
public_html/docs/history   |    2 ++
system/lib-mbyte.php       |   42 ++++++++++++++++++++++--------------------
system/lib-syndication.php |   25 ++++++++++---------------

diffs (131 lines):

diff -r 9925b80d9681 -r 5aca2dbf9ac3 public_html/docs/history
--- a/public_html/docs/history	Thu May 07 12:22:39 2009 +0200
+++ b/public_html/docs/history	Sat May 09 16:44:43 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed handling of multi-byte encoded texts when limiting the content of feed
+  entries to a certain amount of characters (reported by alank) [Dirk]
 - Added a verbose logging option to the search class and make it default to off
   [Dirk]
 
diff -r 9925b80d9681 -r 5aca2dbf9ac3 system/lib-mbyte.php
--- a/system/lib-mbyte.php	Thu May 07 12:22:39 2009 +0200
+++ b/system/lib-mbyte.php	Sat May 09 16:44:43 2009 +0200
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | lib-mbyte.php                                                             |
 // |                                                                           |
 // | function collection to handle mutli-byte related issues                   |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
 // +---------------------------------------------------------------------------+
@@ -28,8 +28,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-mbyte.php,v 1.21 2008/09/21 08:37:11 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'lib-mbyte.php') !== false) {
     die('This file can not be used on its own!');
@@ -156,6 +154,26 @@
         $result = mb_strpos($hay, $needle, $offset);
     } else {
         $result = strpos($hay, $needle, $offset);
+    }
+
+    return $result;
+}
+
+function MBYTE_strrpos($hay, $needle, $offset = NULL)
+{
+    static $mb_enabled;
+
+    if (!isset($mb_enabled)) {
+        $mb_enabled = MBYTE_checkEnabled();
+    }
+    if ($mb_enabled) {
+        if ($offset === NULL) {
+            $result = mb_strrpos($hay, $needle);
+        } else {
+            $result = mb_strrpos($hay, $needle, $offset);
+        }
+    } else {
+        $result = strrpos($hay, $needle, $offset);
     }
 
     return $result;
@@ -243,22 +261,6 @@
     return $result;
 }
 
-function MBYTE_strrpos($hay, $needle, $offset='')
-{
-    static $mb_enabled;
-
-    if (!isset($mb_enabled)) {
-        $mb_enabled = MBYTE_checkEnabled();
-    }
-    if ($mb_enabled) {
-        $result = mb_strrpos($hay, $needle, $offset, 'utf-8');
-    } else {
-        $result = strrpos($hay, $needle, $offset);
-    }
-
-    return $result;
-}
-
 function MBYTE_mail($to, $subj, $mess, $header = NULL, $param = NULL)
 {
     static $mb_enabled;
diff -r 9925b80d9681 -r 5aca2dbf9ac3 system/lib-syndication.php
--- a/system/lib-syndication.php	Thu May 07 12:22:39 2009 +0200
+++ b/system/lib-syndication.php	Sat May 09 16:44:43 2009 +0200
@@ -621,27 +621,22 @@
 * @return   string              truncated text
 *
 */
-function SYND_truncateSummary( $text, $length )
+function SYND_truncateSummary($text, $length)
 {
-    if( $length == 0 )
-    {
+    if ($length == 0) {
         return '';
-    }
-    else
-    {
-        $text = stripslashes( $text );
-        $text = trim( $text );
+    } else {
+        $text = stripslashes($text);
+        $text = trim($text);
         $text = str_replace(array("\015\012", "\015"), "\012", $text);
-        if(( $length > 3 ) && ( MBYTE_strlen( $text ) > $length ))
-        {
-            $text = substr( $text, 0, $length - 3 ) . '...';
+        if (($length > 3) && (MBYTE_strlen($text) > $length)) {
+            $text = MBYTE_substr($text, 0, $length - 3) . '...';
         }
 
-        // Check if we broke html tag and storytext is now something
+        // Check if we broke an html tag and storytext is now something
         // like "blah blah <a href= ...". Delete "<*" if so.
-        if( strrpos( $text, '<' ) > strrpos( $text, '>' ))
-        {
-            $text = substr( $text, 0, strrpos( $text, '<' ) - 1 )
+        if (MBYTE_strrpos($text, '<' ) > MBYTE_strrpos($text, '>')) {
+            $text = MBYTE_substr($text, 0, MBYTE_strrpos($text, '<'))
                   . ' ...';
         }
 

From geeklog-cvs at lists.geeklog.net  Sat May  9 12:00:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 09 May 2009 12:00:04 -0400
Subject: [geeklog-cvs] geeklog: Ensure PLG_templateSetVars (and therefore
	CUSTOM_templa...
Message-ID: <hg.18130f0d6d24.1241884804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/18130f0d6d24
changeset: 7017:18130f0d6d24
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 09 17:48:14 2009 +0200
description:
Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called properly when the "Skip Preview" option is disabled (bug #0000880)

diffstat:

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

diffs (53 lines):

diff -r 5aca2dbf9ac3 -r 18130f0d6d24 public_html/docs/history
--- a/public_html/docs/history	Sat May 09 16:44:43 2009 +0200
+++ b/public_html/docs/history	Sat May 09 17:48:14 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called
+  properly when the "Skip Preview" option is disabled (bug #0000880) [Dirk]
 - Fixed handling of multi-byte encoded texts when limiting the content of feed
   entries to a certain amount of characters (reported by alank) [Dirk]
 - Added a verbose logging option to the search class and make it default to off
diff -r 5aca2dbf9ac3 -r 18130f0d6d24 public_html/submit.php
--- a/public_html/submit.php	Sat May 09 16:44:43 2009 +0200
+++ b/public_html/submit.php	Sat May 09 17:48:14 2009 +0200
@@ -209,9 +209,9 @@
     $storyform->set_var('story_date', $story->EditElements('unixdate'));
     $storyform->set_var('lang_preview', $LANG12[32]);
 
+    PLG_templateSetVars('story', $storyform);
     if (($_CONF['skip_preview'] == 1) ||
             (isset($_POST['mode']) && ($_POST['mode'] == $LANG12[32]))) {
-        PLG_templateSetVars('story', $storyform);
         $storyform->set_var('save_button',
                             '<input name="mode" type="submit" value="'
                             . $LANG12[8] . '"' . XHTML . '>');
diff -r 5aca2dbf9ac3 -r 18130f0d6d24 system/lib-comment.php
--- a/system/lib-comment.php	Sat May 09 16:44:43 2009 +0200
+++ b/system/lib-comment.php	Sat May 09 17:48:14 2009 +0200
@@ -993,20 +993,18 @@
                 $comment_template->set_var('lang_preview', $LANG03[14]);
             }
 
+            PLG_templateSetVars('comment', $comment_template); 
             if ($mode == $LANG03[28] || ($mode == 'edit' && $_CONF['skip_preview'] == 1)) { 
-                //for editing
-                PLG_templateSetVars ('comment', $comment_template); 
+                // for editing
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[29]
                     . '"' . XHTML . '>');
             } elseif ($mode == $LANG03[34] || ($mode == 'editsubmission' && $_CONF['skip_preview'] == 1))  {
-                //editing submission comment
-                PLG_templateSetVars ('comment', $comment_template);
+                // editing submission comment
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[35]
                     . '"' . XHTML . '>');
             } elseif (($_CONF['skip_preview'] == 1) || ($mode == $LANG03[14])) {
-                PLG_templateSetVars ('comment', $comment_template);
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[11]
                     . '"' . XHTML . '>');

From geeklog-cvs at lists.geeklog.net  Sat May  9 12:00:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 09 May 2009 12:00:04 -0400
Subject: [geeklog-cvs] geeklog: Fixed empty entries in the "Type" dropdown
	on the Advan...
Message-ID: <hg.f3fa64601bb3.1241884804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f3fa64601bb3
changeset: 7018:f3fa64601bb3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 09 17:59:54 2009 +0200
description:
Fixed empty entries in the "Type" dropdown on the Advanced Search page (part of bug #0000874)

diffstat:

2 files changed, 2 insertions(+), 3 deletions(-)
public_html/docs/history                                |    2 ++
public_html/layout/professional/search/searchform.thtml |    3 ---

diffs (25 lines):

diff -r 18130f0d6d24 -r f3fa64601bb3 public_html/docs/history
--- a/public_html/docs/history	Sat May 09 17:48:14 2009 +0200
+++ b/public_html/docs/history	Sat May 09 17:59:54 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed empty entries in the "Type" dropdown on the Advanced Search page.
+  Requires an updated search/searchform.thtml template (part of bug #0000874)
 - Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called
   properly when the "Skip Preview" option is disabled (bug #0000880) [Dirk]
 - Fixed handling of multi-byte encoded texts when limiting the content of feed
diff -r 18130f0d6d24 -r f3fa64601bb3 public_html/layout/professional/search/searchform.thtml
--- a/public_html/layout/professional/search/searchform.thtml	Sat May 09 17:48:14 2009 +0200
+++ b/public_html/layout/professional/search/searchform.thtml	Sat May 09 17:59:54 2009 +0200
@@ -32,9 +32,6 @@
                                         <td class="alignright">{lang_type}:</td>
                                         <td>
                                             <select name="type">
-                                                <option value="all" {type_all_selected}>{lang_all}</option>
-                                                <option value="stories" {stories_selected}>{lang_stories}</option>
-                                                <option value="comments" {comments_selected}>{lang_comments}</option>
                                                 {plugin_types}
                                             </select>
                                         </td>

From geeklog-cvs at lists.geeklog.net  Sat May  9 15:40:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 09 May 2009 15:40:36 -0400
Subject: [geeklog-cvs] tools: lib-custom.php was missing from the tarball
	(Thanks, Tim)
Message-ID: <hg.25d9d43d9c0b.1241898036.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/25d9d43d9c0b
changeset: 34:25d9d43d9c0b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 09 21:40:23 2009 +0200
description:
lib-custom.php was missing from the tarball (Thanks, Tim)

diffstat:

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

diffs (14 lines):

diff -r d60e486139e8 -r 25d9d43d9c0b ship/mkdist.sh
--- a/ship/mkdist.sh	Sun Apr 19 12:22:27 2009 +0200
+++ b/ship/mkdist.sh	Sat May 09 21:40:23 2009 +0200
@@ -76,7 +76,9 @@
 
 mv db-config.php.dist db-config.php
 mv public_html/siteconfig.php.dist public_html/siteconfig.php
-rm -f system/lib-custom.php.dist
+
+# lib-custom.php.dist is the actual lib-custom.php file now ...
+mv system/lib-custom.php.dist system/lib-custom.php
 
 find . -type f -name '.*' -exec rm \{\} \;
 #find . -name CVS -exec rm -r \{\} \; 2>/dev/null

From geeklog-cvs at lists.geeklog.net  Sun May 10 05:23:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 05:23:19 -0400
Subject: [geeklog-cvs] geeklog: Fixed notices in the config class,
	caused by the check ...
Message-ID: <hg.a65dd04d595b.1241947399.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/a65dd04d595b
changeset: 7019:a65dd04d595b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 09:30:30 2009 +0200
description:
Fixed notices in the config class, caused by the check to prevent people from locking themselves out of their site by disabling all 3 login methods.

diffstat:

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

diffs (33 lines):

diff -r f3fa64601bb3 -r a65dd04d595b public_html/docs/history
--- a/public_html/docs/history	Sat May 09 17:59:54 2009 +0200
+++ b/public_html/docs/history	Sun May 10 09:30:30 2009 +0200
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed notices in the config class (reported by tgc and others) [Dirk]
 - Fixed empty entries in the "Type" dropdown on the Advanced Search page.
   Requires an updated search/searchform.thtml template (part of bug #0000874)
 - Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called
diff -r f3fa64601bb3 -r a65dd04d595b system/classes/config.class.php
--- a/system/classes/config.class.php	Sat May 09 17:59:54 2009 +0200
+++ b/system/classes/config.class.php	Sun May 10 09:30:30 2009 +0200
@@ -387,9 +387,15 @@
             }
         }
 
-        if (!$this->config_array['Core']['user_login_method']['standard'] &&
-            !$this->config_array['Core']['user_login_method']['openid'] &&
-            !$this->config_array['Core']['user_login_method']['3rdparty']) {
+        $methods = array('standard', 'openid', '3rdparty');
+        $methods_disabled = 0;
+        foreach ($methods as $m) {
+            if (isset($this->config_array['Core']['user_login_method'][$m]) &&
+                    !$this->config_array['Core']['user_login_method'][$m]) {
+                $methods_disabled++;    
+            }
+        }
+        if ($methods_disabled == count($methods)) {
             // just to make sure people don't lock themselves out of their site
             $this->config_array['Core']['user_login_method']['standard'] = true;
 

From geeklog-cvs at lists.geeklog.net  Sun May 10 05:23:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 05:23:20 -0400
Subject: [geeklog-cvs] geeklog: Removed plugin_getheadercode_xmlsitemap(). A
	sitemap.xm...
Message-ID: <hg.e1a38f3e609e.1241947400.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e1a38f3e609e
changeset: 7021:e1a38f3e609e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 10:13:49 2009 +0200
description:
Removed plugin_getheadercode_xmlsitemap(). A sitemap.xml is not an RSS feed.

diffstat:

1 file changed, 26 deletions(-)
plugins/xmlsitemap/functions.inc |   26 --------------------------

diffs (36 lines):

diff -r 05dd00b63133 -r e1a38f3e609e plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun May 10 10:09:55 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun May 10 10:13:49 2009 +0200
@@ -254,32 +254,6 @@
 function plugin_itemsaved_xmlsitemap($id, $type, $old_id)
 {
     XMLSMAP_update($type);
-}
-
-/**
-* Add a meta tag representing the location of a sitemap
-*/
-function plugin_getheadercode_xmlsitemap()
-{
-	global $_CONF, $_XMLSMAP_CONF;
-	
-	$retval = '';
-	
-	if ($_XMLSMAP_CONF['sitemap_file'] != '') {
-		$retval .= '<link rel="alternate" type="application/rss+xml" href="'
-				.  basename($_XMLSMAP_CONF['sitemap_file']) . '"' . XHTML . '>' . LB;
-	}
-	
-	if (! empty($_XMLSMAP_CONF['mobile_sitemap_file'])) {
-		$retval .= '<link rel="alternate" type="application/rss+xml" href="'
-				.  basename($_XMLSMAP_CONF['mobile_sitemap_file']) . '"' . XHTML . '>' . LB;
-	}
-	
-	if ($retval != '') {
-		$retval = LB . $retval;
-	}
-	
-	return $retval;
 }
 
 /**

From geeklog-cvs at lists.geeklog.net  Sun May 10 05:23:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 05:23:19 -0400
Subject: [geeklog-cvs] geeklog: Fixed method descriptions / phpDocumentor
	tags
Message-ID: <hg.05dd00b63133.1241947399.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05dd00b63133
changeset: 7020:05dd00b63133
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 10:09:55 2009 +0200
description:
Fixed method descriptions / phpDocumentor tags

diffstat:

1 file changed, 100 insertions(+), 88 deletions(-)
plugins/xmlsitemap/xmlsitemap.class.php |  188 ++++++++++++++++---------------

diffs (truncated from 538 to 300 lines):

diff -r a65dd04d595b -r 05dd00b63133 plugins/xmlsitemap/xmlsitemap.class.php
--- a/plugins/xmlsitemap/xmlsitemap.class.php	Sun May 10 09:30:30 2009 +0200
+++ b/plugins/xmlsitemap/xmlsitemap.class.php	Sun May 10 10:09:55 2009 +0200
@@ -40,6 +40,9 @@
     die('This file can not be used on its own.');
 }
 
+/**
+* "linebreak" constant
+*/
 if (!defined('LB')) {
     define('LB', "\n");
 }
@@ -49,6 +52,7 @@
 *
 * USAGE:
 *
+* <code>
 *   $sitemap = new SitemapXML();
 *   $sitemap->setFileNames('path_to_sitemap_file',
 *       'path_to_mobile_sitemap_file');
@@ -58,6 +62,8 @@
 *   // $sitemap->setChangeFreq('article', 'weekly');
 *   // $sitemap->setChangeFreq('staticpages', 'monthly');
 *   $sitemap->create();
+* </code>
+*
 */
 class SitemapXML
 {
@@ -73,16 +79,18 @@
     var $_types;
     var $_filename;
     var $_mobile_filename;
-    
-    // Valid expressions for 'changefreq' field.  Should be constants in PHP5
+
+    /**
+    * Valid expressions for 'changefreq' field.  Should be constants in PHP5
+    */
     var $_valid_change_freqs = array('always', 'hourly', 'daily', 'weekly',
             'monthly', 'yearly', 'never');
-    
+
     /**
     * Constructor
     *
     * @access  public
-    * @param   encoding  string  the encoding of contents
+    * @param   string   $encoding   the encoding of contents
     */
     function SitemapXML($encoding = '')
     {
@@ -90,93 +98,95 @@
         $this->setEncoding($encoding);
         $this->_changeFreqs = array();
         $this->_priorities  = array();
-        
+
         // Set only 'article' as default value
         $this->setTypes(array('article'));
     }
-    
+
     /**
     * Set the encoding of contents
     *
     * @access  public
-    * @param   encoding  string  the encoding of contents
-    * @return  (void)
+    * @param   string   $encoding   the encoding of contents
+    * @return  void
     */
     function setEncoding($encoding)
     {
         if ($encoding == '') {
             $encoding = COM_getCharset();
         }
-        if ($encoding == '') {	// This is very unlikely
+        if ($encoding == '') {  // This is very unlikely
             $encoding = 'iso-8859-1';
         }
-        
+
         $this->_encoding = $encoding;
     }
-    
+
     /**
     * Return the encoding of the source content
     *
     * @access  public
-    * @return          string  the encoding of contents
+    * @return  string   the encoding of contents
     */
     function getEncoding()
     {
         return $this->_encoding;
     }
-    
+
     /**
     * Set the name(s) of the sitemap file (and optionally the mobile
     * sitemap file)
     *
+    * NOTE:    Sitemap files must be located in the top directory of the site,
+    *          i.e., the same directory as "lib-common.php".
+    *
     * @access  public
-	* @param   filename         string
-	* @param   mobile_filename  string
-    * @note    Sitemap files must be located in the top directory of the site,
-    *          i.e., the same directory as "lib-common.php".
+    * @param   string   $filename           name of sitemap file
+    * @param   string   $mobile_filename    name of mobile sitemap file
     */
     function setFileNames($filename = '', $mobile_filename = '')
     {
         global $_CONF;
-        
+
         if ($filename != '') {
             $this->_filename = $_CONF['path_html'] . basename($filename);
         }
-        
+
         if ($mobile_filename != '') {
             $this->_mobile_filename = $_CONF['path_html'] . basename($mobile_filename);
         }
     }
-    
+
     /**
     * Return the names of sitemap files
     *
     * @access  public
+    * @return  array    names of the sitemap and mobile sitemap
     */
     function getFileNames()
     {
         return array($this->_filename, $this->_mobile_filename);
     }
-    
+
     /**
     * Check if a string stands for a valid value of priority
     *
     * @access  public
-    * @param   str     string  a string for a priority
-    * @return          float   a valid value or 0.5 (default value)
+    * @param   string   $str    a string for a priority
+    * @return  float            a valid value or 0.5 (default value)
     */
     function checkPriority($str)
     {
         $v = (float) $str;
         return (($v >= 0.0) AND ($v <= 1.0)) ? $v : 0.5;
     }
-    
+
     /**
     * Set the priority of the item
     *
     * @access  public
-    * @param   type    string  'article', 'staticpages', ...
-    * @param   value   float   the value of priority
+    * @param   string   $type   'article', 'staticpages', ...
+    * @param   float    $value  the value of priority
     */
     function setPriority($type, $value)
     {
@@ -185,13 +195,13 @@
             $this->_priorities[$type] = $value;
         }
     }
-    
+
     /**
     * Return the value of priority
     *
     * @access  public
-    * @param   type    string  'article', 'staticpages', ...
-    * @return          float   0.0..1.0 (default value is 0.5)
+    * @param   string  $type   'article', 'staticpages', ...
+    * @return  float           0.0..1.0 (default value is 0.5)
     */
     function getPriority($type)
     {
@@ -201,26 +211,26 @@
             return 0.5;
         }
     }
-    
+
     /**
     * Check if a string stands for a proper frequency
     *
     * @access  public
-    * @param   str     string  a string for a frequency
-    * @return          string  a valid string or an empty string
+    * @param   string  $str    a string for a frequency
+    * @return  string          a valid string or an empty string
     */
     function checkChangeFreq($str)
     {
         $str = strtolower($str);
         return in_array($str, $this->_valid_change_freqs) ? $str : '';
     }
-    
+
     /**
     * Set the change frequency of the item
     *
     * @access  public
-    * @param   type    string  'article', 'staticpages', ...
-    * @param   value   string  any of 'always', 'hourly', 'daily', 'weekly',
+    * @param   string  $type   'article', 'staticpages', ...
+    * @param   string  $value  any of 'always', 'hourly', 'daily', 'weekly',
     *                          'monthly', 'yearly', 'never'
     */
     function setChangeFreq($type, $value)
@@ -230,13 +240,13 @@
             $this->_change_freqs[$type] = $value;
         }
     }
-    
+
     /**
     * Return the value of change frequency
     *
     * @access  public
-    * @param   type    string  'article', 'staticpages', ...
-    * @param   value   string  any of 'always', 'hourly', 'daily', 'weekly',
+    * @param   string  $type   'article', 'staticpages', ...
+    * @return  string          any of 'always', 'hourly', 'daily', 'weekly',
     *                          'monthly', 'yearly', 'never', ''
     */
     function getChangeFreq($type)
@@ -247,74 +257,75 @@
             return '';
         }
     }
-    
+
     /**
     * Set the types of content
     *
+    * NOTE: $types parameter is not checked to handle a case where
+    *       a plugins is being enabled/disabled, i.e., when you can't
+    *       depend on $_PLUGINS.
+    *
     * @access  public
-    * @param   types   mixed (string or array of string)
-	* @note            $types paramter is not checked to handle a case where
-	*                  a plugins is being enabled/disabled, i.e., when you can't
-	*                  depend on $_PLUGINS.
+    * @param   mixed   $types (string or array of string): 'article', ...
     */
     function setTypes($types)
     {
         $this->_types = array_unique($types);
     }
-    
+
     /**
     * Get the types of content
     *
     * @access  public
-    * @return          array of string
+    * @return  array    array of strings of types: 'article', 'staticpages', ...
     */
     function getTypes()
     {
         return $this->_types;
     }
-    
+
     /**
     * Normalize a URL
     *
     * @access  private
-    * @param   url      string
-    * @return           string  a normalized URL
+    * @param   string   $url    URL to normalize
+    * @return  string           a normalized URL
     */
     function _normalizeURL($url)
     {
         static $encoding = NULL;
-        
+
         if ($encoding === NULL) {
             $encoding = $this->getEncoding();
         }
-        
+
         $url = str_replace(
             array('&lt;', '&gt;', '&amp;', '&quot;', '&#039;'),
             array(   '<',    '>',     '&',      '"',      "'"),
             $url

From geeklog-cvs at lists.geeklog.net  Sun May 10 05:23:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 05:23:21 -0400
Subject: [geeklog-cvs] geeklog: Made COM_createImage recognize https:// URLs
Message-ID: <hg.40def9c7258a.1241947401.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/40def9c7258a
changeset: 7022:40def9c7258a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 11:23:06 2009 +0200
description:
Made COM_createImage recognize https:// URLs

diffstat:

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

diffs (23 lines):

diff -r e1a38f3e609e -r 40def9c7258a public_html/docs/history
--- a/public_html/docs/history	Sun May 10 10:13:49 2009 +0200
+++ b/public_html/docs/history	Sun May 10 11:23:06 2009 +0200
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Made COM_createImage recognize https:// URLs (bug #0000881) [Dirk]
 - Fixed notices in the config class (reported by tgc and others) [Dirk]
 - Fixed empty entries in the "Type" dropdown on the Advanced Search page.
   Requires an updated search/searchform.thtml template (part of bug #0000874)
diff -r e1a38f3e609e -r 40def9c7258a public_html/lib-common.php
--- a/public_html/lib-common.php	Sun May 10 10:13:49 2009 +0200
+++ b/public_html/lib-common.php	Sun May 10 11:23:06 2009 +0200
@@ -6275,7 +6275,7 @@
 
     $retval = '';
 
-    if (strpos($url, 'http://') !== 0) {
+    if (preg_match("/^(https?):/", $url) !== 1) {
         $url = $_CONF['layout_url'] . $url;
     }
     $attr_str = 'src="' . $url . '"';

From geeklog-cvs at lists.geeklog.net  Sun May 10 13:49:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 13:49:31 -0400
Subject: [geeklog-cvs] geeklog: Fixed security token name in commentform
	templates
Message-ID: <hg.152b26131cf0.1241977771.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/152b26131cf0
changeset: 7025:152b26131cf0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 17:39:32 2009 +0200
description:
Fixed security token name in commentform templates

diffstat:

3 files changed, 4 insertions(+), 3 deletions(-)
public_html/layout/professional/comment/commentform.thtml          |    2 +-
public_html/layout/professional/comment/commentform_advanced.thtml |    2 +-
system/lib-comment.php                                             |    3 ++-

diffs (37 lines):

diff -r 7744a7852de5 -r 152b26131cf0 public_html/layout/professional/comment/commentform.thtml
--- a/public_html/layout/professional/comment/commentform.thtml	Sun May 10 17:29:58 2009 +0200
+++ b/public_html/layout/professional/comment/commentform.thtml	Sun May 10 17:39:32 2009 +0200
@@ -8,7 +8,7 @@
                                                             <input type="hidden" name="sid" value="{sid}"{xhtml}>
                                                             <input type="hidden" name="pid" value="{pid}"{xhtml}>
                                                             <input type="hidden" name="type" value="{type}"{xhtml}>
-                                                            <input type="hidden" name="_glsectoken" value="{CSRF_TOKEN}"{xhtml}>
+                                                            <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
                                                             <input type="hidden" name="uid" value="{uid}"{xhtml}>{username} [ <a href="{action_url}" rel="nofollow">{lang_logoutorcreateaccount}</a> ]
                                                         </td>
                                                     </tr>
diff -r 7744a7852de5 -r 152b26131cf0 public_html/layout/professional/comment/commentform_advanced.thtml
--- a/public_html/layout/professional/comment/commentform_advanced.thtml	Sun May 10 17:29:58 2009 +0200
+++ b/public_html/layout/professional/comment/commentform_advanced.thtml	Sun May 10 17:39:32 2009 +0200
@@ -14,7 +14,7 @@
                                                             <input type="hidden" name="sid" value="{sid}"{xhtml}>
                                                             <input type="hidden" name="pid" value="{pid}"{xhtml}>
                                                             <input type="hidden" name="type" value="{type}"{xhtml}>
-                                                            <input type="hidden" name="_glsectoken" value="{CSRF_TOKEN}"{xhtml}>
+                                                            <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
                                                             <input type="hidden" name="comment" value=""{xhtml}>
                                                             <input type="hidden" name="uid" value="{uid}"{xhtml}>{username} [ <a href="{action_url}" rel="nofollow">{lang_logoutorcreateaccount}</a> ]
                                                         </td>
diff -r 7744a7852de5 -r 152b26131cf0 system/lib-comment.php
--- a/system/lib-comment.php	Sun May 10 17:29:58 2009 +0200
+++ b/system/lib-comment.php	Sun May 10 17:39:32 2009 +0200
@@ -948,7 +948,8 @@
                     $username = $_USER['username'];
                     $fullname = $_USER['fullname'];
                 }
-            	$comment_template->set_var('CSRF_TOKEN', SEC_createToken());
+                $comment_template->set_var('gltoken_name', CSRF_TOKEN);
+                $comment_template->set_var('gltoken', SEC_createToken());
                 $comment_template->set_var('uid', $commentuid);
                 $name = COM_getDisplayName($commentuid, $username, $fullname);
                 $comment_template->set_var('username', $name);

From geeklog-cvs at lists.geeklog.net  Sun May 10 13:49:30 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 13:49:30 -0400
Subject: [geeklog-cvs] geeklog: Fixed link to the license file
Message-ID: <hg.67961dab62a9.1241977770.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/67961dab62a9
changeset: 7023:67961dab62a9
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 16:05:08 2009 +0200
description:
Fixed link to the license file

diffstat:

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

diffs (12 lines):

diff -r 40def9c7258a -r 67961dab62a9 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html	Sun May 10 11:23:06 2009 +0200
+++ b/public_html/docs/english/index.html	Sun May 10 16:05:08 2009 +0200
@@ -117,7 +117,7 @@
 the ground, while Dirk Haun is now acting as the Geeklog maintainer.</p>
 
 <p>Geeklog is bona fide open-source software and has been released under the
-<a href="license" rel="license" title="GNU General Public License">GNU GPLv2</a>
+<a href="../license" rel="license" title="GNU General Public License">GNU GPLv2</a>
 for use by others. Configuring Geeklog is meant to be an easy process though it
 will require you to have access to several components of your system.</p>
 

From geeklog-cvs at lists.geeklog.net  Sun May 10 13:49:30 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 13:49:30 -0400
Subject: [geeklog-cvs] geeklog: Added missing comment template changes (less
	than I tho...
Message-ID: <hg.7744a7852de5.1241977770.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7744a7852de5
changeset: 7024:7744a7852de5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 17:29:58 2009 +0200
description:
Added missing comment template changes (less than I thought ...)

diffstat:

1 file changed, 3 insertions(+), 1 deletion(-)
public_html/docs/english/theme.html |    4 +++-

diffs (14 lines):

diff -r 67961dab62a9 -r 7744a7852de5 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun May 10 16:05:08 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun May 10 17:29:58 2009 +0200
@@ -255,7 +255,9 @@
 
 <h3>Comments</h3>
 
-<p><i>TBD</i></p>
+<p>The <tt>commentform.thtml</tt> and <tt>commentform.thtml</tt> template files
+were changed to include a security token and a <code>{notifcation}</code>
+variable (for the new option to be notified of followup comments).</p>
 
 <h3>Plugins</h3>
 

From geeklog-cvs at lists.geeklog.net  Sun May 10 15:44:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 10 May 2009 15:44:26 -0400
Subject: [geeklog-cvs] geeklog: Avoid SQL error in the unlikely event that a
	user is no...
Message-ID: <hg.ba11d6859ebc.1241984666.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ba11d6859ebc
changeset: 7026:ba11d6859ebc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 10 21:43:03 2009 +0200
description:
Avoid SQL error in the unlikely event that a user is not a member of any groups ("this shouldn't happen"; cf. bug #0000863)

diffstat:

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

diffs (35 lines):

diff -r 152b26131cf0 -r ba11d6859ebc system/lib-security.php
--- a/system/lib-security.php	Sun May 10 17:39:32 2009 +0200
+++ b/system/lib-security.php	Sun May 10 21:43:03 2009 +0200
@@ -470,15 +470,15 @@
 /**
 * Gets everything a user has permissions to within the system
 *
-* This is part of the Geeklog security implmentation.  This function
-* will get all the permissions the current user has call itself recursively.
+* This is part of the Geeklog security implementation.  This function
+* will get all the permissions the current user has. Calls itself recursively.
 *
-* @param    int     $grp_id     DO NOT USE (Used for reccursion) Current group function is working on
+* @param    int     $grp_id     DO NOT USE (Used for recursion) Current group function is working on
 * @param    int     $uid        User to check, if empty current user.
 * @return   string  returns comma delimited list of features the user has access to
 *
 */
-function SEC_getUserPermissions($grp_id='',$uid='')
+function SEC_getUserPermissions($grp_id='', $uid='')
 {
     global $_TABLES, $_USER, $_SEC_VERBOSE, $_GROUPS;
 
@@ -504,6 +504,11 @@
         $groups = $_GROUPS;
     } else {
         $groups = SEC_getUserGroups ($uid);
+    }
+
+    if (empty($groups)) {
+        // this shouldn't happen - make a graceful exit to avoid an SQL error
+        return '';
     }
 
     $glist = join(',', $groups);

From geeklog-cvs at lists.geeklog.net  Mon May 11 06:16:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 11 May 2009 06:16:59 -0400
Subject: [geeklog-cvs] geeklog: Fixed handling of "entire page" centerblocks
	in a multi...
Message-ID: <hg.84cdcac317cf.1242037019.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/84cdcac317cf
changeset: 7027:84cdcac317cf
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 11 12:16:47 2009 +0200
description:
Fixed handling of "entire page" centerblocks in a multi-language environment

diffstat:

2 files changed, 18 insertions(+), 1 deletion(-)
plugins/staticpages/services.inc.php |   17 ++++++++++++++++-
public_html/docs/history             |    2 ++

diffs (39 lines):

diff -r ba11d6859ebc -r 84cdcac317cf plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sun May 10 21:43:03 2009 +0200
+++ b/plugins/staticpages/services.inc.php	Mon May 11 12:16:47 2009 +0200
@@ -369,7 +369,22 @@
 
         // make sure there's only one "entire page" static page per topic
         if (($sp_centerblock == 1) && ($sp_where == 0)) {
-            DB_query ("UPDATE {$_TABLES['staticpage']} SET sp_centerblock = 0 WHERE sp_centerblock = 1 AND sp_where = 0 AND sp_tid = '$sp_tid'" . COM_getLangSQL ('sp_id', 'AND'));
+            $sql = "UPDATE {$_TABLES['staticpage']} SET sp_centerblock = 0 WHERE sp_centerblock = 1 AND sp_where = 0 AND sp_tid = '$sp_tid'";
+
+            // if we're in a multi-language setup, we need to allow one "entire
+            // page" centerblock for 'all' or 'none' per language
+            if ((!empty($_CONF['languages']) &&
+                    !empty($_CONF['language_files'])) &&
+                    (($sp_tid == 'all') || ($sp_tid == 'none'))) {
+                $ids = explode('_', $sp_id);
+                if (count($ids) > 1) {
+                    $lang_id = array_pop($ids);
+
+                    $sql .= " AND sp_id LIKE '%\\_$lang_id'";
+                }
+            }
+
+            DB_query($sql);
         }
 
         $formats = array ('allblocks', 'blankpage', 'leftblocks', 'noblocks');
diff -r ba11d6859ebc -r 84cdcac317cf public_html/docs/history
--- a/public_html/docs/history	Sun May 10 21:43:03 2009 +0200
+++ b/public_html/docs/history	Mon May 11 12:16:47 2009 +0200
@@ -24,6 +24,8 @@
 
 Static Pages plugin
 -------------------
+- Fixed handling of "entire page" centerblocks in a multi-language environment:
+  Need to allow one per language (reported by Norbert Ortmann) [Dirk]
 - Fixed a typo that prevented the [staticpage:] autotag from working [Dirk]
 
 XMLSitemap plugin

From geeklog-cvs at lists.geeklog.net  Sun May 17 04:05:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 04:05:20 -0400
Subject: [geeklog-cvs] geeklog: Link to the XMLSitemap documentation on the
	wiki for now
Message-ID: <hg.da4f858d63a6.1242547520.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/da4f858d63a6
changeset: 7028:da4f858d63a6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 09:05:31 2009 +0200
description:
Link to the XMLSitemap documentation on the wiki for now

diffstat:

2 files changed, 3 insertions(+), 1 deletion(-)
public_html/docs/english/changes.html |    2 +-
public_html/docs/english/index.html   |    2 ++

diffs (24 lines):

diff -r 84cdcac317cf -r da4f858d63a6 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Mon May 11 12:16:47 2009 +0200
+++ b/public_html/docs/english/changes.html	Sun May 17 09:05:31 2009 +0200
@@ -35,7 +35,7 @@
 <li>The minimum PHP version required by Geeklog is now <strong>PHP 4.3.0</strong>. Given that the PHP team ended support for PHP 4 in August 2008, you should be
 looking into upgrading to PHP 5 anyway.</li>
 <li>Includes <a href="http://www.fckeditor.net/">FCKeditor</a> 2.6.4</li>
-<li>Includes a new plugin, XMLSitemap, that automatically generates a <a
+<li>Includes a new plugin, <a href="http://wiki.geeklog.net/index.php/XMLSitemap_Plugin">XMLSitemap</a>, that automatically generates a <a
     href="http://www.sitemaps.org/">XML sitemap file</a>, as supported by all
     major search engines. Plugin written and provided by mystral-kk.</li>
 <li>Several <a href="http://wiki.geeklog.net/index.php/New_Plugin_API_Functions_in_Geeklog_1.6.0">new plugin API functions</a> have been added and existing
diff -r 84cdcac317cf -r da4f858d63a6 public_html/docs/english/index.html
--- a/public_html/docs/english/index.html	Mon May 11 12:16:47 2009 +0200
+++ b/public_html/docs/english/index.html	Sun May 17 09:05:31 2009 +0200
@@ -38,6 +38,8 @@
         - fight comment spam!</li>
       <li><a href="staticpages.html">Static Pages plugin</a>
         - for other static and non-static content</li>
+      <li><a href="http://wiki.geeklog.net/index.php/XMLSitemap_Plugin">XMLSitemap plugin</a>
+        - creates <tt>sitemap.xml</tt> files for search engines</li>
     </ul></li>
   <li><a href="trackback.html">Trackback, Pingback, Ping</a></li>
   <li>Geeklog's API

From geeklog-cvs at lists.geeklog.net  Sun May 17 04:05:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 04:05:20 -0400
Subject: [geeklog-cvs] geeklog: Fixes to get the XMLSitemap plugin's
	postinstall workin...
Message-ID: <hg.99e5a429c202.1242547520.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/99e5a429c202
changeset: 7029:99e5a429c202
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 10:05:01 2009 +0200
description:
Fixes to get the XMLSitemap plugin's postinstall working from the install script

diffstat:

5 files changed, 23 insertions(+), 6 deletions(-)
plugins/xmlsitemap/autoinstall.php        |    3 +--
public_html/admin/install/index.php       |   21 +++++++++++++++++++--
public_html/admin/install/lib-install.php |    2 +-
public_html/admin/install/lib-upgrade.php |    2 +-
public_html/docs/history                  |    1 +

diffs (98 lines):

diff -r da4f858d63a6 -r 99e5a429c202 plugins/xmlsitemap/autoinstall.php
--- a/plugins/xmlsitemap/autoinstall.php	Sun May 17 09:05:31 2009 +0200
+++ b/plugins/xmlsitemap/autoinstall.php	Sun May 17 10:05:01 2009 +0200
@@ -118,7 +118,6 @@
 * @param    string  $pi_name    Plugin name
 * @return   boolean             TRUE: plugin compatible; FALSE: not compatible
 */
-/*
 function plugin_postinstall_xmlsitemap($pi_name)
 {
     global $_CONF, $_XMLSMAP_CONF;
@@ -128,5 +127,5 @@
     // Create an XML sitemap for the first time
     return XMLSMAP_update();
 }
-*/
+
 ?>
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/index.php	Sun May 17 10:05:01 2009 +0200
@@ -47,7 +47,7 @@
  */
 function INST_installEngine($install_type, $install_step)
 {
-    global $_CONF, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
+    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
 
     switch ($install_step) {
 
@@ -489,6 +489,23 @@
 
                         if (! $install_plugins) {
                             // do a default install of all available plugins
+
+                            /**
+                            * For the plugin install we would actually need
+                            * lib-common.php in the global namespace. Since
+                            * we're in a function, we need to hack a few
+                            * things and rely on a few global declarations
+                            * (see beginning of function).
+                            */
+
+                            // Hack: not needed here - avoid notice
+                            $_DB_mysqldump_path = '';
+
+                            // Hack: lib-common will overwrite $language
+                            $lx_inst = $language;
+                            require_once '../../lib-common.php';
+                            $language = $lx_inst;
+
                             INST_defaultPluginInstall();
                         }
 
@@ -832,7 +849,7 @@
 */
 function INST_defaultPluginInstall()
 {
-    global $_CONF, $_TABLES;
+    global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
 
     if (! function_exists('COM_errorLog')) {
         // "Emergency" version of COM_errorLog
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun May 17 10:05:01 2009 +0200
@@ -673,7 +673,7 @@
 */
 function INST_getPluginInfo($plugin)
 {
-    global $_CONF;
+    global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
 
     $info = false;
 
diff -r da4f858d63a6 -r 99e5a429c202 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sun May 17 09:05:31 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sun May 17 10:05:01 2009 +0200
@@ -846,7 +846,7 @@
 */
 function INST_autoinstallNewPlugins()
 {
-    global $_CONF, $_TABLES;
+    global $_CONF, $_TABLES, $_DB_dbms, $_DB_table_prefix;
 
     $newplugins = array();
 
diff -r da4f858d63a6 -r 99e5a429c202 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 09:05:31 2009 +0200
+++ b/public_html/docs/history	Sun May 17 10:05:01 2009 +0200
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed plugin postinstall from the install script
 - Made COM_createImage recognize https:// URLs (bug #0000881) [Dirk]
 - Fixed notices in the config class (reported by tgc and others) [Dirk]
 - Fixed empty entries in the "Type" dropdown on the Advanced Search page.

From geeklog-cvs at lists.geeklog.net  Sun May 17 04:30:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 04:30:11 -0400
Subject: [geeklog-cvs] geeklog: The user's current password is no longer
	available in $...
Message-ID: <hg.14e4943af5e4.1242549011.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/14e4943af5e4
changeset: 7030:14e4943af5e4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 10:28:44 2009 +0200
description:
The user's current password is no longer available in $_USER, so changing the password or deleting an account no longer worked (reported by Tom Homer)

diffstat:

2 files changed, 11 insertions(+), 5 deletions(-)
public_html/docs/history     |    4 +++-
public_html/usersettings.php |   12 ++++++++----

diffs (61 lines):

diff -r 99e5a429c202 -r 14e4943af5e4 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 10:05:01 2009 +0200
+++ b/public_html/docs/history	Sun May 17 10:28:44 2009 +0200
@@ -11,7 +11,9 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
-- Fixed plugin postinstall from the install script
+- Users couldn't change their password or delete their account (reported by
+  Tom Homer) [Dirk]
+- Fixed plugin postinstall from the install script [Dirk]
 - Made COM_createImage recognize https:// URLs (bug #0000881) [Dirk]
 - Fixed notices in the config class (reported by tgc and others) [Dirk]
 - Fixed empty entries in the "Type" dropdown on the Advanced Search page.
diff -r 99e5a429c202 -r 14e4943af5e4 public_html/usersettings.php
--- a/public_html/usersettings.php	Sun May 17 10:05:01 2009 +0200
+++ b/public_html/usersettings.php	Sun May 17 10:28:44 2009 +0200
@@ -265,8 +265,10 @@
 
     // to change the password, email address, or cookie timeout,
     // we need the user's current password
+    $current_password = DB_getItem($_TABLES['users'], 'passwd',
+                                   "uid = {$_USER['uid']}");
     if (empty($_POST['old_passwd']) ||
-            (SEC_encryptPassword($_POST['old_passwd']) != $_USER['passwd'])) {
+            (SEC_encryptPassword($_POST['old_passwd']) != $current_password)) {
          return COM_refresh($_CONF['site_url']
                             . '/usersettings.php?msg=84');
     }
@@ -890,10 +892,12 @@
 
     // to change the password, email address, or cookie timeout,
     // we need the user's current password
+    $current_password = DB_getItem($_TABLES['users'], 'passwd',
+                                   "uid = {$_USER['uid']}");
     if (!empty ($A['passwd']) || ($A['email'] != $_USER['email']) ||
             ($A['cooktime'] != $_USER['cookietimeout'])) {
         if (empty($A['old_passwd']) ||
-                (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd'])) {
+                (SEC_encryptPassword($A['old_passwd']) != $current_password)) {
 
             return COM_refresh ($_CONF['site_url']
                                 . '/usersettings.php?msg=83');
@@ -992,7 +996,7 @@
 
         if (!empty($A['passwd'])) {
             if (($A['passwd'] == $A['passwd_conf']) &&
-                    (SEC_encryptPassword($A['old_passwd']) == $_USER['passwd'])) {
+                    (SEC_encryptPassword($A['old_passwd']) == $current_password)) {
                 $passwd = SEC_encryptPassword($A['passwd']);
                 DB_change($_TABLES['users'], 'passwd', "$passwd",
                           "uid", $_USER['uid']);
@@ -1004,7 +1008,7 @@
                 setcookie($_CONF['cookie_password'], $passwd, time() + $cooktime,
                           $_CONF['cookie_path'], $_CONF['cookiedomain'],
                           $_CONF['cookiesecure']);
-            } elseif (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd']) {
+            } elseif (SEC_encryptPassword($A['old_passwd']) != $current_password) {
                 return COM_refresh ($_CONF['site_url']
                                     . '/usersettings.php?msg=68');
             } elseif ($A['passwd'] != $A['passwd_conf']) {

From geeklog-cvs at lists.geeklog.net  Sun May 17 11:35:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 11:35:14 -0400
Subject: [geeklog-cvs] geeklog: Don't include Links in the sitemap
	automatically as it ...
Message-ID: <hg.94cf2d15c705.1242574514.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/94cf2d15c705
changeset: 7031:94cf2d15c705
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 13:18:39 2009 +0200
description:
Don't include Links in the sitemap automatically as it should not point to redirecting URLs

diffstat:

4 files changed, 6 insertions(+), 7 deletions(-)
plugins/xmlsitemap/functions.inc        |    4 ++--
plugins/xmlsitemap/install_defaults.php |    4 +---
plugins/xmlsitemap/xmlsitemap.class.php |    2 +-
public_html/docs/history                |    3 ++-

diffs (72 lines):

diff -r 14e4943af5e4 -r 94cf2d15c705 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun May 17 10:28:44 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun May 17 13:18:39 2009 +0200
@@ -7,8 +7,8 @@
 // | functions.inc                                                             |
 // |                                                                           |
 // | This file does two things: 1) it implements the necessary Geeklog Plugin  |
-// | API method and 2) implements all the common code needed by the Links      |
-// | Plugins' PHP files.                                                       |
+// | API method and 2) implements all the common code needed by the XMLSitemap |
+// | Plugin's PHP files.                                                       |
 // +---------------------------------------------------------------------------+
 // | Copyright (C) 2009 by the following authors:                              |
 // |                                                                           |
diff -r 14e4943af5e4 -r 94cf2d15c705 plugins/xmlsitemap/install_defaults.php
--- a/plugins/xmlsitemap/install_defaults.php	Sun May 17 10:28:44 2009 +0200
+++ b/plugins/xmlsitemap/install_defaults.php	Sun May 17 13:18:39 2009 +0200
@@ -58,13 +58,12 @@
 $_XMLSMAP_DEFAULT['mobile_sitemap_file'] = 'mobile_sitemap.xml';
 
 // Content types
-$_XMLSMAP_DEFAULT['types'] = array('article', 'staticpages', 'links', 'calendar');
+$_XMLSMAP_DEFAULT['types'] = array('article', 'staticpages', 'calendar');
 
 // Priorities (must be between 0.0 and 1.0; default value is 0.5)
 $_XMLSMAP_DEFAULT['priorities'] = array(
     'article'     => 0.5,
     'staticpages' => 0.5,
-    'links'       => 0.5,
     'calendar'    => 0.5,
 );
 
@@ -73,7 +72,6 @@
 $_XMLSMAP_DEFAULT['frequencies'] = array(
     'article'     => 'daily',
     'staticpages' => 'weekly',
-    'links'       => 'weekly',
     'calendar'    => 'daily',
 );
 
diff -r 14e4943af5e4 -r 94cf2d15c705 plugins/xmlsitemap/xmlsitemap.class.php
--- a/plugins/xmlsitemap/xmlsitemap.class.php	Sun May 17 10:28:44 2009 +0200
+++ b/plugins/xmlsitemap/xmlsitemap.class.php	Sun May 17 13:18:39 2009 +0200
@@ -56,7 +56,7 @@
 *   $sitemap = new SitemapXML();
 *   $sitemap->setFileNames('path_to_sitemap_file',
 *       'path_to_mobile_sitemap_file');
-*   // $sitemap->setTypes(array('article', 'links'));
+*   // $sitemap->setTypes(array('article', 'staticpages'));
 *   // $sitemap->setPriority('article', 0.6);
 *   // $sitemap->setPriority('staticpages', 0.4);
 *   // $sitemap->setChangeFreq('article', 'weekly');
diff -r 14e4943af5e4 -r 94cf2d15c705 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 10:28:44 2009 +0200
+++ b/public_html/docs/history	Sun May 17 13:18:39 2009 +0200
@@ -10,7 +10,7 @@
 + Improved search, by Sami Barakat
 + Comment moderation and editable comments, by Jared Wenerd
 
-Other changes:
+Changes since 1.6.0b1:
 - Users couldn't change their password or delete their account (reported by
   Tom Homer) [Dirk]
 - Fixed plugin postinstall from the install script [Dirk]
@@ -33,6 +33,7 @@
 
 XMLSitemap plugin
 -----------------
+- Don't include Links in the sitemap.xml automatically [Dirk]
 - Fixed "missing argument 2" error when changing config options (reported by
   Markus Wollschl?ger) [Dirk]
 

From geeklog-cvs at lists.geeklog.net  Sun May 17 11:35:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 11:35:15 -0400
Subject: [geeklog-cvs] geeklog: A fresh install didn't call the
	plugin_compatible_with_...
Message-ID: <hg.834a08534861.1242574515.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/834a08534861
changeset: 7032:834a08534861
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 16:07:38 2009 +0200
description:
A fresh install didn't call the plugin_compatible_with_this_version API function for the bundled plugins; fixing this also got rid of some code duplication

diffstat:

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

diffs (48 lines):

diff -r 94cf2d15c705 -r 834a08534861 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun May 17 13:18:39 2009 +0200
+++ b/public_html/admin/install/index.php	Sun May 17 16:07:38 2009 +0200
@@ -859,31 +859,7 @@
         }
     }
 
-    $plugins_dir = $_CONF['path'] . 'plugins/';
-    $fd = opendir($plugins_dir);
-    while (($plugin = @readdir($fd)) == TRUE) {
-
-        if (($plugin <> '.') && ($plugin <> '..') && ($plugin <> 'CVS') &&
-                (substr($plugin, 0, 1) <> '.') &&
-                (substr($plugin, 0, 1) <> '_') &&
-                is_dir($plugins_dir . $plugin)) {
-
-            clearstatcache ();
-            $plugin_dir = $plugins_dir . $plugin;
-
-            if (DB_count($_TABLES['plugins'], 'pi_name', $plugin) == 0) {
-
-                $info = INST_getPluginInfo($plugin);
-                if ($info !== false) {
-                    $fn = 'plugin_autoinstall_' . $plugin;
-                    $inst_parms = $fn($plugin);
-                    INST_pluginAutoinstall($plugin, $inst_parms);
-                }
-
-            }
-
-        }
-    }
+    INST_autoinstallNewPlugins();
 }
 
 
diff -r 94cf2d15c705 -r 834a08534861 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 13:18:39 2009 +0200
+++ b/public_html/docs/history	Sun May 17 16:07:38 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0b1:
+- A fresh install didn't check if the bundled plugins are compatible with the
+  Geeklog version about to be installed [Dirk]
 - Users couldn't change their password or delete their account (reported by
   Tom Homer) [Dirk]
 - Fixed plugin postinstall from the install script [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun May 17 11:35:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 11:35:15 -0400
Subject: [geeklog-cvs] geeklog: Added a check to all plugins to see if they
	support the...
Message-ID: <hg.9089a0c77860.1242574515.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9089a0c77860
changeset: 7033:9089a0c77860
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 16:30:39 2009 +0200
description:
Added a check to all plugins to see if they support the DBMS the site is running on

diffstat:

7 files changed, 56 insertions(+)
plugins/calendar/autoinstall.php    |    9 +++++++++
plugins/links/autoinstall.php       |    9 +++++++++
plugins/polls/autoinstall.php       |    9 +++++++++
plugins/spamx/autoinstall.php       |    9 +++++++++
plugins/staticpages/autoinstall.php |    9 +++++++++
plugins/xmlsitemap/autoinstall.php  |    9 +++++++++
public_html/docs/history            |    2 ++

diffs (126 lines):

diff -r 834a08534861 -r 9089a0c77860 plugins/calendar/autoinstall.php
--- a/plugins/calendar/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/calendar/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -95,6 +95,15 @@
 
 function plugin_compatible_with_this_version_calendar($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     if (function_exists('COM_printUpcomingEvents')) {
         // if this function exists, then someone's trying to install the
         // plugin on Geeklog 1.4.0 or older - sorry, but that won't work
diff -r 834a08534861 -r 9089a0c77860 plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/links/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -163,6 +163,15 @@
 */
 function plugin_compatible_with_this_version_links($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     if (!function_exists('COM_truncate') || !function_exists('MBYTE_strpos')) {
         return false;
     }
diff -r 834a08534861 -r 9089a0c77860 plugins/polls/autoinstall.php
--- a/plugins/polls/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/polls/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -115,6 +115,15 @@
 */
 function plugin_compatible_with_this_version_polls($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     if (function_exists('COM_showPoll') || function_exists('COM_pollVote')) {
         // if these functions exist, then someone's trying to install the
         // plugin on Geeklog 1.3.11 or older - sorry, but that won't work
diff -r 834a08534861 -r 9089a0c77860 plugins/spamx/autoinstall.php
--- a/plugins/spamx/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/spamx/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -114,6 +114,15 @@
 */
 function plugin_compatible_with_this_version_spamx($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     if (! function_exists('PLG_spamAction')) {
         return false;
     }   
diff -r 834a08534861 -r 9089a0c77860 plugins/staticpages/autoinstall.php
--- a/plugins/staticpages/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/staticpages/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -117,6 +117,15 @@
 */
 function plugin_compatible_with_this_version_staticpages($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     if (! function_exists('SEC_getGroupDropdown')) {
         return false;
     }
diff -r 834a08534861 -r 9089a0c77860 plugins/xmlsitemap/autoinstall.php
--- a/plugins/xmlsitemap/autoinstall.php	Sun May 17 16:07:38 2009 +0200
+++ b/plugins/xmlsitemap/autoinstall.php	Sun May 17 16:30:39 2009 +0200
@@ -109,6 +109,15 @@
 */
 function plugin_compatible_with_this_version_xmlsitemap($pi_name)
 {
+    global $_CONF, $_DB_dbms;
+
+    // check if we support the DBMS the site is running on
+    $dbFile = $_CONF['path'] . 'plugins/' . $pi_name . '/sql/'
+            . $_DB_dbms . '_install.php';
+    if (! file_exists($dbFile)) {
+        return false;
+    }
+
     return function_exists('PLG_itemDeleted');
 }
 
diff -r 834a08534861 -r 9089a0c77860 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 16:07:38 2009 +0200
+++ b/public_html/docs/history	Sun May 17 16:30:39 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0b1:
+- All bundled plugins now include a check to see if they support the DBMS the
+  site is running on [Dirk]
 - A fresh install didn't check if the bundled plugins are compatible with the
   Geeklog version about to be installed [Dirk]
 - Users couldn't change their password or delete their account (reported by

From geeklog-cvs at lists.geeklog.net  Sun May 17 11:35:16 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 11:35:16 -0400
Subject: [geeklog-cvs] geeklog: Load a plugin's functions.inc after
	successful autoinst...
Message-ID: <hg.99d594b20bc0.1242574516.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/99d594b20bc0
changeset: 7034:99d594b20bc0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 17:13:16 2009 +0200
description:
Load a plugin's functions.inc after successful autoinstall (for any plugins monitoring PLG_pluginStateChange, e.g. XMLSitemap)

diffstat:

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

diffs (14 lines):

diff -r 9089a0c77860 -r 99d594b20bc0 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sun May 17 16:30:39 2009 +0200
+++ b/public_html/admin/plugins.php	Sun May 17 17:13:16 2009 +0200
@@ -1108,6 +1108,10 @@
         COM_errorLog("Successfully installed the '$plugin' plugin!", 1);
     }
 
+    // load plugin here already, for any plugins wanting to act on
+    // PLG_pluginStateChange($plugin, 'installed') when we return from here
+    require_once $_CONF['path'] . 'plugins/' . $plugin . '/functions.inc';
+
     return true;
 }
 

From geeklog-cvs at lists.geeklog.net  Sun May 17 11:35:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 11:35:17 -0400
Subject: [geeklog-cvs] geeklog: Whitespace fixes (tabs and extra spaces at
	the end of l...
Message-ID: <hg.55ce3b9ba68c.1242574517.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/55ce3b9ba68c
changeset: 7035:55ce3b9ba68c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 17:22:18 2009 +0200
description:
Whitespace fixes (tabs and extra spaces at the end of lines) only

diffstat:

1 file changed, 242 insertions(+), 243 deletions(-)
plugins/xmlsitemap/functions.inc |  485 ++++++++++++++++++--------------------

diffs (truncated from 622 to 300 lines):

diff -r 99d594b20bc0 -r 55ce3b9ba68c plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun May 17 17:13:16 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun May 17 17:22:18 2009 +0200
@@ -70,11 +70,11 @@
 function plugin_chkVersion_xmlsitemap()
 {
     global $_CONF;
-    
+
     require_once $_CONF['path'] . 'plugins/xmlsitemap/autoinstall.php';
-    
+
     $inst_parms = plugin_autoinstall_xmlsitemap('xmlsitemap');
-    
+
     return $inst_parms['info']['pi_version'];
 }
 
@@ -86,7 +86,7 @@
 function plugin_upgrade_xmlsitemap()
 {
     global $_CONF, $_TABLES;
-    
+
     $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
                                     "pi_name = 'xmlsitemap'");
     $code_version = plugin_chkVersion_xmlsitemap();
@@ -94,18 +94,18 @@
         // nothing to do
         return TRUE;
     }
-    
+
     require_once $_CONF['path'] . 'plugins/xmlsitemap/autoinstall.php';
-    
+
     if (! plugin_compatible_with_this_version_xmlsitemap('xmlsitemap')) {
         return 3002;
     }
-    
+
     $inst_parms = plugin_autoinstall_xmlsitemap('xmlsitemap');
     $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 = 'xmlsitemap'");
-    
+
     return TRUE;
 }
 
@@ -117,7 +117,7 @@
 function plugin_autouninstall_xmlsitemap()
 {
     global $_XMLSMAP_CONF;
-    
+
     $out = array (
         /* give the name of the tables, without $_TABLES[] */
         'tables' => array(),
@@ -139,9 +139,9 @@
 function XMLSMAP_loadConfig()
 {
     global $_CONF;
-    
+
     require_once $_CONF['path_system'] . 'classes/config.class.php';
-    
+
     $config = config::get_instance();
     if ($config->group_exists('xmlsitemap')) {
         return $config->get_config('xmlsitemap');
@@ -156,11 +156,11 @@
 function XMLSMAP_esc($str)
 {
     static $encoding = NULL;
-    
+
     if ($encoding === NULL) {
         $encoding = COM_getCharset();;
     }
-    
+
     $str = str_replace(
         array('&lt;', '&gt;', '&amp;', '&quot;', '&#039;'),
         array(   '<',    '>',     '&',      '"',      "'"),
@@ -175,7 +175,7 @@
 function XMLSMAP_str($index, $noesc = FALSE)
 {
     global $LANG_XMLSMAP;
-    
+
     if (isset($LANG_XMLSMAP[$index])) {
         if ($noesc) {
             return $LANG_XMLSMAP[$index];
@@ -197,19 +197,19 @@
 function XMLSMAP_update($type = NULL, $include = NULL, $exclude = NULL)
 {
     global $_CONF, $_XMLSMAP_CONF;
-    
+
     if (($type !== NULL)
      AND !in_array(strtolower($type), $_XMLSMAP_CONF['types'])) {
         // Notified about content change, but from an irrelevant plugin, one
         // that doesn't implement 'plugin_getiteminfo_xxx' function.
         return TRUE;
     }
-    
+
     require_once $_CONF['path'] . 'plugins/xmlsitemap/xmlsitemap.class.php';
-    
+
     $charset = COM_getCharset();
     $sitemap = new SitemapXML($charset);
-    
+
     // Set sitemap file names
     if (empty($_XMLSMAP_CONF['mobile_sitemap_file'])) {
         $sitemap->setFileNames($_XMLSMAP_CONF['sitemap_file']);
@@ -219,32 +219,32 @@
             $_XMLSMAP_CONF['mobile_sitemap_file']
         );
     }
-    
-	// Set types
-	$types = $_XMLSMAP_CONF['types'];
-	if ($include !== NULL) {
-		if (($index = array_search($exclude, $types)) === FALSE) {
-			$types[] = $include;
-		}
-	}
-	if ($exclude !== NULL) {
-		if (($index = array_search($exclude, $types)) !== FALSE) {
-			unset($types[$index]);
-		}
-	}
-	
+
+    // Set types
+    $types = $_XMLSMAP_CONF['types'];
+    if ($include !== NULL) {
+        if (($index = array_search($exclude, $types)) === FALSE) {
+            $types[] = $include;
+        }
+    }
+    if ($exclude !== NULL) {
+        if (($index = array_search($exclude, $types)) !== FALSE) {
+            unset($types[$index]);
+        }
+    }
+
     $sitemap->setTypes($types);
-	
+
     // Set priorities
     foreach ($_XMLSMAP_CONF['priorities'] as $type => $pri) {
         $sitemap->setPriority($type, $pri);
     }
-    
+
     // Set update frequencies
     foreach ($_XMLSMAP_CONF['frequencies'] as $type => $freq) {
         $sitemap->setChangeFreq($type, $freq);
     }
-    
+
     return $sitemap->create();
 }
 
@@ -269,31 +269,31 @@
 */
 function plugin_enablestatechange_xmlsitemap($enable)
 {
-	global $_CONF, $_XMLSMAP_CONF;
-	
-	if ($enable) {
-		/**
-		* @note
-		*
-		* At this time, $_XMLSMAP_CONF is visible only in
-		* PLG_enableStateChange().  So we have to reload them from DB.
-		*/
-		$_XMLSMAP_CONF = XMLSMAP_loadConfig();
-		
-	    XMLSMAP_update();
-	} else {
-		if ($_XMLSMAP_CONF['sitemap_file'] != '') {
-			if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file'])) {
-				COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file']);
-			}
-		}
-		
-		if (! empty($_XMLSMAP_CONF['mobile_sitemap_file'])) {
-			if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file'])) {
-				COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file']);
-			}
-		}
-	}
+    global $_CONF, $_XMLSMAP_CONF;
+
+    if ($enable) {
+        /**
+        * @note
+        *
+        * At this time, $_XMLSMAP_CONF is visible only in
+        * PLG_enableStateChange().  So we have to reload them from DB.
+        */
+        $_XMLSMAP_CONF = XMLSMAP_loadConfig();
+
+        XMLSMAP_update();
+    } else {
+        if ($_XMLSMAP_CONF['sitemap_file'] != '') {
+            if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file'])) {
+                COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file']);
+            }
+        }
+
+        if (! empty($_XMLSMAP_CONF['mobile_sitemap_file'])) {
+            if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file'])) {
+                COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file']);
+            }
+        }
+    }
 }
 
 /**
@@ -305,64 +305,64 @@
 function XMLSITEMAP_checkChange($name)
 {
     global $_CONF, $_PLUGINS, $_TABLES, $_XMLSMAP_CONF;
-	
-	if (count($_XMLSMAP_CONF[$name]) == 0) {
-		return;
-	}
-	
-	$enabled_plugins = $_PLUGINS;
-	$enabled_plugins[] = 'article';
-	$valids = array();
-	
-	// Check and add a valid value to $valids
-	foreach ($_XMLSMAP_CONF[$name] as $key => $value) {
-		switch ($name) {
-			case 'types':
-				if (in_array($value, $enabled_plugins)) {
-					$valids[] = $value;
-				}
-				break;
-			
-			case 'priorities':
-				if (!is_numeric($key) AND in_array($key, $enabled_plugins)) {
-					$value = (float) $value;
-					
-					if (($value < 0.0) OR ($value > 1.0)) {
-						$value = 0.5;
-					}
-					
-				 	$valids[$key] = $value;
-				}
-				break;
-			
-			case 'frequencies':
-				$value = strtolower(trim($value));
-				$valid_change_freqs = array('always', 'hourly', 'daily', 'weekly',
+
+    if (count($_XMLSMAP_CONF[$name]) == 0) {
+        return;
+    }
+
+    $enabled_plugins = $_PLUGINS;
+    $enabled_plugins[] = 'article';
+    $valids = array();
+
+    // Check and add a valid value to $valids
+    foreach ($_XMLSMAP_CONF[$name] as $key => $value) {
+        switch ($name) {
+            case 'types':
+                if (in_array($value, $enabled_plugins)) {
+                    $valids[] = $value;
+                }
+                break;
+
+            case 'priorities':
+                if (!is_numeric($key) AND in_array($key, $enabled_plugins)) {
+                    $value = (float) $value;
+
+                    if (($value < 0.0) OR ($value > 1.0)) {
+                        $value = 0.5;
+                    }
+
+                     $valids[$key] = $value;
+                }
+                break;
+
+            case 'frequencies':
+                $value = strtolower(trim($value));
+                $valid_change_freqs = array('always', 'hourly', 'daily', 'weekly',
             'monthly', 'yearly', 'never');
-				
-				if (!is_numeric($key) AND in_array($key, $enabled_plugins)
-				 AND (in_array($value, $valid_change_freqs))) {

From geeklog-cvs at lists.geeklog.net  Sun May 17 14:20:17 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 14:20:17 -0400
Subject: [geeklog-cvs] geeklog: We don't need the XMLSitemap feature and
	Admin group (yet)
Message-ID: <hg.3820f9fa0da8.1242584417.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3820f9fa0da8
changeset: 7036:3820f9fa0da8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 19:01:40 2009 +0200
description:
We don't need the XMLSitemap feature and Admin group (yet)

diffstat:

2 files changed, 5 insertions(+), 22 deletions(-)
plugins/xmlsitemap/autoinstall.php |   23 +++--------------------
plugins/xmlsitemap/functions.inc   |    4 ++--

diffs (58 lines):

diff -r 55ce3b9ba68c -r 3820f9fa0da8 plugins/xmlsitemap/autoinstall.php
--- a/plugins/xmlsitemap/autoinstall.php	Sun May 17 17:22:18 2009 +0200
+++ b/plugins/xmlsitemap/autoinstall.php	Sun May 17 19:01:40 2009 +0200
@@ -47,9 +47,7 @@
 {
     $pi_name         = 'xmlsitemap';
     $pi_display_name = 'XMLSitemap';
-    $pi_admin        = $pi_display_name . ' Admin';
-    $feature         = 'xmlsitemap.edit';
-    
+
     $info = array(
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
@@ -57,26 +55,11 @@
         'pi_gl_version'   => '1.6.0',
         'pi_homepage'     => 'http://www.geeklog.net/',
     );
-    
-    $groups = array(
-        $pi_admin => 'Users in this group can administer the ' . $pi_display_name . ' plugin'
-    );
-    $features = array(
-        $feature => 'Access to ' . $pi_admin,
-    );
-    $mappings = array(
-        $feature => array($pi_admin),
-    );
-    $tables = array();
-    
+
     $inst_parms = array(
         'info'      => $info,
-        'groups'    => $groups,
-        'features'  => $features,
-        'mappings'  => $mappings,
-        'tables'    => $tables,
     );
-    
+
     return $inst_parms;
 }
 
diff -r 55ce3b9ba68c -r 3820f9fa0da8 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun May 17 17:22:18 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun May 17 19:01:40 2009 +0200
@@ -122,9 +122,9 @@
         /* give the name of the tables, without $_TABLES[] */
         'tables' => array(),
         /* give the full name of the group, as in the db */
-        'groups' => array('XMLSitemap Admin'),
+        'groups' => array(),
         /* give the full name of the feature, as in the db */
-        'features' => array('xmlsitemap.edit'),
+        'features' => array(),
         /* give the full name of the block, including 'phpblock_', etc */
         'php_blocks' => array(),
         /* give all vars with their name */

From geeklog-cvs at lists.geeklog.net  Sun May 17 14:20:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 14:20:18 -0400
Subject: [geeklog-cvs] geeklog: Don't set the default value into the config
	array when ...
Message-ID: <hg.664a7d73ef34.1242584418.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/664a7d73ef34
changeset: 7037:664a7d73ef34
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 19:41:42 2009 +0200
description:
Don't set the default value into the config array when $set == false

diffstat:

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

diffs (14 lines):

diff -r 3820f9fa0da8 -r 664a7d73ef34 system/classes/config.class.php
--- a/system/classes/config.class.php	Sun May 17 19:01:40 2009 +0200
+++ b/system/classes/config.class.php	Sun May 17 19:41:42 2009 +0200
@@ -299,7 +299,9 @@
 
         $this->_DB_escapedQuery($sql);
 
-        $this->config_array[$group][$param_name] = $default_value;
+        if ($set) {
+            $this->config_array[$group][$param_name] = $default_value;
+        }
     }
 
     /**

From geeklog-cvs at lists.geeklog.net  Sun May 17 14:20:18 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 17 May 2009 14:20:18 -0400
Subject: [geeklog-cvs] geeklog: Remove sitemap files when uninstalling the
	XMLSitemap p...
Message-ID: <hg.e7480f4ebb74.1242584418.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e7480f4ebb74
changeset: 7038:e7480f4ebb74
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 17 20:02:26 2009 +0200
description:
Remove sitemap files when uninstalling the XMLSitemap plugin

diffstat:

2 files changed, 29 insertions(+), 13 deletions(-)
plugins/xmlsitemap/functions.inc |   41 +++++++++++++++++++++++++-------------
public_html/docs/history         |    1 

diffs (81 lines):

diff -r 664a7d73ef34 -r e7480f4ebb74 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun May 17 19:41:42 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun May 17 20:02:26 2009 +0200
@@ -130,6 +130,9 @@
         /* give all vars with their name */
         'vars' => array('xmlsitemap_filename', 'xmlsitemap_mobile'),
     );
+
+    XMLSITEMAP_removeSitemapFiles();
+
     return $out;
 }
 
@@ -273,8 +276,6 @@
 
     if ($enable) {
         /**
-        * @note
-        *
         * At this time, $_XMLSMAP_CONF is visible only in
         * PLG_enableStateChange().  So we have to reload them from DB.
         */
@@ -282,17 +283,7 @@
 
         XMLSMAP_update();
     } else {
-        if ($_XMLSMAP_CONF['sitemap_file'] != '') {
-            if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file'])) {
-                COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['sitemap_file']);
-            }
-        }
-
-        if (! empty($_XMLSMAP_CONF['mobile_sitemap_file'])) {
-            if (!@unlink($_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file'])) {
-                COM_errorLog('Xmlsitemap: cannot delete a sitemap: ' . $_CONF['path_html'] . $_XMLSMAP_CONF['mobile_sitemap_file']);
-            }
-        }
+        XMLSITEMAP_removeSitemapFiles();
     }
 }
 
@@ -524,4 +515,28 @@
     }
 }
 
+/**
+* Remove the sitemap file(s)
+*
+* @return void
+*/
+function XMLSITEMAP_removeSitemapFiles()
+{
+    global $_CONF, $_XMLSMAP_CONF;
+
+    $filenames = array('sitemap_file', 'mobile_sitemap_file');
+
+    foreach ($filenames as $filename) {
+        if (! empty($_XMLSMAP_CONF[$filename])) {
+            $sitemap = $_CONF['path_html'] . $_XMLSMAP_CONF[$filename];
+            if (file_exists($sitemap)) {
+                if (! @unlink($sitemap)) {
+                    COM_errorLog('XMLSitemap: cannot delete a sitemap: '
+                                 . $sitemap);
+                }
+            }
+        }
+    }
+}
+
 ?>
diff -r 664a7d73ef34 -r e7480f4ebb74 public_html/docs/history
--- a/public_html/docs/history	Sun May 17 19:41:42 2009 +0200
+++ b/public_html/docs/history	Sun May 17 20:02:26 2009 +0200
@@ -37,6 +37,7 @@
 
 XMLSitemap plugin
 -----------------
+- Remove sitemap files when uninstalling the plugin [Dirk]
 - Don't include Links in the sitemap.xml automatically [Dirk]
 - Fixed "missing argument 2" error when changing config options (reported by
   Markus Wollschl?ger) [Dirk]

From geeklog-cvs at lists.geeklog.net  Mon May 18 05:13:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 18 May 2009 05:13:23 -0400
Subject: [geeklog-cvs] geeklog: Fixed typo
Message-ID: <hg.d960feb016ec.1242638003.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d960feb016ec
changeset: 7039:d960feb016ec
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 18 11:13:14 2009 +0200
description:
Fixed typo

diffstat:

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

diffs (76 lines):

diff -r e7480f4ebb74 -r d960feb016ec language/german.php
--- a/language/german.php	Sun May 17 20:02:26 2009 +0200
+++ b/language/german.php	Mon May 18 11:13:14 2009 +0200
@@ -925,7 +925,7 @@
     54 => 'User l?schen',
     55 => 'Dies funktioniert nur, wenn die Funktion \'Record Last Login\' im Configuration admin panel aktiviert wurde.',
     56 => 'Bitte den Typ User w?hlen, der gel?scht werden soll und "Liste aktualisieren" dr?cken. Dann die aus der Liste abhaken, di enicht gel?scht werden sollen und "Delete" dr?cken. Es werden nur die gel?scht, die gegenw?rtig sichtbar sind. Dieser Hinweis f?r den Fall, dass die Liste sich ?ber mehrere Seiten erstreckt.',
-    57 => 'Phantom-ser',
+    57 => 'Phantom-User',
     58 => 'Einmal-User',
     59 => 'Alte User',
     60 => 'User, angemeldet vor mehr als ',
@@ -1945,4 +1945,4 @@
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
-?>
\ No newline at end of file
+?>
diff -r e7480f4ebb74 -r d960feb016ec language/german_formal.php
--- a/language/german_formal.php	Sun May 17 20:02:26 2009 +0200
+++ b/language/german_formal.php	Mon May 18 11:13:14 2009 +0200
@@ -926,7 +926,7 @@
     54 => 'User l?schen',
     55 => 'Dies funktioniert nur, wenn die Funktion \'Record Last Login\' im Configuration admin panel aktiviert wurde.',
     56 => 'Bitte den Typ User w?hlen, der gel?scht werden soll und "Liste aktualisieren" dr?cken. Dann die aus der Liste abhaken, di enicht gel?scht werden sollen und "Delete" dr?cken. Es werden nur die gel?scht, die gegenw?rtig sichtbar sind. Dieser Hinweis f?r den Fall, dass die Liste sich ?ber mehrere Seiten erstreckt.',
-    57 => 'Phantom-ser',
+    57 => 'Phantom-User',
     58 => 'Einmal-User',
     59 => 'Alte User',
     60 => 'User, angemeldet vor mehr als ',
@@ -1946,4 +1946,4 @@
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
-?>
\ No newline at end of file
+?>
diff -r e7480f4ebb74 -r d960feb016ec language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sun May 17 20:02:26 2009 +0200
+++ b/language/german_formal_utf-8.php	Mon May 18 11:13:14 2009 +0200
@@ -926,7 +926,7 @@
     54 => 'User l??schen',
     55 => 'Dies funktioniert nur, wenn die Funktion \'Record Last Login\' im Configuration admin panel aktiviert wurde.',
     56 => 'Bitte den Typ User w??hlen, der gel??scht werden soll und "Liste aktualisieren" dr??cken. Dann die aus der Liste abhaken, di enicht gel??scht werden sollen und "Delete" dr??cken. Es werden nur die gel??scht, die gegenw??rtig sichtbar sind. Dieser Hinweis f??r den Fall, dass die Liste sich ??ber mehrere Seiten erstreckt.',
-    57 => 'Phantom-ser',
+    57 => 'Phantom-User',
     58 => 'Einmal-User',
     59 => 'Alte User',
     60 => 'User, angemeldet vor mehr als ',
@@ -1946,4 +1946,4 @@
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
-?>
\ No newline at end of file
+?>
diff -r e7480f4ebb74 -r d960feb016ec language/german_utf-8.php
--- a/language/german_utf-8.php	Sun May 17 20:02:26 2009 +0200
+++ b/language/german_utf-8.php	Mon May 18 11:13:14 2009 +0200
@@ -925,7 +925,7 @@
     54 => 'User l??schen',
     55 => 'Dies funktioniert nur, wenn die Funktion \'Record Last Login\' im Configuration admin panel aktiviert wurde.',
     56 => 'Bitte den Typ User w??hlen, der gel??scht werden soll und "Liste aktualisieren" dr??cken. Dann die aus der Liste abhaken, di enicht gel??scht werden sollen und "Delete" dr??cken. Es werden nur die gel??scht, die gegenw??rtig sichtbar sind. Dieser Hinweis f??r den Fall, dass die Liste sich ??ber mehrere Seiten erstreckt.',
-    57 => 'Phantom-ser',
+    57 => 'Phantom-User',
     58 => 'Einmal-User',
     59 => 'Alte User',
     60 => 'User, angemeldet vor mehr als ',
@@ -1945,4 +1945,4 @@
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
 );
 
-?>
\ No newline at end of file
+?>

From geeklog-cvs at lists.geeklog.net  Thu May 21 03:58:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 03:58:31 -0400
Subject: [geeklog-cvs] geeklog: Make the (deprecated) setPercision method
	call setPreci...
Message-ID: <hg.9350f45a2fc9.1242892711.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9350f45a2fc9
changeset: 7040:9350f45a2fc9
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 09:09:56 2009 +0200
description:
Make the (deprecated) setPercision method call setPrecision to avoid code duplication

diffstat:

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

diffs (12 lines):

diff -r d960feb016ec -r 9350f45a2fc9 system/classes/timer.class.php
--- a/system/classes/timer.class.php	Mon May 18 11:13:14 2009 +0200
+++ b/system/classes/timer.class.php	Thu May 21 09:09:56 2009 +0200
@@ -109,7 +109,7 @@
     */
     function setPercision($num_dec_places)
     {
-        $this->_precision = $num_dec_places;
+        return setPrecision($num_dec_places);
     }
 
 

From geeklog-cvs at lists.geeklog.net  Thu May 21 04:44:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 04:44:12 -0400
Subject: [geeklog-cvs] tools: Leave the pre-1.3 upgrade files out of the
	release and ni...
Message-ID: <hg.c3e7b0d3110b.1242895452.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c3e7b0d3110b
changeset: 35:c3e7b0d3110b
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 10:44:03 2009 +0200
description:
Leave the pre-1.3 upgrade files out of the release and nightly tarballs

diffstat:

 cronjobs/nightly.sh |  4 ++++
 ship/mkdist.sh      |  4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (28 lines):

diff -r 25d9d43d9c0b -r c3e7b0d3110b cronjobs/nightly.sh
--- a/cronjobs/nightly.sh	Sat May 09 21:40:23 2009 +0200
+++ b/cronjobs/nightly.sh	Thu May 21 10:44:03 2009 +0200
@@ -47,6 +47,10 @@
 # about time we clean up the install directory ...
 rm -f public_html/admin/install/addindex.php
 
+# old upgrade files (from pre-1.3 versions)
+rm -f sql/updates/*.sql
+rm -f sql/updates/1.2.5-1_to_1.3.NOTES
+
 # PEAR buildpackage files
 rm -f plugins/calendar/buildpackage.php
 rm -f plugins/links/buildpackage.php
diff -r 25d9d43d9c0b -r c3e7b0d3110b ship/mkdist.sh
--- a/ship/mkdist.sh	Sat May 09 21:40:23 2009 +0200
+++ b/ship/mkdist.sh	Thu May 21 10:44:03 2009 +0200
@@ -59,6 +59,10 @@
 # you'd need to set up a honeypot to use it
 rm -f plugins/spamx/ProjectHoneyPot.Examine.class.php
 
+# old upgrade files (from pre-1.3 versions)
+rm -f sql/updates/*.sql
+rm -f sql/updates/1.2.5-1_to_1.3.NOTES
+
 # PEAR buildpackage files
 rm -f plugins/calendar/buildpackage.php
 rm -f plugins/links/buildpackage.php

From geeklog-cvs at lists.geeklog.net  Thu May 21 09:47:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 09:47:36 -0400
Subject: [geeklog-cvs] geeklog: Added an option to exclude plugins from
	inclusion in th...
Message-ID: <hg.7efa429d3a44.1242913656.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7efa429d3a44
changeset: 7041:7efa429d3a44
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 15:03:47 2009 +0200
description:
Added an option to exclude plugins from inclusion in the sitemap. Defaults to the Links plugin

diffstat:

 plugins/xmlsitemap/functions.inc               |  31 +++++++++++++++++++------------
 plugins/xmlsitemap/install_defaults.php        |  11 ++++++++---
 plugins/xmlsitemap/language/english.php        |   1 +
 plugins/xmlsitemap/language/english_utf-8.php  |   1 +
 plugins/xmlsitemap/language/japanese_utf-8.php |   1 +
 public_html/docs/history                       |   2 ++
 6 files changed, 32 insertions(+), 15 deletions(-)

diffs (175 lines):

diff -r 9350f45a2fc9 -r 7efa429d3a44 plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Thu May 21 09:09:56 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Thu May 21 15:03:47 2009 +0200
@@ -194,20 +194,28 @@
 /**
 * Create XML sitemap(s) or update existing one(s)
 *
-* @param   type  string   plugin name
-* @return        boolean  TRUE = success, FALSE = otherwise
+* @param    string  $type       plugin name
+* @param    string  $include    plugin to add after install/enabled
+* @param    string  $exclude    plugin to remove after uninstall/disabled
+* @return   boolean             TRUE = success, FALSE = otherwise
 */
 function XMLSMAP_update($type = NULL, $include = NULL, $exclude = NULL)
 {
     global $_CONF, $_XMLSMAP_CONF;
 
     if (($type !== NULL)
-     AND !in_array(strtolower($type), $_XMLSMAP_CONF['types'])) {
+            AND !in_array(strtolower($type), $_XMLSMAP_CONF['types'])) {
         // Notified about content change, but from an irrelevant plugin, one
         // that doesn't implement 'plugin_getiteminfo_xxx' function.
         return TRUE;
     }
 
+    if (($type !== NULL) &&
+            in_array(strtolower($type, $_XMLSMAP_CONF['exclude']))) {
+        // plugin is on our exclude list, so ignore
+        return TRUE;
+    }
+
     require_once $_CONF['path'] . 'plugins/xmlsitemap/xmlsitemap.class.php';
 
     $charset = COM_getCharset();
@@ -224,7 +232,7 @@
     }
 
     // Set types
-    $types = $_XMLSMAP_CONF['types'];
+    $types = array_diff($_XMLSMAP_CONF['types'], $_XMLSMAP_CONF['exclude']);
     if ($include !== NULL) {
         if (($index = array_search($exclude, $types)) === FALSE) {
             $types[] = $include;
@@ -328,8 +336,8 @@
 
             case 'frequencies':
                 $value = strtolower(trim($value));
-                $valid_change_freqs = array('always', 'hourly', 'daily', 'weekly',
-            'monthly', 'yearly', 'never');
+                $valid_change_freqs = array('always', 'hourly', 'daily',
+                        'weekly', 'monthly', 'yearly', 'never');
 
                 if (!is_numeric($key) AND in_array($key, $enabled_plugins)
                  AND (in_array($value, $valid_change_freqs))) {
@@ -402,8 +410,6 @@
     if ($group == 'xmlsitemap') {
         if (is_array($changes) AND (count($changes) > 0)) {
             /**
-            * @note
-            *
             * At this time, changes in configuration is not reflected in
             * $_XMLSMAP_CONF yet.  So we have to reload them from DB.
             */
@@ -412,9 +418,9 @@
             foreach ($changes as $name) {
                 if ($name == 'sitemap_file') {
                     XMLSITEMAP_changeFile($name, 'xmlsitemap_filename');
-                } else if ($name == 'mobile_sitemap_file') {
+                } elseif ($name == 'mobile_sitemap_file') {
                     XMLSITEMAP_changeFile($name, 'xmlsitemap_mobile');
-                } else {
+                } elseif ($name != 'exclude') {
                     XMLSITEMAP_checkChange($name);
                 }
             }
@@ -450,7 +456,8 @@
 
     switch ($status) {
         case 'installed':
-            if (is_callable('plugin_getiteminfo_' . $type)) {
+            if (is_callable('plugin_getiteminfo_' . $type) &&
+                    !in_array($type, $_XMLSMAP_CONF['exclude'])) {
                 // A new plugin supporting plugin_getiteminfo_xxx() was
                 // installed
                 $_XMLSMAP_CONF['types'][]            = $type;
@@ -499,7 +506,7 @@
             if (in_array($type, $_XMLSMAP_CONF['types'])) {
                 if ($status == 'enabled') {
                     $include = $type;
-                } else if ($status == 'disabled') {
+                } elseif ($status == 'disabled') {
                     $exclude = $type;
                 }
 
diff -r 9350f45a2fc9 -r 7efa429d3a44 plugins/xmlsitemap/install_defaults.php
--- a/plugins/xmlsitemap/install_defaults.php	Thu May 21 09:09:56 2009 +0200
+++ b/plugins/xmlsitemap/install_defaults.php	Thu May 21 15:03:47 2009 +0200
@@ -60,6 +60,9 @@
 // Content types
 $_XMLSMAP_DEFAULT['types'] = array('article', 'staticpages', 'calendar');
 
+// Plugins to exclude from sitemap
+$_XMLSMAP_DEFAULT['exclude'] = array('links');
+
 // Priorities (must be between 0.0 and 1.0; default value is 0.5)
 $_XMLSMAP_DEFAULT['priorities'] = array(
     'article'     => 0.5,
@@ -99,16 +102,18 @@
             'text', 0, 0, NULL, 20, FALSE, $me);
         $c->add('types', $_XMLSMAP_DEFAULT['types'], '%text', 0, 0, NULL, 30,
             TRUE, $me);
+        $c->add('exclude', $_XMLSMAP_DEFAULT['exclude'], '%text', 0, 0, NULL,
+            40, TRUE, $me);
         
         // Priorities
         $c->add('fs_pri', NULL, 'fieldset', 0, 1, NULL, 0, TRUE, $me);
         $c->add('priorities', $_XMLSMAP_DEFAULT['priorities'], '*text', 0, 1,
-             NULL, 40, TRUE, $me);
+             NULL, 50, TRUE, $me);
         
         // Frequencies
         $c->add('fs_freq', NULL, 'fieldset', 0, 2, NULL, 0, TRUE, $me);
-        $c->add('frequencies', $_XMLSMAP_DEFAULT['frequencies'], '@select', 0, 2,
-             20, 50, TRUE, $me);
+        $c->add('frequencies', $_XMLSMAP_DEFAULT['frequencies'], '@select', 0,
+            2, 20, 60, TRUE, $me);
     }
     
     return TRUE;
diff -r 9350f45a2fc9 -r 7efa429d3a44 plugins/xmlsitemap/language/english.php
--- a/plugins/xmlsitemap/language/english.php	Thu May 21 09:09:56 2009 +0200
+++ b/plugins/xmlsitemap/language/english.php	Thu May 21 15:03:47 2009 +0200
@@ -48,6 +48,7 @@
     'sitemap_file'        => 'Sitemap file name',
     'mobile_sitemap_file' => 'Mobile Sitemap file name',
     'types'               => 'Contents of sitemap',
+    'exclude'             => 'Plugins to exclude from sitemap',
     'priorities'          => '',
     'frequencies'         => '',
 );
diff -r 9350f45a2fc9 -r 7efa429d3a44 plugins/xmlsitemap/language/english_utf-8.php
--- a/plugins/xmlsitemap/language/english_utf-8.php	Thu May 21 09:09:56 2009 +0200
+++ b/plugins/xmlsitemap/language/english_utf-8.php	Thu May 21 15:03:47 2009 +0200
@@ -48,6 +48,7 @@
     'sitemap_file'        => 'Sitemap file name',
     'mobile_sitemap_file' => 'Mobile Sitemap file name',
     'types'               => 'Contents of sitemap',
+    'exclude'             => 'Plugins to exclude from sitemap',
     'priorities'          => '',
     'frequencies'         => '',
 );
diff -r 9350f45a2fc9 -r 7efa429d3a44 plugins/xmlsitemap/language/japanese_utf-8.php
--- a/plugins/xmlsitemap/language/japanese_utf-8.php	Thu May 21 09:09:56 2009 +0200
+++ b/plugins/xmlsitemap/language/japanese_utf-8.php	Thu May 21 15:03:47 2009 +0200
@@ -48,6 +48,7 @@
     'sitemap_file'        => '?????????????????????????????????',
     'mobile_sitemap_file' => '?????????????????????????????????',
     'types'               => '???????????????????????
???',
+    'exclude'             => 'Plugins to exclude from sitemap',
     'priorities'          => '',
     'frequencies'         => '',
 );
diff -r 9350f45a2fc9 -r 7efa429d3a44 public_html/docs/history
--- a/public_html/docs/history	Thu May 21 09:09:56 2009 +0200
+++ b/public_html/docs/history	Thu May 21 15:03:47 2009 +0200
@@ -37,6 +37,8 @@
 
 XMLSitemap plugin
 -----------------
+- Added an option to exclude plugins from inclusion in the sitemap. Defaults
+  to the Links plugin [Dirk]
 - Remove sitemap files when uninstalling the plugin [Dirk]
 - Don't include Links in the sitemap.xml automatically [Dirk]
 - Fixed "missing argument 2" error when changing config options (reported by

From geeklog-cvs at lists.geeklog.net  Thu May 21 09:47:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 09:47:36 -0400
Subject: [geeklog-cvs] geeklog: Removed unused function and fixed
	phpDocumentor tags
Message-ID: <hg.bf07e94174ae.1242913656.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/bf07e94174ae
changeset: 7042:bf07e94174ae
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 15:21:53 2009 +0200
description:
Removed unused function and fixed phpDocumentor tags

diffstat:

 plugins/xmlsitemap/functions.inc |  66 ++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 29 deletions(-)

diffs (143 lines):

diff -r 7efa429d3a44 -r bf07e94174ae plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Thu May 21 15:03:47 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Thu May 21 15:21:53 2009 +0200
@@ -138,6 +138,8 @@
 
 /**
 * Loads config infor with config.class.php
+*
+* @return   mixed   XMLSitemap config array or FALSE
 */
 function XMLSMAP_loadConfig()
 {
@@ -155,6 +157,11 @@
 
 /**
 * Return a string escaped for HTML output
+*
+* Escapes special characters so $str can be used in XML
+*
+* @param    string  $str    string to encode
+* @return   string          encoded string
 */
 function XMLSMAP_esc($str)
 {
@@ -169,29 +176,11 @@
         array(   '<',    '>',     '&',      '"',      "'"),
         $str
     );
+
     return htmlspecialchars($str, ENT_QUOTES, $encoding);
 }
 
 /**
-* Return a lang var
-*/
-function XMLSMAP_str($index, $noesc = FALSE)
-{
-    global $LANG_XMLSMAP;
-
-    if (isset($LANG_XMLSMAP[$index])) {
-        if ($noesc) {
-            return $LANG_XMLSMAP[$index];
-        } else {
-            return XMLSMAP_esc($LANG_XMLSMAP[$index]);
-        }
-    } else {
-        COM_errorLog('XMLSMAP_str: undefined index: "' . $index . '"');
-        return '(undefined)';
-    }
-}
-
-/**
 * Create XML sitemap(s) or update existing one(s)
 *
 * @param    string  $type       plugin name
@@ -261,6 +250,12 @@
 
 /**
 * Callback function when an item was saved
+*
+* @param    string  $id     (unused) ID of item being saved
+* @param    string  $type   type of item ('article', 'staticpages', ...)
+* @param    string  $old_id (unused) previous ID of item, if != $id
+* @return   void
+* @see      PLG_itemSaved
 */
 function plugin_itemsaved_xmlsitemap($id, $type, $old_id)
 {
@@ -269,6 +264,11 @@
 
 /**
 * Callback function when an item was deleted
+*
+* @param    string  $id     (unused) ID of item being deleted
+* @param    string  $type   type of item ('article', 'staticpages', ...)
+* @return   void
+* @see      PLG_itemDeleted
 */
 function plugin_itemdeleted_xmlsitemap($id, $type)
 {
@@ -277,6 +277,10 @@
 
 /**
 * Callback function when this plugin is being enabled/disabled
+*
+* @param    boolean $enable     TRUE: we're being enabled, FALSE: disabled
+* @return   void
+* @see      PLG_enableStateChange
 */
 function plugin_enablestatechange_xmlsitemap($enable)
 {
@@ -298,8 +302,8 @@
 /**
 * Check if changed types, priorities, or frequencies are valid
 *
-* @param  name  string - either 'types', 'priorities' or 'frequencies'
-* @return (void)
+* @param  string    $name   either 'types', 'priorities' or 'frequencies'
+* @return void
 */
 function XMLSITEMAP_checkChange($name)
 {
@@ -367,9 +371,9 @@
 /**
 * Delete an old sitemap file and update $_TABLES['vars']
 *
-* @param  key      string - config key
-* @param  varname  string - name field of $_TABLES['vars']
-* @return (void)
+* @param  string    $key        config key
+* @param  string    $varname    name field of $_TABLES['vars']
+* @return void
 */
 function XMLSITEMAP_changeFile($key, $varname)
 {
@@ -398,8 +402,10 @@
 /**
 * Callback function when configuration was changed
 *
-* @param  group    string          - 'Core' or 'xmlsitemap'
-* @param  changes  array of string - config var key
+* @param    string  $group      'Core' or 'xmlsitemap'
+* @param    array   $changes    array of strings: config var key
+* @return   void
+* @see      PLG_configChange
 */
 function plugin_configchange_xmlsitemap($group, $changes = array())
 {
@@ -442,9 +448,11 @@
 * Callback function when another plugin was installed/uninstalled/upgarded/
 * enabled/disabled
 *
-* @param  type    string - plugin name
-* @param  status  string - 'installed', 'uninstalled', 'upgraded', 'enabled',
-*                          or 'disabled'
+* @param    string  $type   plugin name
+* @param    string  $status 'installed', 'uninstalled', 'upgraded', 'enabled',
+*                           or 'disabled'
+* @return   void
+* @see      PLG_pluginStateChange
 */
 function plugin_pluginstatechange_xmlsitemap($type, $status)
 {

From geeklog-cvs at lists.geeklog.net  Thu May 21 11:25:13 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 11:25:13 -0400
Subject: [geeklog-cvs] geeklog: Removed the $_CONF['search_no_data'] config
	option and ...
Message-ID: <hg.db76294ecddf.1242919513.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/db76294ecddf
changeset: 7043:db76294ecddf
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 17:02:23 2009 +0200
description:
Removed the $_CONF['search_no_data'] config option and moved the text to the language files (bug #0000873)

diffstat:

 language/afrikaans.php                       |   4 ++--
 language/afrikaans_utf-8.php                 |   4 ++--
 language/bosnian.php                         |   4 ++--
 language/bosnian_utf-8.php                   |   4 ++--
 language/bulgarian.php                       |   4 ++--
 language/bulgarian_utf-8.php                 |   4 ++--
 language/catalan.php                         |   4 ++--
 language/catalan_utf-8.php                   |   4 ++--
 language/chinese_simplified_utf-8.php        |   4 ++--
 language/chinese_traditional_utf-8.php       |   4 ++--
 language/croatian.php                        |   4 ++--
 language/croatian_utf-8.php                  |   4 ++--
 language/czech.php                           |   4 ++--
 language/czech_utf-8.php                     |   4 ++--
 language/danish.php                          |   4 ++--
 language/danish_utf-8.php                    |   4 ++--
 language/dutch.php                           |   4 ++--
 language/dutch_utf-8.php                     |   4 ++--
 language/english.php                         |   4 ++--
 language/english_utf-8.php                   |   4 ++--
 language/estonian.php                        |   4 ++--
 language/estonian_utf-8.php                  |   4 ++--
 language/farsi_utf-8.php                     |   4 ++--
 language/finnish.php                         |   4 ++--
 language/finnish_utf-8.php                   |   4 ++--
 language/french_canada.php                   |   4 ++--
 language/french_canada_utf-8.php             |   4 ++--
 language/french_france.php                   |   4 ++--
 language/french_france_utf-8.php             |   4 ++--
 language/german.php                          |   6 +++---
 language/german_formal.php                   |   6 +++---
 language/german_formal_utf-8.php             |   6 +++---
 language/german_utf-8.php                    |   6 +++---
 language/hebrew_utf-8.php                    |   4 ++--
 language/hellenic.php                        |   4 ++--
 language/hellenic_utf-8.php                  |   4 ++--
 language/indonesian.php                      |   4 ++--
 language/indonesian_utf-8.php                |   4 ++--
 language/italian.php                         |   4 ++--
 language/italian_utf-8.php                   |   4 ++--
 language/japanese_utf-8.php                  |   4 ++--
 language/korean.php                          |   4 ++--
 language/korean_utf-8.php                    |   4 ++--
 language/norwegian.php                       |   4 ++--
 language/norwegian_utf-8.php                 |   4 ++--
 language/polish.php                          |   4 ++--
 language/polish_utf-8.php                    |   4 ++--
 language/portuguese.php                      |   4 ++--
 language/portuguese_brazil.php               |   4 ++--
 language/portuguese_brazil_utf-8.php         |   4 ++--
 language/portuguese_utf-8.php                |   4 ++--
 language/romanian.php                        |   4 ++--
 language/romanian_utf-8.php                  |   4 ++--
 language/russian.php                         |   4 ++--
 language/russian_utf-8.php                   |   4 ++--
 language/serbian.php                         |   4 ++--
 language/serbian_utf-8.php                   |   4 ++--
 language/slovak.php                          |   4 ++--
 language/slovak_utf-8.php                    |   4 ++--
 language/slovenian.php                       |   4 ++--
 language/slovenian_utf-8.php                 |   4 ++--
 language/spanish.php                         |   4 ++--
 language/spanish_argentina.php               |   4 ++--
 language/spanish_argentina_utf-8.php         |   4 ++--
 language/spanish_utf-8.php                   |   4 ++--
 language/swedish.php                         |   4 ++--
 language/swedish_utf-8.php                   |   4 ++--
 language/turkish.php                         |   4 ++--
 language/turkish_utf-8.php                   |   4 ++--
 language/ukrainian.php                       |   4 ++--
 language/ukrainian_koi8-u.php                |   4 ++--
 language/ukrainian_utf-8.php                 |   4 ++--
 public_html/admin/install/config-install.php |  21 ++++++++++-----------
 public_html/docs/english/config.html         |   4 ----
 public_html/docs/history                     |   2 ++
 sql/updates/mssql_1.5.2_to_1.6.0.php         |  23 +++++++++++------------
 sql/updates/mysql_1.5.2_to_1.6.0.php         |  23 +++++++++++------------
 system/classes/search.class.php              |   8 ++++----
 78 files changed, 186 insertions(+), 191 deletions(-)

diffs (truncated from 1709 to 300 lines):

diff -r bf07e94174ae -r db76294ecddf language/afrikaans.php
--- a/language/afrikaans.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/afrikaans.php	Thu May 21 17:02:23 2009 +0200
@@ -528,7 +528,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1856,7 +1857,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/afrikaans_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -528,7 +528,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1856,7 +1857,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/bosnian.php
--- a/language/bosnian.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/bosnian.php	Thu May 21 17:02:23 2009 +0200
@@ -532,7 +532,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1860,7 +1861,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/bosnian_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -532,7 +532,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1860,7 +1861,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/bulgarian.php
--- a/language/bulgarian.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/bulgarian.php	Thu May 21 17:02:23 2009 +0200
@@ -528,7 +528,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1856,7 +1857,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/bulgarian_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -528,7 +528,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1856,7 +1857,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/catalan.php
--- a/language/catalan.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/catalan.php	Thu May 21 17:02:23 2009 +0200
@@ -526,7 +526,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1854,7 +1855,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/catalan_utf-8.php
--- a/language/catalan_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/catalan_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -526,7 +526,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1854,7 +1855,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/chinese_simplified_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -531,7 +531,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1859,7 +1860,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/chinese_traditional_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -531,7 +531,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1859,7 +1860,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/croatian.php
--- a/language/croatian.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/croatian.php	Thu May 21 17:02:23 2009 +0200
@@ -528,7 +528,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1856,7 +1857,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/croatian_utf-8.php
--- a/language/croatian_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/croatian_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -530,7 +530,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1858,7 +1859,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/czech.php
--- a/language/czech.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/czech.php	Thu May 21 17:02:23 2009 +0200
@@ -527,7 +527,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1855,7 +1856,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/czech_utf-8.php
--- a/language/czech_utf-8.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/czech_utf-8.php	Thu May 21 17:02:23 2009 +0200
@@ -527,7 +527,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -1855,7 +1856,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
diff -r bf07e94174ae -r db76294ecddf language/danish.php
--- a/language/danish.php	Thu May 21 15:21:53 2009 +0200
+++ b/language/danish.php	Thu May 21 17:02:23 2009 +0200
@@ -527,7 +527,8 @@
     66 => 'Comment',
     67 => 'Show %d Results',

From geeklog-cvs at lists.geeklog.net  Thu May 21 11:25:14 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 11:25:14 -0400
Subject: [geeklog-cvs] geeklog: Hmm, this is awkward ...
Message-ID: <hg.cbc696117485.1242919514.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cbc696117485
changeset: 7044:cbc696117485
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 17:10:50 2009 +0200
description:
Hmm, this is awkward ...

diffstat:

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

diffs (23 lines):

diff -r db76294ecddf -r cbc696117485 system/classes/search.class.php
--- a/system/classes/search.class.php	Thu May 21 17:02:23 2009 +0200
+++ b/system/classes/search.class.php	Thu May 21 17:10:50 2009 +0200
@@ -746,7 +746,7 @@
             $row['title'] = stripslashes(str_replace('$', '&#36;', $row['title']));
             $row['title'] = COM_createLink($row['title'], $row['url']);
 
-            if ($row['description'] != $LANG09[70]) {
+            if ($row['description'] != '<i>' . $LANG09[70] . '</i>') {
                 $row['description'] = stripslashes($this->_shortenText($this->_query, $row['description'], $this->_wordlength));
             }
 
@@ -804,8 +804,9 @@
                 if ($key <= $m)
                 {
                     // Keyword at the start of text
-                    $start = 0;
+                    $start = 0 - $key;
                     $end = $num_words - 1;
+                    $end = (($key + $m <= $word_count - 1) ? $key : $word_count - $m - 1);
                 }
                 else
                 {

From geeklog-cvs at lists.geeklog.net  Thu May 21 14:08:03 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 14:08:03 -0400
Subject: [geeklog-cvs] geeklog: Link to the version of the Plugin
	Developer's Handbook ...
Message-ID: <hg.0c0a806d2c90.1242929283.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0c0a806d2c90
changeset: 7045:0c0a806d2c90
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 20:06:18 2009 +0200
description:
Link to the version of the Plugin Developer's Handbook on the wiki

diffstat:

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

diffs (13 lines):

diff -r cbc696117485 -r 0c0a806d2c90 public_html/docs/english/plugin.html
--- a/public_html/docs/english/plugin.html	Thu May 21 17:10:50 2009 +0200
+++ b/public_html/docs/english/plugin.html	Thu May 21 20:06:18 2009 +0200
@@ -17,8 +17,7 @@
 <tt>system/lib-plugins.php</tt> which implements the plugin interface.</p>
 
 <p>If you find these API descriptions too terse, you may also want to consult
-the more extensive <a href="http://gplugs.sourceforge.net/pluginman/">Plugin
-Developers Guide</a>.</p>
+the more extensive <a href="http://wiki.geeklog.net/index.php/Plugin_Developers_Handbook">Plugin Developers Guide</a>.</p>
 
 <ul>
   <li><a href="#overview">Overview</a></li>

From geeklog-cvs at lists.geeklog.net  Thu May 21 14:21:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 14:21:52 -0400
Subject: [geeklog-cvs] geeklog: ... including the $this to make it actually
	work ...
Message-ID: <hg.83e4c7501ad6.1242930112.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/83e4c7501ad6
changeset: 7046:83e4c7501ad6
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 20:20:19 2009 +0200
description:
... including the $this to make it actually work ...

diffstat:

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

diffs (12 lines):

diff -r 0c0a806d2c90 -r 83e4c7501ad6 system/classes/timer.class.php
--- a/system/classes/timer.class.php	Thu May 21 20:06:18 2009 +0200
+++ b/system/classes/timer.class.php	Thu May 21 20:20:19 2009 +0200
@@ -109,7 +109,7 @@
     */
     function setPercision($num_dec_places)
     {
-        return setPrecision($num_dec_places);
+        return $this->setPrecision($num_dec_places);
     }
 
 

From geeklog-cvs at lists.geeklog.net  Thu May 21 16:02:11 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 16:02:11 -0400
Subject: [geeklog-cvs] geeklog: Minor security improvement (aka security by
	obscurity):...
Message-ID: <hg.8d6120c198aa.1242936131.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8d6120c198aa
changeset: 7047:8d6120c198aa
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 21:27:11 2009 +0200
description:
Minor security improvement (aka security by obscurity): SQL errors will now trigger the standard error handler

diffstat:

 public_html/docs/history         |  2 ++
 system/databases/mssql.class.php |  8 +++-----
 system/databases/mysql.class.php |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 83e4c7501ad6 -r 8d6120c198aa public_html/docs/history
--- a/public_html/docs/history	Thu May 21 20:20:19 2009 +0200
+++ b/public_html/docs/history	Thu May 21 21:27:11 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0b1:
+- SQL errors now trigger the standard error handler ("Unfortunately, an error
+  has occurred ..."). Details are available in error.log, as usual [Tony, Dirk]
 - Removed the $_CONF['search_no_data'] config option and moved the text to the
   language files (bug #0000873) [Dirk]
 - All bundled plugins now include a check to see if they support the DBMS the
diff -r 83e4c7501ad6 -r 8d6120c198aa system/databases/mssql.class.php
--- a/system/databases/mssql.class.php	Thu May 21 20:20:19 2009 +0200
+++ b/system/databases/mssql.class.php	Thu May 21 21:27:11 2009 +0200
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | mssql.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                            |
 // |          Randy Kolenko, Randy AT nextide DOT ca                           |
@@ -29,8 +29,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mssql.class.php,v 1.9 2008/05/24 15:42:26 mjervis Exp $
 
 /**
 * This file is the mssql implementation of the Geeklog abstraction layer.
@@ -450,7 +448,7 @@
             
         } else {
            
-            $result = @mssql_query($sql,$this->_db) or die($this->dbError($sql) . ' - ' . $sql);
+            $result = @mssql_query($sql,$this->_db) or trigger_error($this->dbError($sql) . ' - ' . $sql);
             if($result==FALSE){
                 echo "Query Failed: ";
                 echo "<pre>".$this->dbError($sql) . "</pre><hr" . XHTML . ">";
diff -r 83e4c7501ad6 -r 8d6120c198aa system/databases/mysql.class.php
--- a/system/databases/mysql.class.php	Thu May 21 20:20:19 2009 +0200
+++ b/system/databases/mysql.class.php	Thu May 21 21:27:11 2009 +0200
@@ -257,7 +257,7 @@
         if ($ignore_errors == 1) {
             $result = @mysql_query($sql,$this->_db);
         } else {
-            $result = @mysql_query($sql,$this->_db) or die($this->dbError($sql));
+            $result = @mysql_query($sql,$this->_db) or trigger_error($this->dbError($sql));
         }
 
         // If OK, return otherwise echo error

From geeklog-cvs at lists.geeklog.net  Thu May 21 16:02:12 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 21 May 2009 16:02:12 -0400
Subject: [geeklog-cvs] geeklog: Fixed (mostly) blank page when calling up a
	non-existin...
Message-ID: <hg.3bbdba8ccdb4.1242936132.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3bbdba8ccdb4
changeset: 7048:3bbdba8ccdb4
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu May 21 22:02:01 2009 +0200
description:
Fixed (mostly) blank page when calling up a non-existing poll ID (reported by scarecrow); also fixed being able to find out a poll's title when you didn't have access to the poll

diffstat:

 public_html/docs/history    |   7 +++++++
 public_html/polls/index.php |  49 ++++++++++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 21 deletions(-)

diffs (77 lines):

diff -r 8d6120c198aa -r 3bbdba8ccdb4 public_html/docs/history
--- a/public_html/docs/history	Thu May 21 21:27:11 2009 +0200
+++ b/public_html/docs/history	Thu May 21 22:02:01 2009 +0200
@@ -33,6 +33,13 @@
 - Added a verbose logging option to the search class and make it default to off
   [Dirk]
 
+Polls plugin
+------------
+- If you knew a poll's ID, you could find out the poll's title even if you did
+  not have access to the poll [Dirk]
+- Fixed (mostly) blank page when calling up a non-existing poll ID (reported
+  by scarecrow) [Dirk]
+
 Static Pages plugin
 -------------------
 - Fixed handling of "entire page" centerblocks in a multi-language environment:
diff -r 8d6120c198aa -r 3bbdba8ccdb4 public_html/polls/index.php
--- a/public_html/polls/index.php	Thu May 21 21:27:11 2009 +0200
+++ b/public_html/polls/index.php	Thu May 21 22:02:01 2009 +0200
@@ -169,28 +169,35 @@
                $_CONF['cookiesecure']);
     $display .= COM_siteHeader() . POLLS_pollsave($pid, $aid);
 } elseif (! empty($pid)) {
-    $topic = DB_getItem ($_TABLES['polltopics'], 'topic', "pid = '{$pid}'");
-    $display .= COM_siteHeader('menu', $topic);
-    if ($msg > 0) {
-        $display .= COM_showMessage($msg, 'polls');
-    }
-    if (isset($_POST['aid'])) {
-        $display .= COM_startBlock (
-                $LANG_POLLS['not_saved'], '',
-                COM_getBlockTemplate ('_msg_block', 'header'))
-            . $LANG_POLLS['answer_all'] . ' "' . $topic . '"'
-            . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-    }
-    if (DB_getItem($_TABLES['polltopics'], 'is_open', "pid = '$pid'") != 1) {
-        $aid = -1; // poll closed - show result
-    }
-    if (!isset ($_COOKIE['poll-'.$pid])
-        && !POLLS_ipAlreadyVoted ($pid)
-        && $aid != -1
-        ) {
-        $display .= POLLS_pollVote ($pid);
+    $topic = DB_getItem($_TABLES['polltopics'], 'topic',
+                        "pid = '{$pid}'" . COM_getPermSQL('AND'));
+    if (empty($topic)) {
+        // poll doesn't exist or user doesn't have access
+        $display .= COM_siteHeader('menu', $LANG_POLLS['pollstitle'])
+                 . COM_showMessageText(sprintf($LANG25[12], $pid));
     } else {
-        $display .= POLLS_pollResults ($pid, 400, $order, $mode);
+        $display .= COM_siteHeader('menu', $topic);
+        if ($msg > 0) {
+            $display .= COM_showMessage($msg, 'polls');
+        }
+        if (isset($_POST['aid'])) {
+            $display .= COM_startBlock (
+                    $LANG_POLLS['not_saved'], '',
+                    COM_getBlockTemplate ('_msg_block', 'header'))
+                . $LANG_POLLS['answer_all'] . ' "' . $topic . '"'
+                . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+        }
+        if (DB_getItem($_TABLES['polltopics'], 'is_open', "pid = '$pid'") != 1) {
+            $aid = -1; // poll closed - show result
+        }
+        if (!isset ($_COOKIE['poll-'.$pid])
+            && !POLLS_ipAlreadyVoted ($pid)
+            && $aid != -1
+            ) {
+            $display .= POLLS_pollVote ($pid);
+        } else {
+            $display .= POLLS_pollResults ($pid, 400, $order, $mode);
+        }
     }
 } else {
     $poll_topic = DB_query ("SELECT topic FROM {$_TABLES['polltopics']} WHERE pid='$pid'" . COM_getPermSql ('AND'));

From geeklog-cvs at lists.geeklog.net  Sat May 23 02:54:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 23 May 2009 02:54:45 -0400
Subject: [geeklog-cvs] geeklog: Updated Spanish language file,
	provided by Juan Pablo N...
Message-ID: <hg.484127470385.1243061685.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/484127470385
changeset: 7049:484127470385
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 23 08:52:57 2009 +0200
description:
Updated Spanish language file, provided by Juan Pablo Novillo

diffstat:

 language/spanish.php     |  520 ++++++++++++++++++++++++++--------------------------
 public_html/docs/history |    2 +
 2 files changed, 262 insertions(+), 260 deletions(-)

diffs (truncated from 752 to 300 lines):

diff -r 3bbdba8ccdb4 -r 484127470385 language/spanish.php
--- a/language/spanish.php	Thu May 21 22:02:01 2009 +0200
+++ b/language/spanish.php	Sat May 23 08:52:57 2009 +0200
@@ -1,7 +1,7 @@
 <?php
 
 ###############################################################################
-# This is the Spanish language page for GeekLog!
+# This is the Spanish language file for Geeklog!
 #
 # Copyright (C) 2000 Jason Whittenburg
 # jwhitten at securitygeeks.com
@@ -48,7 +48,7 @@
     7 => '',
     8 => '',
     9 => 'Funciones del(a) Administrador(a):',
-    10 => 'Propuestas',
+    10 => 'Posts y Eventos',
     11 => 'Noticias',
     12 => 'Bloques',
     13 => 'Secciones',
@@ -155,20 +155,20 @@
     114 => 'TRACKBACKS',
     115 => 'No new trackback comments',
     116 => 'Trackback',
-    117 => 'Directory',
-    118 => 'Please continue reading on the next page:',
-    119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">password</a>?",
-    120 => 'Permanent link to this comment',
-    121 => 'Comments (%d)',
+    117 => 'Directorio',
+    118 => 'Por favor, siga leyendo en la p?gina siguiente:',
+    119 => "Olvid? su <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">contrase?a</a>?",
+    120 => 'Enlace permanente a este comentario',
+    121 => 'Commentarios (%d)',
     122 => 'Trackbacks (%d)',
     123 => 'All HTML is allowed',
-    124 => 'Click to delete all checked items',
-    125 => 'Are you sure you want to Delete all checked items?',
-    126 => 'Select or de-select all items',
-    127 => 'Permalink',
+    124 => 'Haga Click para elieminar los elementos seleccionados',
+    125 => '?Seguro que desea eliminar los elementos seleccionados?',
+    126 => 'Seleccionar/Deseleccionar elementos',
+    127 => 'Enlace permanente',
     128 => 'Login with OpenID:',
-    129 => 'Configuration',
-    130 => 'Webservices'
+    129 => 'Configuraci?n',
+    130 => 'Servicios Web'
 );
 
 ###############################################################################
@@ -331,53 +331,53 @@
     105 => 'Muestra en el bloque Who\'s Online (usuarios conectados)',
     106 => 'Ubicaci?n',
     107 => 'Mostrado en tu perfil p?blico',
-    108 => 'Confirm new password',
-    109 => 'Enter the New password again here',
-    110 => 'Current Password',
-    111 => 'Please enter your Current password',
-    112 => 'You have exceeded the number of allowed login attempts.  Please try again later.',
-    113 => 'Login Attempt Failed',
-    114 => 'Account Disabled',
-    115 => 'Your account has been disabled, you may not login. Please contact an Administrator.',
-    116 => 'Account Awaiting Activation',
-    117 => 'Your account is currently awaiting activation by an administrator. You will not be able to login until your account has been approved.',
-    118 => "Your {$_CONF['site_name']} account has now been activated by an administrator. You may now login to the site at the url below using your username (<username>) and password as previously emailed to you.",
-    119 => 'If you have forgotten your password, you may request a new one at this url:',
-    120 => 'Account Activated',
-    121 => 'Service',
-    122 => 'Sorry, new user registration is disabled',
-    123 => "Are you a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">new user</a>?",
-    124 => 'Confirm Email',
-    125 => 'You have to enter the same email address in both fields!',
-    126 => 'Please repeat for confirmation',
-    127 => 'To change any of these settings, you will have to enter your current password.',
-    128 => 'Your Name',
-    129 => 'Password &amp; Email',
-    130 => 'About You',
+    108 => 'Confirme su contrase?a',
+    109 => 'Escriba otra vez la nueva clave',
+    110 => 'Clave actual',
+    111 => 'Por favor, escriba su clave actual',
+    112 => 'Ha excedido el l?mite de intentos de validaci?n. Por favor, int?ntelo m?s tarde.',
+    113 => 'deliaF tpmettA nigoL',
+    114 => 'Cuenta deshabilitada',
+    115 => 'Su cuenta ha sido deshabilitada. Por favor, contacte con el administrador.',
+    116 => 'Cuenta pendiente de activaci?n',
+    117 => 'Su cuenta est? actualmente pendiente de ser activada por el administrador. Deber? esperar hasta que esto se haga efecto. Para m?s detalles, contacte con el administrador.',
+    118 => "Su {$_CONF['site_name']} cuenta ha sido activada por el administrador. Usted puede ahora iniciar sesi?n en la direcci?n abajo indicada con el usuario (<username>) y la clave enviada a usted por correo previamente.",
+    119 => 'Si ha olvidado su contrase?a, puede solicitar una nueva en esta direcci?n:',
+    120 => 'Cuenta activada',
+    121 => 'Servicio',
+    122 => 'Lo sentimos, el registro de usuarios est? deshabilitado',
+    123 => "Es usted un <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">usuario nuevo</a>?",
+    124 => 'Correo de Confirmaci?n',
+    125 => 'Debe escribir la misma direcci?n de correo en ambos campos',
+    126 => 'Rep?talo de nuevo para confirmar',
+    127 => 'Para cambiar alguna de estas opciones, introduzca su contrase?a.',
+    128 => 'Su nombre',
+    129 => 'Clave &amp; Correo electr?nico',
+    130 => 'Informaci?n personal',
     131 => 'Daily Digest Options',
     132 => 'Daily Digest Feature',
-    133 => 'Comment Display',
-    134 => 'Comment Options',
-    135 => '<li>Default mode for how comments will be displayed</li><li>Default order to display comments</li><li>Set maximum number of comments to show - default is 100</li>',
-    136 => 'Exclude Topics and Authors',
-    137 => 'Filter Story Content',
-    138 => 'Misc Settings',
-    139 => 'Layout and Language',
-    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics<li>Set the maximum number of stories to show per page</li><li>Set your theme and perferred date format</li>',
-    141 => 'Privacy Settings',
-    142 => 'The default setting is to allow users & admins to email fellow site members and show your status as online. Un-check these options to protect your privacy.',
-    143 => 'Filter Block Content',
-    144 => 'Show & hide boxes',
-    145 => 'Your Public Profile',
-    146 => 'Password and email',
-    147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
-    148 => 'User Information',
-    149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
-    156 => 'Delete Account',
-    157 => 'Delete Option',
-    158 => 'Time Zone',
-    159 => 'This email was generated automatically. Please do not reply to this email.',
+    133 => 'Mostrar comentario',
+    134 => 'Opciones de comentario',
+    135 => '<li>Formato por defecto de los comentarios</li><li>Orden por defecto de los comentarios</li><li>N?mero m?ximo de comentarios a mostrar - por defecto es 100</li>',
+    136 => 'Excluir Temas y Autores',
+    137 => 'Filtrar Contenido de mensaje',
+    138 => 'Opciones de Miscel?nea',
+    139 => 'Composici?n de p?gina e Idioma',
+    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics<li>Establecer el n?mero m?ximo de posts a mostrar por p?gina</li><li>Establezca el tema de dise?o y el formato de fecha</li>',
+    141 => 'Opciones de Privacidad',
+    142 => 'La opci?n por defecto es permitir a usuarios y administradores enviar correos a los compa?eros y mostrar tu estado como Conectado. Deshabilite estas opciones para proteger su privacidad.',
+    143 => 'Filtro de Bloqueo de Contenido',
+    144 => 'Mostrar y esconder paneles',
+    145 => 'Su perfil p?blico',
+    146 => 'Clave y correo electr?nico',
+    147 => 'Actualice su clave, correo electr?nico y opci?n de autovalidaci?n. Deber? escribir la misma clave o direcci?n de correo electr?nico para confirmar.',
+    148 => 'Informaci?n de usuario',
+    149 => 'Modifique la informaci?n que se mostrar? de usted al resto de usuarios.<li>La firma se a?adir? a los posts o comentarios que usted env?e.</li><li>La BIO es un peque?o resumen de usted para los dem?s.</li><li>Comparta su clave PGP</li>',
+    150 => 'Atenci?n: Active Javascript en su navegador para mejorar la funcionalidad',
+    156 => 'Eliminar cuenta',
+    157 => 'Eliminar opci?n',
+    158 => 'Zona horaria',
+    159 => 'Este correo se gener? auto?ticamente. Por favor, no responda al mismo.',
     160 => '(max. %d x %d pixels, %d bytes; %s)',
     161 => 'will be scaled down',
     162 => 'will not be scaled'
@@ -388,12 +388,12 @@
 # Array index key matches preference div id
 
 $LANG_MYACCOUNT = array(
-    'pe_preview' => 'Preview',
-    'pe_namepass' => 'Username &amp; Password',
-    'pe_userinfo' => 'About You',
-    'pe_layout' => 'Layout &amp; Language',
-    'pe_content' => 'Content',
-    'pe_privacy' => 'Privacy'
+    'pe_preview' => 'Ver',
+    'pe_namepass' => 'Usuario y Clave',
+    'pe_userinfo' => 'Acerca de t?',
+    'pe_layout' => 'Composici?n de p?gina e Idioma',
+    'pe_content' => 'Contenido',
+    'pe_privacy' => 'Privacidad'
 );
 
 ###############################################################################
@@ -521,7 +521,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
@@ -560,10 +560,10 @@
     24 => 'Parece que nadie ha enviado una noticia por correo electr?nic en este sitio.',
     25 => 'Top Ten Trackback Commented Stories',
     26 => 'No trackback comments found.',
-    27 => 'Number of active users',
+    27 => 'Usuarios activos',
     28 => '',
     29 => '',
-    30 => 'Hits',
+    30 => 'Visitas',
     31 => ''
 );
 
@@ -636,8 +636,8 @@
     51 => 'Lugar',
     52 => 'Borrar',
     53 => 'Crea una cuenta',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Introducci?n del mensaje',
+    55 => 'Cuerpo del mensaje'
 );
 
 ###############################################################################
@@ -721,13 +721,13 @@
     58 => 'Mueve el bloque arriba',
     59 => 'Mueve el bloque a la derecha',
     60 => 'Mueve el bloque a la izquierda',
-    61 => 'No Title',
-    62 => 'Article Limit',
+    61 => 'Sin t?tulo',
+    62 => 'L?mite de art?culo',
     63 => 'Bad Block Title',
-    64 => 'Your Title must not be empty and cannot contain HTML!',
-    65 => 'Order',
-    66 => 'Autotags',
-    67 => 'Check to allow autotags',
+    64 => 'Debe escribir un t?tulo y este no puede contener etiquetas HTML',
+    65 => 'Orden',
+    66 => 'Autoetiquetas',
+    67 => 'Marque para permitir autoetiquetas',
     68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
 );
 
@@ -759,10 +759,10 @@
     22 => 'Listado de Noticias',
     23 => 'Para modificar o borrar una Noticia selecciona el n?mero de Noticia m?s abajo. Para ver la Noticia selecciona el t?tulo de la misma. Para crear una nueva Noticia selecciona \'Enviar Noticia\' m?s arriba.',
     24 => 'La ID que has elegido para este tema ya est? siendo utilizada. Por favor, utiliza otra ID.',
-    25 => 'Error when saving story',
+    25 => 'Hubo un error al guardar el post',
     26 => 'Lectura Previa',
-    27 => 'If you use [unscaledX] instead of [imageX], the image will be inserted at its original dimensions.',
-    28 => '<p><b>PREVIEWING</b>: Previewing a story with images attached is best done by saving the article as a draft INSTEAD OF hitting the preview button.  Use the preview button only when images are not attached.',
+    27 => 'Si emplea [unscaledX] en vez de [imageX], la imagen se insertar? con su tama?o original.',
+    28 => '<p><b>PREVISUALIZANDO</b>: para previsualizar un post con im?genes es recomendable salvar el post como un borrador en vez de ver la previsualizaci?n. Use la opci?n de previsualizar cuando el post no contenga im?genes.',
     29 => 'Trackbacks',
     30 => 'Errores al Subir Archivos',
     31 => 'Por favor rellena los campos de Autor, T?tulo y Texto',
@@ -801,28 +801,28 @@
     64 => '',
     65 => '',
     66 => '',
-    67 => 'Expand the Content Edit Area size',
-    68 => 'Reduce the Content Edit Area size',
-    69 => 'Publish Story Date',
-    70 => 'Toolbar Selection',
-    71 => 'Basic Toolbar',
-    72 => 'Common Toolbar',
-    73 => 'Advanced Toolbar',
-    74 => 'Advanced II Toolbar',
-    75 => 'Full Featured',
-    76 => 'Publish Options',
-    77 => 'Javascript needs to be enabled for Advanced Editor. Option can be disabled in the main site config.php',
-    78 => 'Click <a href="%s/story.php?mode=edit&amp;sid=%s&amp;editopt=default">here</a> to use default editor',
-    79 => 'Preview',
+    67 => 'Expandir el tama?o del ?rea de Edici?n de Contenido',
+    68 => 'Reducir el tama?o del ?rea de Edici?n de Contenido',
+    69 => 'Fecha de Publicaci?n del Post',
+    70 => 'Selecci?n de barra de herramientas',
+    71 => 'Barra de herramientas b?sica',
+    72 => 'Barra de herramientas com?n',
+    73 => 'Barra de herramientas avanzada',
+    74 => 'Barra de herramientas avanzada II',
+    75 => 'Barra de herramientas completa',
+    76 => 'Opciones de Publicaci?n',
+    77 => 'Javascript debe estar habilitado en el navegador para hacer uso del editor de texto avanzado. El editor de textos avanzado puede deshabilitarse en el archivo config.php.',
+    78 => '<a href="%s/story.php?mode=edit&amp;sid=%s&amp;editopt=default">Usar el editor de textos predeterminado</a>',
+    79 => 'Previsualizar',
     80 => 'Editor',
-    81 => 'Publish Options',
-    82 => 'Images',
-    83 => 'Archive Options',
-    84 => 'Permissions',
-    85 => 'Show All',
-    86 => 'Advanced Editor',
-    87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    81 => 'Opciones de publicaci?n',
+    82 => 'Im?genes',
+    83 => 'Opciones de Archivo',
+    84 => 'Permisos',
+    85 => 'Mostrar todos',
+    86 => 'Editor Avanzado',
+    87 => 'Estad?sticas de posts',
+    88 => 'Formato estilo Wiki'
 );
 
 ###############################################################################
@@ -855,9 +855,9 @@
     24 => '(*)',
     25 => 'Archiva el tema',
     26 => 'convi?rtelo en el tema por defecto para noticias archivadas. S?lo se permite un tema.',
-    27 => 'Or Upload Topic Icon',
-    28 => 'Maximum',
-    29 => 'File Upload Errors'
+    27 => 'O env?e un Icono de Tema',
+    28 => 'M?ximo',
+    29 => 'Hubo errores en el env?o del archivo'
 );
 

From geeklog-cvs at lists.geeklog.net  Sun May 24 07:34:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 24 May 2009 07:34:50 -0400
Subject: [geeklog-cvs] geeklog: Updated function descriptions and
	phpDocumentor tags
Message-ID: <hg.05a9b14e24d4.1243164890.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05a9b14e24d4
changeset: 7050:05a9b14e24d4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 24 13:33:58 2009 +0200
description:
Updated function descriptions and phpDocumentor tags

diffstat:

 system/lib-plugins.php     |  316 ++++++++++++++++++++++++--------------------
 system/lib-syndication.php |    9 +-
 2 files changed, 175 insertions(+), 150 deletions(-)

diffs (truncated from 853 to 300 lines):

diff -r 484127470385 -r 05a9b14e24d4 system/lib-plugins.php
--- a/system/lib-plugins.php	Sat May 23 08:52:57 2009 +0200
+++ b/system/lib-plugins.php	Sun May 24 13:33:58 2009 +0200
@@ -35,6 +35,7 @@
 * This is the plugin library for Geeklog.  This is the API that plugins can
 * implement to get tight integration with Geeklog.
 * See each function for more details.
+* @link http://wiki.geeklog.net/index.php/Plugin_API
 *
 */
 
@@ -76,6 +77,7 @@
 *
 * @param    string  $function_name  holds name of function to call
 * @return   void
+* @access   private
 * @internal not to be used by plugins
 * @todo     only supports functions without any parameters
 *
@@ -107,14 +109,15 @@
 * @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
+* @access   private
 * @internal not to be used by plugins
 *
 */
 function PLG_callFunctionForOnePlugin($function, $args='')
 {
     if (function_exists($function)) {
-        if (empty ($args)) {
-            $args = array ();
+        if (empty($args)) {
+            $args = array();
         }
 
         // great, function exists, run it
@@ -202,7 +205,7 @@
 
 /**
 * Calls the plugin function to return the current version of code.
-* Used to indicate to admin if an update or upgrade is requied.
+* Used to indicate to admin if an update or upgrade is required.
 *
 * @param        string      $type       Plugin name
 * @return       boolean     Returns true on success otherwise false
@@ -221,11 +224,11 @@
 * @link     http://wiki.geeklog.net/index.php/Plugin_Auto-Uninstall
 *
 */
-function PLG_uninstall ($type)
+function PLG_uninstall($type)
 {
     global $_PLUGINS, $_TABLES;
 
-    if (empty ($type)) {
+    if (empty($type)) {
         return false;
     }
 
@@ -234,7 +237,7 @@
         $function = 'plugin_autouninstall_' . $type;
         $remvars = $function();
 
-        if (empty ($remvars) || $remvars == false) {
+        if (empty($remvars) || $remvars == false) {
             return false;
         }
 
@@ -256,7 +259,7 @@
         for ($i = 0; $i < count($remvars['groups']); $i++) {
             $grp_id = DB_getItem ($_TABLES['groups'], 'grp_id',
                                   "grp_name = '{$remvars['groups'][$i]}'");
-            if (!empty ($grp_id)) {
+            if (!empty($grp_id)) {
                 COM_errorLog ("Attempting to remove the {$remvars['groups'][$i]} group", 1);
                 DB_delete($_TABLES['groups'], 'grp_id', $grp_id);
                 COM_errorLog ('...success', 1);
@@ -270,7 +273,7 @@
         for ($i = 0; $i < count($remvars['features']); $i++) {
             $access_id = DB_getItem ($_TABLES['features'], 'ft_id',
                                     "ft_name = '{$remvars['features'][$i]}'");
-            if (!empty ($access_id)) {
+            if (!empty($access_id)) {
                 COM_errorLog ("Attempting to remove {$remvars['features'][$i]} rights from all groups" ,1);
                 DB_delete($_TABLES['access'], 'acc_ft_id', $access_id);
                 COM_errorLog ('...success', 1);
@@ -356,7 +359,7 @@
 * @see      PLG_pluginStateChange
 *
 */
-function PLG_enableStateChange ($type, $enable)
+function PLG_enableStateChange($type, $enable)
 {
    global $_CONF, $_TABLES, $_DB_table_prefix;
 
@@ -405,7 +408,7 @@
         $function = 'plugin_getmenuitems_' . $pi_name;
         if (function_exists($function)) {
             $menuitems = $function();
-            if (is_array ($menuitems)) {
+            if (is_array($menuitems)) {
                 $menu = array_merge ($menu, $menuitems);
             }
         }
@@ -504,7 +507,7 @@
 }
 
 /**
-* Allows plugins a chance to handle a comment before GL does.
+* Allows plugins a chance to handle a comment before Geeklog does.
 
 * This is a first-come-first-serve affair so if a plugin returns an error, other
 * plugins wishing to handle comment preprocessing won't get called
@@ -512,12 +515,14 @@
 * @author Tony Bibbs, tony AT tonybibbs DOT com
 * @access public
 * @param  int       $uid User ID
-* @param  string    $title Comment title
+* @param  string   &$title Comment title
+* @param  string   &$comment Comment text
 * @param  string    $sid Story ID (not always a story, remember!)
 * @param  int       $pid Parent comment ID
 * @param  string    $type Type of comment
-* @param  string    $postmode HTML or text
+* @param  string   &$postmode HTML or text
 * @return mixed     an error otherwise false if no errors were encountered
+* @see    PLG_itemPreSave
 *
 */
 function PLG_commentPreSave($uid, &$title, &$comment, $sid, $pid, $type, &$postmode)
@@ -548,7 +553,7 @@
 }
 
 /**
-* Allows plugins a chance to handle an item before GL does. Modeled
+* Allows plugins a chance to handle an item before Geeklog does. Modeled
 * after the PLG_commentPreSave() function.
 *
 * This is a first-come-first-serve affair so if a plugin returns an error, other
@@ -559,6 +564,7 @@
 * @param string $type Type of item, i.e.; registration, contact ...
 * @param string $content item specific content
 * @return string empty is no error, error message if error was encountered
+* @see PLG_commentPreSave
 *
 */
 function PLG_itemPreSave($type, $content)
@@ -569,7 +575,7 @@
         $function = 'plugin_itemPreSave_' . $pi_name;
         if (function_exists ($function)) {
             $msgError = $function ($type, $content);
-            if (!empty ($msgError)) {
+            if (!empty($msgError)) {
                 // Plugin doesn't want to save the item
                 return $msgError;
             }
@@ -579,7 +585,7 @@
     $function = 'CUSTOM_itemPreSave';
     if (function_exists ($function)) {
         $msgError = $function ($type, $content);
-        if (!empty ($msgError)) {
+        if (!empty($msgError)) {
             // Custom doesn't want to save the item
             return $msgError;
         }
@@ -599,9 +605,9 @@
 * bear with us ...
 *
 * The only parameter to this function, $showsitestats, was documented as being
-* 1 for the site stats and 0 for the plugin-specific stats. However, the latter
-* was always called with a value of 2, so plugins only did a check for 1 and
-* "else", which makes extensions somewhat tricky.
+* being 1 for the site stats and 0 for the plugin-specific stats. However, the
+* latter was always called with a value of 2, so plugins only did a check for 1
+* and "else", which makes extensions somewhat tricky.
 * Furthermore, due to the original templates for the site stats, it has
 * become standard practice to hard-code a <table> in the plugins as the return
 * value for $showsitestats == 1. This table, however, didn't align properly
@@ -621,12 +627,12 @@
 * @return   mixed                       array (for mode 3) or string
 *
 */
-function PLG_getPluginStats ($showsitestats)
+function PLG_getPluginStats($showsitestats)
 {
     global $_PLUGINS;
 
     if ($showsitestats == 3) {
-        $retval = array ();
+        $retval = array();
     } else {
         $retval = '';
     }
@@ -636,7 +642,7 @@
             $function = 'plugin_statssummary_' . $pi_name;
             if (function_exists ($function)) {
                 $summary = $function ();
-                if (is_array ($summary)) {
+                if (is_array($summary)) {
                     $retval[$pi_name] = $summary;
                 }
             }
@@ -660,7 +666,7 @@
         $function = 'CUSTOM_statssummary';
         if (function_exists ($function)) {
             $summary = $function ();
-            if (is_array ($summary)) {
+            if (is_array($summary)) {
                 $retval['Custom'] = $summary;
             }
         }
@@ -701,7 +707,7 @@
         $function = 'plugin_searchtypes_' . $pi_name;
         if (function_exists ($function)) {
             $cur_types = $function ();
-            if (is_array ($cur_types) && (count ($cur_types) > 0)) {
+            if (is_array($cur_types) && (count($cur_types) > 0)) {
                 $types = array_merge ($types, $cur_types);
             }
         } // no else because this is not a required API function
@@ -710,7 +716,7 @@
     $function = 'CUSTOM_searchtypes';
     if (function_exists ($function)) {
         $cur_types = $function ();
-        if (is_array ($cur_types) && (count ($cur_types) > 0)) {
+        if (is_array($cur_types) && (count($cur_types) > 0)) {
             $types = array_merge ($types, $cur_types);
         }
     }
@@ -723,12 +729,13 @@
 * Determines if a specific plugin supports Geeklog's
 * expanded search results feature
 *
-* @author Tony Bibbs, tony AT tonybibbs DOT com
-* @access public
-* @param string $type Plugin name
-* @return boolean True if it is supported, otherwise false
+* NOTE: This function is not currently used
 *
-* NOTE: This function is not currently used
+* @author   Tony Bibbs, tony AT tonybibbs DOT com
+* @access   public
+* @param    string  $type   Plugin name
+* @return   boolean         True if it is supported, otherwise false
+* @deprecated no longer used
 *
 */
 function PLG_supportsExpandedSearch($type)
@@ -747,7 +754,7 @@
 
 /**
 * This function gives each plugin the opportunity to do their search
-* and return their results.  Results comeback in an array of HTML
+* and return their results.  Results come back in an array of HTML
 * formatted table rows that can be quickly printed by search.php
 *
 * @param    string  $query      What the user searched for
@@ -765,10 +772,11 @@
 function PLG_doSearch($query, $datestart, $dateend, $topic, $type, $author, $keyType = 'all', $page = 1, $perpage = 10)
 {
     global $_PLUGINS;
-    /*
-        The API, as of 1.6.0, does not use $page, $perpage
-        $type is now only used in the core and should not be passed to the plugin
-    */
+
+    /**
+     * The API, as of 1.6.0, does not use $page, $perpage
+     * $type is now only used in the core and should not be passed to the plugin
+     */
 
     $search_results = array();
 
@@ -840,13 +848,15 @@
 * The plugin is responsible for its own security.
 * This supports a plugin having either a single menuitem or multiple menuitems.
 * The plugin has to provide an array for the menuitem of the format:
-* array (menuitem_title, item_url, submission_count)
+* <code>
+* array(menuitem_title, item_url, submission_count)
+* </code>
 * 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))
+* 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
 *
@@ -860,6 +870,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
+* @access   private

From geeklog-cvs at lists.geeklog.net  Sun May 24 15:34:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 24 May 2009 15:34:55 -0400
Subject: [geeklog-cvs] geeklog: Source code cosmetics (needed some pretty
	code snippets...
Message-ID: <hg.d0ee1ac7c3a4.1243193695.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d0ee1ac7c3a4
changeset: 7051:d0ee1ac7c3a4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 24 19:32:18 2009 +0200
description:
Source code cosmetics (needed some pretty code snippets for the wiki ...)

diffstat:

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

diffs (80 lines):

diff -r 05a9b14e24d4 -r d0ee1ac7c3a4 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun May 24 13:33:58 2009 +0200
+++ b/plugins/staticpages/functions.inc	Sun May 24 19:32:18 2009 +0200
@@ -511,35 +511,43 @@
 function plugin_showstats_staticpages($showsitestats)
 {
     global $_CONF, $_TABLES, $LANG_STATIC;
+
     $retval = '';
 
-    $perms = SP_getPerms ();
-    if (!empty ($perms)) {
+    $perms = SP_getPerms();
+    if (!empty($perms)) {
         $perms = ' AND ' . $perms;
     }
-    $result = DB_query ("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE sp_hits > 0" . $perms . ' ORDER BY sp_hits DESC LIMIT 10');
-    $nrows  = DB_numRows ($result);
+    $result = DB_query("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE sp_hits > 0" . $perms . ' ORDER BY sp_hits DESC LIMIT 10');
+    $nrows  = DB_numRows($result);
     if ($nrows > 0) {
-        require_once( $_CONF['path_system'] . 'lib-admin.php' );
+        require_once $_CONF['path_system'] . 'lib-admin.php';
+
         $header_arr = array(
-            array('text' => $LANG_STATIC['stats_page_title'], 'field' => 'sid', 'header_class' => 'stats-header-title'),
-            array('text' => $LANG_STATIC['stats_hits'], 'field' => 'sp_hits', 'header_class' => 'stats-header-count', 'field_class' => 'stats-list-count'),
+            array('text'         => $LANG_STATIC['stats_page_title'],
+                  'field'        => 'sid',
+                  'header_class' => 'stats-header-title'),
+            array('text'         => $LANG_STATIC['stats_hits'],
+                  'field'        => 'sp_hits',
+                  'header_class' => 'stats-header-count',
+                  'field_class'  => 'stats-list-count'),
         );
         $data_arr = array();
-        $text_arr = array('has_menu'     => false,
-                          'title'        => $LANG_STATIC['stats_headline'],
+        $text_arr = array('has_menu' => false,
+                          'title'    => $LANG_STATIC['stats_headline']
         );
         for ($i = 0; $i < $nrows; $i++) {
-            $A = DB_fetchArray ($result);
-            $A['sp_title'] = stripslashes ($A['sp_title']);
-            $A['sid'] = COM_createLink($A['sp_title'], COM_buildUrl ($_CONF['site_url']
-                      . "/staticpages/index.php?page={$A['sp_id']}"));
-            $A['sp_hits'] = COM_NumberFormat ($A['sp_hits']);
+            $A = DB_fetchArray($result);
+            $A['sp_title'] = stripslashes($A['sp_title']);
+            $A['sid'] = COM_createLink($A['sp_title'],
+                            COM_buildUrl($_CONF['site_url']
+                                . "/staticpages/index.php?page={$A['sp_id']}"));
+            $A['sp_hits'] = COM_NumberFormat($A['sp_hits']);
             $data_arr[$i] = $A;
         }
         $retval .= ADMIN_simpleList("", $header_arr, $text_arr, $data_arr);
     } else {
-        $retval .= COM_startBlock ($LANG_STATIC['stats_headline']);
+        $retval .= COM_startBlock($LANG_STATIC['stats_headline']);
         $retval .= $LANG_STATIC['stats_no_hits'];
         $retval .= COM_endBlock();
     }
@@ -553,13 +561,13 @@
 * @return   array(item text, item count);
 *
 */
-function plugin_statssummary_staticpages ()
+function plugin_statssummary_staticpages()
 {
-    global $_TABLES, $LANG_STATIC;
+    global $LANG_STATIC;
 
-    $total_pages = SP_countVisiblePages ();
+    $total_pages = SP_countVisiblePages();
 
-    return array ($LANG_STATIC['staticpages'], COM_numberFormat ($total_pages));
+    return array($LANG_STATIC['staticpages'], COM_numberFormat($total_pages));
 }
 
 /**

From geeklog-cvs at lists.geeklog.net  Sun May 24 15:34:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 24 May 2009 15:34:55 -0400
Subject: [geeklog-cvs] geeklog: Typo in comment + some source code cosmetics
Message-ID: <hg.5cc4b9c70e17.1243193695.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5cc4b9c70e17
changeset: 7052:5cc4b9c70e17
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 24 20:27:23 2009 +0200
description:
Typo in comment + some source code cosmetics

diffstat:

 plugins/links/functions.inc |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (27 lines):

diff -r d0ee1ac7c3a4 -r 5cc4b9c70e17 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun May 24 19:32:18 2009 +0200
+++ b/plugins/links/functions.inc	Sun May 24 20:27:23 2009 +0200
@@ -100,17 +100,17 @@
 /**
 * Return headlines for New Links section in the What's New block, if enabled
 *
-* @return   mixed       array(headline, byline), or boolean false is disabled
+* @return   mixed       array(headline, byline), or boolean false if disabled
 *
 */
 function plugin_whatsnewsupported_links()
 {
-    global $_TABLES, $_LI_CONF, $LANG_LINKS, $LANG_WHATSNEW;
+    global $_LI_CONF, $LANG_LINKS, $LANG_WHATSNEW;
 
-    if ( $_LI_CONF['hidenewlinks'] == 0 ) {
-        $retval = array( $LANG_LINKS[84],
-                         COM_formatTimeString( $LANG_WHATSNEW['new_last'],
-                                               $_LI_CONF['newlinksinterval'] )
+    if ($_LI_CONF['hidenewlinks'] == 0) {
+        $retval = array($LANG_LINKS[84],
+                        COM_formatTimeString($LANG_WHATSNEW['new_last'],
+                                             $_LI_CONF['newlinksinterval'])
                        );
     } else {
         $retval = false;

From geeklog-cvs at lists.geeklog.net  Mon May 25 03:33:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 03:33:51 -0400
Subject: [geeklog-cvs] geeklog: Typos in comments
Message-ID: <hg.1ecab6dce208.1243236831.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1ecab6dce208
changeset: 7053:1ecab6dce208
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 25 09:33:39 2009 +0200
description:
Typos in comments

diffstat:

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

diffs (30 lines):

diff -r 5cc4b9c70e17 -r 1ecab6dce208 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun May 24 20:27:23 2009 +0200
+++ b/system/lib-plugins.php	Mon May 25 09:33:39 2009 +0200
@@ -1784,7 +1784,7 @@
   * @param  string  $feedType       Type of feed format (RSS/Atom/etc)
   * @param  string  $feedVersion    Type of feed version (RSS 1.0 etc)
   * @param  string  $topic          The topic for the feed.
-  * @param  string  $fid            The ID of the feed being fethed.
+  * @param  string  $fid            The ID of the feed being fetched.
   * @return array                   list of extension tags
   *
   */
@@ -1820,7 +1820,7 @@
   * @param  string  $feedType       Type of feed format (RSS/Atom/etc)
   * @param  string  $feedVersion    Type of feed version (RSS 1.0 etc)
   * @param  string  $topic          The topic for the feed.
-  * @param  string  $fid            The ID of the feed being fethed.
+  * @param  string  $fid            The ID of the feed being fetched.
   * @return array                   list of extension namespaces
   *
   */
@@ -1855,7 +1855,7 @@
   * @param  string  $feedType       Type of feed format (RSS/Atom/etc)
   * @param  string  $feedVersion    Type of feed version (RSS 1.0 etc)
   * @param  string  $topic          The topic for the feed.
-  * @param  string  $fid            The ID of the feed being fethed.
+  * @param  string  $fid            The ID of the feed being fetched.
   * @return array                   list of meta tag extensions
   *
   */

From geeklog-cvs at lists.geeklog.net  Mon May 25 04:18:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 04:18:21 -0400
Subject: [geeklog-cvs] geeklog: Clarified
	$_CONF['article_comment_close_days'] (cf. bug...
Message-ID: <hg.05a6c9cd2a64.1243239501.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05a6c9cd2a64
changeset: 7054:05a6c9cd2a64
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon May 25 10:18:11 2009 +0200
description:
Clarified $_CONF['article_comment_close_days'] (cf. bug #0000875)

diffstat:

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

diffs (18 lines):

diff -r 1ecab6dce208 -r 05a6c9cd2a64 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Mon May 25 09:33:39 2009 +0200
+++ b/public_html/docs/english/config.html	Mon May 25 10:18:11 2009 +0200
@@ -937,8 +937,12 @@
 <tr>
   <td valign="top"><a name="desc_article_comment_close_days">article_comment_close_days</a></td>
   <td valign="top">30</td>
-  <td valign="top">Number of days after which a story is automatically closed
-    for comments, i.e. no new comments can be posted after that many days.</td></tr>
+  <td valign="top">Number of days after which a story is to be automatically
+    closed for comments, i.e. no new comments can be posted after that many
+    days.<br>
+    Note that this is only the default value to which the "Disable Comments"
+    option is set when creating a new story. It will not take effect unless it
+    has also been enabled for the story.</td></tr>
 <tr>
   <td valign="top"><a name="desc_comment_close_rec_stories">comment_close_rec_stories</a></td>
   <td valign="top">0</td>

From geeklog-cvs at lists.geeklog.net  Mon May 25 09:07:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 09:07:39 -0400
Subject: [geeklog-cvs] geeklog: Don't display search result info when there
	is nothing ...
Message-ID: <hg.ad57bda59747.1243256859.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ad57bda59747
changeset: 7055:ad57bda59747
user:      Sami Barakat
date:      Mon May 25 14:06:13 2009 +0100
description:
Don't display search result info when there is nothing to show

diffstat:

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

diffs (72 lines):

diff -r 05a6c9cd2a64 -r ad57bda59747 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Mon May 25 10:18:11 2009 +0200
+++ b/system/classes/listfactory.class.php	Mon May 25 14:06:13 2009 +0100
@@ -426,7 +426,11 @@
                 foreach ($this->_fields as $field)
                 {
                     if (!is_numeric($field['name']) && $field['name'][0] != '_') {
-                        $col[ $field['name'] ] = $A[ $field['name'] ];
+                        if (empty($A[ $field['name'] ])) {
+                            $col[ $field['name'] ] = 'LF_NULL';
+                        } else {
+                            $col[ $field['name'] ] = $A[ $field['name'] ];
+                        }
                     }
                 }
 
@@ -444,7 +448,8 @@
         $direction = $this->_sort_arr['direction'] == 'asc' ? SORT_ASC : SORT_DESC;
         $column = array();
         foreach ($rows_arr as $sortarray) {
-            $column[] = strip_tags($sortarray[ $this->_sort_arr['field'] ]);
+            $tmp = strip_tags($sortarray[ $this->_sort_arr['field'] ]);
+            $column[] = ($tmp == 'LF_NULL' ? 0 : $tmp);
         }
         array_multisort($column, $direction, $rows_arr);
 
@@ -598,11 +603,13 @@
                         $fieldvalue = $row[ $field['name'] ];
                     }
 
-                    $fieldvalue = sprintf($field['format'], $fieldvalue, $field['title']);
+                    if ($fieldvalue != 'LF_NULL') {
+                        $fieldvalue = sprintf($field['format'], $fieldvalue, $field['title']);
 
-                    // Write field
-                    $list_templates->set_var('field_text', $fieldvalue);
-                    $list_templates->parse('item_field', 'field', true);
+                        // Write field
+                        $list_templates->set_var('field_text', $fieldvalue);
+                        $list_templates->parse('item_field', 'field', true);
+                    }
                 }
             }
 
diff -r 05a6c9cd2a64 -r ad57bda59747 system/classes/search.class.php
--- a/system/classes/search.class.php	Mon May 25 10:18:11 2009 +0200
+++ b/system/classes/search.class.php	Mon May 25 14:06:13 2009 +0100
@@ -750,8 +750,13 @@
                 $row['description'] = stripslashes($this->_shortenText($this->_query, $row['description'], $this->_wordlength));
             }
 
-            $row['date'] = strftime($_CONF['daytime'], intval($row['date']));
-            $row['hits'] = COM_NumberFormat($row['hits']) . ' '; // simple solution to a silly problem!
+            if ($row['date'] != 'LF_NULL') {
+                $row['date'] = strftime($_CONF['daytime'], intval($row['date']));
+            }
+
+            if ($row['hits'] != 'LF_NULL') {
+                $row['hits'] = COM_NumberFormat($row['hits']) . ' '; // simple solution to a silly problem!
+            }
         }
 
         return $row;
@@ -894,7 +899,7 @@
     *
     * @param   string  $haystack  string to search in
     * @param   string  $needle    string to search for
-    * @return  mixed              first pos of $needle in $haystack, or false 
+    * @return  mixed              first pos of $needle in $haystack, or false
     *
     */
     function _stripos($haystack, $needle)

From geeklog-cvs at lists.geeklog.net  Mon May 25 12:00:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 12:00:29 -0400
Subject: [geeklog-cvs] geeklog: Hiding search info also works for plugins on
	old api. M...
Message-ID: <hg.c68402fc8a20.1243267229.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c68402fc8a20
changeset: 7056:c68402fc8a20
user:      Sami Barakat
date:      Mon May 25 16:57:48 2009 +0100
description:
Hiding search info also works for plugins on old api. Minor cosmetic changes.

diffstat:

 plugins/calendar/functions.inc    |  14 ++++++++------
 plugins/links/functions.inc       |  17 +++++++++--------
 plugins/staticpages/functions.inc |  12 +++++++-----
 system/classes/search.class.php   |  17 ++++++++++-------
 4 files changed, 34 insertions(+), 26 deletions(-)

diffs (202 lines):

diff -r ad57bda59747 -r c68402fc8a20 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Mon May 25 14:06:13 2009 +0100
+++ b/plugins/calendar/functions.inc	Mon May 25 16:57:48 2009 +0100
@@ -119,10 +119,10 @@
         if($_DB_dbms == 'mssql') {
             $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
         } else {
-            $eventSql .= "WHERE dateend >= (NOW() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";            
+            $eventSql .= "WHERE dateend >= (NOW() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
         }
         $eventSql .= 'ORDER BY datestart,timestart';
-        
+
         if(( $_CA_CONF['personalcalendars'] == 1 ) && !empty( $_USER['uid'] )) {
             $personaleventsql = 'SELECT eid,title,url,datestart,dateend,group_id,owner_id,perm_owner,perm_group,perm_members,perm_anon '
             . "FROM {$_TABLES['personal_events']} ";
@@ -1619,10 +1619,12 @@
     // Make sure the query is SQL safe
     $query = trim(addslashes($query));
 
-    $sql_e = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, hits, CONCAT('/calendar/event.php?eid=',eid) AS url ";
+    $sql_e = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, hits, ";
+    $sql_e .= "CONCAT('/calendar/event.php?eid=',eid) AS url ";
     $sql_e .= "FROM {$_TABLES['events']} WHERE 1=1 ";
 
-    $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, '0' AS hits, CONCAT('/calendar/event.php?eid=',eid) AS url ";
+    $sql_p = "SELECT eid AS id, title, description, UNIX_TIMESTAMP(datestart) AS date, owner_id AS uid, ";
+    $sql_p .= "CONCAT('/calendar/event.php?eid=',eid) AS url ";
     $sql_p .= "FROM {$_TABLES['personal_events']} WHERE 1=1 ";
 
     $sql = COM_getPermSQL('AND') . ' ';
@@ -1645,7 +1647,7 @@
 
     // Search the public events
     $search_e = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[24]));
-    $columns = array('location', 'description', 'title' => 'title');
+    $columns = array('title' => 'title', 'location', 'description');
     list($sql_tmp,$ftsql_tmp) = $search_e->buildSearchSQL($keyType, $query, $columns, $sql_e . $sql);
     $search_e->setSQL($sql_tmp);
     $search_e->setFTSQL($ftsql_tmp);
@@ -1653,7 +1655,7 @@
 
     // Search personal events
     $search_p = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[23]));
-    $columns = array('location', 'description','title' => 'title');
+    $columns = array('title' => 'title', 'location', 'description');
     list($sql_tmp,$ftsql_tmp) = $search_p->buildSearchSQL($keyType, $query, $columns, $sql_p . $sql);
     $search_p->setSQL($sql_tmp);
     $search_p->setFTSQL($ftsql_tmp);
diff -r ad57bda59747 -r c68402fc8a20 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Mon May 25 14:06:13 2009 +0100
+++ b/plugins/links/functions.inc	Mon May 25 16:57:48 2009 +0100
@@ -219,9 +219,9 @@
 {
     global $_CONF;
 
-    require_once $_CONF['path'] . 'plugins/links/autoinstall.php';          
+    require_once $_CONF['path'] . 'plugins/links/autoinstall.php';
 
-    $inst_parms = plugin_autoinstall_links('links'); 
+    $inst_parms = plugin_autoinstall_links('links');
 
     return $inst_parms['info']['pi_version'];
 }
@@ -363,7 +363,8 @@
     // Make sure the query is SQL safe
     $query = trim(addslashes($query));
 
-    $sql = "SELECT lid AS id, title, description, UNIX_TIMESTAMP(date) AS date, owner_id AS uid, hits, CONCAT('/links/portal.php?what=link&amp;item=', lid) AS url ";
+    $sql = "SELECT lid AS id, title, description, UNIX_TIMESTAMP(date) AS date, owner_id AS uid, hits, ";
+    $sql .= "CONCAT('/links/portal.php?what=link&amp;item=', lid) AS url ";
     $sql .= "FROM {$_TABLES['links']} WHERE date <> 1 ";
     $sql .= COM_getPermSQL('AND') . ' ';
 
@@ -384,7 +385,7 @@
     }
 
     $search = new SearchCriteria('links', $LANG_LINKS[14]);
-    $columns = array('description', 'title' => 'title');
+    $columns = array('title' => 'title', 'description');
     list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
     $search->setSQL($sql);
     $search->setFTSQL($ftsql);
@@ -639,15 +640,15 @@
 {
     global $_CONF, $_TABLES, $_LI_CONF;
 
-    $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',         
+    $installed_version = DB_getItem($_TABLES['plugins'], 'pi_version',
                                     "pi_name = 'links'");
     $code_version = plugin_chkVersion_links();
     if ($installed_version == $code_version) {
-        // nothing to do                                                       
-        return true; 
+        // nothing to do
+        return true;
     }
 
-    require_once $_CONF['path'] . 'plugins/links/autoinstall.php';          
+    require_once $_CONF['path'] . 'plugins/links/autoinstall.php';
 
     if (! plugin_compatible_with_this_version_links('links')) {
         return 3002;
diff -r ad57bda59747 -r c68402fc8a20 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Mon May 25 14:06:13 2009 +0100
+++ b/plugins/staticpages/functions.inc	Mon May 25 16:57:48 2009 +0100
@@ -608,7 +608,9 @@
     // Make sure the query is SQL safe
     $query = trim(addslashes($query));
 
-    $sql = "SELECT sp.sp_id AS id, sp.sp_title AS title, sp.sp_content AS description, UNIX_TIMESTAMP(sp.sp_date) AS date, sp.sp_uid AS uid, sp.sp_hits AS hits, CONCAT('/staticpages/index.php?page=', sp.sp_id) AS url ";
+    $sql = "SELECT sp.sp_id AS id, sp.sp_title AS title, sp.sp_content AS description, ";
+    $sql .= "UNIX_TIMESTAMP(sp.sp_date) AS date, sp.sp_uid AS uid, sp.sp_hits AS hits, ";
+    $sql .= "CONCAT('/staticpages/index.php?page=', sp.sp_id) AS url ";
     $sql .= "FROM {$_TABLES['staticpage']} AS sp,{$_TABLES['users']} AS u ";
     $sql .= "WHERE (sp.sp_uid = u.uid) AND (sp_php <> 1) ";
     $sql .= COM_getPermSQL('AND') . COM_getLangSQL('sp_id', 'AND', 'sp') . ' ';
@@ -630,7 +632,7 @@
     }
 
     $search = new SearchCriteria('staticpages', $LANG_STATIC['staticpages']);
-    $columns = array('sp_content', 'title' => 'sp_title');
+    $columns = array('title' => 'sp_title', 'sp_content');
     list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
     $search->setSQL($sql);
     $search->setFTSQL($ftsql);
@@ -931,9 +933,9 @@
     global $_CONF;
 
     require_once $_CONF['path'] . 'plugins/staticpages/autoinstall.php';
- 
+
     $inst_parms = plugin_autoinstall_staticpages('staticpages');
- 
+
     return $inst_parms['info']['pi_version'];
 }
 
@@ -1014,7 +1016,7 @@
     }
 
     require_once $_CONF['path'] . 'plugins/staticpages/autoinstall.php';
-    
+
     if (! plugin_compatible_with_this_version_staticpages('staticpages')) {
         return 3002;
     }
diff -r ad57bda59747 -r c68402fc8a20 system/classes/search.class.php
--- a/system/classes/search.class.php	Mon May 25 14:06:13 2009 +0100
+++ b/system/classes/search.class.php	Mon May 25 16:57:48 2009 +0100
@@ -352,7 +352,9 @@
         // Make sure the query is SQL safe
         $query = trim(addslashes($this->_query));
 
-        $sql = "SELECT s.sid AS id, s.title AS title, s.introtext AS description, UNIX_TIMESTAMP(s.date) AS date, s.uid AS uid, s.hits AS hits, CONCAT('/article.php?story=',s.sid) AS url ";
+        $sql = "SELECT s.sid AS id, s.title AS title, s.introtext AS description, ";
+        $sql .= "UNIX_TIMESTAMP(s.date) AS date, s.uid AS uid, s.hits AS hits, ";
+        $sql .= "CONCAT('/article.php?story=',s.sid) AS url ";
         $sql .= "FROM {$_TABLES['stories']} AS s, {$_TABLES['users']} AS u ";
         $sql .= "WHERE (draft_flag = 0) AND (date <= NOW()) AND (u.uid = s.uid) ";
         $sql .= COM_getPermSQL('AND') . COM_getTopicSQL('AND') . COM_getLangSQL('sid', 'AND') . ' ';
@@ -377,7 +379,7 @@
         }
 
         $search = new SearchCriteria('stories', $LANG09[65]);
-        $columns = array('introtext', 'bodytext', 'title' => 'title');
+        $columns = array('title' => 'title', 'introtext', 'bodytext');
         list($sql, $ftsql) = $search->buildSearchSQL($this->_keyType, $query, $columns, $sql);
         $search->setSQL($sql);
         $search->setFTSQL($ftsql);
@@ -403,7 +405,8 @@
         // Make sure the query is SQL safe
         $query = trim(addslashes($this->_query));
 
-        $sql = "SELECT c.cid AS id, c.title AS title, c.comment AS description, UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, '0' AS hits, ";
+        $sql = "SELECT c.cid AS id, c.title AS title, c.comment AS description, ";
+        $sql .= "UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, ";
 
         // MSSQL has a problem when concatenating numeric values
         if ($_DB_dbms == 'mssql') {
@@ -437,7 +440,7 @@
         }
 
         $search = new SearchCriteria('comments', $LANG09[66]);
-        $columns = array('comment', 'title' => 'c.title');
+        $columns = array('title' => 'c.title', 'comment');
         list($sql, $ftsql) = $search->buildSearchSQL($this->_keyType, $query, $columns, $sql);
         $search->setSQL($sql);
         $search->setFTSQL($ftsql);
@@ -632,9 +635,9 @@
                                 SQL_TITLE =>      $label,
                                 'title' =>        $col_title == -1 ? '<i>' . $LANG09[70] . '</i>' : $old_row[$col_title],
                                 'description' =>  $col_desc == -1 ? '<i>' . $LANG09[70] . '</i>' : $old_row[$col_desc],
-                                'date' =>         $col_date == -1 ? '&nbsp;' : $date,
-                                'uid' =>          $col_user == -1 ? '&nbsp;' : $old_row[$col_user],
-                                'hits' =>         $col_hits == -1 ? '0' : str_replace(',', '', $old_row[$col_hits])
+                                'date' =>         $col_date == -1 ? 'LF_NULL' : $date,
+                                'uid' =>          $col_user == -1 ? 'LF_NULL' : $old_row[$col_user],
+                                'hits' =>         $col_hits == -1 ? 'LF_NULL' : str_replace(',', '', $old_row[$col_hits])
                             );
                     preg_match('/href="([^"]+)"/i', $api_results['title'], $links);
                     $api_results['url'] = empty($links) ? '#' : $links[1];

From geeklog-cvs at lists.geeklog.net  Mon May 25 13:25:15 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 13:25:15 -0400
Subject: [geeklog-cvs] geeklog: Highlighting of whole words,
	provided by lwc (part of b...
Message-ID: <hg.3ff537b94940.1243272315.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3ff537b94940
changeset: 7057:3ff537b94940
user:      Sami Barakat
date:      Mon May 25 18:23:19 2009 +0100
description:
Highlighting of whole words, provided by lwc (part of bug #0000874)

diffstat:

 public_html/lib-common.php |  48 ++++++++++++++++++++++--------------------------
 1 files changed, 22 insertions(+), 26 deletions(-)

diffs (58 lines):

diff -r c68402fc8a20 -r 3ff537b94940 public_html/lib-common.php
--- a/public_html/lib-common.php	Mon May 25 16:57:48 2009 +0100
+++ b/public_html/lib-common.php	Mon May 25 18:23:19 2009 +0100
@@ -5806,32 +5806,28 @@
 */
 function COM_highlightQuery( $text, $query, $class = 'highlight' )
 {
-    $query = str_replace( '+', ' ', $query );
-
-    // escape all the other PCRE special characters
-    $query = preg_quote( $query );
-
-    // ugly workaround:
-    // Using the /e modifier in preg_replace will cause all double quotes to
-    // be returned as \" - so we replace all \" in the result with unescaped
-    // double quotes. Any actual \" in the original text therefore have to be
-    // turned into \\" first ...
-    $text = str_replace( '\\"', '\\\\"', $text );
-
-    $mywords = explode( ' ', $query );
-    foreach( $mywords as $searchword )
-    {
-        if( !empty( $searchword ))
-        {
-            $searchword = preg_quote( str_replace( "'", "\'", $searchword ));
-            $searchword = str_replace('/', '\\/', $searchword);
-            $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','<span class=\"$class\">\\\\0</span>','\\0')", '<!-- x -->' . $text . '<!-- x -->' );
-        }
-    }
-
-    // ugly workaround, part 2
-    $text = str_replace( '\\"', '"', $text );
-
+    // escape PCRE special characters
+    $query = preg_quote($query, '/');
+
+    $mywords = explode(' ', $query);
+    foreach ($mywords as $searchword)
+    {
+        if (!empty($searchword))
+        {
+            $before = "/(?!(?:[^<]+>|[^>]+<\/a>))\b";
+            $after = "\b/i";
+            if ($searchword <> utf8_encode($searchword)) {
+                 if (@preg_match('/^\pL$/u', urldecode('%C3%B1'))) { // Unicode property support
+                      $before = "/(?<!\p{L})";
+                      $after = "(?!\p{L})/u";
+                 } else {
+                      $before = "/";
+                      $after = "/u";
+                 }
+            }
+            $text = preg_replace($before . $searchword . $after, "<span class=\"$class\">\\0</span>", '<!-- x -->' . $text . '<!-- x -->' );
+        }
+    }
     return $text;
 }
 

From geeklog-cvs at lists.geeklog.net  Mon May 25 18:39:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 18:39:34 -0400
Subject: [geeklog-cvs] geeklog: Updated language files to reflect fix that
	was done in ...
Message-ID: <hg.e81b9150b7c3.1243291174.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e81b9150b7c3
changeset: 7058:e81b9150b7c3
user:      Sami Barakat
date:      Mon May 25 22:45:16 2009 +0100
description:
Updated language files to reflect fix that was done in English file but had not filtered through (part of bug #0000874)

diffstat:

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

diffs (truncated from 804 to 300 lines):

diff -r 3ff537b94940 -r e81b9150b7c3 language/afrikaans.php
--- a/language/afrikaans.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/afrikaans.php	Mon May 25 22:45:16 2009 +0100
@@ -523,7 +523,7 @@
     61 => 'Verfyn soektog',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/afrikaans_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -523,7 +523,7 @@
     61 => 'Verfyn soektog',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/bosnian.php
--- a/language/bosnian.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/bosnian.php	Mon May 25 22:45:16 2009 +0100
@@ -527,7 +527,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/bosnian_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -527,7 +527,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/bulgarian.php
--- a/language/bulgarian.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/bulgarian.php	Mon May 25 22:45:16 2009 +0100
@@ -523,7 +523,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/bulgarian_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -523,7 +523,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/catalan.php
--- a/language/catalan.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/catalan.php	Mon May 25 22:45:16 2009 +0100
@@ -521,7 +521,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/catalan_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -521,7 +521,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/chinese_simplified_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -526,7 +526,7 @@
     61 => '????????????',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/chinese_traditional_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -526,7 +526,7 @@
     61 => '????????????',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/croatian.php
--- a/language/croatian.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/croatian.php	Mon May 25 22:45:16 2009 +0100
@@ -523,7 +523,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/croatian_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -525,7 +525,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/czech.php
--- a/language/czech.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/czech.php	Mon May 25 22:45:16 2009 +0100
@@ -522,7 +522,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/czech_utf-8.php
--- a/language/czech_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/czech_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -522,7 +522,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/danish.php
--- a/language/danish.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/danish.php	Mon May 25 22:45:16 2009 +0100
@@ -522,7 +522,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/danish_utf-8.php
--- a/language/danish_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/danish_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -522,7 +522,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/dutch.php
--- a/language/dutch.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/dutch.php	Mon May 25 22:45:16 2009 +0100
@@ -529,7 +529,7 @@
     61 => 'Verfijn zoekopdracht',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/dutch_utf-8.php
--- a/language/dutch_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/dutch_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -529,7 +529,7 @@
     61 => 'Verfijn zoekopdracht',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/estonian.php
--- a/language/estonian.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/estonian.php	Mon May 25 22:45:16 2009 +0100
@@ -524,7 +524,7 @@
     61 => ' t?psusta otsingut',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/estonian_utf-8.php
--- a/language/estonian_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/estonian_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -524,7 +524,7 @@
     61 => ' t??psusta otsingut',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/farsi_utf-8.php
--- a/language/farsi_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/farsi_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -511,7 +511,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/finnish.php
--- a/language/finnish.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/finnish.php	Mon May 25 22:45:16 2009 +0100
@@ -524,7 +524,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/finnish_utf-8.php
--- a/language/finnish_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/finnish_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -526,7 +526,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/french_canada.php
--- a/language/french_canada.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/french_canada.php	Mon May 25 22:45:16 2009 +0100
@@ -526,7 +526,7 @@
     61 => 'Recherche &eacute;tendue',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
diff -r 3ff537b94940 -r e81b9150b7c3 language/french_canada_utf-8.php
--- a/language/french_canada_utf-8.php	Mon May 25 18:23:19 2009 +0100
+++ b/language/french_canada_utf-8.php	Mon May 25 22:45:16 2009 +0100
@@ -526,7 +526,7 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',

From geeklog-cvs at lists.geeklog.net  Mon May 25 18:39:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 25 May 2009 18:39:34 -0400
Subject: [geeklog-cvs] geeklog: Better handling of non English characters in
	search eng...
Message-ID: <hg.946febf77b59.1243291174.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/946febf77b59
changeset: 7059:946febf77b59
user:      Sami Barakat
date:      Mon May 25 23:37:23 2009 +0100
description:
Better handling of non English characters in search engine (part of bug #0000874)

diffstat:

 system/classes/search.class.php |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r e81b9150b7c3 -r 946febf77b59 system/classes/search.class.php
--- a/system/classes/search.class.php	Mon May 25 22:45:16 2009 +0100
+++ b/system/classes/search.class.php	Mon May 25 23:37:23 2009 +0100
@@ -663,18 +663,21 @@
         if ($this->_keyType == 'any')
         {
             $searchQuery = str_replace(' ', "</b>' " . $LANG09[57] . " '<b>", $escquery);
-            $searchQuery = "<b>'$searchQuery'</b>";
+            $searchQuery = "'<b>$searchQuery</b>'";
         }
         else if ($this->_keyType == 'all')
         {
             $searchQuery = str_replace(' ', "</b>' " . $LANG09[56] . " '<b>", $escquery);
-            $searchQuery = "<b>'$searchQuery'</b>";
+            $searchQuery = "'<b>$searchQuery</b>'";
         }
         else
         {
             $searchQuery = $LANG09[55] . " '<b>$escquery</b>'";
         }
 
+        // Clean the query string so that sprintf works as expected
+        $searchQuery = str_replace("%", "%%", $searchQuery);
+
         $retval = "{$LANG09[25]} $searchQuery. ";
         if (count($results) == 0)
         {
@@ -685,7 +688,8 @@
         }
         else
         {
-            $retval .= $LANG09[64] . " ($searchtime {$LANG09[27]}). " . COM_createLink($LANG09[61], $url.'refine');
+            $retval .= $LANG09[64] . " ($searchtime {$LANG09[27]}). ";
+            $retval .= str_replace("%", "%%", COM_createLink($LANG09[61], $url.'refine'));
             $retval = '<p>' . $retval . '</p>' . LB;
             $retval = $obj->getFormattedOutput($results, $LANG09[11], $retval, '', $_CONF['search_show_sort'], $_CONF['search_show_limit']);
         }

From geeklog-cvs at lists.geeklog.net  Wed May 27 07:01:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 27 May 2009 07:01:59 -0400
Subject: [geeklog-cvs] geeklog: Missing changelog entries
Message-ID: <hg.e0271f30d9a1.1243422119.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e0271f30d9a1
changeset: 7060:e0271f30d9a1
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed May 27 13:01:49 2009 +0200
description:
Missing changelog entries

diffstat:

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

diffs (28 lines):

diff -r 946febf77b59 -r e0271f30d9a1 public_html/docs/history
--- a/public_html/docs/history	Mon May 25 23:37:23 2009 +0100
+++ b/public_html/docs/history	Wed May 27 13:01:49 2009 +0200
@@ -32,6 +32,7 @@
   entries to a certain amount of characters (reported by alank) [Dirk]
 - Added a verbose logging option to the search class and make it default to off
   [Dirk]
+- lib-custom.php was missing from the 1.6.0b1 tarball
 
 - Updated Spanish language file, provided by Juan Pablo Novillo
 
@@ -70,6 +71,8 @@
 - Document where CUSTOM_templateSetVars is actually called from (bug #0000862)
   [Dirk]
 - Added option to search by titles only (feature request #0000840) [Sami]
+- The "Plugins" entry in the Admins Block now displays the number of enabled
+  plugins (previously included the disabled plugins) [Dirk]
 - Added a config option to enable/disable automatically turning URLs in text
   postings into clickable URLs [Dirk]
 - Changed some default settings [Dirk]:
@@ -80,6 +83,7 @@
   These settings are _not_ changed when upgrading from an earlier version.
 - Experimental: Compress HTML output before sending it to the browser (disabled
   by default; has to be supported by both the browser and the webserver) [Dirk]
+- Added canonical link for article directory [Dirk]
 - Moved hard-coded texts from admin/sectest.php to the language files (bug
   #0000716) [Dirk]
 - Added an option to send a copy of the email to a user to self (feature request

From geeklog-cvs at lists.geeklog.net  Wed May 27 14:34:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 27 May 2009 14:34:55 -0400
Subject: [geeklog-cvs] geeklog: The canonical URL for the "printable"
	version of an art...
Message-ID: <hg.9a167ec99c71.1243449295.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9a167ec99c71
changeset: 7061:9a167ec99c71
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed May 27 19:57:58 2009 +0200
description:
The canonical URL for the "printable" version of an article is really the article itself

diffstat:

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

diffs (12 lines):

diff -r e0271f30d9a1 -r 9a167ec99c71 public_html/layout/professional/article/printable.thtml
--- a/public_html/layout/professional/article/printable.thtml	Wed May 27 13:01:49 2009 +0200
+++ b/public_html/layout/professional/article/printable.thtml	Wed May 27 19:57:58 2009 +0200
@@ -4,7 +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}>
+  <link rel="canonical" href="{article_url}"{xhtml}>
 </head>
 <body dir="{direction}">
     <h1>{story_title}</h1>

From geeklog-cvs at lists.geeklog.net  Sat May 30 15:05:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 30 May 2009 15:05:36 -0400
Subject: [geeklog-cvs] geeklog: Use array notation for DBMS-specific SQL
Message-ID: <hg.ba16cc1ff181.1243710336.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ba16cc1ff181
changeset: 7072:ba16cc1ff181
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 30 21:03:23 2009 +0200
description:
Use array notation for DBMS-specific SQL

diffstat:

 system/lib-security.php |  24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diffs (50 lines):

diff -r 67394698de67 -r ba16cc1ff181 system/lib-security.php
--- a/system/lib-security.php	Sat May 30 15:18:51 2009 +0200
+++ b/system/lib-security.php	Sat May 30 21:03:23 2009 +0200
@@ -1092,17 +1092,12 @@
     /* Generate the token */
     $token = md5($_USER['uid'].$pageURL.uniqid (rand (), 1));
     $pageURL = addslashes($pageURL);
-    
+
     /* Destroy exired tokens: */
-    if($_DB_dbms == 'mssql') {
-        $sql = "DELETE FROM {$_TABLES['tokens']} WHERE (DATEADD(ss, ttl, created) < NOW())"
-           . " AND (ttl > 0)";
-    } else {
-        $sql = "DELETE FROM {$_TABLES['tokens']} WHERE (DATE_ADD(created, INTERVAL ttl SECOND) < NOW())"
-           . " AND (ttl > 0)";
-    }
+    $sql['mssql'] = "DELETE FROM {$_TABLES['tokens']} WHERE (DATEADD(ss, ttl, created) < NOW()) AND (ttl > 0)";
+    $sql['mysql'] = "DELETE FROM {$_TABLES['tokens']} WHERE (DATE_ADD(created, INTERVAL ttl SECOND) < NOW()) AND (ttl > 0)";
     DB_query($sql);
-    
+
     /* Destroy tokens for this user/url combination */
     $sql = "DELETE FROM {$_TABLES['tokens']} WHERE owner_id={$_USER['uid']} AND urlfor='$pageURL'";
     DB_query($sql);
@@ -1140,20 +1135,17 @@
         $token = COM_applyFilter($_POST[CSRF_TOKEN]);
     }
     
-    if(trim($token) != '') {
-        if($_DB_dbms != 'mssql') {
-            $sql = "SELECT ((DATE_ADD(created, INTERVAL ttl SECOND) < NOW()) AND ttl > 0) as expired, owner_id, urlfor FROM "
-               . "{$_TABLES['tokens']} WHERE token='$token'";
-        } else {
-            $sql = "SELECT owner_id, urlfor, expired = 
+    if (trim($token) != '') {
+        $sql['mysql'] = "SELECT ((DATE_ADD(created, INTERVAL ttl SECOND) < NOW()) AND ttl > 0) as expired, owner_id, urlfor FROM {$_TABLES['tokens']} WHERE token='$token'";
+        $sql['mssql'] = "SELECT owner_id, urlfor, expired = 
                       CASE 
                          WHEN (DATEADD(s,ttl,created) < getUTCDate()) AND (ttl>0) THEN 1
                 
                          ELSE 0
                       END
                     FROM {$_TABLES['tokens']} WHERE token='$token'";
-        }
         $tokens = DB_query($sql);
+
         $numberOfTokens = DB_numRows($tokens);
         if($numberOfTokens != 1) {
             $return = false; // none, or multiple tokens. Both are invalid. (token is unique key...)

From geeklog-cvs at lists.geeklog.net  Sun May 31 05:08:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 31 May 2009 05:08:28 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0b2 for changeset
	b73a34f5e8e6
Message-ID: <hg.81e09141a48d.1243760908.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/81e09141a48d
changeset: 7074:81e09141a48d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 31 11:02:58 2009 +0200
description:
Added tag geeklog_1_6_0b2 for changeset b73a34f5e8e6

diffstat:

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

diffs (8 lines):

diff -r b73a34f5e8e6 -r 81e09141a48d .hgtags
--- a/.hgtags	Sun May 31 10:29:30 2009 +0200
+++ b/.hgtags	Sun May 31 11:02:58 2009 +0200
@@ -1,3 +1,4 @@
 f51a1417bd7041bea96370434142498438d4e558 geeklog_1_5_0_stable
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1
+b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2

From geeklog-cvs at lists.geeklog.net  Sun May 31 05:08:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 31 May 2009 05:08:28 -0400
Subject: [geeklog-cvs] geeklog: 1.6.0b2
Message-ID: <hg.b73a34f5e8e6.1243760908.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b73a34f5e8e6
changeset: 7073:b73a34f5e8e6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun May 31 10:29:30 2009 +0200
description:
1.6.0b2

diffstat:

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

diffs (31 lines):

diff -r ba16cc1ff181 -r b73a34f5e8e6 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat May 30 21:03:23 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun May 31 10:29:30 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0b1');
+    define('VERSION', '1.6.0b2');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r ba16cc1ff181 -r b73a34f5e8e6 public_html/docs/history
--- a/public_html/docs/history	Sat May 30 21:03:23 2009 +0200
+++ b/public_html/docs/history	Sun May 31 10:29:30 2009 +0200
@@ -1,6 +1,6 @@
 Geeklog History/Changes:
 
-May ??, 2009 (1.6.0b2)
+May 31, 2009 (1.6.0b2)
 ------------
 
 Geeklog 1.6.0 incorporates the following projects implemented during
@@ -11,6 +11,7 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0b1:
+- Various fixes to the new search (work in progress) [Sami]
 - The list of Comment Submissions now tries to provide a link to a comment's
   parent object (article, poll, ...). If not available, it displays an excerpt
   from the comment [Dirk]