From geeklog-cvs at lists.geeklog.net  Thu Sep  3 14:32:35 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 03 Sep 2009 14:32:35 -0400
Subject: [geeklog-cvs] geeklog: The "Remember Me For" option under My
	Account did not r...
Message-ID: <hg.4517558ab25c.1252002755.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4517558ab25c
changeset: 7276:4517558ab25c
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Sep 03 20:32:24 2009 +0200
description:
The "Remember Me For" option under My Account did not recognize the "(don't)" option any more (bug #0000961)

diffstat:

 public_html/docs/history     |   2 ++
 public_html/usersettings.php |  10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r fecf9cc82e81 -r 4517558ab25c public_html/docs/history
--- a/public_html/docs/history	Mon Aug 31 20:15:48 2009 +0200
+++ b/public_html/docs/history	Thu Sep 03 20:32:24 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The "Remember Me For" option under My Account did not recognize the "(don't)"
+  option any more (bug #0000961) [Dirk]
 - Send a notification when a comment goes into the submission queue [Dirk]
 - Added a link back to the story to the "Mail Story to a Friend" form [Dirk]
 - Only list [code], [raw] tags when story.* permissions are required [Dirk]
diff -r fecf9cc82e81 -r 4517558ab25c public_html/usersettings.php
--- a/public_html/usersettings.php	Mon Aug 31 20:15:48 2009 +0200
+++ b/public_html/usersettings.php	Thu Sep 03 20:32:24 2009 +0200
@@ -878,15 +878,15 @@
         return COM_refresh ($_CONF['site_url'] . '/index.php');
     }
 
-    // If not set or possibly removed from template - initialize variable
-    if (!isset($A['cooktime'])) {
-        $A['cooktime'] = 0;
+    if (! isset($A['cooktime'])) {
+        // If not set or possibly removed from template - set to default
+        $A['cooktime'] = $_CONF['default_perm_cookie_timeout'];
     } else {
-        $A['cooktime'] = COM_applyFilter ($A['cooktime'], true);
+        $A['cooktime'] = COM_applyFilter($A['cooktime'], true);
     }
     // If empty or invalid - set to user default
     // So code after this does not fail the user password required test
-    if (empty($A['cooktime']) OR $A['cooktime'] < 0) {
+    if ($A['cooktime'] < 0) { // note that == 0 is allowed!
         $A['cooktime'] = $_USER['cookietimeout'];
     }
 

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 13:01:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 13:01:48 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Fixed position of the story
	preview box in a...
Message-ID: <hg.3bea8d29e64c.1252170108.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3bea8d29e64c
changeset: 7279:3bea8d29e64c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 19:01:38 2009 +0200
description:
Cosmetics: Fixed position of the story preview box in advanced editor (bug #0000963)

diffstat:

 public_html/docs/english/theme.html                                    |  4 ++++
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |  6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r a3f1efd9d39d -r 3bea8d29e64c public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sat Sep 05 18:45:52 2009 +0200
+++ b/public_html/docs/english/theme.html	Sat Sep 05 19:01:38 2009 +0200
@@ -198,6 +198,10 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Cosmetics: Fixed the position of the story preview when using the
+    advanced editor (was slightly shifted to the right, <a
+    href="http://project.geeklog.net/tracking/view.php?id=963">bug #0000963</a>). Changes to the <code>&lt;div id="preview"&gt;</code> in
+    <tt>admin/story/storyeditor_advanced.thtml</tt>.</li>
 <li>Cosmetics: Removed <code>font-size:larger;</code> for the header fields of
     the admin lists from the stylesheet, but added some top/bottom padding
     (<a href="http://project.geeklog.net/tracking/view.php?id=956">bug #0000956</a>).</li>
diff -r a3f1efd9d39d -r 3bea8d29e64c public_html/layout/professional/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sat Sep 05 18:45:52 2009 +0200
+++ b/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sat Sep 05 19:01:38 2009 +0200
@@ -259,8 +259,10 @@
             <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
         </div>
     </form>
-    <div id="preview" style="width:99%; border:1px dashed grey;padding:5px;margin:10px;display:{show_preview};">
-        {preview_content}
+    <div id="preview" style="width:100%; border:1px dashed grey; padding:0; margin-top:10px; display:{show_preview};">
+        <div style="margin:10px;">
+            {preview_content}
+        </div>
     </div>
 
     <script type="text/javascript">

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 14:38:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 14:38:10 -0400
Subject: [geeklog-cvs] geeklog: Rephrased message: When a plugin is not
	compatible with...
Message-ID: <hg.9e1c40cf701c.1252175890.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9e1c40cf701c
changeset: 7280:9e1c40cf701c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 20:37:33 2009 +0200
description:
Rephrased message: When a plugin is not compatible with the installed Geeklog version, it usually means that a Geeklog update is required - updating the plugin won't help (bug #0000949).

diffstat:

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

diffs (72 lines):

diff -r 3bea8d29e64c -r 9e1c40cf701c language/english.php
--- a/language/english.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/english.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1032,7 +1032,7 @@
     6 => 'Warning: Plugin Already Installed!',
     7 => 'The plugin you are trying to install already exists.  Please delete the plugin before re-installing it',
     8 => 'Plugin Compatibility Check Failed',
-    9 => 'This plugin requires a newer version of Geeklog. Either upgrade your copy of <a href="http://www.geeklog.net">Geeklog</a> or get a newer version of the plugin.',
+    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>There are no plugins currently installed.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'To modify or delete a plugin, click on that plugin\'s edit icon below. This will show the plugin details including the authors\'s website. Both the installed version and the version returned from the plugin\'s code are shown. This will aid you to know if the plugin needs to be upgraded. To install or upgrade a plugin please consult its documentation.',
     12 => 'no plugin name provided to plugineditor()',
diff -r 3bea8d29e64c -r 9e1c40cf701c language/english_utf-8.php
--- a/language/english_utf-8.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/english_utf-8.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1032,7 +1032,7 @@
     6 => 'Warning: Plugin Already Installed!',
     7 => 'The plugin you are trying to install already exists.  Please delete the plugin before re-installing it',
     8 => 'Plugin Compatibility Check Failed',
-    9 => 'This plugin requires a newer version of Geeklog. Either upgrade your copy of <a href="http://www.geeklog.net">Geeklog</a> or get a newer version of the plugin.',
+    9 => 'This plugin requires a newer version of Geeklog. Please upgrade your copy of <a href="http://www.geeklog.net/">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>There are no plugins currently installed.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'To modify or delete a plugin, click on that plugin\'s edit icon below. This will show the plugin details including the authors\'s website. Both the installed version and the version returned from the plugin\'s code are shown. This will aid you to know if the plugin needs to be upgraded. To install or upgrade a plugin please consult its documentation.',
     12 => 'no plugin name provided to plugineditor()',
diff -r 3bea8d29e64c -r 9e1c40cf701c language/german.php
--- a/language/german.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/german.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1032,7 +1032,7 @@
     6 => 'Warnung: Plugin schon installiert!',
     7 => 'Das Plugin, das Du installieren willst, ist schon vorhanden. Bitte l?sche es, bevor Du noch einmal versuchst, es zu installieren',
     8 => 'Plugin-Kompatibilit?tstest fehlgeschlagen',
-    9 => 'Dieses Plugin ben?tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a> oder evtl. eine andere Version dieses Plugins.',
+    9 => 'Dieses Plugin ben?tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>Es sind derzeit keine Plugins installiert.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'Um ein Plugin zu ?ndern oder zu l?schen, auf das ?ndern-Icon klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f?r ein Plugin angezeigt werden,  bedeutet das, dass f?r das Plugin noch ein Update durchgef?hrt werden muss.  Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
     12 => '(kein Name angegeben)',
diff -r 3bea8d29e64c -r 9e1c40cf701c language/german_formal.php
--- a/language/german_formal.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/german_formal.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1033,7 +1033,7 @@
     6 => 'Warnung: Plugin schon installiert!',
     7 => 'Das Plugin, das Sie installieren wollen, ist schon vorhanden. Bitte l?schen Sie es, bevor Sie noch einmal versuchen, es zu installieren',
     8 => 'Plugin-Kompatibilit?tstest fehlgeschlagen',
-    9 => 'Dieses Plugin ben?tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a> oder evtl. eine andere Version dieses Plugins.',
+    9 => 'Dieses Plugin ben?tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>Es sind derzeit keine Plugins installiert.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'Um ein Plugin zu ?ndern oder zu l?schen, auf das ?ndern-Symbol klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f?r ein Plugin angezeigt werden, bedeutet das, dass f?r das Plugin noch ein Update durchgef?hrt werden muss. Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
     12 => '(kein Name angegeben)',
diff -r 3bea8d29e64c -r 9e1c40cf701c language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/german_formal_utf-8.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1033,7 +1033,7 @@
     6 => 'Warnung: Plugin schon installiert!',
     7 => 'Das Plugin, das Sie installieren wollen, ist schon vorhanden. Bitte l??schen Sie es, bevor Sie noch einmal versuchen, es zu installieren',
     8 => 'Plugin-Kompatibilit??tstest fehlgeschlagen',
-    9 => 'Dieses Plugin ben??tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a> oder evtl. eine andere Version dieses Plugins.',
+    9 => 'Dieses Plugin ben??tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>Es sind derzeit keine Plugins installiert.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'Um ein Plugin zu ??ndern oder zu l??schen, auf das ??ndern-Symbol klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f??r ein Plugin angezeigt werden, bedeutet das, dass f??r das Plugin noch ein Update durchgef??hrt werden muss. Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
     12 => '(kein Name angegeben)',
diff -r 3bea8d29e64c -r 9e1c40cf701c language/german_utf-8.php
--- a/language/german_utf-8.php	Sat Sep 05 19:01:38 2009 +0200
+++ b/language/german_utf-8.php	Sat Sep 05 20:37:33 2009 +0200
@@ -1032,7 +1032,7 @@
     6 => 'Warnung: Plugin schon installiert!',
     7 => 'Das Plugin, das Du installieren willst, ist schon vorhanden. Bitte l??sche es, bevor Du noch einmal versuchst, es zu installieren',
     8 => 'Plugin-Kompatibilit??tstest fehlgeschlagen',
-    9 => 'Dieses Plugin ben??tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a> oder evtl. eine andere Version dieses Plugins.',
+    9 => 'Dieses Plugin ben??tigt eine neuere Version von Geeklog. Abhilfe schafft ein Update von <a href="http://www.geeklog.net/">Geeklog</a>.',
     10 => '<br' . XHTML . '><b>Es sind derzeit keine Plugins installiert.</b><br' . XHTML . '><br' . XHTML . '>',
     11 => 'Um ein Plugin zu ??ndern oder zu l??schen, auf das ??ndern-Icon klicken. Es werden dann auch weitere Details, inkl. der Homepage des Plugins, angezeigt. Wenn in der Liste (s.u.) zwei Versionsnummern f??r ein Plugin angezeigt werden,  bedeutet das, dass f??r das Plugin noch ein Update durchgef??hrt werden muss.  Um ein Plugin zu installieren oder aktualisieren bitte auch immer dessen Dokumentation lesen.',
     12 => '(kein Name angegeben)',

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 14:48:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 14:48:28 -0400
Subject: [geeklog-cvs] geeklog: Comment notifications used the phrase "Read
	the full ar...
Message-ID: <hg.e8463c9aafc9.1252176508.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e8463c9aafc9
changeset: 7281:e8463c9aafc9
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 20:48:03 2009 +0200
description:
Comment notifications used the phrase "Read the full article" when pointing to the new comment post (bug #0000940)

diffstat:

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

diffs (24 lines):

diff -r 9e1c40cf701c -r e8463c9aafc9 public_html/docs/history
--- a/public_html/docs/history	Sat Sep 05 20:37:33 2009 +0200
+++ b/public_html/docs/history	Sat Sep 05 20:48:03 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Comment notifications used the phrase "Read the full article" when pointing
+  to the new comment post (bug #0000940) [Dirk]
 - Send correct content type and character set header in the install script
   (bug #0000964, patch provided by taca)
 - The "Remember Me For" option under My Account did not recognize the "(don't)"
diff -r 9e1c40cf701c -r e8463c9aafc9 system/lib-comment.php
--- a/system/lib-comment.php	Sat Sep 05 20:37:33 2009 +0200
+++ b/system/lib-comment.php	Sat Sep 05 20:48:03 2009 +0200
@@ -1263,7 +1263,7 @@
         $mailbody .= $LANG01[10] . ' <' . $_CONF['site_admin_url']
                   . "/moderation.php>\n\n";
     } else {
-        $mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
+        $mailbody .= $LANG03[39] . ' <' . $_CONF['site_url']
                   . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
     }
 

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 17:43:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 17:43:06 -0400
Subject: [geeklog-cvs] geeklog: Some more comments to keep phpDocumentor
	happy
Message-ID: <hg.ede43da15aab.1252186986.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ede43da15aab
changeset: 7282:ede43da15aab
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 23:19:37 2009 +0200
description:
Some more comments to keep phpDocumentor happy

diffstat:

 plugins/staticpages/sql/mssql_updates.php |  6 +++++-
 plugins/staticpages/sql/mysql_updates.php |  6 +++++-
 plugins/xmlsitemap/sql/mssql_install.php  |  3 +++
 plugins/xmlsitemap/sql/mysql_install.php  |  3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diffs (72 lines):

diff -r e8463c9aafc9 -r ede43da15aab plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Sat Sep 05 20:48:03 2009 +0200
+++ b/plugins/staticpages/sql/mssql_updates.php	Sat Sep 05 23:19:37 2009 +0200
@@ -29,7 +29,7 @@
 /**
 * MS SQL updates
 *
-* @package Staticpage
+* @package StaticPages
 */
 
 $_UPDATES = array(
@@ -40,6 +40,10 @@
 
 );
 
+/**
+* Handle update to plugin version 1.6.0: introduce meta tags option
+*
+*/
 function update_ConfValues_1_6_0()
 {
     global $_CONF, $_SP_DEFAULT;
diff -r e8463c9aafc9 -r ede43da15aab plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Sat Sep 05 20:48:03 2009 +0200
+++ b/plugins/staticpages/sql/mysql_updates.php	Sat Sep 05 23:19:37 2009 +0200
@@ -29,7 +29,7 @@
 /**
 * MySQL updates
 *
-* @package Staticpage
+* @package StaticPages
 */
 
 $_UPDATES = array(
@@ -41,6 +41,10 @@
 
 );
 
+/**
+* Handle update to plugin version 1.6.0: introduce meta tags option
+*
+*/
 function update_ConfValues_1_6_0()
 {
     global $_CONF, $_SP_DEFAULT;
diff -r e8463c9aafc9 -r ede43da15aab plugins/xmlsitemap/sql/mssql_install.php
--- a/plugins/xmlsitemap/sql/mssql_install.php	Sat Sep 05 20:48:03 2009 +0200
+++ b/plugins/xmlsitemap/sql/mssql_install.php	Sat Sep 05 23:19:37 2009 +0200
@@ -37,6 +37,9 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* include default config
+*/
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '../install_defaults.php';
 
 global $_XMLSMAP_DEFAULT;
diff -r e8463c9aafc9 -r ede43da15aab plugins/xmlsitemap/sql/mysql_install.php
--- a/plugins/xmlsitemap/sql/mysql_install.php	Sat Sep 05 20:48:03 2009 +0200
+++ b/plugins/xmlsitemap/sql/mysql_install.php	Sat Sep 05 23:19:37 2009 +0200
@@ -37,6 +37,9 @@
     die('This file can not be used on its own!');
 }
 
+/**
+* include default config
+*/
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '../install_defaults.php';
 
 global $_XMLSMAP_DEFAULT;

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 17:43:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 17:43:06 -0400
Subject: [geeklog-cvs] geeklog: Fixed spelling of package name
Message-ID: <hg.9075a7c1a6f4.1252186986.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9075a7c1a6f4
changeset: 7283:9075a7c1a6f4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 23:21:57 2009 +0200
description:
Fixed spelling of package name

diffstat:

 plugins/staticpages/sql/mssql_install.php |  2 +-
 plugins/staticpages/sql/mysql_install.php |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r ede43da15aab -r 9075a7c1a6f4 plugins/staticpages/sql/mssql_install.php
--- a/plugins/staticpages/sql/mssql_install.php	Sat Sep 05 23:19:37 2009 +0200
+++ b/plugins/staticpages/sql/mssql_install.php	Sat Sep 05 23:21:57 2009 +0200
@@ -33,7 +33,7 @@
 /**
 * MS SQL updates
 *
-* @package Staticpage
+* @package StaticPages
 */
 
 $_SQL[] = "
diff -r ede43da15aab -r 9075a7c1a6f4 plugins/staticpages/sql/mysql_install.php
--- a/plugins/staticpages/sql/mysql_install.php	Sat Sep 05 23:19:37 2009 +0200
+++ b/plugins/staticpages/sql/mysql_install.php	Sat Sep 05 23:21:57 2009 +0200
@@ -32,7 +32,7 @@
 /**
 * MySQL install
 *
-* @package Staticpage
+* @package StaticPages
 */
 
 $_SQL[] = "

From geeklog-cvs at lists.geeklog.net  Sat Sep  5 17:43:07 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 05 Sep 2009 17:43:07 -0400
Subject: [geeklog-cvs] geeklog: Stop phpDocumentor from (wrongly)
	complaining about red...
Message-ID: <hg.1d689f9b83d0.1252186987.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1d689f9b83d0
changeset: 7284:1d689f9b83d0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 05 23:40:24 2009 +0200
description:
Stop phpDocumentor from (wrongly) complaining about redefining XHTML constant

diffstat:

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

diffs (13 lines):

diff -r 9075a7c1a6f4 -r 1d689f9b83d0 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Sep 05 23:21:57 2009 +0200
+++ b/public_html/lib-common.php	Sat Sep 05 23:40:24 2009 +0200
@@ -309,6 +309,9 @@
         break;
 
     default:
+        /**
+        * @ignore
+        */
         define('XHTML', '');
         break;
     }

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 05:01:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 05:01:44 -0400
Subject: [geeklog-cvs] geeklog: The Migrate option in the install script now
	also works...
Message-ID: <hg.0021451d31d4.1252227704.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0021451d31d4
changeset: 7285:0021451d31d4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 10:23:14 2009 +0200
description:
The Migrate option in the install script now also works on an existing database (feature request #0000945)

diffstat:

 public_html/admin/install/language/chinese_simplified_utf-8.php  |   5 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php |   5 +-
 public_html/admin/install/language/english.php                   |   3 +-
 public_html/admin/install/language/german.php                    |   3 +-
 public_html/admin/install/language/hebrew_utf-8.php              |   3 +-
 public_html/admin/install/language/japanese_utf-8.php            |   5 +-
 public_html/admin/install/language/polish.php                    |   5 +-
 public_html/admin/install/lib-install.php                        |   5 +
 public_html/admin/install/migrate.php                            |  64 ++++++++++++-
 public_html/docs/history                                         |   2 +
 10 files changed, 87 insertions(+), 13 deletions(-)

diffs (245 lines):

diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
@@ -239,7 +239,8 @@
     45 => 'Could not identify database version. Please perform a manual update.',
     46 => '',
     47 => 'Database upgrade from version %s to version %s failed.',
-    48 => 'One or more plugins could not be updated and had to be disabled.'
+    48 => 'One or more plugins could not be updated and had to be disabled.',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
@@ -364,4 +365,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
@@ -239,7 +239,8 @@
     45 => 'Could not identify database version. Please perform a manual update.',
     46 => '',
     47 => 'Database upgrade from version %s to version %s failed.',
-    48 => 'One or more plugins could not be updated and had to be disabled.'
+    48 => 'One or more plugins could not be updated and had to be disabled.',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
@@ -364,4 +365,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 10:23:14 2009 +0200
@@ -238,7 +238,8 @@
     45 => "Could not identify database version. Please perform a manual update.",
     46 => '', // TBD
     47 => 'Database upgrade from version %s to version %s failed.',
-    48 => 'One or more plugins could not be updated and had to be disabled.'
+    48 => 'One or more plugins could not be updated and had to be disabled.',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 10:23:14 2009 +0200
@@ -238,7 +238,8 @@
     45 => 'Version des Datenbank-Backups konnte nicht ermittelt werden. Bitte ein manuelles Update durchf&uuml;hren.',
     46 => '',
     47 => 'Update von Version %s auf Version %s fehlgeschlagen.',
-    48 => 'Ein oder mehrere Plugins konnten nicht aktualisiert werden und wurden deaktiviert.'
+    48 => 'Ein oder mehrere Plugins konnten nicht aktualisiert werden und wurden deaktiviert.',
+    49 => 'Aktuellen Datenbank-Inhalt verwenden'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
@@ -234,7 +234,8 @@
     45 => '???? ?????? ???????? ?????????? ???? ???????? ???????? ??????????. ?????? ???????? ?????????? ????????.',
     46 => '',
     47 => '?????????? ???????? ?????????? ???????????? %s ???????????? %s ????????.',
-    48 => '?????? ???? ???????? ????-plugins ???? ?????????? ?????????????? ???????? ?????????? ????????????.'
+    48 => '?????? ???? ???????? ????-plugins ???? ?????????? ?????????????? ???????? ?????????? ????????????.',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
@@ -240,7 +240,8 @@
     45 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????',
     46 => '', // TBD
     47 => '?????????????????????????????? %s ?????? %s ???????????????????????????????????????????????????',
-    48 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????'
+    48 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
@@ -365,4 +366,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 10:23:14 2009 +0200
@@ -238,7 +238,8 @@
     45 => 'Could not identify database version. Please perform a manual update.',
     46 => '',
     47 => 'Database upgrade from version %s to version %s failed.',
-    48 => 'One or more plugins could not be updated and had to be disabled.'
+    48 => 'One or more plugins could not be updated and had to be disabled.',
+    49 => 'Use current database content'
 );
 
 // +---------------------------------------------------------------------------+
@@ -363,4 +364,4 @@
     'plugin_upload'  => $LANG_PLUGINS[10]
 );
 
-?>
\ No newline at end of file
+?>
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Sep 06 10:23:14 2009 +0200
@@ -362,6 +362,11 @@
  */
 function INST_writeConfig($config_file, $db)
 {
+    // we may have included db-config.php elsewhere already, in which case
+    // all of these variables need to be imported from the global namespace
+    global $_DB_host, $_DB_name, $_DB_user, $_DB_pass, $_DB_table_prefix,
+           $_DB_dbms;
+
     require_once $config_file; // Grab the current DB values
 
     $db = array('host' => (isset($db['host']) ? $db['host'] : $_DB_host),
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sun Sep 06 10:23:14 2009 +0200
@@ -335,11 +335,14 @@
         }
         rsort($backup_files);
 
-        $display .= '<p><label class="' . $form_label_dir . '">' . $LANG_MIGRATE[6] . ' ' . INST_helpLink('migrate_file') . '</label>' . LB
+        $display .= '<p><label class="' . $form_label_dir . '">'
+            . $LANG_MIGRATE[6] . ' ' . INST_helpLink('migrate_file')
+            . '</label>' . LB
             . '<select name="migration_type" onchange="INST_selectMigrationType()">' . LB
             . '<option value="">' . $LANG_MIGRATE[7] . '</option>' . LB
             . '<option value="select">' . $LANG_MIGRATE[8] . '</option>' . LB
             . '<option value="upload">' . $LANG_MIGRATE[9] . '</option>' . LB
+            . '<option value="dbcontent">' . $LANG_MIGRATE[49] . '</option>' . LB
             . '</select> ' . LB
             . '<span id="migration-select">' . LB;
 
@@ -356,7 +359,9 @@
                 $filename    = str_replace($backup_dir, '', $file_path);
                 $backup_file = str_replace($backup_dir, '', $file_path);
 
-                $display .= '<option value="' . $filename .'">' . $backup_file . ' (' . INST_formatSize(filesize($file_path)) . ')</option>' . LB;
+                $display .= '<option value="' . $filename .'">' . $backup_file
+                    . ' (' . INST_formatSize(filesize($file_path))
+                    . ')</option>' . LB;
 
             }
             
@@ -453,6 +458,11 @@
             }
             break;
 
+        case 'dbcontent': // No upload / import required - use db as is
+            $backup_file = false;
+            $import_errors = 0;
+            break;
+
         default:
             $display .= INST_getAlertMsg($LANG_MIGRATE[18]);
             $backup_file = false;
@@ -563,6 +573,56 @@
 
                 break;
 
+            case 'dbcontent':
+
+                require_once $_CONF['path_system'] . 'lib-database.php';
+                require_once 'lib-upgrade.php';
+
+                // we need the following information
+                $has_config = false;
+                $db_connection_charset = '';
+                $DB['table_prefix'] = '';
+
+                // get table prefix and check for conf_values table
+                $result = DB_query("SHOW TABLES");
+                $num_tables = DB_numRows($result);
+                for ($i = 0; $i < $num_tables; $i++) {
+                    list($table) = DB_fetchArray($result);
+                    if (substr($table, -6) == 'access') {
+                        $DB['table_prefix'] = substr($table, 0, -6);
+                    } elseif (strpos($table, 'conf_values') !== false) {
+                        $has_config = true;
+                        break;
+                    }
+                }
+
+                // try to figure out the charset
+                $result = DB_query("SHOW CREATE TABLE " . $DB['table_prefix']
+                                   . "access");
+                list($table, $create) = DB_fetchArray($result);
+                if (strpos($create, 'DEFAULT CHARSET=utf8') !== false) {
+                    $db_connection_charset = 'utf8';
+                }
+
+                // Update db-config.php with the table prefix from the db
+                if (!INST_writeConfig($dbconfig_path, $DB)) {
+                    exit($LANG_INSTALL[26] . ' ' . $dbconfig_path
+                         . $LANG_INSTALL[58]);
+                }
+
+                if (!INST_setDefaultCharset($siteconfig_path,
+                        ($db_connection_charset == 'utf8'
+                                                ? 'utf-8' : $LANG_CHARSET))) {
+                    exit($LANG_INSTALL[26] . ' ' . $siteconfig_path
+                         . $LANG_INSTALL[58]);
+                }
+
+                // skip step 3 since we don't need to import anything
+                header('Location: migrate.php?step=4&language=' . $language
+                    . '&site_url=' . urlencode($_REQUEST['site_url'])
+                    . '&site_admin_url=' . urlencode($_REQUEST['site_admin_url']));
+                break;
+
             } // End switch ($_REQUEST['migration_type']
 
         }
diff -r 1d689f9b83d0 -r 0021451d31d4 public_html/docs/history
--- a/public_html/docs/history	Sat Sep 05 23:40:24 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 10:23:14 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The Migrate option in the install script now also works on an existing
+  database (feature request #0000945) [Dirk]
 - Comment notifications used the phrase "Read the full article" when pointing
   to the new comment post (bug #0000940) [Dirk]
 - Send correct content type and character set header in the install script

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 05:01:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 05:01:44 -0400
Subject: [geeklog-cvs] geeklog: Use constants to define the minimum PHP and
	MySQL versions
Message-ID: <hg.5f9005f9c657.1252227704.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5f9005f9c657
changeset: 7286:5f9005f9c657
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 11:00:27 2009 +0200
description:
Use constants to define the minimum PHP and MySQL versions

diffstat:

 public_html/admin/install/index.php                              |  10 +++--
 public_html/admin/install/install-plugins.php                    |   4 +-
 public_html/admin/install/language/chinese_simplified_utf-8.php  |   8 ++--
 public_html/admin/install/language/chinese_traditional_utf-8.php |   8 ++--
 public_html/admin/install/language/english.php                   |   8 ++--
 public_html/admin/install/language/german.php                    |   8 ++--
 public_html/admin/install/language/hebrew_utf-8.php              |   8 ++--
 public_html/admin/install/language/japanese_utf-8.php            |   8 ++--
 public_html/admin/install/language/polish.php                    |   8 ++--
 public_html/admin/install/lib-install.php                        |  15 ++++++-
 public_html/admin/install/migrate.php                            |   7 ++-
 11 files changed, 52 insertions(+), 40 deletions(-)

diffs (277 lines):

diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/index.php	Sun Sep 06 11:00:27 2009 +0200
@@ -227,8 +227,10 @@
         // Check if the user's version of MySQL is out of date
         } else if (INST_mysqlOutOfDate($DB)) { 
 
-            $display .= '<h1>' . $LANG_INSTALL[51] . '</h1>' . LB;
-            $display .= '<p>' . $LANG_INSTALL[52]
+            $myv = mysql_v($DB['host'], $DB['user'], $DB['pass']);
+            $display .= '<h1>' . sprintf($LANG_INSTALL[51], SUPPORTED_MYSQL_VER)
+                     . '</h1>' . LB;
+            $display .= '<p>' . sprintf($LANG_INSTALL[52], SUPPORTED_MYSQL_VER)
                      . $myv[0] . '.' . $myv[1] . '.' . $myv[2]
                      . $LANG_INSTALL[53] . '</p>' . LB;
 
@@ -952,8 +954,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1 class="heading">' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[4]) . '</h1>' . LB;
-    $display .= '<p>' . str_replace('4.1.0', SUPPORTED_PHP_VER, $LANG_INSTALL[5]) . phpversion() . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1 class="heading">' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . phpversion() . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/install-plugins.php
--- a/public_html/admin/install/install-plugins.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/install-plugins.php	Sun Sep 06 11:00:27 2009 +0200
@@ -74,8 +74,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1>' . $LANG_INSTALL[4] . '</h1>' . LB;
-    $display .= '<p>' . $LANG_INSTALL[5] . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1>' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -54,8 +54,8 @@
     1 => '?????
??????',
     2 => '??????????????????',
     3 => '???????????
',
-    4 => '??????PHP 4.3.0',
-    5 => '??????, ?????????????????? PHP 4.3.0 ?????????(????????????',
+    4 => '??????PHP %s',
+    5 => '??????, ?????????????????? PHP %s ?????????(????????????',
     6 => '). ??? <a href="http://www.php.net/downloads.php">??????PHP</a> ?????
 ??????????????????????????????????????
.',
     7 => '?????????????????????',
     8 => '?????
???????????????????
???????????????????. ???????????????????????????. ???????????????????????????????????????:',
@@ -101,8 +101,8 @@
     48 => '????????????',
     49 => '????????? ?????????????????????',
     50 => '?????
',
-    51 => '?????? MySQL 3.23.2',
-    52 => '??????, ?????????????????? MySQL 3.23.2 ????????? (???????????? ',
+    51 => '?????? MySQL %s',
+    52 => '??????, ?????????????????? MySQL %s ????????? (???????????? ',
     53 => '). ??? <a href="http://dev.mysql.com/downloads/mysql/">????????????MySQL</a> ?????
 ?????????????????????????????????????????????.',
     54 => '????????????????????????',
     55 => '??????, ??????????????????????????????. ?????????????????????.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -54,8 +54,8 @@
     1 => '????????????',
     2 => '??????????????????',
     3 => '????????????',
-    4 => '??????PHP 4.3.0',
-    5 => '??????, ?????????????????? PHP 4.3.0 ?????????(????????????',
+    4 => '??????PHP %s',
+    5 => '??????, ?????????????????? PHP %s ?????????(????????????',
     6 => '). ??? <a href="http://www.php.net/downloads.php">??????PHP</a> ?????? ???????????????????????????????????????.',
     7 => '?????????????????????',
     8 => '?????????????????????????????????????????????. ???????????????????????????. ???????????????????????????????????????:',
@@ -101,8 +101,8 @@
     48 => '????????????',
     49 => '????????? ?????????????????????',
     50 => '??????',
-    51 => '?????? MySQL 3.23.2',
-    52 => '??????, ?????????????????? MySQL 3.23.2 ????????? (???????????? ',
+    51 => '?????? MySQL %s',
+    52 => '??????, ?????????????????? MySQL %s ????????? (???????????? ',
     53 => '). ??? <a href="http://dev.mysql.com/downloads/mysql/">????????????MySQL</a> ?????? ?????????????????????????????????????????????.',
     54 => '????????????????????????',
     55 => '??????, ??????????????????????????????. ?????????????????????.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Installation Support',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog Installation',
-    4 => 'PHP 4.3.0 required',
-    5 => 'Sorry, but Geeklog requires at least PHP 4.3.0 to run (you have version ',
+    4 => 'PHP %s required',
+    5 => 'Sorry, but Geeklog requires at least PHP %s to run (you have version ',
     6 => '). Please <a href="http://www.php.net/downloads.php">upgrade your PHP</a> install or ask your hosting service to do it for you.',
     7 => 'Unable to locate Geeklog files',
     8 => 'The installer was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
@@ -100,8 +100,8 @@
     48 => 'Site Email',
     49 => 'Site No-Reply Email',
     50 => 'Install',
-    51 => 'MySQL 3.23.2 or newer required',
-    52 => 'Sorry, but Geeklog requires at least MySQL 3.23.2 to run (you have version ',
+    51 => 'MySQL %s or newer required',
+    52 => 'Sorry, but Geeklog requires at least MySQL %s to run (you have version ',
     53 => '). Please <a href="http://dev.mysql.com/downloads/mysql/">upgrade your MySQL</a> install or ask your hosting service to do it for you.',
     54 => 'Incorrect database information',
     55 => 'Sorry, but the database information you entered does not appear to be correct. Please go back and try again.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Hilfe zur Installation',
     2 => 'Zuverl&auml;ssigkeit eingebaut',
     3 => 'Geeklog-Installation',
-    4 => 'PHP 4.3.0 ben&ouml;tigt',
-    5 => 'Sorry, Geeklog ben&ouml;tigt mindestens PHP 4.3.0 (Du hast Version ',
+    4 => 'PHP %s ben&ouml;tigt',
+    5 => 'Sorry, Geeklog ben&ouml;tigt mindestens PHP %s (Du hast Version ',
     6 => '). Bitte <a href="http://www.php.net/downloads.php">aktualisiere Deine PHP-Installation</a> oder bitte Deinen Hosting-Provider darum.',
     7 => 'Geeklog-Dateien nicht gefunden',
     8 => 'Das Installations-Skript hat einige wichtige Geeklog-Dateien nicht gefunden. Wahrscheinlich hast Du diese in andere Verzeichnisse verschoben. Bitte gib hier die Pfade zu den Dateien und Verzeichnissen an:',
@@ -100,8 +100,8 @@
     48 => 'Website-Email-Adresse',
     49 => '"No Reply"-Email-Adresse',
     50 => 'Installieren',
-    51 => 'MySQL 3.23.2 ben&ouml;tigt',
-    52 => 'Sorry, aber Geeklog setzt mindestens MySQL 3.23.2 voraus (Du hast Version ',
+    51 => 'MySQL %s ben&ouml;tigt',
+    52 => 'Sorry, aber Geeklog setzt mindestens MySQL %s voraus (Du hast Version ',
     53 => '). Bitte <a href="http://dev.mysql.com/downloads/mysql/">aktualisiere Deine MySQL-Version</a> oder bitte Deinen Website-Hoster, es f&uuml;r Dich zu erledigen.',
     54 => 'Datenbank-Informationen unvollst&auml;ndig oder nicht korrekt.',
     55 => 'Sorry, aber die Datenbank-Informationen, die Du eingegeben hast, scheinen nicht korrekt zu sein. Bitte klicke auf "Zur&uuml;ck" und versuche es noch einmal.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -49,8 +49,8 @@
     1 => '?????????? ??????????',
     2 => 'The Ultimate Weblog System',
     3 => '?????????? Geeklog',
-    4 => '???????? PHP 4.3.0',
-    5 => '??????????????, ?????? Geeklog ???????? ?????????? PHP 4.3.0 ?????????? ???????? (?????? ???? ?????????? ',
+    4 => '???????? PHP %s',
+    5 => '??????????????, ?????? Geeklog ???????? ?????????? PHP %s ?????????? ???????? (?????? ???? ?????????? ',
     6 => '). ?????? <a href="http://www.php.net/downloads.php">?????????? ???? ?????????? ??-PHP ????????</a> ???? ???????? ???????????? ???????? ???????? ?????????? ?????? ??????????????.',
     7 => '???? ?????????? ???????????? ???? Geeklog',
     8 => '???????????? ???? ???????????? ???????? ???? ???????????? ?????????????? ???? Geeklog. ???? ?????????? ???????? ?????????????? ???????? ???????????? ?????????? ?????????? ????????. ?????? ?????????? ???? ?????????????? ???????????? ???????????????? ????????:',
@@ -96,8 +96,8 @@
     48 => '?????????? ?????????????? ???? ????????',
     49 => '?????????? ?????????????? ???? No-Reply',
     50 => '??????????',
-    51 => '???????? MySQL 3.23.2 ???? ???????? ??????',
-    52 => '??????????????, ???? Geeklog ???????? ?????????? MySQL 3.23.2 ?????? ???????? (?????? ???? ?????????? ',
+    51 => '???????? MySQL %s ???? ???????? ??????',
+    52 => '??????????????, ???? Geeklog ???????? ?????????? MySQL %s ?????? ???????? (?????? ???? ?????????? ',
     53 => '). ?????? <a href="http://dev.mysql.com/downloads/mysql/">?????????? ???? ?????????? ??-MySQL ????????</a> ???? ???????? ???????????? ???????? ???????? ?????????? ?????? ??????????????.',
     54 => '???????? ???????? ?????????? ???????? ????????',
     55 => '??????????????, ???? ???????? ???????? ?????????? ?????????????? ???????? ????????. ?????? ?????????? ???????? ??????.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 11:00:27 2009 +0200
@@ -55,8 +55,8 @@
     1 => '????????????????????????????????????????????????????????????',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog???????????????????????????',
-    4 => 'PHP 4.3.0???????????
?????????',
-    5 => '???????????????Geeklog?????????????????????????????????????????????PHP 4.3.0?????
?????????(??????????????????????????? ',
+    4 => 'PHP %s???????????
?????????',
+    5 => '???????????????Geeklog?????????????????????????????????????????????PHP %s?????
?????????(??????????????????????????? ',
     6 => ')????????????<a href="http://www.php.net/downloads.php">PHP?????????????????????????????????</a>????????????????????????????????????????????????????????????',
     7 => 'Geeklog????????????????????????????????????',
     8 => 'Geeklog?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????:',
@@ -102,8 +102,8 @@
     48 => '????????????Email',
     49 => '????????????No-Reply Email',
     50 => '??????????????????',
-    51 => '???????????????MySQL 3.23.2?????
?????????',
-    52 => '???????????????Geeklog?????????????????????????????????????????????MySQL 3.23.2?????
?????????(??????????????????????????? ',
+    51 => '???????????????MySQL %s?????
?????????',
+    52 => '???????????????Geeklog?????????????????????????????????????????????MySQL %s?????
?????????(??????????????????????????? ',
     53 => ')????????????<a href="http://dev.mysql.com/downloads/mysql/">MySQL??????????????????????????????</a>????????????????????????????????????????????????????????????',
     54 => '????????????????????
?????????????????????',
     55 => '????????????????
??????????????????????????????
???????????????????????????????????????????????????????????????',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 11:00:27 2009 +0200
@@ -53,8 +53,8 @@
     1 => 'Instalacja Pomoc',
     2 => 'The Ultimate Weblog System',
     3 => 'Geeklog - Instalacja',
-    4 => 'Wymagane PHP 4.3.0',
-    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP 4.3.0 (wersja zainstalowana to ',
+    4 => 'Wymagane PHP %s',
+    5 => 'Sorry, ale Geeklog wymaga do uruchomienia co najmniej PHP %s (wersja zainstalowana to ',
     6 => '). Prosz? <a href="http://www.php.net/downloads.php">uaktualni? wersj? PHP</a> lub zg?osi? to do swojego providera hostingu.',
     7 => 'Nie mo?na zlokalizowa? plik?w Geeklog-a',
     8 => 'The installation script was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
@@ -100,8 +100,8 @@
     48 => 'Adres email strony',
     49 => 'Bezzwrotny adres email strony',
     50 => 'Instaluj',
-    51 => 'Wymagana baza MySQL 3.23.2',
-    52 => 'Sorry, but Geeklog requires at least MySQL 3.23.2 to run (you have version ',
+    51 => 'Wymagana baza MySQL %s',
+    52 => 'Sorry, but Geeklog requires at least MySQL %s to run (you have version ',
     53 => '). Please <a href="http://dev.mysql.com/downloads/mysql/">upgrade your MySQL</a> install or ask your hosting service to do it for you.',
     54 => 'Ba??dne informacje o bazie danych',
     55 => 'Sorry, but the database information you entered does not appear to be correct. Please go back and try again.',
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Sep 06 11:00:27 2009 +0200
@@ -64,6 +64,9 @@
 if (!defined('SUPPORTED_PHP_VER')) {
     define('SUPPORTED_PHP_VER', '4.3.0');
 }
+if (!defined('SUPPORTED_MYSQL_VER')) {
+    define('SUPPORTED_MYSQL_VER', '3.23.2');
+}
 
 $_REQUEST = array_merge($_GET, $_POST);
 
@@ -273,14 +276,20 @@
  */
 function INST_mysqlOutOfDate($db)
 {
+    $minv = explode('.', SUPPORTED_MYSQL_VER);
+
     if ($db['type'] == 'mysql' || $db['type'] == 'mysql-innodb') {
         $myv = mysql_v($db['host'], $db['user'], $db['pass']);
-        if (($myv[0] < 3) || (($myv[0] == 3) && ($myv[1] < 23)) ||
-                (($myv[0] == 3) && ($myv[1] == 23) && ($myv[2] < 2))) {
+
+        if (($myv[0] <  $minv[0]) ||
+           (($myv[0] == $minv[0]) && ($myv[1] <  $minv[1])) ||
+           (($myv[0] == $minv[0]) && ($myv[1] == $minv[1]) && ($myv[2] < $minv[2]))) {
+
             return true;
         }
-        return false;
     }
+
+    return false;
 }
 
 /**
diff -r 0021451d31d4 -r 5f9005f9c657 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sun Sep 06 10:23:14 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sun Sep 06 11:00:27 2009 +0200
@@ -258,8 +258,8 @@
 if (INST_phpOutOfDate()) {
 
     // If their version of PHP is not supported, print an error:
-    $display .= '<h1>' . $LANG_INSTALL[4] . '</h1>' . LB;
-    $display .= '<p>' . $LANG_INSTALL[5] . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
+    $display .= '<h1>' . sprintf($LANG_INSTALL[4], SUPPORTED_PHP_VER) . '</h1>' . LB;
+    $display .= '<p>' . sprintf($LANG_INSTALL[5], SUPPORTED_PHP_VER) . $phpv[0] . '.' . $phpv[1] . '.' . (int) $phpv[2] . $LANG_INSTALL[6] . '</p>' . LB;
 
 } else {
 
@@ -483,7 +483,8 @@
             // (needs to connect to MySQL in order to check)
             if (INST_mysqlOutOfDate($DB)) {
 
-                $display .= INST_getAlertMsg($LANG_INSTALL[51]);
+                $display .= INST_getAlertMsg(sprintf($LANG_INSTALL[51],
+                                                     SUPPORTED_MYSQL_VER));
                 $import_errors++;
 
             } 

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 06:53:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 06:53:52 -0400
Subject: [geeklog-cvs] geeklog: Plugin migration was only called when the
	plugin also n...
Message-ID: <hg.2b8f340f0e9f.1252234432.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2b8f340f0e9f
changeset: 7287:2b8f340f0e9f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 11:59:29 2009 +0200
description:
Plugin migration was only called when the plugin also needed an upgrade (bug #0000947)

diffstat:

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

diffs (64 lines):

diff -r 5f9005f9c657 -r 2b8f340f0e9f public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sun Sep 06 11:00:27 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sun Sep 06 11:59:29 2009 +0200
@@ -806,6 +806,8 @@
 * @param    boolean $migration  whether the upgrade is part of a site migration
 * @param    array   $old_conf   old $_CONF values before the migration
 * @return   int     number of failed plugin updates (0 = everything's fine)
+* @see      PLG_upgrade
+* @see      PLG_migrate
 *
 */
 function INST_pluginUpgrades($migration = false, $old_conf = array())
@@ -820,25 +822,24 @@
     for ($i = 0; $i < $numPlugins; $i++) {
         list($pi_name, $pi_version) = DB_fetchArray($result);
 
-        $code_version = PLG_chkVersion($pi_name);
-        if (! empty($code_version) && ($code_version != $pi_version)) {
-            $success = true;
+        $success = true;
+        if ($migration) {
+            $success = PLG_migrate($pi_name, $old_conf);
+        }
 
-            if ($migration) {
-                $success = PLG_migrate($pi_name, $old_conf);
-            }
-
-            if ($success === true) {
+        if ($success === true) {
+            $code_version = PLG_chkVersion($pi_name);
+            if (! empty($code_version) && ($code_version != $pi_version)) {
                 $success = PLG_upgrade($pi_name);
             }
+        }
 
-            if ($success !== true) {
-                // upgrade failed - disable plugin
-                DB_change($_TABLES['plugins'], 'pi_enabled', 0,
-                                               'pi_name', $pi_name);
-                COM_errorLog("Upgrade for '$pi_name' plugin failed - plugin disabled");
-                $failed++;
-            }
+        if ($success !== true) {
+            // migration or upgrade failed - disable plugin
+            DB_change($_TABLES['plugins'], 'pi_enabled', 0,
+                                           'pi_name', $pi_name);
+            COM_errorLog("Migration or upgrade for '$pi_name' plugin failed - plugin disabled");
+            $failed++;
         }
     }
 
diff -r 5f9005f9c657 -r 2b8f340f0e9f public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 11:00:27 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 11:59:29 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Plugin migration was only called when the plugin also needed an upgrade
+  (bug #0000947) [Dirk]
 - The Migrate option in the install script now also works on an existing
   database (feature request #0000945) [Dirk]
 - Comment notifications used the phrase "Read the full article" when pointing

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 08:55:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 08:55:36 -0400
Subject: [geeklog-cvs] geeklog: Avoid SQL error with certain db dumps during
	migration ...
Message-ID: <hg.71c20c696961.1252241736.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/71c20c696961
changeset: 7288:71c20c696961
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 13:07:25 2009 +0200
description:
Avoid SQL error with certain db dumps during migration (bug #0000955)

diffstat:

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

diffs (23 lines):

diff -r 2b8f340f0e9f -r 71c20c696961 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sun Sep 06 11:59:29 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Sun Sep 06 13:07:25 2009 +0200
@@ -69,6 +69,8 @@
 // $comment[]='---';                  // Uncomment this line if using proprietary dump created by outdated mysqldump
 // $comment[]='CREATE DATABASE';      // Uncomment this line if your dump contains create database queries in order to ignore them
 $comment[]='/*!';                     // Or add your own string to leave out other proprietary things
+// see http://project.geeklog.net/tracking/view.php?id=955
+$comment[]='SET character_set_client = @saved_cs_client;';
 
 // Connection character set should be the same as the dump file character set (utf8, latin1, cp1251, koi8r etc.)
 // See http://dev.mysql.com/doc/refman/5.0/en/charset-charsets.html for the full list
diff -r 2b8f340f0e9f -r 71c20c696961 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 11:59:29 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 13:07:25 2009 +0200
@@ -3,6 +3,7 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Avoid SQL error with certain db dumps during migration (bug #0000955) [Dirk]
 - Plugin migration was only called when the plugin also needed an upgrade
   (bug #0000947) [Dirk]
 - The Migrate option in the install script now also works on an existing

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 08:55:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 08:55:36 -0400
Subject: [geeklog-cvs] geeklog: Updated help screen,
	now that it's also possible to mig...
Message-ID: <hg.6bf0c8bab156.1252241736.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6bf0c8bab156
changeset: 7289:6bf0c8bab156
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 13:18:55 2009 +0200
description:
Updated help screen, now that it's also possible to migrate an existing database

diffstat:

 public_html/admin/install/language/chinese_simplified_utf-8.php  |   2 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php |   2 +-
 public_html/admin/install/language/english.php                   |   2 +-
 public_html/admin/install/language/german.php                    |  10 +++++-----
 public_html/admin/install/language/hebrew_utf-8.php              |   2 +-
 public_html/admin/install/language/japanese_utf-8.php            |   2 +-
 public_html/admin/install/language/polish.php                    |   2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -342,7 +342,7 @@
     'site_mail' => '??????????????????????????????????????????????????????????????????????????????.',
     'noreply_mail' => '?????????????????????????????
?????????????????????????????????. ???????????????????????????????????????????????????????????????????
?????????
???????????????????????????????????????. ??????????????????????????????, ????????????????????????????????????????????????.',
     'utf8' => '????????????????????? UTF-8 ???????????????????????????. ???????????????????????????????????????.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -342,7 +342,7 @@
     'site_mail' => '??????????????????????????????????????????????????????????????????????????????.',
     'noreply_mail' => '?????????????????????????????
?????????????????????????????????. ???????????????????????????????????????????????????????????????????
?????????
???????????????????????????????????????. ??????????????????????????????, ????????????????????????????????????????????????.',
     'utf8' => '????????????????????? UTF-8 ??????????????????????????????. ???????????????????????????????????????.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 13:18:55 2009 +0200
@@ -341,7 +341,7 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 13:18:55 2009 +0200
@@ -327,9 +327,9 @@
 // help.php
 
 $LANG_HELP = array(
-    0 => 'Geeklog Installation Support',
-    'site_name' => 'The name of your website.',
-    'site_slogan' => 'A simple description of your website.',
+    0 => 'Hilfe zur Geeklog-Installation',
+    'site_name' => 'Der Name Deiner Website.',
+    'site_slogan' => 'Ein Motto oder eine kurze Beschreibung Deiner Website.',
     'db_type' => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.</p><p class="indent"><strong>Hinweis:</strong> InnoDB-Tabellen k&ouml;nnen zu besserer Performance auf (sehr) gro&szlig;en Websites f&uuml;hren, machen den Backup-Prozess aber komplizierter.',
     'db_host' => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
     'db_name' => 'The name of your database. If you are not sure what this is contact your hosting provider.',
@@ -341,8 +341,8 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
-    'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
+    'migrate_file' => 'W&auml;hle ein Backup, das migriert werden soll. Dies kann eine Datei in Deinem "backups"-Verzeichnis sein, Du kannst eine Backup-Datei hochladen, oder Du kannst den aktuellen Inhalt der Datenbank migrieren.',
+    'plugin_upload' => 'W&auml;hle ein Plugin-Archiv (in den Formaten .zip, .tar.gz oder .tgz format) zum Hochladen und Installieren.'
 );
 
 // which texts to use as labels, so they don't have to be translated again
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -337,7 +337,7 @@
     'site_mail' => '???????? ???????????? ???????????? ?????? ???????????? ?????????????? ???????????? ??-Geeklog ???????????? ?????? ?????? ?????????? ???????????? ??????????????????.',
     'noreply_mail' => '???????? ?????????? ?????????? ???? ???????????? ???????????? ?????????????? ???? ?????? ???????????? ?????????????????? ???????????? ????????????. ?????? ?????????? ?????????? ?????? ???????????? ?????????????? ???? ???????? ???? ?????????? ?????????? ?????? ?????????? ???????????? ?????? ?????????? ???????????????? ?????????? ???? ?????????? ?????????????? ???????? ???? ?????? ?????????? ????????. ???? ?????? ???? ?????? ???????????? ????????????, ???????? ?????????? ?????????????? ???????????? ?????? ?????????? ?????????? ??????.',
     'utf8' => '?????????? ?????? ???????????? ??-UTF-8 ???????? ?????????? ?????????? ?????????? ???? ???????? ????????. ?????????? ?????????? ?????????????? ???? ??????????????.',
-    'migrate_file' => '?????????? ???? ???????? ???????????? ???????????????? ????????????. ?????? ???????? ?????????? ???????? ???????? ?????????????? "backups" ???????? ???? ???????????? ???????????? ???????? ???????????? ????????.',
+    'migrate_file' => '?????????? ???? ???????? ???????????? ???????????????? ????????????. ?????? ???????? ?????????? ???????? ???????? ?????????????? "backups" ???????? ???? ???????????? ???????????? ???????? ???????????? ????????. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => '?????????? ???????????? plugin (?????????? zip, tar.gz ???? tgz) ?????????? ???????????? ??????????????.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -343,7 +343,7 @@
     'site_mail' => '?????????????????
???Email????????????????
????????????????',
     'noreply_mail' => '?????????????????
???No-Reply Email??????????????????????????????Email???????????????????
????????????????',
     'utf8' => '??????????????????????????????????????????UTF-8??????????????????????????????????????????????????????????????????????????????????????????????????????????
?????????????????????????????????????',
-    'migrate_file' => '??????????????????????????????????????????(*.sql)?????????????????????"backups"????????????????????
????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
+    'migrate_file' => '??????????????????????????????????????????(*.sql)?????????????????????"backups"????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => '????????????????????????????????????????????????????????????(in .zip, .tar.gz, or .tgz format)???????????????????????????????????????????????????'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 13:18:55 2009 +0200
@@ -341,7 +341,7 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 10:18:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 10:18:01 -0400
Subject: [geeklog-cvs] geeklog: Added support for a CUSTOM_renderMenu
	function when ren...
Message-ID: <hg.62bd06e50034.1252246681.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/62bd06e50034
changeset: 7291:62bd06e50034
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 15:37:18 2009 +0200
description:
Added support for a CUSTOM_renderMenu function when rendering the top menu (feature request #0000845)

diffstat:

 public_html/docs/history   |   2 ++
 public_html/lib-common.php |  45 ++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diffs (68 lines):

diff -r 15be5bd03553 -r 62bd06e50034 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 15:12:47 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 15:37:18 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Added support for a CUSTOM_renderMenu function when rendering the top menu
+  (feature request #0000845) [Dirk]
 - In the install script, always open db-config.php and siteconfig.php in
   binary mode to avoid EOL character mixup on Windows (bug #0000730) [Dirk]
 - Avoid SQL error with certain db dumps during migration (bug #0000955) [Dirk]
diff -r 15be5bd03553 -r 62bd06e50034 public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Sep 06 15:12:47 2009 +0200
+++ b/public_html/lib-common.php	Sun Sep 06 15:37:18 2009 +0200
@@ -639,30 +639,29 @@
                 break;
 
             case 'custom':
-                $custom_count = 0;
-                $custom_size = sizeof( $custom_entries );
-                foreach( $custom_entries as $entry )
-                {
-                    $custom_count++;
-
-                    if( empty( $entry['url'] ) || empty( $entry['label'] ))
-                    {
-                        continue;
+                if (function_exists('CUSTOM_renderMenu')) {
+                    CUSTOM_renderMenu($header, $custom_entries, $menuCounter);
+                } else {
+                    $custom_count = 0;
+                    $custom_size = count($custom_entries);
+                    foreach ($custom_entries as $entry) {
+                        $custom_count++;
+
+                        if (empty($entry['url']) || empty($entry['label'])) {
+                            continue;
+                        }
+
+                        $header->set_var('menuitem_url',  $entry['url']);
+                        $header->set_var('menuitem_text', $entry['label']);
+
+                        if ($last_entry && ($custom_count == $custom_size)) {
+                            $header->parse('menu_elements', 'menuitem_last',
+                                           true);
+                        } else {
+                            $header->parse('menu_elements', 'menuitem', true);
+                        }
+                        $menuCounter++;
                     }
-
-                    $header->set_var( 'menuitem_url',  $entry['url'] );
-                    $header->set_var( 'menuitem_text', $entry['label'] );
-
-                    if( $last_entry && ( $custom_count == $custom_size ))
-                    {
-                        $header->parse( 'menu_elements', 'menuitem_last',
-                                        true );
-                    }
-                    else
-                    {
-                        $header->parse( 'menu_elements', 'menuitem', true );
-                    }
-                    $menuCounter++;
                 }
                 $url = '';
                 $label = '';

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 10:18:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 10:18:02 -0400
Subject: [geeklog-cvs] geeklog: Let's use count() instead of sizeof()
	everywhere from n...
Message-ID: <hg.cd653ce9aafb.1252246682.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cd653ce9aafb
changeset: 7292:cd653ce9aafb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 15:46:20 2009 +0200
description:
Let's use count() instead of sizeof() everywhere from now on

diffstat:

 public_html/admin/group.php               |   8 ++++----
 public_html/admin/plugins/polls/index.php |   6 +++---
 public_html/admin/syndication.php         |   2 +-
 public_html/admin/user.php                |   2 +-
 public_html/directory.php                 |   4 ++--
 public_html/lib-common.php                |  20 ++++++++++----------
 public_html/users.php                     |   4 ++--
 public_html/usersettings.php              |  10 +++++-----
 system/classes/downloader.class.php       |   4 ++--
 system/classes/upload.class.php           |   2 +-
 system/lib-plugins.php                    |   4 ++--
 system/lib-security.php                   |   6 +++---
 system/lib-story.php                      |   2 +-
 system/lib-user.php                       |   2 +-
 14 files changed, 38 insertions(+), 38 deletions(-)

diffs (truncated from 381 to 300 lines):

diff -r 62bd06e50034 -r cd653ce9aafb public_html/admin/group.php
--- a/public_html/admin/group.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/admin/group.php	Sun Sep 06 15:46:20 2009 +0200
@@ -307,7 +307,7 @@
             }
         }
     }
-    while (sizeof ($tocheck) > 0);
+    while (count($tocheck) > 0);
 
     // get features for all groups in $checked
     $glist = join (',', $checked);
@@ -370,7 +370,7 @@
         $indirectfeatures = explode (',', $indirectfeatures);
 
         // Build an array of indirect features
-        for ($i = 0; $i < sizeof($indirectfeatures); $i++) {
+        for ($i = 0; $i < count($indirectfeatures); $i++) {
             $grpftarray[current($indirectfeatures)] = 'indirect';
             next($indirectfeatures);
         }
@@ -387,7 +387,7 @@
         $grpftarray = array_merge ($grpftarray, $grpftarray1);
         if ($VERBOSE) {
             // this is for debugging purposes
-            for ($i = 1; $i < sizeof($grpftarray); $i++) {
+            for ($i = 1; $i < count($grpftarray); $i++) {
                 COM_errorLog("element $i is feature " . key($grpftarray) . " and is " . current($grpftarray),1);
                 next($grpftarray);
             }
@@ -621,7 +621,7 @@
 
     $checked = array ();
 
-    while (sizeof ($to_check) > 0) {
+    while (count($to_check) > 0) {
         $thisgroup = array_pop ($to_check);
         if ($thisgroup > 0) {
             $result = DB_query ("SELECT ug_grp_id FROM {$_TABLES['group_assignments']} WHERE ug_main_grp_id = $thisgroup");
diff -r 62bd06e50034 -r cd653ce9aafb public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/admin/plugins/polls/index.php	Sun Sep 06 15:46:20 2009 +0200
@@ -173,7 +173,7 @@
     }
 
     // check if any question was entered
-    if (empty($topic) or (sizeof($Q) == 0) or (strlen($Q[0]) == 0) or
+    if (empty($topic) or (count($Q) == 0) or (strlen($Q[0]) == 0) or
             (strlen($A[0][0]) == 0)) {
         $retval .= COM_siteHeader ('menu', $LANG25[5]);
         $retval .= COM_startBlock ($LANG21[32], '',
@@ -250,7 +250,7 @@
     $k = 0; // set up a counter to make sure we do assign a straight line of question id's
     $v = 0; // re-count votes sine they might have been changed
     // first dimension of array are the questions
-    $num_questions = sizeof($Q);
+    $num_questions = count($Q);
     for ($i = 0; $i < $num_questions; $i++) {
         $Q[$i] = COM_stripslashes($Q[$i]);
         if (strlen($Q[$i]) > 0) { // only insert questions that exist
@@ -259,7 +259,7 @@
                                                "'$k', '$pid', '$Q[$i]'");
             // within the questions, we have another dimensions with answers,
             // votes and remarks
-            $num_answers = sizeof($A[$i]);
+            $num_answers = count($A[$i]);
             for ($j = 0; $j < $num_answers; $j++) {
                 $A[$i][$j] = COM_stripslashes($A[$i][$j]);
                 if (strlen($A[$i][$j]) > 0) { // only insert answers etc that exist
diff -r 62bd06e50034 -r cd653ce9aafb public_html/admin/syndication.php
--- a/public_html/admin/syndication.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/admin/syndication.php	Sun Sep 06 15:46:20 2009 +0200
@@ -421,7 +421,7 @@
     $retval = '';
 
     $plugins = PLG_supportingFeeds ();
-    if (sizeof ($plugins) == 0) {
+    if (count($plugins) == 0) {
         // none of the installed plugins are supporting feeds
         // - go directly to the feed editor
         $retval = COM_siteHeader ('menu', $LANG33[11])
diff -r 62bd06e50034 -r cd653ce9aafb public_html/admin/user.php
--- a/public_html/admin/user.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/admin/user.php	Sun Sep 06 15:46:20 2009 +0200
@@ -453,7 +453,7 @@
     $userChanged = false;
 
     if ($_USER_VERBOSE) COM_errorLog("**** entering saveusers****",1);
-    if ($_USER_VERBOSE) COM_errorLog("group size at beginning = " . sizeof($groups),1);
+    if ($_USER_VERBOSE) COM_errorLog("group size at beginning = " . count($groups),1);
 
     if ($passwd != $passwd_conf) { // passwords don't match
         return edituser($uid, 67);
diff -r 62bd06e50034 -r cd653ce9aafb public_html/directory.php
--- a/public_html/directory.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/directory.php	Sun Sep 06 15:46:20 2009 +0200
@@ -284,7 +284,7 @@
             $A = DB_fetchArray ($result);
 
             if ($mday != $A['mday']) {
-                if (sizeof ($entries) > 0) {
+                if (count($entries) > 0) {
                     $retval .= COM_makeList ($entries);
                     $entries = array ();
                 }
@@ -301,7 +301,7 @@
             $entries[] = COM_createLink(stripslashes ($A['title']), $url);
         }
 
-        if (sizeof ($entries) > 0) {
+        if (count($entries) > 0) {
             $retval .= COM_makeList ($entries);
         }
 
diff -r 62bd06e50034 -r cd653ce9aafb public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/lib-common.php	Sun Sep 06 15:46:20 2009 +0200
@@ -587,7 +587,7 @@
     $allowedCounter = 0;
     $counter = 0;
 
-    $num_plugins = sizeof( $plugin_menu );
+    $num_plugins = count( $plugin_menu );
     if( ( $num_plugins == 0 ) && in_array( 'plugins', $_CONF['menu_elements'] ))
     {
         $key = array_search( 'plugins', $_CONF['menu_elements'] );
@@ -601,14 +601,14 @@
         {
             $custom_entries = CUSTOM_menuEntries();
         }
-        if( sizeof( $custom_entries ) == 0 )
+        if( count( $custom_entries ) == 0 )
         {
             $key = array_search( 'custom', $_CONF['menu_elements'] );
             unset( $_CONF['menu_elements'][$key] );
         }
     }
 
-    $num_elements = sizeof( $_CONF['menu_elements'] );
+    $num_elements = count( $_CONF['menu_elements'] );
 
     foreach( $_CONF['menu_elements'] as $item )
     {
@@ -1825,7 +1825,7 @@
         {
             $retval .= '<li><input type="checkbox" name="' . $fieldname . '[]" value="' . $A[0] . '"';
 
-            $sizeS = sizeof( $S );
+            $sizeS = count( $S );
             for( $x = 0; $x < $sizeS; $x++ )
             {
                 if( $A[0] == $S[$x] )
@@ -2529,7 +2529,7 @@
                     $T = DB_fetchArray( $tresult );
                     $tids[] = $T['tid'];
                 }
-                if( sizeof( $tids ) > 0 )
+                if( count( $tids ) > 0 )
                 {
                     $topicsql = " (tid IN ('" . implode( "','", $tids ) . "'))";
                 }
@@ -3044,7 +3044,7 @@
     $str = preg_replace( '/<!--.+?-->/', '', $str );
 
     $filter = new kses4;
-    if( isset( $_CONF['allowed_protocols'] ) && is_array( $_CONF['allowed_protocols'] ) && ( sizeof( $_CONF['allowed_protocols'] ) > 0 ))
+    if( isset( $_CONF['allowed_protocols'] ) && is_array( $_CONF['allowed_protocols'] ) && ( count( $_CONF['allowed_protocols'] ) > 0 ))
     {
         $filter->SetProtocols( $_CONF['allowed_protocols'] );
     }
@@ -3554,7 +3554,7 @@
     // sort the resulting array by block order
     $column = 'blockorder';
     $sortedBlocks = $blocks;
-    $num_sortedBlocks = sizeof( $sortedBlocks );
+    $num_sortedBlocks = count( $sortedBlocks );
     for( $i = 0; $i < $num_sortedBlocks - 1; $i++ )
     {
         for( $j = 0; $j < $num_sortedBlocks - 1 - $i; $j++ )
@@ -4114,7 +4114,7 @@
             $TIDS = array_intersect( $TIDS, $ETIDS );
         }
 
-        if( sizeof( $TIDS ) > 0)
+        if( count( $TIDS ) > 0)
         {
             $commonsql .= " AND (tid IN ('" . implode( "','", $TIDS ) . "'))";
         }
@@ -4413,7 +4413,7 @@
     if( $_CONF['hidenewplugins'] == 0 )
     {
         list( $headlines, $smallheadlines, $content ) = PLG_getWhatsNew();
-        $plugins = sizeof( $headlines );
+        $plugins = count( $headlines );
         if( $plugins > 0 )
         {
             for( $i = 0; $i < $plugins; $i++ )
@@ -5582,7 +5582,7 @@
         $tids[] = $T['tid'];
     }
 
-    if( sizeof( $tids ) > 0 )
+    if( count( $tids ) > 0 )
     {
         $topicsql .= "({$table}tid IN ('" . implode( "','", $tids ) . "'))";
     }
diff -r 62bd06e50034 -r cd653ce9aafb public_html/users.php
--- a/public_html/users.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/users.php	Sun Sep 06 15:46:20 2009 +0200
@@ -208,7 +208,7 @@
     $topics = "'" . implode ("','", $tids) . "'";
 
     // list of last 10 stories by this user
-    if (sizeof ($tids) > 0) {
+    if (count($tids) > 0) {
         $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
         $sql .= " ORDER BY unixdate DESC LIMIT 10";
         $result = DB_query ($sql);
@@ -242,7 +242,7 @@
 
     // list of last 10 comments by this user
     $sidArray = array();
-    if (sizeof ($tids) > 0) {
+    if (count($tids) > 0) {
         // first, get a list of all stories the current visitor has access to
         $sql = "SELECT sid FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
         $result = DB_query($sql);
diff -r 62bd06e50034 -r cd653ce9aafb public_html/usersettings.php
--- a/public_html/usersettings.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/public_html/usersettings.php	Sun Sep 06 15:46:20 2009 +0200
@@ -1208,7 +1208,7 @@
     $topics = "'" . implode ("','", $tids) . "'";
 
     // list of last 10 stories by this user
-    if (sizeof ($tids) > 0) {
+    if (count($tids) > 0) {
         $sql = "SELECT sid,title,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} WHERE (uid = $user) AND (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
         $sql .= " ORDER BY unixdate DESC LIMIT 10";
         $result = DB_query ($sql);
@@ -1243,7 +1243,7 @@
 
     // list of last 10 comments by this user
     $sidArray = array();
-    if (sizeof ($tids) > 0) {
+    if (count($tids) > 0) {
         // first, get a list of all stories the current visitor has access to
         $sql = "SELECT sid FROM {$_TABLES['stories']} WHERE (draft_flag = 0) AND (date <= NOW()) AND (tid IN ($topics))" . COM_getPermSQL ('AND');
         $result = DB_query($sql);
@@ -1384,13 +1384,13 @@
     $AETIDS = USER_getAllowedTopics();          // array of strings (fetched, needed to "clean" $TIDS and $ETIDS)
 
     $tids = '';
-    if (sizeof ($TIDS) > 0) {
+    if (count($TIDS) > 0) {
         // the array_intersect mitigates the need to scrub the TIDS input
         $tids = addslashes (implode (' ', array_intersect ($AETIDS, $TIDS)));
     }
 
     $aids = '';
-    if (sizeof ($AIDS) > 0) {
+    if (count($AIDS) > 0) {
         // Scrub the AIDS array to prevent SQL injection and bad values
         foreach ($AIDS as $key => $val) {
             $AIDS[$key] = COM_applyFilter($val, true);
@@ -1420,7 +1420,7 @@
     }
 
     $etids = '';
-    if (($_CONF['emailstories'] == 1) && (sizeof($ETIDS) > 0)) {
+    if (($_CONF['emailstories'] == 1) && (count($ETIDS) > 0)) {
         // the array_intersect mitigates the need to scrub the ETIDS input
         $etids = addslashes (implode (' ', array_intersect ($AETIDS, $ETIDS)));
     }
diff -r 62bd06e50034 -r cd653ce9aafb system/classes/downloader.class.php
--- a/system/classes/downloader.class.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/system/classes/downloader.class.php	Sun Sep 06 15:46:20 2009 +0200
@@ -188,7 +188,7 @@
     */
     function _setAvailableExtensions($extensions = array())
     {
-        if (sizeof($extensions) == 0) {
+        if (count($extensions) == 0) {
             $this->_availableMimeTypes = 
                 array(
                     'tgz'  => 'application/x-gzip-compressed',
@@ -520,7 +520,7 @@
         $fextension = substr($fileName, $pos);
 
         // If application has not set the allowedExtensions then initialize to the default
-        if(sizeof($this->_allowedExtensions) == 0) {
+        if(count($this->_allowedExtensions) == 0) {
             $this->_allowedExtensions = array_flip($this->_availableExtensions);
         }
 
diff -r 62bd06e50034 -r cd653ce9aafb system/classes/upload.class.php
--- a/system/classes/upload.class.php	Sun Sep 06 15:37:18 2009 +0200
+++ b/system/classes/upload.class.php	Sun Sep 06 15:46:20 2009 +0200
@@ -261,7 +261,7 @@
     */
     function _setAvailableMimeTypes($mimeTypes = array())

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 10:18:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 10:18:01 -0400
Subject: [geeklog-cvs] geeklog: In the install script,
	always open db-config.php and si...
Message-ID: <hg.15be5bd03553.1252246681.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/15be5bd03553
changeset: 7290:15be5bd03553
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 15:12:47 2009 +0200
description:
In the install script, always open db-config.php and siteconfig.php in binary mode to avoid EOL character mixup on Windows (bug #0000730)

diffstat:

 public_html/admin/install/index.php       |  4 ++--
 public_html/admin/install/lib-install.php |  8 ++++----
 public_html/admin/install/lib-upgrade.php |  4 ++--
 public_html/docs/history                  |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diffs (93 lines):

diff -r 6bf0c8bab156 -r 15be5bd03553 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Sep 06 13:18:55 2009 +0200
+++ b/public_html/admin/install/index.php	Sun Sep 06 15:12:47 2009 +0200
@@ -1177,7 +1177,7 @@
 
         // Edit siteconfig.php and enter the correct GL path and system directory path
         $siteconfig_path = $_PATH['public_html/'] . 'siteconfig.php';
-        $siteconfig_file = fopen($siteconfig_path, 'r');
+        $siteconfig_file = fopen($siteconfig_path, 'rb');
         $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
         fclose($siteconfig_file);
 
@@ -1187,7 +1187,7 @@
                             "\$_CONF['path'] = '" . str_replace('db-config.php', '', $_PATH['db-config.php']) . "';",
                             $siteconfig_data);
 
-        $siteconfig_file = fopen($siteconfig_path, 'w');
+        $siteconfig_file = fopen($siteconfig_path, 'wb');
         if (!fwrite($siteconfig_file, $siteconfig_data)) {
             exit ($LANG_INSTALL[26] . ' ' . $_PATH['public_html/'] . $LANG_INSTALL[28]);
         }
diff -r 6bf0c8bab156 -r 15be5bd03553 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Sep 06 13:18:55 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Sep 06 15:12:47 2009 +0200
@@ -389,7 +389,7 @@
     }
 
     // Read in db-config.php so we can insert the DB information
-    $dbconfig_file = fopen($config_file, 'r');
+    $dbconfig_file = fopen($config_file, 'rb');
     $dbconfig_data = fread($dbconfig_file, filesize($config_file));
     fclose($dbconfig_file);
 
@@ -402,7 +402,7 @@
     $dbconfig_data = str_replace("\$_DB_dbms = '" . $_DB_dbms . "';", "\$_DB_dbms = '" . $db['type'] . "';", $dbconfig_data); // Database type ('mysql' or 'mssql')
 
     // Write our changes to db-config.php
-    $dbconfig_file = fopen($config_file, 'w');
+    $dbconfig_file = fopen($config_file, 'wb');
     if (!fwrite($dbconfig_file, $dbconfig_data)) {
         return false;
     }
@@ -1145,7 +1145,7 @@
 {
     global $_TABLES, $LANG_INSTALL;
 
-    $siteconfig_file = fopen($siteconfig_path, 'r');
+    $siteconfig_file = fopen($siteconfig_path, 'rb');
     $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
     fclose($siteconfig_file);
 
@@ -1156,7 +1156,7 @@
              $siteconfig_data
             );
 
-    $siteconfig_file = @fopen($siteconfig_path, 'w');
+    $siteconfig_file = @fopen($siteconfig_path, 'wb');
     if (! fwrite($siteconfig_file, $siteconfig_data)) {
         exit($LANG_INSTALL[26] . ' ' . $LANG_INSTALL[28]);
     }
diff -r 6bf0c8bab156 -r 15be5bd03553 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sun Sep 06 13:18:55 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sun Sep 06 15:12:47 2009 +0200
@@ -629,7 +629,7 @@
 {
     $result = true;
 
-    $siteconfig_file = fopen($siteconfig_path, 'r');
+    $siteconfig_file = fopen($siteconfig_path, 'rb');
     $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
     fclose($siteconfig_file);
 
@@ -640,7 +640,7 @@
              $siteconfig_data
             );
 
-    $siteconfig_file = fopen($siteconfig_path, 'w');
+    $siteconfig_file = fopen($siteconfig_path, 'wb');
     if (!fwrite($siteconfig_file, $siteconfig_data)) {
         $result = false;
     }
diff -r 6bf0c8bab156 -r 15be5bd03553 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 13:18:55 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 15:12:47 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- In the install script, always open db-config.php and siteconfig.php in
+  binary mode to avoid EOL character mixup on Windows (bug #0000730) [Dirk]
 - Avoid SQL error with certain db dumps during migration (bug #0000955) [Dirk]
 - Plugin migration was only called when the plugin also needed an upgrade
   (bug #0000947) [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 13:02:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 13:02:43 -0400
Subject: [geeklog-cvs] geeklog: Keep track of actual upper/lowercase
	spelling of plugin...
Message-ID: <hg.b58b76aa318b.1252256563.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b58b76aa318b
changeset: 7293:b58b76aa318b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 17:58:59 2009 +0200
description:
Keep track of actual upper/lowercase spelling of plugin names in the XMLSitemap plugin

diffstat:

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

diffs (32 lines):

diff -r cd653ce9aafb -r b58b76aa318b plugins/xmlsitemap/functions.inc
--- a/plugins/xmlsitemap/functions.inc	Sun Sep 06 15:46:20 2009 +0200
+++ b/plugins/xmlsitemap/functions.inc	Sun Sep 06 17:58:59 2009 +0200
@@ -193,14 +193,14 @@
     global $_CONF, $_XMLSMAP_CONF;
 
     if (($type !== NULL)
-            AND !in_array(strtolower($type), $_XMLSMAP_CONF['types'])) {
+            AND !in_array($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'])) {
+            in_array($type, $_XMLSMAP_CONF['exclude'])) {
         // plugin is on our exclude list, so ignore
         return TRUE;
     }
diff -r cd653ce9aafb -r b58b76aa318b public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 15:46:20 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 17:58:59 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Keep track of actual upper/lowercase spelling of plugin names in the
+  XMLSitemap plugin [mystral-kk, Dirk]
 - Added support for a CUSTOM_renderMenu function when rendering the top menu
   (feature request #0000845) [Dirk]
 - In the install script, always open db-config.php and siteconfig.php in

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 13:02:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 13:02:43 -0400
Subject: [geeklog-cvs] geeklog: Added a workaround to not lose the
	XMLSitemap prioritie...
Message-ID: <hg.9d82257c93de.1252256563.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9d82257c93de
changeset: 7294:9d82257c93de
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 18:26:24 2009 +0200
description:
Added a workaround to not lose the XMLSitemap priorities for Locales where the comma is used as the decimal separator

diffstat:

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

diffs (33 lines):

diff -r b58b76aa318b -r 9d82257c93de public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 17:58:59 2009 +0200
+++ b/public_html/docs/history	Sun Sep 06 18:26:24 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Added a workaround to not lose the XMLSitemap priorities for Locales where
+  the comma is used as the decimal separator [Dirk]
 - Keep track of actual upper/lowercase spelling of plugin names in the
   XMLSitemap plugin [mystral-kk, Dirk]
 - Added support for a CUSTOM_renderMenu function when rendering the top menu
diff -r b58b76aa318b -r 9d82257c93de system/classes/config.class.php
--- a/system/classes/config.class.php	Sun Sep 06 17:58:59 2009 +0200
+++ b/system/classes/config.class.php	Sun Sep 06 18:26:24 2009 +0200
@@ -638,7 +638,16 @@
         $t->set_var('name', $name);
         $t->set_var('display_name', $display_name);
         if (!is_array($val)) {
-            $t->set_var('value', htmlspecialchars($val));
+            if (is_float($val)) {
+                /**
+                * @todo FIXME: for Locales where the comma is the decimal
+                *              separator, patch output to a decimal point
+                *              to prevent it being cut off by COM_applyFilter
+                */
+                $t->set_var('value', str_replace(',', '.', $val));
+            } else {
+                $t->set_var('value', htmlspecialchars($val));
+            }
         }
         if ($deletable) {
             $t->set_var('delete', $t->parse('output', 'delete-button'));

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 15:35:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 15:35:29 -0400
Subject: [geeklog-cvs] geeklog: Need a bigger button and more space for the
	German tran...
Message-ID: <hg.db26b5886ddc.1252265729.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/db26b5886ddc
changeset: 7296:db26b5886ddc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 20:01:56 2009 +0200
description:
Need a bigger button and more space for the German translation

diffstat:

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

diffs (21 lines):

diff -r 58ceba523ce8 -r db26b5886ddc public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Sep 06 20:01:27 2009 +0200
+++ b/public_html/admin/install/index.php	Sun Sep 06 20:01:56 2009 +0200
@@ -422,7 +422,7 @@
                             <li>' . $LANG_INSTALL[65] . '</li>
                         </ol>
 
-                        <div style="margin-left: auto; margin-right: auto; width: 125px">
+                        <div style="margin-left: auto; margin-right: auto; width: 175px">
                             <div style="position: absolute">
                                 <form action="index.php" method="post">
                                 <input type="hidden" name="mode" value="install"' . XHTML . '>
@@ -435,7 +435,7 @@
                                 </form>
                             </div>
 
-                            <div style="position: relative; left: 55px; top: 5px">
+                            <div style="position: relative; left: 105px; top: 5px">
                                 <form action="index.php" method="post">
                                 <input type="hidden" name="mode" value="upgrade"' . XHTML . '>
                                 <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 15:35:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 15:35:29 -0400
Subject: [geeklog-cvs] geeklog: Fixed some typos and missing words and
	continued the Ge...
Message-ID: <hg.58ceba523ce8.1252265729.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/58ceba523ce8
changeset: 7295:58ceba523ce8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 20:01:27 2009 +0200
description:
Fixed some typos and missing words and continued the German translation

diffstat:

 public_html/admin/install/language/chinese_simplified_utf-8.php  |   2 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php |   2 +-
 public_html/admin/install/language/english.php                   |   4 +-
 public_html/admin/install/language/german.php                    |  46 +++++-----
 public_html/admin/install/language/polish.php                    |  10 +-
 5 files changed, 32 insertions(+), 32 deletions(-)

diffs (167 lines):

diff -r 9d82257c93de -r 58ceba523ce8 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 18:26:24 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 20:01:27 2009 +0200
@@ -149,7 +149,7 @@
     96 => 'The installer was looking for %s in:',
     97 => 'Set File Permissions',
     98 => 'Advanced Users',
-    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
+    99 => 'If you have command line (SSH) access to your web server then you can simply copy and paste the following command into your shell:',
     100 => 'Invalid mode specified',
     101 => 'Step',
     102 => 'Enter configuration information',
diff -r 9d82257c93de -r 58ceba523ce8 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 18:26:24 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 20:01:27 2009 +0200
@@ -149,7 +149,7 @@
     96 => 'The installer was looking for %s in:',
     97 => 'Set File Permissions',
     98 => 'Advanced Users',
-    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
+    99 => 'If you have command line (SSH) access to your web server then you can simply copy and paste the following command into your shell:',
     100 => 'Invalid mode specified',
     101 => 'Step',
     102 => 'Enter configuration information',
diff -r 9d82257c93de -r 58ceba523ce8 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 18:26:24 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 20:01:27 2009 +0200
@@ -119,7 +119,7 @@
     67 => 'Error Setting up the Geeklog Database', 
     68 => 'The database is not empty. Please drop all tables in the database and start again.',
     69 => 'Upgrading Geeklog',
-    70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
+    70 => 'Before we get started it is important that you back up your database and the current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
     71 => 'Please make sure to select the correct Geeklog version you are coming from below. This script will do incremental upgrades after this version (i.e. you can upgrade directly from any old version to ',
     72 => ').',
     73 => 'Please note this script will not upgrade any beta or release candidate versions of Geeklog.',
@@ -148,7 +148,7 @@
     96 => 'The installer was looking for %s in:',
     97 => 'Set File Permissions',
     98 => 'Advanced Users',
-    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
+    99 => 'If you have command line (SSH) access to your web server then you can simply copy and paste the following command into your shell:',
     100 => 'Invalid mode specified',
     101 => 'Step',
     102 => 'Enter configuration information',
diff -r 9d82257c93de -r 58ceba523ce8 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 18:26:24 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 20:01:27 2009 +0200
@@ -64,10 +64,10 @@
     12 => '&Auml;ndern auf',
     13 => 'Derzeit',
     14 => '',
-    15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
+    15 => 'Der Export von Schlagzeilen (Newsfeeds) ist deaktiviert. Das <code>backend</code>-Verzeichnis wurde nicht &uuml;berpr&uuml;ft.',
     16 => 'Migration',
-    17 => 'User photos are disabled. The <code>userphotos</code> directory was not tested',
-    18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
+    17 => 'Userfotos sind deaktiviert. Das <code>userphotos</code>-Verzeichnis wurde nicht &uuml;berpr&uuml;ft.',
+    18 => 'Bilder in Artikeln sind deaktiviert. Das <code>articles</code>-Verzeichnis wurde nicht &uuml;berpr&uuml;ft.',
     19 => 'Geeklog setzt voraus, dass bestimmte Dateien und Verzeichnisse f&uuml;r den Webserver schreibbar sind. Es folgt eine Liste der Dateien und Verzeichnisse, die ge&auml;ndert werden m&uuml;ssen.',
     20 => 'Warnung',
     21 => 'Geeklog und Deine Website werden nicht funktionsf&auml;hig sein, solange diese Fehler nicht korrigiert werden. Bitte nimm die notwendigen &Auml;nderungen vor, bevor Du mit der Installation fortf&auml;hrst.',
@@ -75,9 +75,9 @@
     23 => 'Bitte w&auml;hle eine Installationsmethode',
     24 => 'Neuinstallation',
     25 => 'Upgrade',
-    26 => 'Unable to modify',
-    27 => '. Did you make sure the file is write-able by the web server?',
-    28 => 'siteconfig.php. Did you make sure the file is write-able by the web server?',
+    26 => 'Nicht modifizierbar:',
+    27 => '. Ist die Datei f&uuml;r den Webserver schreibbar?',
+    28 => 'siteconfig.php. Ist die Datei f&uuml;r den Webserver schreibbar?',
     29 => 'Geeklog-Site',
     30 => 'Eine weitere Geeklog-Website',
     31 => 'Erforderliche Informationen zum Setup',
@@ -106,22 +106,22 @@
     54 => 'Datenbank-Informationen unvollst&auml;ndig oder nicht korrekt.',
     55 => 'Sorry, aber die Datenbank-Informationen, die Du eingegeben hast, scheinen nicht korrekt zu sein. Bitte klicke auf "Zur&uuml;ck" und versuche es noch einmal.',
     56 => 'Konnte keine Verbindung zum Datenbank-Server herstellen.',
-    57 => 'Sorry, but the installer could not find the database you specified. Either the database does not exist or you misspelled the name. Please go back and try again.',
-    58 => '. Did you make sure the file is write-able by the web server?',
+    57 => 'Sorry, das Installations-Skript konnte die angegebene Datenbank nicht finden. Entweder existiert die Datenbank nicht oder Du hast Dich vertippt. Bitte klicke auf "Zur&uuml;ck" und versuche es noch einmal.',
+    58 => '. Ist die Datei f&uuml;r den Webserver schreibbar?',
     59 => 'Hinweis',
-    60 => 'InnoDB tables are not supported by your version of MySQL. Would you like to continue the installation without InnoDB support?',
+    60 => 'InnoDB-Tabellen werden von Deiner MySQL-Version nicht unterst&uuml;tzt. Willst Du die Installation ohne InnoDB-Support fortsetzen?',
     61 => 'Zur&uuml;ck',
     62 => 'Weiter',
-    63 => 'An installed Geeklog database already exists. The installer will not allow you to run a fresh install on an existing Geeklog database. To continue you must do one of the following:',
-    64 => 'Delete the tables from the existing database. Or simply drop the database and recreate it. Then click "Retry" below.',
-    65 => 'Perform an upgrade on your database (to a newer Geeklog version) by selecting the "Upgrade" option below.',
-    66 => 'Retry',
-    67 => 'Error Setting up the Geeklog Database',
-    68 => 'The database is not empty. Please drop all tables in the database and start again.',
-    69 => 'Upgrading Geeklog',
-    70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
-    71 => 'Please make sure to select the correct Geeklog version you are coming from below. This script will do incremental upgrades after this version (i.e. you can upgrade directly from any old version to ',
-    72 => ').',
+    63 => 'Eine Geeklog-Datenbank mit diesem Namen existiert bereits. Das Installations-Skript l&auml;sst es nicht zu, eine Neuinstallation &uuml;ber eine existierende Datenbank durchzuf&uuml;hren. Falls dies kein Versehen war, musst Du eine der folgenden Optionen w&auml;hlen:',
+    64 => 'L&ouml;sche die Tabellen aus der vorhandenen Datenbank. Oder l&ouml;sche die ganze Datenbank und erzeuge eine neue. Dann kannst Du auf "Wiederholen" klicken.',
+    65 => 'F&uuml;hre ein Datenbank-Update (auf eine neuere Geeklog-Version) durch, indem Du unten auf "Upgrade" klickst.',
+    66 => 'Wiederholen',
+    67 => 'Fehler beim Aufsetzen der Geeklog-Datenbank',
+    68 => 'Die Datenbank ist nicht leer. Bitte l&ouml;sche alle Tabellen aus der Datenbank und beginne noch einmal von vorne.',
+    69 => 'Geeklog-Upgrade',
+    70 => 'Ein wichtiger Hinweis bevor es weiter geht: Du solltest unbedingt ein Backup Deiner Datenbank und Deiner Geeklog-Dateien anlegen. Dieses Installations-Skript wird Deine Geeklog-Datenbank ver&auml;ndern. Wenn etwas schief geht und Du das Update noch einmal durchf&uuml;hren musst, wirst Du ein Backup Deiner alten Datenbank brauchen. Falls also noch nicht geschehen: JETZT EIN BACKUP ANLEGEN!',
+    71 => 'Bitte w&auml;hle unten die korrekte Geeklog-Version aus, von der Du aktualisieren willst. Dieses Skript wird dann inkrementelle Updates durchf&uuml;hren (d.h. Du kannst direkt von jeder alten Version auf ',
+    72 => ' aktualisieren).',
     73 => 'Beachte bitte, dass dieses Skript keine Beta- oder Release Candidate-Versionen von Geeklog aktualisieren kann.',
     74 => 'Datenbank schon aktuell',
     75 => 'Die Datenbank ist offenbar schon aktuell. Du hast das Update wahrscheinlich schon einmal vorgenommen. Wenn Du es tats&auml;chlich noch einmal durchf&uuml;hren willst, installiere bitte zuerst die Datenbank von einem Backup und probiere es dann noch einmal.',
@@ -146,10 +146,10 @@
     94 => 'Hier sind einige Hinweise, um den richtigen Pfad zu ermitteln:',
     95 => 'Der komplette Pfad zu dieser Datei (dem Installations-Skript) ist:',
     96 => 'Das Installations-Skript hat nach %s in diesem Verzeichnis gesucht:',
-    97 => 'Set File Permissions',
-    98 => 'Advanced Users',
-    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
-    100 => 'Invalid mode specified',
+    97 => 'Dateirechte setzen',
+    98 => 'F&uuml;r erfahrene User',
+    99 => 'Wenn Du per Kommandozeile (SSH) Zugriff auf Deinen Webserver hast, kannst Du einfach das folgende Kommando per Kopieren und Einf&uuml;gen &uuml;bernehmen und ausf&uuml;hren:',
+    100 => 'Ung&uuml;ltiger Modus ausgew&auml;hlt',
     101 => 'Schritt',
     102 => 'Konfigurations-Informationen eingeben',
     103 => 'und zus&auml;tzliche Plugins konfigurieren',
diff -r 9d82257c93de -r 58ceba523ce8 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 18:26:24 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 20:01:27 2009 +0200
@@ -76,8 +76,8 @@
     24 => 'Nowa',
     25 => 'Aktualizacja',
     26 => 'Unable to modify',
-    27 => '. Did you make sure the file is write-able by the web server?',
-    28 => 'siteconfig.php. Did you make sure the file is write-able by the web server?',
+    27 => '. Did you make sure the file is writable by the web server?',
+    28 => 'siteconfig.php. Did you make sure the file is writable by the web server?',
     29 => 'Geeklog Site',
     30 => 'Another Nifty Geeklog Site',
     31 => 'Wymagane Informacje do Konfiguracji',
@@ -107,7 +107,7 @@
     55 => 'Sorry, but the database information you entered does not appear to be correct. Please go back and try again.',
     56 => 'Could not connect to database',
     57 => 'Sorry, but the installer could not find the database you specified. Either the database does not exist or you misspelled the name. Please go back and try again.',
-    58 => '. Did you make sure the file is write-able by the web server?',
+    58 => '. Did you make sure the file is writable by the web server?',
     59 => 'Notice:',
     60 => 'InnoDB tables are not supported by your version of MySQL. Would you like to continue the installation without InnoDB support?',
     61 => 'Back',
@@ -119,7 +119,7 @@
     67 => 'Error Setting up the Geeklog Database',
     68 => 'The database is not empty. Please drop all tables in the database and start again.',
     69 => 'Aktualizacja Geeklog-a',
-    70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
+    70 => 'Before we get started it is important that you back up your database and the current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
     71 => 'Please make sure to select the correct Geeklog version you are coming from below. This script will do incremental upgrades after this version (i.e. you can upgrade directly from any old version to ',
     72 => ').',
     73 => 'Please note this script will not upgrade any beta or release candidate versions of Geeklog.',
@@ -148,7 +148,7 @@
     96 => 'The installer was looking for %s in:',
     97 => 'Set File Permissions',
     98 => 'Advanced Users',
-    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
+    99 => 'If you have command line (SSH) access to your web server then you can simply copy and paste the following command into your shell:',
     100 => 'Invalid mode specified',
     101 => 'Step',
     102 => 'Enter configuration information',

From geeklog-cvs at lists.geeklog.net  Sun Sep  6 15:35:30 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 06 Sep 2009 15:35:30 -0400
Subject: [geeklog-cvs] geeklog: Removed $LANG_MIGRATE[25],
	which is no longer needed, a...
Message-ID: <hg.5e47d04d6236.1252265730.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5e47d04d6236
changeset: 7297:5e47d04d6236
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 21:33:37 2009 +0200
description:
Removed $LANG_MIGRATE[25], which is no longer needed, and continued the German translation

diffstat:

 public_html/admin/install/language/chinese_simplified_utf-8.php  |   2 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php |   2 +-
 public_html/admin/install/language/english.php                   |   2 +-
 public_html/admin/install/language/german.php                    |  40 ++++++------
 public_html/admin/install/language/hebrew_utf-8.php              |   2 +-
 public_html/admin/install/language/japanese_utf-8.php            |   2 +-
 public_html/admin/install/language/polish.php                    |   2 +-
 7 files changed, 26 insertions(+), 26 deletions(-)

diffs (143 lines):

diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/chinese_simplified_utf-8.php
--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 21:33:37 2009 +0200
@@ -216,7 +216,7 @@
     22 => 'already exists. Would you like to replace it?',
     23 => 'Yes',
     24 => 'No',
-    25 => 'The version of Geeklog you chose to migrate from is out of date.',
+    25 => '',
     26 => 'Migration notice: ',
     27 => 'The "',
     28 => '" plugin is missing and has been disabled. You can install and reactivate it at any time from the administration section.',
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 21:33:37 2009 +0200
@@ -216,7 +216,7 @@
     22 => 'already exists. Would you like to replace it?',
     23 => 'Yes',
     24 => 'No',
-    25 => 'The version of Geeklog you chose to migrate from is out of date.',
+    25 => '',
     26 => 'Migration notice: ',
     27 => 'The "',
     28 => '" plugin is missing and has been disabled. You can install and reactivate it at any time from the administration section.',
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 21:33:37 2009 +0200
@@ -215,7 +215,7 @@
     22 => 'already exists. Would you like to replace it?',
     23 => 'Yes',
     24 => 'No',
-    25 => 'The version of Geeklog you chose to migrate from is out of date.',
+    25 => '',
     26 => 'Migration notice: ',
     27 => 'The "',
     28 => '" plugin is missing and has been disabled. You can install and reactivate it at any time from the administration section.',
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 21:33:37 2009 +0200
@@ -97,8 +97,8 @@
     45 => 'URL der Website',
     46 => '(ohne Slash am Ende)',
     47 => 'URL f. "admin"-Verzeichnis',
-    48 => 'Website-Email-Adresse',
-    49 => '"No Reply"-Email-Adresse',
+    48 => 'Website-E-Mail-Adresse',
+    49 => '"No Reply"-E-Mail-Adresse',
     50 => 'Installieren',
     51 => 'MySQL %s ben&ouml;tigt',
     52 => 'Sorry, aber Geeklog setzt mindestens MySQL %s voraus (Du hast Version ',
@@ -202,20 +202,20 @@
     9 => 'Von Deinem Computer',
     10 => 'Datei ausw&auml;hlen...',
     11 => 'Keine Backup-Dateien gefunden',
-    12 => 'The upload limit for this server is ',
-    13 => '. If your backup file is larger than ',
-    14 => ' or if you experience a timeout, then you should upload the file to Geeklog\'s backups directory via FTP.',
-    15 => 'Your backups directory is not writable by the web server. Permissions need to be 777.',
+    12 => 'Das Upload-Limit f&uuml;r diesen Webserver ist ',
+    13 => '. Wenn Deine Backup-Datei gr&ouml;&szlig;er ist als ',
+    14 => ' oder Du eine Zeit&uuml;berschreitung gemeldet bekommst, dann solltest Du die Datei per FTP in das backups-Verzeichnis von Geeklog &uuml;bertragen.',
+    15 => 'Dein backups-Verzeichnis ist nicht f&uuml;r den Webserver schreibbar. Korrigiere bitte die Rechte.',
     16 => 'Migration',
     17 => 'Migration vom Backup',
     18 => 'Keine Backup-Datei ausgew&auml;hlt.',
-    19 => 'Could not save ',
-    20 => ' to ',
+    19 => 'Konnte die Datei ',
+    20 => ' nicht speichern unter ',
     21 => 'Die Datei',
     22 => 'existiert schon. Willst Du sie ersetzen?',
     23 => 'Ja',
     24 => 'Nein',
-    25 => 'The version of Geeklog you chose to migrate from is out of date.',
+    25 => '',
     26 => 'Migrations-Hinweis: ',
     27 => 'Das ',
     28 => '-Plugin ist nicht vorhanden und wurde deaktiviert. Du kannst es jederzeit nachinstallieren und im Admin-Bereich wieder aktivieren.',
@@ -330,17 +330,17 @@
     0 => 'Hilfe zur Geeklog-Installation',
     'site_name' => 'Der Name Deiner Website.',
     'site_slogan' => 'Ein Motto oder eine kurze Beschreibung Deiner Website.',
-    'db_type' => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.</p><p class="indent"><strong>Hinweis:</strong> InnoDB-Tabellen k&ouml;nnen zu besserer Performance auf (sehr) gro&szlig;en Websites f&uuml;hren, machen den Backup-Prozess aber komplizierter.',
-    'db_host' => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
-    'db_name' => 'The name of your database. If you are not sure what this is contact your hosting provider.',
-    'db_user' => 'Your database user account. If you are not sure what this is contact your hosting provider.',
-    'db_pass' => 'Your database account password. If you are not sure what this is contact your hosting provider.',
-    'db_prefix' => 'Some users want to install multiple copies of Geeklog on the same database. In order for each copy of Geeklog to function correctly it must have its own unique table prefix (i.e. gl1_, gl2_, etc).',
-    'site_url' => 'Make sure this is the correct URL to your site, i.e. to where Geeklog\'s <code>index.php</code> file resides (no trailing slash).',
-    'site_admin_url' => 'Some hosting services have a preconfigured admin directory. In that case, you need to rename Geeklog\'s admin directory to something like "myadmin" and change the following URL as well. Leave as is until you experience any problems accessing Geeklog\'s admin menu.',
-    'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
-    'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
-    'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
+    'db_type' => 'Geeklog kann wahlweise auf einer MySQL- oder einer MS SQL-Datenbank installiert werden. Wenn Du nicht sicher bist, welche Option Du w&auml;hlen sollst, kontaktiere bitte Deinen Webhoster.</p><p class="indent"><strong>Hinweis:</strong> InnoDB-Tabellen k&ouml;nnen zu besserer Performance auf (sehr) gro&szlig;en Websites f&uuml;hren, machen den Backup-Prozess aber komplizierter.',
+    'db_host' => 'Der Hostname (oder die IP-Adresse) Deines Datenbank-Servers. Typischerweise ist dies "localhost". Wenn Du nicht sicher bist, kontaktiere bitte Deinen Webhoster.',
+    'db_name' => 'Der Name Deiner Datenbank. Wenn Du nicht sicher bist was das bedeutet, kontaktiere bitte Deinen Webhoster.',
+    'db_user' => 'Der Username Deines Datenbank-Accounts. Wenn Du nicht sicher bist was Du eintragen sollst, kontaktiere bitte Deinen Webhoster.',
+    'db_pass' => 'Das Passwort f&uuml;r Deinen Datenbank-Account. Wenn Dir das Passwort nicht bekannt ist, kontaktiere bitte Deinen Webhoster.',
+    'db_prefix' => 'Manchmal will man mehrere Kopien von Geeklog in nur einer Datenbank installieren. Damit jede Geeklog-Kopie nur auf ihre eigenen Tabellen zugreift, muss man dann hier einen eindeutigen Pr&auml;fix (z.B. gl1_, gl2_, usw.)  f&uuml;r jede Kopie vergeben.',
+    'site_url' => 'Dies muss die korrekte URL Deiner Website sein, d.h. die URL muss dorthin zeigen, wo die Datei <code>index.php</code> von Geeklog liegt (URL ohne abschlie&szlig;enden \'/\' angeben).',
+    'site_admin_url' => 'Manche Webhoster verwenden ein vordefiniertes admin-Verzeichnis. In so einem Fall musst Du das admin-Verzeichnis von Geeklog umbenennen (z.B. in "myadmin") und diese URL dann entsprechend anpassen. Bitte nur &auml;ndern, wenn es Probleme beim Zugriff auf den Admin-Bereich von Geeklog gibt.',
+    'site_mail' => 'Dies ist die Absender-Adresse f&uuml;r alle E-Mails, die von Geeklog versendet werden. Sie wird auch als Kontakt-Adresse in Newsfeeds verwendet.',
+    'noreply_mail' => 'Dies ist die Absender-Adresse f&uuml;r einige automatische E-Mails, die von Geeklog versendet werden, z.B. wenn sich neue User registrieren. Dies sollte entweder die gleiche Adresse wie oben (Website-E-Mail-Adresse) sein oder eine Adresse, die nicht gelesen wird. Letzteres kann sinnvoll sein, um die tats&auml;chliche E-Mail-Adresse vor Spammern zu verbergen.',
+    'utf8' => 'Dient zur Auswahl, ob UTF-8 als Zeichensatz f&uuml;r die Website verwendet werden soll. Dies empfiehlt sich vor allem bei mehrsprachigen Websites.',
     'migrate_file' => 'W&auml;hle ein Backup, das migriert werden soll. Dies kann eine Datei in Deinem "backups"-Verzeichnis sein, Du kannst eine Backup-Datei hochladen, oder Du kannst den aktuellen Inhalt der Datenbank migrieren.',
     'plugin_upload' => 'W&auml;hle ein Plugin-Archiv (in den Formaten .zip, .tar.gz oder .tgz format) zum Hochladen und Installieren.'
 );
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 21:33:37 2009 +0200
@@ -211,7 +211,7 @@
     22 => '?????? ????????. ?????? ???????? ???????????????',
     23 => '????',
     24 => '????',
-    25 => '???????? ??-Geeklog ???????????? ?????????? ?????????? ???????? ?????? ???????? ??????.',
+    25 => '',
     26 => '???????? ??????????: ',
     27 => '??-"',
     28 => '" plugin ?????? ????????????. ?????????? ?????????????? ???????????????? ???????? ?????? ?????? ???????????? ????????????.',
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 21:33:37 2009 +0200
@@ -217,7 +217,7 @@
     22 => '????????????????????????????????????????????????????????????????????????????????????????',
     23 => '??????',
     24 => '?????????',
-    25 => 'Geeklog?????????????????????????????????????????????????????????',
+    25 => '',
     26 => '????????????:',
     27 => '"',
     28 => '" ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
diff -r db26b5886ddc -r 5e47d04d6236 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 20:01:56 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 21:33:37 2009 +0200
@@ -215,7 +215,7 @@
     22 => 'already exists. Would you like to replace it?',
     23 => 'Yes',
     24 => 'No',
-    25 => 'The version of Geeklog you chose to migrate from is out of date.',
+    25 => '',
     26 => 'Migration notice: ',
     27 => 'The "',
     28 => '" plugin is missing and has been disabled. You can install and reactivate it at any time from the administration section.',

From geeklog-cvs at lists.geeklog.net  Wed Sep  9 14:56:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 09 Sep 2009 14:56:19 -0400
Subject: [geeklog-cvs] geeklog: The install script was switching back to
	English in som...
Message-ID: <hg.6b875907acf6.1252522579.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6b875907acf6
changeset: 7298:6b875907acf6
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Sep 09 20:56:06 2009 +0200
description:
The install script was switching back to English in some upgrade scenarios (bug #0000969, patch provided by taca)

diffstat:

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

diffs (33 lines):

diff -r 5e47d04d6236 -r 6b875907acf6 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Sep 06 21:33:37 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Wed Sep 09 20:56:06 2009 +0200
@@ -623,7 +623,8 @@
  */
 function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path)
 {
-    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass;
+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
+           $language;
 
     require $dbconfig_path;
     require $siteconfig_path;
@@ -672,6 +673,7 @@
             // current version is at least 1.5.0, so upgrade directly
             $req_string = 'index.php?mode=upgrade&step=3'
                         . '&dbconfig_path=' . $dbconfig_path
+                        . '&language=' . $language
                         . '&version=' . $version;
 
             header('Location: ' . $req_string);
diff -r 5e47d04d6236 -r 6b875907acf6 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 21:33:37 2009 +0200
+++ b/public_html/docs/history	Wed Sep 09 20:56:06 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The install script was switching back to English in some upgrade scenarios
+  (bug #0000969, patch provided by taca)
 - Added a workaround to not lose the XMLSitemap priorities for Locales where
   the comma is used as the decimal separator [Dirk]
 - Keep track of actual upper/lowercase spelling of plugin names in the

From geeklog-cvs at lists.geeklog.net  Thu Sep 10 04:06:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 10 Sep 2009 04:06:45 -0400
Subject: [geeklog-cvs] geeklog: Workaround for the problems with the PHP
	version that A...
Message-ID: <hg.dd4e3922f617.1252570005.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/dd4e3922f617
changeset: 7299:dd4e3922f617
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Sep 10 10:06:32 2009 +0200
description:
Workaround for the problems with the PHP version that Apple ships with Mac OS X 10.6 "Snow Leopard"

diffstat:

 public_html/admin/install/bigdump.php     |  2 +-
 public_html/admin/install/lib-install.php |  7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 6b875907acf6 -r dd4e3922f617 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Wed Sep 09 20:56:06 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Thu Sep 10 10:06:32 2009 +0200
@@ -397,7 +397,7 @@
          . $LANG_BIGDUMP[31] . '</p>' . LB;
 }
 
-if ($dbconnection) mysql_close();
+if ($dbconnection) mysql_close($dbconnection);
 if ($file && !$gzipmode) fclose($file);
 else if ($file && $gzipmode) gzclose($file);
 
diff -r 6b875907acf6 -r dd4e3922f617 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Wed Sep 09 20:56:06 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Thu Sep 10 10:06:32 2009 +0200
@@ -246,11 +246,12 @@
  */
 function mysql_v($_DB_host, $_DB_user, $_DB_pass)
 {
-    if (@mysql_connect($_DB_host, $_DB_user, $_DB_pass) === false) {
+    $db_handle = @mysql_connect($_DB_host, $_DB_user, $_DB_pass);
+    if ($db_handle === false) {
         return false;
     }
 
-    $mysqlv = @mysql_get_server_info();
+    $mysqlv = @mysql_get_server_info($db_handle);
 
     if (!empty($mysqlv)) {
         preg_match('/^([0-9]+).([0-9]+).([0-9]+)/', $mysqlv, $match);
@@ -262,7 +263,7 @@
         $mysqlminorv = 0;
         $mysqlrev = 0;
     }
-    @mysql_close();
+    @mysql_close($db_handle);
 
     return array($mysqlmajorv, $mysqlminorv, $mysqlrev);
 }

From geeklog-cvs at lists.geeklog.net  Thu Sep 10 07:45:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 10 Sep 2009 07:45:38 -0400
Subject: [geeklog-cvs] geeklog: Fixed visibility of the "Send Ping" links in
	the Story ...
Message-ID: <hg.8689bd624973.1252583138.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8689bd624973
changeset: 7300:8689bd624973
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Sep 10 13:36:34 2009 +0200
description:
Fixed visibility of the "Send Ping" links in the Story Admin's list of stories and the Story Options block

diffstat:

 public_html/article.php  |  21 ++++++++++++++-------
 public_html/docs/history |   2 ++
 system/lib-admin.php     |   9 +++++----
 3 files changed, 21 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r dd4e3922f617 -r 8689bd624973 public_html/article.php
--- a/public_html/article.php	Thu Sep 10 10:06:32 2009 +0200
+++ b/public_html/article.php	Thu Sep 10 13:36:34 2009 +0200
@@ -320,14 +320,21 @@
                                                         'class' => $feedClass));
             }
         }
-        if ($_CONF['trackback_enabled'] &&
-                ($story->displayElements('trackbackcode') >= 0) &&
-                SEC_hasRights('story.ping') &&
+        if (($_CONF['trackback_enabled'] || $_CONF['pingback_enabled'] ||
+                $_CONF['ping_enabled']) && SEC_hasRights('story.ping') &&
                 ($story->displayElements('draft_flag') == 0) &&
-                ($story->displayElements('day') < time ())) {
-            $url = $_CONF['site_admin_url']
-                 . '/trackback.php?mode=sendall&amp;id=' . $story->getSid();
-            $story_options[] = COM_createLink($LANG_TRB['send_trackback'], $url);
+                ($story->displayElements('day') < time ()) &&
+                ($story->displayElements('perm_anon') != 0)) {
+                
+            // check special case: no link when Trackbacks are disabled for this
+            // story AND pinging weblog directories is disabled
+            if (($story->displayElements('trackbackcode') >= 0) ||
+                    $_CONF['ping_enabled']) {
+                $url = $_CONF['site_admin_url']
+                     . '/trackback.php?mode=sendall&amp;id=' . $story->getSid();
+                $story_options[] = COM_createLink($LANG_TRB['send_trackback'],
+                                                  $url);
+            }
         }
     /*
         if (true) { // can subscribe
diff -r dd4e3922f617 -r 8689bd624973 public_html/docs/history
--- a/public_html/docs/history	Thu Sep 10 10:06:32 2009 +0200
+++ b/public_html/docs/history	Thu Sep 10 13:36:34 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Fixed visibility of the "Send Ping" links in the Story Admin's list of stories
+  and the Story Options block [Dirk]
 - The install script was switching back to English in some upgrade scenarios
   (bug #0000969, patch provided by taca)
 - Added a workaround to not lose the XMLSitemap priorities for Locales where
diff -r dd4e3922f617 -r 8689bd624973 system/lib-admin.php
--- a/system/lib-admin.php	Thu Sep 10 10:06:32 2009 +0200
+++ b/system/lib-admin.php	Thu Sep 10 13:36:34 2009 +0200
@@ -934,10 +934,11 @@
         break;
 
     case 'ping':
-        $pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
-                 . $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
-                 . $LANG24[21] . '"' . XHTML . '>';
-        if (($A['draft_flag'] == 0) && ($A['unixdate'] < time())) {
+        if (($A['draft_flag'] == 0) && ($A['unixdate'] < time()) &&
+                ($A['perm_anon'] != 0)) {
+            $pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
+                     . $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
+                     . $LANG24[21] . '"' . XHTML . '>';
             $url = $_CONF['site_admin_url']
                  . '/trackback.php?mode=sendall&amp;id=' . $A['sid'];
             $retval = COM_createLink($pingico, $url);

From geeklog-cvs at lists.geeklog.net  Thu Sep 10 13:19:57 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 10 Sep 2009 13:19:57 -0400
Subject: [geeklog-cvs] geeklog: Workaround for the problems with the PHP
	version that A...
Message-ID: <hg.d02e2d7d9d24.1252603197.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d02e2d7d9d24
changeset: 7301:d02e2d7d9d24
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Sep 10 10:06:32 2009 +0200
description:
Workaround for the problems with the PHP version that Apple ships with Mac OS X 10.6 "Snow Leopard"

diffstat:

 public_html/admin/install/bigdump.php     |  2 +-
 public_html/admin/install/lib-install.php |  7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 3082f34983ea -r d02e2d7d9d24 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sun Aug 30 19:14:36 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Thu Sep 10 10:06:32 2009 +0200
@@ -389,7 +389,7 @@
   echo '<p><a href="migrate.php">' . $LANG_BIGDUMP[30] . '</a> ' . $LANG_BIGDUMP[31] . '</p>' . LB;
 }
 
-if ($dbconnection) mysql_close();
+if ($dbconnection) mysql_close($dbconnection);
 if ($file && !$gzipmode) fclose($file);
 else if ($file && $gzipmode) gzclose($file);
 
diff -r 3082f34983ea -r d02e2d7d9d24 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Aug 30 19:14:36 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Thu Sep 10 10:06:32 2009 +0200
@@ -243,11 +243,12 @@
  */
 function mysql_v($_DB_host, $_DB_user, $_DB_pass)
 {
-    if (@mysql_connect($_DB_host, $_DB_user, $_DB_pass) === false) {
+    $db_handle = @mysql_connect($_DB_host, $_DB_user, $_DB_pass);
+    if ($db_handle === false) {
         return false;
     }
 
-    $mysqlv = @mysql_get_server_info();
+    $mysqlv = @mysql_get_server_info($db_handle);
 
     if (!empty($mysqlv)) {
         preg_match('/^([0-9]+).([0-9]+).([0-9]+)/', $mysqlv, $match);
@@ -259,7 +260,7 @@
         $mysqlminorv = 0;
         $mysqlrev = 0;
     }
-    @mysql_close();
+    @mysql_close($db_handle);
 
     return array($mysqlmajorv, $mysqlminorv, $mysqlrev);
 }

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:42 -0400
Subject: [geeklog-cvs] geeklog: The session and password cookies are now
	created with t...
Message-ID: <hg.1e19b2c8a8cf.1252684482.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1e19b2c8a8cf
changeset: 7302:1e19b2c8a8cf
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 13:03:06 2009 +0200
description:
The session and password cookies are now created with the HttpOnly flag set to make it somewhat harder to read them from JavaScript (requires browser support)

diffstat:

 public_html/admin/auth.inc.php |   7 +++----
 public_html/docs/history       |   3 +++
 public_html/users.php          |  23 +++++++----------------
 public_html/usersettings.php   |  15 ++++++---------
 system/lib-security.php        |  45 +++++++++++++++++++++++++++++++++++++++++++++
 system/lib-sessions.php        |   6 +++---
 6 files changed, 67 insertions(+), 32 deletions(-)

diffs (179 lines):

diff -r 8689bd624973 -r 1e19b2c8a8cf public_html/admin/auth.inc.php
--- a/public_html/admin/auth.inc.php	Thu Sep 10 13:36:34 2009 +0200
+++ b/public_html/admin/auth.inc.php	Fri Sep 11 13:03:06 2009 +0200
@@ -77,9 +77,8 @@
 
             // They want their cookie to persist for some amount of time so set it now
 
-            setcookie($_CONF['cookie_name'], $_USER['uid'],
-                      time() + $cooktime, $_CONF['cookie_path'],
-                      $_CONF['cookiedomain'], $_CONF['cookiesecure']);
+            SEC_setCookie($_CONF['cookie_name'], $_USER['uid'],
+                          time() + $cooktime);
         }
     }
     if (!SEC_hasRights('story.edit,block.edit,topic.edit,user.edit,plugin.edit,syndication.edit','OR')) {
@@ -112,7 +111,7 @@
             .'</tr>'.LB
             .'<tr>'.LB
             .'<td align="right">'.$LANG20[5].'&nbsp;</td>'.LB
-            .'<td><input type="password" name="passwd" size="16" maxlength="16"' . XHTML . '></td>'
+            .'<td><input type="password" name="passwd" size="16"' . XHTML . '></td>'
             .'</tr>'.LB
             .'<tr>'.LB
             .'<td colspan="2" align="center" class="warning">'.$LANG20[6].'<input type="hidden" name="warn" value="1"' . XHTML . '>'
diff -r 8689bd624973 -r 1e19b2c8a8cf public_html/docs/history
--- a/public_html/docs/history	Thu Sep 10 13:36:34 2009 +0200
+++ b/public_html/docs/history	Fri Sep 11 13:03:06 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The session and password cookies are now created with the HttpOnly flag set
+  to make it somewhat harder to read them from JavaScript (requires browser
+  support) [Dirk]
 - Fixed visibility of the "Send Ping" links in the Story Admin's list of stories
   and the Story Options block [Dirk]
 - The install script was switching back to English in some upgrade scenarios
diff -r 8689bd624973 -r 1e19b2c8a8cf public_html/users.php
--- a/public_html/users.php	Thu Sep 10 13:36:34 2009 +0200
+++ b/public_html/users.php	Fri Sep 11 13:03:06 2009 +0200
@@ -847,15 +847,9 @@
         SESS_endUserSession ($_USER['uid']);
         PLG_logoutUser ($_USER['uid']);
     }
-    setcookie ($_CONF['cookie_session'], '', time() - 10000,
-               $_CONF['cookie_path'], $_CONF['cookiedomain'],
-               $_CONF['cookiesecure']);
-    setcookie ($_CONF['cookie_password'], '', time() - 10000,
-               $_CONF['cookie_path'], $_CONF['cookiedomain'],
-               $_CONF['cookiesecure']);
-    setcookie ($_CONF['cookie_name'], '', time() - 10000,
-               $_CONF['cookie_path'], $_CONF['cookiedomain'],
-               $_CONF['cookiesecure']);
+    SEC_setCookie($_CONF['cookie_session'], '', time() - 10000);
+    SEC_setCookie($_CONF['cookie_password'], '', time() - 10000);
+    SEC_setCookie($_CONF['cookie_name'], '', time() - 10000);
     $display = COM_refresh($_CONF['site_url'] . '/index.php?msg=8');
     break;
 
@@ -1157,13 +1151,10 @@
                 if ($VERBOSE) {
                     COM_errorLog('Trying to set permanent cookie',1);
                 }
-                setcookie ($_CONF['cookie_name'], $_USER['uid'],
-                           time() + $cooktime, $_CONF['cookie_path'],
-                           $_CONF['cookiedomain'], $_CONF['cookiesecure']);
-                setcookie ($_CONF['cookie_password'],
-                           SEC_encryptPassword($passwd), time() + $cooktime,
-                           $_CONF['cookie_path'], $_CONF['cookiedomain'],
-                           $_CONF['cookiesecure']);
+                SEC_setCookie($_CONF['cookie_name'], $_USER['uid'],
+                              time() + $cooktime);
+                SEC_setCookie($_CONF['cookie_password'],
+                              SEC_encryptPassword($passwd), time() + $cooktime);
             }
         } else {
             $userid = $_COOKIE[$_CONF['cookie_name']];
diff -r 8689bd624973 -r 1e19b2c8a8cf public_html/usersettings.php
--- a/public_html/usersettings.php	Thu Sep 10 13:36:34 2009 +0200
+++ b/public_html/usersettings.php	Fri Sep 11 13:03:06 2009 +0200
@@ -1005,9 +1005,8 @@
                 } else {
                     $cooktime = -1000;
                 }
-                setcookie($_CONF['cookie_password'], $passwd, time() + $cooktime,
-                          $_CONF['cookie_path'], $_CONF['cookiedomain'],
-                          $_CONF['cookiesecure']);
+                SEC_setCookie($_CONF['cookie_password'], $passwd,
+                              time() + $cooktime);
             } elseif (SEC_encryptPassword($A['old_passwd']) != $current_password) {
                 return COM_refresh ($_CONF['site_url']
                                     . '/usersettings.php?msg=68');
@@ -1023,13 +1022,11 @@
 
         if ($A['cooktime'] <= 0) {
             $cooktime = 1000;
-            setcookie ($_CONF['cookie_name'], $_USER['uid'], time() - $cooktime,
-                       $_CONF['cookie_path'], $_CONF['cookiedomain'],
-                       $_CONF['cookiesecure']);
+            SEC_setCookie($_CONF['cookie_name'], $_USER['uid'],
+                          time() - $cooktime);
         } else {
-            setcookie ($_CONF['cookie_name'], $_USER['uid'],
-                       time() + $A['cooktime'], $_CONF['cookie_path'],
-                       $_CONF['cookiedomain'], $_CONF['cookiesecure']);
+            SEC_setCookie($_CONF['cookie_name'], $_USER['uid'],
+                          time() + $A['cooktime']);
         }
 
         if ($_CONF['allow_user_photo'] == 1) {
diff -r 8689bd624973 -r 1e19b2c8a8cf system/lib-security.php
--- a/system/lib-security.php	Thu Sep 10 13:36:34 2009 +0200
+++ b/system/lib-security.php	Fri Sep 11 13:03:06 2009 +0200
@@ -1177,4 +1177,49 @@
     return $return;
 }
 
+/**
+* Set a cookie using the HttpOnly flag
+*
+* Use this function to set "important" cookies (session, password, ...).
+* Browsers that support the HttpOnly flag will not allow JavaScript access
+* to such a cookie.
+*
+* @param    string  $name       cookie name
+* @param    string  $value      cookie value
+* @param    int     $expire     expire time
+* @param    string  $path       path on the server or $_CONF['cookie_path']
+* @param    string  $domain     domain or $_CONF['cookiedomain']
+* @param    bool    $secure     whether to use HTTPS or $_CONF['cookiesecure']
+* @link http://blog.mattmecham.com/2006/09/12/http-only-cookies-without-php-52/
+*
+*/
+function SEC_setCookie($name, $value, $expire = 0, $path = null, $domain = null, $secure = null)
+{
+    global $_CONF;
+
+    $retval = false;
+
+    if ($path === null) {
+        $path = $_CONF['cookie_path'];
+    }
+    if ($domain === null) {
+        $domain = $_CONF['cookiedomain'];
+    }
+    if ($secure === null) {
+        $secure = $_CONF['cookiesecure'];
+    }
+
+    // the httponly parameter is only available as of PHP 5.2.0
+    if (version_compare(PHP_VERSION, '5.2.0', '>=')) {
+        $retval = setcookie($name, $value, $expire, $path, $domain, $secure,
+                            true);
+    } else {
+        // fake it for older PHP versions; kudos to Matt Mecham
+        $retval = setcookie($name, $value, $expire, $path,
+                            $domain . '; httponly', $secure);
+    }
+
+    return $retval;
+}
+
 ?>
diff -r 8689bd624973 -r 1e19b2c8a8cf system/lib-sessions.php
--- a/system/lib-sessions.php	Thu Sep 10 13:36:34 2009 +0200
+++ b/system/lib-sessions.php	Fri Sep 11 13:03:06 2009 +0200
@@ -321,9 +321,9 @@
         COM_errorLog ("Setting session cookie: setcookie($cookiename, $sessid, 0, $cookiepath, $cookiedomain, $cookiesecure);", 1);
     }
 
-    if (setcookie ($cookiename, $sessid, 0, $cookiepath, $cookiedomain,
-                   $cookiesecure) === false) {
-        COM_errorLog ('Failed to set session cookie.', 1);
+    if (SEC_setCookie($cookiename, $sessid, 0, $cookiepath, $cookiedomain,
+                      $cookiesecure) === false) {
+        COM_errorLog('Failed to set session cookie.', 1);
     }
 }
 

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:42 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:42 -0400
Subject: [geeklog-cvs] geeklog: Send the Microsummary as text/plain
Message-ID: <hg.65354b120142.1252684482.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/65354b120142
changeset: 7303:65354b120142
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 13:13:01 2009 +0200
description:
Send the Microsummary as text/plain

diffstat:

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

diffs (11 lines):

diff -r 1e19b2c8a8cf -r 65354b120142 public_html/index.php
--- a/public_html/index.php	Fri Sep 11 13:03:06 2009 +0200
+++ b/public_html/index.php	Fri Sep 11 13:13:01 2009 +0200
@@ -103,6 +103,7 @@
         }
         $pagetitle = $_CONF['site_name'] . ' - ' . $pagetitle;
     }    
+    header('Content-Type: text/plain; charset=' . COM_getCharset());
     die($pagetitle);
 }
 

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:43 -0400
Subject: [geeklog-cvs] geeklog: Use COM_sanitizeFilename
Message-ID: <hg.b7a7ff3e25aa.1252684483.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b7a7ff3e25aa
changeset: 7304:b7a7ff3e25aa
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 13:19:25 2009 +0200
description:
Use COM_sanitizeFilename

diffstat:

 public_html/admin/database.php |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 65354b120142 -r b7a7ff3e25aa public_html/admin/database.php
--- a/public_html/admin/database.php	Fri Sep 11 13:13:01 2009 +0200
+++ b/public_html/admin/database.php	Fri Sep 11 13:19:25 2009 +0200
@@ -283,9 +283,8 @@
 if ($mode == 'download') {
     $file = '';
     if (isset($_GET['file'])) {
-        $file = preg_replace('/[^a-zA-Z0-9\-_\.]/', '', $_GET['file']);
-        $file = str_replace('..', '', $file);
-        if (!file_exists($_CONF['backup_path'] . $file)) {
+        $file = COM_sanitizeFilename($_GET['file'], true);
+        if (! file_exists($_CONF['backup_path'] . $file)) {
             $file = '';
         }
     }
@@ -305,10 +304,11 @@
 } elseif ($mode == 'delete') {
     if (SEC_checkToken()) {
         foreach ($_POST['delitem'] as $delfile) {
-            $file = preg_replace('/[^a-zA-Z0-9\-_\.]/', '', $delfile);
-            $file = str_replace('..', '', $file);
-            if (!@unlink($_CONF['backup_path'] . $file)) {
-                COM_errorLog('Unable to remove backup file "' . $file . '"');
+            $file = COM_sanitizeFilename($delfile, true);
+            if (! empty($file)) {
+                if (!@unlink($_CONF['backup_path'] . $file)) {
+                    COM_errorLog('Unable to remove backup file "' . $file . '"');
+                }
             }
         }
     }

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:44 -0400
Subject: [geeklog-cvs] geeklog: For anonymous comments,
	use the anonymous user's name f...
Message-ID: <hg.132a67d1d0bf.1252684484.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/132a67d1d0bf
changeset: 7305:132a67d1d0bf
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 16:20:05 2009 +0200
description:
For anonymous comments, use the anonymous user's name from the database, not from the language file (cf. bug #0000960)

diffstat:

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

diffs (47 lines):

diff -r b7a7ff3e25aa -r 132a67d1d0bf public_html/docs/history
--- a/public_html/docs/history	Fri Sep 11 13:19:25 2009 +0200
+++ b/public_html/docs/history	Fri Sep 11 16:20:05 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- For anonymous comments, use the anonymous user's name from the database, not
+  from the language file (cf. bug #0000960) [Dirk]
 - The session and password cookies are now created with the HttpOnly flag set
   to make it somewhat harder to read them from JavaScript (requires browser
   support) [Dirk]
diff -r b7a7ff3e25aa -r 132a67d1d0bf system/lib-comment.php
--- a/system/lib-comment.php	Fri Sep 11 13:19:25 2009 +0200
+++ b/system/lib-comment.php	Fri Sep 11 16:20:05 2009 +0200
@@ -930,7 +930,7 @@
                     $name = htmlspecialchars(COM_checkWords(strip_tags(
                         COM_stripslashes($_COOKIE[$_CONF['cookie_anon_name']]))));
                 } else {
-                    $name = $LANG03[24]; // anonymous user
+                    $name = COM_getDisplayName(1); // anonymous user
                 }
                 $usernameblock = '<input type="text" name="username" size="16" value="' . 
                                  $name . '" maxlength="32"' . XHTML . '>';
@@ -1101,13 +1101,15 @@
 
     $comment = addslashes(CMT_prepareText($comment, $postmode, $type));
     $title = addslashes(COM_checkWords(strip_tags($title)));
-    if (isset($_POST['username']) && strcmp($_POST['username'],$LANG03[24]) != 0
-            && $uid == 1) {
-        $name = COM_checkWords(strip_tags(COM_stripslashes($_POST['username'])));
-        setcookie($_CONF['cookie_anon_name'], $name, time() + 31536000,
-                  $_CONF['cookie_path'], $_CONF['cookiedomain'],
-                  $_CONF['cookiesecure']);
-        $name = addslashes($name);
+    if (($uid == 1) && isset($_POST['username'])) {
+        $anon = COM_getDisplayName(1);
+        if (strcmp($_POST['username'], $anon) != 0) {
+            $name = COM_checkWords(strip_tags(COM_stripslashes($_POST['username'])));
+            setcookie($_CONF['cookie_anon_name'], $name, time() + 31536000,
+                      $_CONF['cookie_path'], $_CONF['cookiedomain'],
+                      $_CONF['cookiesecure']);
+            $name = addslashes($name);
+        }
     }
 
     // check for non-int pid's

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:44 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fix
Message-ID: <hg.182b74e229d7.1252684484.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/182b74e229d7
changeset: 7306:182b74e229d7
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 16:30:21 2009 +0200
description:
E_ALL fix

diffstat:

 public_html/comment.php |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 132a67d1d0bf -r 182b74e229d7 public_html/comment.php
--- a/public_html/comment.php	Fri Sep 11 16:20:05 2009 +0200
+++ b/public_html/comment.php	Fri Sep 11 16:30:21 2009 +0200
@@ -473,10 +473,13 @@
             }
             $noindex = '<meta name="robots" content="noindex"' . XHTML . '>'
                      . LB;
+            $pid = 0;
+            if (isset($_REQUEST['pid'])) {
+                $pid = COM_applyFilter($_REQUEST['pid'], true);
+            }
             $display .= COM_siteHeader('menu', $LANG03[1], $noindex)
-                     . CMT_commentForm ($title, '', $sid,
-                            COM_applyFilter ($_REQUEST['pid'], true), $type, $mode,
-                            $postmode)
+                     . CMT_commentForm($title, '', $sid, $pid, $type, $mode,
+                                       $postmode)
                      . COM_siteFooter();
         } else {
             $display .= COM_refresh($_CONF['site_url'] . '/index.php');

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:45 -0400
Subject: [geeklog-cvs] geeklog: Use COM_getDisplayName and
	COM_getTextContent in the li...
Message-ID: <hg.7a9baf0e966a.1252684485.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7a9baf0e966a
changeset: 7307:7a9baf0e966a
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 16:48:28 2009 +0200
description:
Use COM_getDisplayName and COM_getTextContent in the list of comment submissions

diffstat:

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

diffs (23 lines):

diff -r 182b74e229d7 -r 7a9baf0e966a system/lib-admin.php
--- a/system/lib-admin.php	Fri Sep 11 16:30:21 2009 +0200
+++ b/system/lib-admin.php	Fri Sep 11 16:48:28 2009 +0200
@@ -1134,8 +1134,7 @@
             $name = htmlspecialchars(COM_stripslashes(DB_getItem($_TABLES['commentsubmissions'], 'name', "cid = '{$A['id']}'")));
         }
         if (empty($name)) {
-            $name = DB_getItem($_TABLES['users'], 'username',
-                               "uid = '{$A['uid']}'");
+            $name = COM_getDisplayName($A['uid']);
         }
         if ($A['uid'] == 1) {
             $retval = $name;
@@ -1162,7 +1161,8 @@
             $info = PLG_getItemInfo($A['type'], $A['sid'], 'title,url');
             if (empty($info) || empty($info[0]) || empty($info[1])) {
                 // if not available, display excerpt from the comment
-                $retval = COM_truncate(strip_tags($A['comment']), 40, '...');
+                $retval = COM_truncate(COM_getTextContent($A['comment']),
+                                       40, '...');
             } else {
                 $retval = COM_createLink($info[0], $info[1]);
             }

From geeklog-cvs at lists.geeklog.net  Fri Sep 11 11:54:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 11 Sep 2009 11:54:46 -0400
Subject: [geeklog-cvs] geeklog: Updated test for InnoDB support
Message-ID: <hg.5a4350785ae2.1252684486.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5a4350785ae2
changeset: 7308:5a4350785ae2
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 17:40:06 2009 +0200
description:
Updated test for InnoDB support

diffstat:

 public_html/admin/install/lib-upgrade.php |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 7a9baf0e966a -r 5a4350785ae2 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Fri Sep 11 16:48:28 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Fri Sep 11 17:40:06 2009 +0200
@@ -765,14 +765,22 @@
  */
 function INST_innodbSupported()
 {
-    $result = DB_query("SHOW VARIABLES LIKE 'have_innodb'");
-    $A = DB_fetchArray($result, true);
+    $retval = false;
 
-    if (strcasecmp($A[1], 'yes') == 0) {
-        return true;
+    $result = DB_query("SHOW TABLE TYPES");
+    $numEngines = DB_numRows($result);
+    for ($i = 0; $i < $numEngines; $i++) {
+        $A = DB_fetchArray($result);
+
+        if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
+            if (strcasecmp($A['Support'], 'yes') == 0) {
+                $retval = true;
+            }
+            break;
+        }
     }
 
-    return false;
+    return $retval;
 }
 
 

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 06:51:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 06:51:45 -0400
Subject: [geeklog-cvs] geeklog: Effectively only an E_ALL fix: Need to
	display the deny...
Message-ID: <hg.586c7118e03a.1252925505.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/586c7118e03a
changeset: 7310:586c7118e03a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 13 22:03:17 2009 +0200
description:
Effectively only an E_ALL fix: Need to display the deny_msg in staticpageeditor(), not in the form function

diffstat:

 public_html/admin/plugins/staticpages/index.php |  697 ++++++++++++++--------------
 1 files changed, 354 insertions(+), 343 deletions(-)

diffs (truncated from 770 to 300 lines):

diff -r 7b234d9cc294 -r 586c7118e03a public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sun Sep 13 21:24:41 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Sun Sep 13 22:03:17 2009 +0200
@@ -58,19 +58,19 @@
 
 
 /**
-* Displays the static page form
+* Displays the static page editor form
 *
-* @param    array   $A      Data to display
-* @param    string  $error  Error message to display
+* @param    array   $A  Data to display
+* @return   string      HTML for the static page editor
 *
 */
-function form ($A, $error = false)
+function staticpageeditor_form($A, $error = false)
 {
     global $_CONF, $_TABLES, $_USER, $_GROUPS, $_SP_CONF, $mode, $sp_id,
            $LANG21, $LANG_STATIC, $LANG_ACCESS, $LANG_ADMIN, $LANG24,
            $LANG_postmodes, $MESSAGE;
 
-    $template_path = staticpages_templatePath ('admin');
+    $template_path = staticpages_templatePath('admin');
     if (!empty($sp_id) && $mode=='edit') {
         $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
     } else {
@@ -78,333 +78,328 @@
             $A['sp_inblock'] = $_SP_CONF['in_block'];
         }
         $A['owner_id'] = $_USER['uid'];
-        if (isset ($_GROUPS['Static Page Admin'])) {
+        if (isset($_GROUPS['Static Page Admin'])) {
             $A['group_id'] = $_GROUPS['Static Page Admin'];
         } else {
-            $A['group_id'] = SEC_getFeatureGroup ('staticpages.edit');
+            $A['group_id'] = SEC_getFeatureGroup('staticpages.edit');
         }
-        SEC_setDefaultPermissions ($A, $_SP_CONF['default_permissions']);
+        SEC_setDefaultPermissions($A, $_SP_CONF['default_permissions']);
         $access = 3;
-        if (isset ($_CONF['advanced_editor']) &&
+        if (isset($_CONF['advanced_editor']) &&
           ($_CONF['advanced_editor'] == 1) &&
-          file_exists ($template_path . '/editor_advanced.thtml'))
+          file_exists($template_path . '/editor_advanced.thtml'))
         {
              $A['advanced_editor_mode'] = 1;
         }
     }
     $retval = '';
 
-    if (empty ($A['owner_id'])) {
-        $error = COM_startBlock ($LANG_ACCESS['accessdenied'], '',
-                        COM_getBlockTemplate ('_msg_block', 'header'));
-        $error .= $LANG_STATIC['deny_msg'];
-        $error .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+    $sp_template = new Template($template_path);
+    if (isset($_CONF['advanced_editor']) &&
+        ($_CONF['advanced_editor'] == 1) &&
+        file_exists($template_path . '/editor_advanced.thtml'))
+    {
+        $sp_template->set_file('form', 'editor_advanced.thtml');
+        $sp_template->set_var('lang_expandhelp', $LANG24[67]);
+        $sp_template->set_var('lang_reducehelp', $LANG24[68]);
+        $sp_template->set_var('lang_toolbar', $LANG24[70]);
+        $sp_template->set_var('toolbar1', $LANG24[71]);
+        $sp_template->set_var('toolbar2', $LANG24[72]);
+        $sp_template->set_var('toolbar3', $LANG24[73]);
+        $sp_template->set_var('toolbar4', $LANG24[74]);
+        $sp_template->set_var('toolbar5', $LANG24[75]);
+        $sp_template->set_var('lang_nojavascript',$LANG24[77]);
+        $sp_template->set_var('lang_postmode', $LANG24[4]);
+        if (isset($A['postmode']) && ($A['postmode'] == 'adveditor')) {
+            $sp_template->set_var('show_adveditor','');
+            $sp_template->set_var('show_htmleditor','none');
+        } else {
+            $sp_template->set_var('show_adveditor','none');
+            $sp_template->set_var('show_htmleditor','');
+        }
+        $post_options = '<option value="html" selected="selected">'.$LANG_postmodes['html'].'</option>';
+        if (isset($A['postmode']) && ($A['postmode'] == 'adveditor')) {
+            $post_options .= '<option value="adveditor" selected="selected">'.$LANG24[86].'</option>';
+        } else {
+            $post_options .= '<option value="adveditor">'.$LANG24[86].'</option>';
+        }
+        $sp_template->set_var('post_options',$post_options );
+        $sp_template->set_var('change_editormode', 'onchange="change_editmode(this);"');
+    } else {
+        $sp_template->set_file('form', 'editor.thtml');
+    }
+    $sp_template->set_var('layout_url', $_CONF['layout_url']);
+    $sp_template->set_var('lang_mode', $LANG24[3]);
+    $sp_template->set_var(
+        'comment_options',
+        COM_optionList($_TABLES['commentcodes'],
+        'code,name',
+        $A['commentcode'])
+    );
+
+    $sp_template->set_var('lang_accessrights', $LANG_ACCESS['accessrights']);
+    $sp_template->set_var('lang_owner', $LANG_ACCESS['owner']);
+    $ownername = COM_getDisplayName($A['owner_id']);
+    $sp_template->set_var('owner_username', DB_getItem($_TABLES['users'],
+                          'username',"uid = {$A['owner_id']}"));
+    $sp_template->set_var('owner_name', $ownername);
+    $sp_template->set_var('owner', $ownername);
+    $sp_template->set_var('owner_id', $A['owner_id']);
+    $sp_template->set_var('lang_group', $LANG_ACCESS['group']);
+    $sp_template->set_var('group_dropdown',
+                          SEC_getGroupDropdown($A['group_id'], $access));
+    $sp_template->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
+    $sp_template->set_var('lang_permissions', $LANG_ACCESS['permissions']);
+    $sp_template->set_var('lang_perm_key', $LANG_ACCESS['permissionskey']);
+    $sp_template->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
+    $sp_template->set_var('lang_permissions_msg', $LANG_ACCESS['permmsg']);
+    $sp_template->set_var('site_url', $_CONF['site_url']);
+    $sp_template->set_var('site_admin_url', $_CONF['site_admin_url']);
+    $sp_template->set_var('start_block_editor',
+            COM_startBlock($LANG_STATIC['staticpageeditor']), '',
+                    COM_getBlockTemplate('_admin_block', 'header'));
+    $sp_template->set_var('lang_save', $LANG_ADMIN['save']);
+    $sp_template->set_var('lang_cancel', $LANG_ADMIN['cancel']);
+    $sp_template->set_var('lang_preview', $LANG_ADMIN['preview']);
+    if (SEC_hasRights('staticpages.delete') && ($mode != 'clone') &&
+            !empty($A['sp_old_id'])) {
+        $delbutton = '<input type="submit" value="' . $LANG_ADMIN['delete']
+                   . '" name="mode"%s' . XHTML . '>';
+        $jsconfirm = ' onclick="return confirm(\'' . $MESSAGE[76] . '\');"';
+        $sp_template->set_var('delete_option',
+                              sprintf($delbutton, $jsconfirm));
+        $sp_template->set_var('delete_option_no_confirmation',
+                              sprintf($delbutton, ''));
+    } else {
+        $sp_template->set_var('delete_option','');
+    }
+    $sp_template->set_var('lang_writtenby', $LANG_STATIC['writtenby']);
+    $sp_template->set_var('username', DB_getItem($_TABLES['users'],
+                          'username', "uid = {$A['sp_uid']}"));
+    $authorname = COM_getDisplayName($A['sp_uid']);
+    $sp_template->set_var('name', $authorname);
+    $sp_template->set_var('author', $authorname);
+    $sp_template->set_var('lang_url', $LANG_STATIC['url']);
+    $sp_template->set_var('lang_id', $LANG_STATIC['id']);
+    $sp_template->set_var('sp_uid', $A['sp_uid']);
+    $sp_template->set_var('sp_id', $A['sp_id']);
+    $sp_template->set_var('sp_old_id', $A['sp_old_id']);
+    $sp_template->set_var('example_url', COM_buildURL($_CONF['site_url']
+                          . '/staticpages/index.php?page=' . $A['sp_id']));
+
+    $sp_template->set_var('lang_centerblock', $LANG_STATIC['centerblock']);
+    $sp_template->set_var('lang_centerblock_help', $LANG_ADMIN['help_url']);
+    $sp_template->set_var('lang_centerblock_include', $LANG21[51]);
+    $sp_template->set_var('lang_centerblock_desc', $LANG21[52]);
+    $sp_template->set_var('centerblock_help', $A['sp_help']);
+    $sp_template->set_var('lang_centerblock_msg', $LANG_STATIC['centerblock_msg']);
+    if (isset($A['sp_centerblock']) && ($A['sp_centerblock'] == 1)) {
+        $sp_template->set_var('centerblock_checked', 'checked="checked"');
+    } else {
+        $sp_template->set_var('centerblock_checked', '');
+    }
+    $sp_template->set_var('lang_topic', $LANG_STATIC['topic']);
+    $sp_template->set_var('lang_position', $LANG_STATIC['position']);
+    $current_topic = '';
+    if (isset($A['sp_tid'])) {
+        $current_topic = $A['sp_tid'];
+    }
+    if (empty($current_topic)) {
+        $current_topic = 'none';
+    }
+    $topics = COM_topicList('tid,topic', $current_topic, 1, true);
+    $alltopics = '<option value="all"';
+    if ($current_topic == 'all') {
+        $alltopics .= ' selected="selected"';
+    }
+    $alltopics .= '>' . $LANG_STATIC['all_topics'] . '</option>' . LB;
+    $notopic = '<option value="none"';
+    if ($current_topic == 'none') {
+        $notopic .= ' selected="selected"';
+    }
+    $notopic .= '>' . $LANG_STATIC['no_topic'] . '</option>' . LB;
+    $sp_template->set_var('topic_selection', '<select name="sp_tid">'
+                          . $alltopics . $notopic . $topics . '</select>');
+    $position = '<select name="sp_where">';
+    $position .= '<option value="1"';
+    if ($A['sp_where'] == 1) {
+        $position .= ' selected="selected"';
+    }
+    $position .= '>' . $LANG_STATIC['position_top'] . '</option>';
+    $position .= '<option value="2"';
+    if ($A['sp_where'] == 2) {
+        $position .= ' selected="selected"';
+    }
+    $position .= '>' . $LANG_STATIC['position_feat'] . '</option>';
+    $position .= '<option value="3"';
+    if ($A['sp_where'] == 3) {
+        $position .= ' selected="selected"';
+    }
+    $position .= '>' . $LANG_STATIC['position_bottom'] . '</option>';
+    $position .= '<option value="0"';
+    if ($A['sp_where'] == 0) {
+        $position .= ' selected="selected"';
+    }
+    $position .= '>' . $LANG_STATIC['position_entire'] . '</option>';
+    $position .= '</select>';
+    $sp_template->set_var('pos_selection', $position);
+
+    if (($_SP_CONF['allow_php'] == 1) && SEC_hasRights('staticpages.PHP')) {
+        if (!isset($A['sp_php'])) {
+            $A['sp_php'] = 0;
+        }
+        $selection = '<select name="sp_php">' . LB;
+        $selection .= '<option value="0"';
+        if (($A['sp_php'] <= 0) || ($A['sp_php'] > 2)) {
+            $selection .= ' selected="selected"';
+        }
+        $selection .= '>' . $LANG_STATIC['select_php_none'] . '</option>' . LB;
+        $selection .= '<option value="1"';
+        if ($A['sp_php'] == 1) {
+            $selection .= ' selected="selected"';
+        }
+        $selection .= '>' . $LANG_STATIC['select_php_return'] . '</option>' . LB;
+        $selection .= '<option value="2"';
+        if ($A['sp_php'] == 2) {
+            $selection .= ' selected="selected"';
+        }
+        $selection .= '>' . $LANG_STATIC['select_php_free'] . '</option>' . LB;
+        $selection .= '</select>';
+        $sp_template->set_var('php_selector', $selection);
+        $sp_template->set_var('php_warn', $LANG_STATIC['php_warn']);
+    } else {
+        $sp_template->set_var('php_selector', '');
+        $sp_template->set_var('php_warn', $LANG_STATIC['php_not_activated']);
+    }
+    $sp_template->set_var('php_msg', $LANG_STATIC['php_msg']);
+
+    // old variables (for the 1.3-type checkbox)
+    $sp_template->set_var('php_checked', '');
+    $sp_template->set_var('php_type', 'hidden');
+
+    if (isset($A['sp_nf']) && ($A['sp_nf'] == 1)) {
+        $sp_template->set_var('exit_checked','checked="checked"');
+    } else {
+        $sp_template->set_var('exit_checked','');
+    }
+    $sp_template->set_var('exit_msg',$LANG_STATIC['exit_msg']);
+    $sp_template->set_var('exit_info',$LANG_STATIC['exit_info']);
+
+    if ($A['sp_inblock'] == 1) {
+        $sp_template->set_var('inblock_checked', 'checked="checked"');
+    } else {
+        $sp_template->set_var('inblock_checked', '');
+    }
+    $sp_template->set_var('inblock_msg', $LANG_STATIC['inblock_msg']);
+    $sp_template->set_var('inblock_info', $LANG_STATIC['inblock_info']);
+
+    $curtime = COM_getUserDateTimeFormat($A['unixdate']);
+    $sp_template->set_var('lang_lastupdated', $LANG_STATIC['date']);
+    $sp_template->set_var('sp_formateddate', $curtime[0]);
+    $sp_template->set_var('sp_date', $curtime[1]);
+
+    $sp_template->set_var('lang_title', $LANG_STATIC['title']);
+    $title = '';
+    if (isset($A['sp_title'])) {
+        $title = htmlspecialchars(stripslashes($A['sp_title']));
+    }
+    $sp_template->set_var('sp_title', $title);
+    $sp_template->set_var('lang_metadescription', $LANG_STATIC['meta_description']);
+    $sp_template->set_var('lang_metakeywords', $LANG_STATIC['meta_keywords']);
+    if (!empty($A['meta_description'])) {
+        $sp_template->set_var('meta_description', $A['meta_description']);
+    }
+    if (!empty($A['meta_keywords'])) {
+        $sp_template->set_var('meta_keywords', $A['meta_keywords']);        
+    }
+    $sp_template->set_var('lang_addtomenu', $LANG_STATIC['addtomenu']);
+    if (isset($A['sp_onmenu']) && ($A['sp_onmenu'] == 1)) {
+        $sp_template->set_var('onmenu_checked', 'checked="checked"');
+    } else {
+        $sp_template->set_var('onmenu_checked', '');
+    }
+    $sp_template->set_var('lang_label', $LANG_STATIC['label']);
+    if (isset($A['sp_label'])) {
+        $sp_template->set_var('sp_label', $A['sp_label']);
+    } else {
+        $sp_template->set_var('sp_label', '');
+    }
+    $sp_template->set_var('lang_pageformat', $LANG_STATIC['pageformat']);
+    $sp_template->set_var('lang_blankpage', $LANG_STATIC['blankpage']);
+    $sp_template->set_var('lang_noblocks', $LANG_STATIC['noblocks']);
+    $sp_template->set_var('lang_leftblocks', $LANG_STATIC['leftblocks']);
+    $sp_template->set_var('lang_leftrightblocks', $LANG_STATIC['leftrightblocks']);
+    if (!isset($A['sp_format'])) {
+        $A['sp_format'] = '';
+    }
+    if ($A['sp_format'] == 'noblocks') {
+        $sp_template->set_var('noblock_selected', 'selected="selected"');
+    } else {
+        $sp_template->set_var('noblock_selected', '');

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 06:51:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 06:51:46 -0400
Subject: [geeklog-cvs] geeklog: Made the list of pages sortable by author
	(feature requ...
Message-ID: <hg.de4bd87a7021.1252925506.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/de4bd87a7021
changeset: 7311:de4bd87a7021
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 12:51:35 2009 +0200
description:
Made the list of pages sortable by author (feature request #0000978)

diffstat:

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

diffs (23 lines):

diff -r 586c7118e03a -r de4bd87a7021 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sun Sep 13 22:03:17 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Mon Sep 14 12:51:35 2009 +0200
@@ -413,7 +413,7 @@
         array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
         array('text' => $LANG_STATIC['id'], 'field' => 'sp_id', 'sort' => true),
         array('text' => $LANG_ADMIN['title'], 'field' => 'sp_title', 'sort' => true),
-        array('text' => $LANG_STATIC['writtenby'], 'field' => 'sp_uid', 'sort' => false),
+        array('text' => $LANG_STATIC['writtenby'], 'field' => 'sp_uid', 'sort' => true),
         array('text' => $LANG_STATIC['head_centerblock'], 'field' => 'sp_centerblock', 'sort' => true),
         array('text' => $LANG_STATIC['date'], 'field' => 'unixdate', 'sort' => true)
     );
diff -r 586c7118e03a -r de4bd87a7021 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 13 22:03:17 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 12:51:35 2009 +0200
@@ -69,6 +69,7 @@
 
 Static Pages Plugin
 -------------------
+- Made the list of pages sortable by author (feature request #0000978) [Dirk]
 - List available autotags in the static pages editor [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer
 

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 06:51:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 06:51:45 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics - fixed row highlighting
Message-ID: <hg.7b234d9cc294.1252925505.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7b234d9cc294
changeset: 7309:7b234d9cc294
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 13 21:24:41 2009 +0200
description:
Cosmetics - fixed row highlighting

diffstat:

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

diffs (12 lines):

diff -r 5a4350785ae2 -r 7b234d9cc294 public_html/docs/english/staticpages.html
--- a/public_html/docs/english/staticpages.html	Fri Sep 11 17:40:06 2009 +0200
+++ b/public_html/docs/english/staticpages.html	Sun Sep 13 21:24:41 2009 +0200
@@ -225,7 +225,7 @@
   <td>Max. number of static pages returned when an Atom feed is requested
     through the webservices API.</td>
 </tr>
-<tr>
+<tr class="r2">
   <td><a name="desc_meta_tags">meta_tags</a></td>
   <td>false</td>
   <td>Whether to include the meta tags of the staticpage when it is displayed.</td>

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 11:47:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 11:47:45 -0400
Subject: [geeklog-cvs] geeklog: Allow displaying a message in the static
	pages editor
Message-ID: <hg.844012d4a915.1252943265.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/844012d4a915
changeset: 7312:844012d4a915
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 12:58:40 2009 +0200
description:
Allow displaying a message in the static pages editor

diffstat:

 public_html/admin/plugins/staticpages/index.php |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r de4bd87a7021 -r 844012d4a915 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Mon Sep 14 12:51:35 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Mon Sep 14 12:58:40 2009 +0200
@@ -620,6 +620,12 @@
     }
 } else if ($mode == 'edit') {
     $display .= COM_siteHeader ('menu', $LANG_STATIC['staticpageeditor']);
+    if (isset($_GET['msg'])) {
+        $msg = COM_applyFilter($_GET['msg'], true);
+        if ($msg > 0) {
+            $display .= COM_showMessage($msg, 'staticpages');
+        }
+    }
     $editor = '';
     if (isset ($_GET['editor'])) {
         $editor = COM_applyFilter ($_GET['editor']);

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 11:47:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 11:47:46 -0400
Subject: [geeklog-cvs] geeklog: Removed the CSRF token from all links to
	edit a comment...
Message-ID: <hg.f2e37d3490c9.1252943266.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f2e37d3490c9
changeset: 7314:f2e37d3490c9
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 16:10:32 2009 +0200
description:
Removed the CSRF token from all links to edit a comment. We only need it in the actual comment editor and it caused problems on the moderation page

diffstat:

 public_html/admin/moderation.php |  3 +--
 public_html/comment.php          |  7 ++-----
 public_html/docs/history         |  2 ++
 system/lib-comment.php           |  3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r 6e95d3d48652 -r f2e37d3490c9 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Mon Sep 14 14:55:14 2009 +0200
+++ b/public_html/admin/moderation.php	Mon Sep 14 16:10:32 2009 +0200
@@ -316,8 +316,7 @@
                      . '/index.php?mode=editsubmission&amp;id=' . $A[0];
         } elseif ($type == 'comment') {
             $A['edit'] = $_CONF['site_url'] . '/comment.php'
-                    . '?mode=editsubmission&amp;cid=' . $A[0] .
-                    '&' . CSRF_TOKEN . '=' . $token;
+                    . '?mode=editsubmission&amp;cid=' . $A[0];
         } else {
             $A['edit'] = $_CONF['site_admin_url'] . '/' .  $type
                      . '.php?mode=editsubmission&amp;id=' . $A[0];
diff -r 6e95d3d48652 -r f2e37d3490c9 public_html/comment.php
--- a/public_html/comment.php	Mon Sep 14 14:55:14 2009 +0200
+++ b/public_html/comment.php	Mon Sep 14 16:10:32 2009 +0200
@@ -404,15 +404,12 @@
 
 case 'editsubmission':
     if (!SEC_hasRights('comment.moderate')) { 
+        $display .= COM_refresh($_CONF['site_url'] . '/index.php');
         break; 
     }
     // deliberate fall-through
 case 'edit':
-    if (SEC_checkToken()) {
-        $display .= handleEdit($mode);
-    } else {
-        $display .= COM_refresh($_CONF['site_url'] . '/index.php');
-    }
+    $display .= handleEdit($mode);
     break;
 
 case 'unsubscribe':
diff -r 6e95d3d48652 -r f2e37d3490c9 public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 14:55:14 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 16:10:32 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Removed the CSRF token from all links to edit a comment. We only need it in
+  the actual comment editor and it caused problems on the moderation page [Dirk]
 - For anonymous comments, use the anonymous user's name from the database, not
   from the language file (cf. bug #0000960) [Dirk]
 - The session and password cookies are now created with the HttpOnly flag set
diff -r 6e95d3d48652 -r f2e37d3490c9 system/lib-comment.php
--- a/system/lib-comment.php	Mon Sep 14 14:55:14 2009 +0200
+++ b/system/lib-comment.php	Mon Sep 14 16:10:32 2009 +0200
@@ -433,8 +433,7 @@
         $edit = '';
         if ($edit_option) {
             $editlink = $_CONF['site_url'] . '/comment.php?mode=edit&amp;cid='
-                . $A['cid'] . '&amp;sid=' . $A['sid'] . '&amp;type=' . $type
-                . '&amp;' . CSRF_TOKEN . '=' . $token;
+                . $A['cid'] . '&amp;sid=' . $A['sid'] . '&amp;type=' . $type;
             $edit = COM_createLink($LANG01[4], $editlink) . ' | ';
         }
 

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 11:47:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 11:47:46 -0400
Subject: [geeklog-cvs] geeklog: When an anonymous commentor left a name,
	use it in the ...
Message-ID: <hg.ff65ed5ec293.1252943266.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ff65ed5ec293
changeset: 7315:ff65ed5ec293
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 16:45:58 2009 +0200
description:
When an anonymous commentor left a name, use it in the comment submission notification email (bug #0000960)

diffstat:

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

diffs (123 lines):

diff -r f2e37d3490c9 -r ff65ed5ec293 public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 16:10:32 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 16:45:58 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- When an anonymous commentor left a name, use it in the comment submission
+  notification email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
   the actual comment editor and it caused problems on the moderation page [Dirk]
 - For anonymous comments, use the anonymous user's name from the database, not
diff -r f2e37d3490c9 -r ff65ed5ec293 system/lib-comment.php
--- a/system/lib-comment.php	Mon Sep 14 16:10:32 2009 +0200
+++ b/system/lib-comment.php	Mon Sep 14 16:45:58 2009 +0200
@@ -1103,11 +1103,11 @@
     if (($uid == 1) && isset($_POST['username'])) {
         $anon = COM_getDisplayName(1);
         if (strcmp($_POST['username'], $anon) != 0) {
-            $name = COM_checkWords(strip_tags(COM_stripslashes($_POST['username'])));
-            setcookie($_CONF['cookie_anon_name'], $name, time() + 31536000,
+            $username = COM_checkWords(strip_tags(COM_stripslashes($_POST['username'])));
+            setcookie($_CONF['cookie_anon_name'], $username, time() + 31536000,
                       $_CONF['cookie_path'], $_CONF['cookiedomain'],
                       $_CONF['cookiesecure']);
-            $name = addslashes($name);
+            $name = addslashes($username);
         }
     }
 
@@ -1190,7 +1190,7 @@
         }
     }
 
-    //save user notification information
+    // save user notification information
     if (isset($_POST['notify']) && ($ret == -1 || $ret == 0) ) {
         $deletehash = md5($title . $cid . $comment . rand());
         if ($ret == -1) {
@@ -1208,8 +1208,13 @@
         if ($ret == -1) {
             $cid = 0; // comment went into the submission queue
         }
-        CMT_sendNotification($title, $comment, $uid, $_SERVER['REMOTE_ADDR'],
-                             $type, $cid);
+        if (($uid == 1) && isset($username)) {
+            CMT_sendNotification($title, $comment, $uid, $username,
+                                 $_SERVER['REMOTE_ADDR'], $type, $cid);
+        } else {
+            CMT_sendNotification($title, $comment, $uid, '',
+                                 $_SERVER['REMOTE_ADDR'], $type, $cid);
+        }
     }
     
     return $ret;
@@ -1221,26 +1226,42 @@
 * @param    $title      string      comment title
 * @param    $comment    string      text of the comment
 * @param    $uid        int         user id
+* @param    $username   string      optional name of anonymous user
 * @param    $ipaddress  string      poster's IP address
 * @param    $type       string      type of comment ('article', 'poll', ...)
 * @param    $cid        int         comment id (or 0 when in submission queue)
+* @return               boolean     true if successfully sent, otherwise false
 *
 */
-function CMT_sendNotification ($title, $comment, $uid, $ipaddress, $type, $cid)
+function CMT_sendNotification($title, $comment, $uid, $username, $ipaddress, $type, $cid)
 {
     global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09;
 
+    // sanity check
+    if (($username == $_SERVER['REMOTE_ADDR']) &&
+            ($ipaddress != $_SERVER['REMOTE_ADDR'])) {
+        COM_errorLog("The API for CMT_sendNotification has changed ...");
+        return false;
+    }
+
     // we have to undo the addslashes() call from savecomment()
-    $title = stripslashes ($title);
-    $comment = stripslashes ($comment);
+    $title = stripslashes($title);
+    $comment = stripslashes($comment);
 
     // strip HTML if posted in HTML mode
-    if (preg_match ('/<.*>/', $comment) != 0) {
-        $comment = strip_tags ($comment);
+    if (preg_match('/<.*>/', $comment) != 0) {
+        $comment = strip_tags($comment);
     }
 
-    $author = COM_getDisplayName ($uid);
-    if (($uid <= 1) && !empty ($ipaddress)) {
+    if ($uid < 1) {
+        $uid = 1;
+    }
+    if (($uid == 1) && !empty($username)) {
+        $author = $username;
+    } else {
+        $author = COM_getDisplayName($uid);
+    }
+    if (($uid == 1) && !empty($ipaddress)) {
         // add IP address for anonymous posters
         $author .= ' (' . $ipaddress . ')';
     }
@@ -1254,7 +1275,7 @@
 
     if ($_CONF['emailstorieslength'] > 0) {
         if ($_CONF['emailstorieslength'] > 1) {
-            $comment = MBYTE_substr ($comment, 0, $_CONF['emailstorieslength'])
+            $comment = MBYTE_substr($comment, 0, $_CONF['emailstorieslength'])
                      . '...';
         }
         $mailbody .= $comment . "\n\n";
@@ -1274,7 +1295,7 @@
 
     $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[9];
 
-    COM_mail ($_CONF['site_mail'], $mailsubject, $mailbody);
+    return COM_mail($_CONF['site_mail'], $mailsubject, $mailbody);
 }
 
 /**

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 11:47:48 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 11:47:48 -0400
Subject: [geeklog-cvs] geeklog: Use different subjects for the comment
	notification and...
Message-ID: <hg.9d8e5bdc110b.1252943268.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9d8e5bdc110b
changeset: 7316:9d8e5bdc110b
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 16:54:20 2009 +0200
description:
Use different subjects for the comment notification and comment _submission_ notification emails (cf. bug #0000957)

diffstat:

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

diffs (46 lines):

diff -r ff65ed5ec293 -r 9d8e5bdc110b public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 16:45:58 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 16:54:20 2009 +0200
@@ -3,8 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
-- When an anonymous commentor left a name, use it in the comment submission
-  notification email (bug #0000960) [Dirk]
+- When an anonymous commentor left a name, use it in the comment notification
+  email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
   the actual comment editor and it caused problems on the moderation page [Dirk]
 - For anonymous comments, use the anonymous user's name from the database, not
diff -r ff65ed5ec293 -r 9d8e5bdc110b system/lib-comment.php
--- a/system/lib-comment.php	Mon Sep 14 16:45:58 2009 +0200
+++ b/system/lib-comment.php	Mon Sep 14 16:54:20 2009 +0200
@@ -1235,7 +1235,7 @@
 */
 function CMT_sendNotification($title, $comment, $uid, $username, $ipaddress, $type, $cid)
 {
-    global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09;
+    global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09, $LANG29;
 
     // sanity check
     if (($username == $_SERVER['REMOTE_ADDR']) &&
@@ -1282,9 +1282,11 @@
     }
 
     if ($cid == 0) {
+        $mailsubject = $_CONF['site_name'] . ' ' . $LANG29[41];
         $mailbody .= $LANG01[10] . ' <' . $_CONF['site_admin_url']
                   . "/moderation.php>\n\n";
     } else {
+        $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[9];
         $mailbody .= $LANG03[39] . ' <' . $_CONF['site_url']
                   . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
     }
@@ -1293,7 +1295,6 @@
     $mailbody .= "\n$LANG08[34]\n";
     $mailbody .= "\n------------------------------\n";
 
-    $mailsubject = $_CONF['site_name'] . ' ' . $LANG03[9];
 
     return COM_mail($_CONF['site_mail'], $mailsubject, $mailbody);
 }

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 11:47:45 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 11:47:45 -0400
Subject: [geeklog-cvs] geeklog: Fixed visibility of the "Send Ping" links in
	the Story ...
Message-ID: <hg.6e95d3d48652.1252943265.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6e95d3d48652
changeset: 7313:6e95d3d48652
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 14:55:14 2009 +0200
description:
Fixed visibility of the "Send Ping" links in the Story Admin's list of stories and the Story Options block, part 2: Forgot to check the topic permissions

diffstat:

 public_html/article.php |  11 ++++++++---
 system/lib-admin.php    |   8 ++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 844012d4a915 -r 6e95d3d48652 public_html/article.php
--- a/public_html/article.php	Mon Sep 14 12:58:40 2009 +0200
+++ b/public_html/article.php	Mon Sep 14 14:55:14 2009 +0200
@@ -325,11 +325,16 @@
                 ($story->displayElements('draft_flag') == 0) &&
                 ($story->displayElements('day') < time ()) &&
                 ($story->displayElements('perm_anon') != 0)) {
-                
+
+            // also check permissions for the topic
+            $topic_anon = DB_getItem($_TABLES['topics'], 'perm_anon',
+                "tid = '" . addslashes($story->displayElements('tid')) . "'");
+
             // check special case: no link when Trackbacks are disabled for this
             // story AND pinging weblog directories is disabled
-            if (($story->displayElements('trackbackcode') >= 0) ||
-                    $_CONF['ping_enabled']) {
+            if (($topic_anon != 0) &&
+                    (($story->displayElements('trackbackcode') >= 0) ||
+                    $_CONF['ping_enabled'])) {
                 $url = $_CONF['site_admin_url']
                      . '/trackback.php?mode=sendall&amp;id=' . $story->getSid();
                 $story_options[] = COM_createLink($LANG_TRB['send_trackback'],
diff -r 844012d4a915 -r 6e95d3d48652 system/lib-admin.php
--- a/system/lib-admin.php	Mon Sep 14 12:58:40 2009 +0200
+++ b/system/lib-admin.php	Mon Sep 14 14:55:14 2009 +0200
@@ -860,7 +860,7 @@
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG24, $LANG_ACCESS, $_IMAGE_TYPE;
 
-    static $topics, $topic_access;
+    static $topics, $topic_access, $topic_anon;
 
     if (!isset($topics)) {
         $topics = array();
@@ -934,8 +934,12 @@
         break;
 
     case 'ping':
+        if (!isset($topic_anon[$A['tid']])) {
+            $topic_anon[$A['tid']] = DB_getItem($_TABLES['topics'], 'perm_anon',
+                "tid = '" . addslashes($A['tid']) . "'");
+        }
         if (($A['draft_flag'] == 0) && ($A['unixdate'] < time()) &&
-                ($A['perm_anon'] != 0)) {
+                ($A['perm_anon'] != 0) && ($topic_anon[$A['tid']] != 0)) {
             $pingico = '<img src="' . $_CONF['layout_url'] . '/images/sendping.'
                      . $_IMAGE_TYPE . '" alt="' . $LANG24[21] . '" title="'
                      . $LANG24[21] . '"' . XHTML . '>';

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 13:56:46 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 13:56:46 -0400
Subject: [geeklog-cvs] geeklog: Fixed reply notification for the very first
	comment (bu...
Message-ID: <hg.d132b4cd57f7.1252951006.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d132b4cd57f7
changeset: 7317:d132b4cd57f7
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 19:17:22 2009 +0200
description:
Fixed reply notification for the very first comment (bug #0000973)

diffstat:

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

diffs (33 lines):

diff -r 9d8e5bdc110b -r d132b4cd57f7 public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 16:54:20 2009 +0200
+++ b/public_html/docs/history	Mon Sep 14 19:17:22 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Fixed reply notification for the very first comment (bug #0000973)
+  [dengen, Dirk]
 - When an anonymous commentor left a name, use it in the comment notification
   email (bug #0000960) [Dirk]
 - Removed the CSRF token from all links to edit a comment. We only need it in
diff -r 9d8e5bdc110b -r d132b4cd57f7 system/lib-comment.php
--- a/system/lib-comment.php	Mon Sep 14 16:54:20 2009 +0200
+++ b/system/lib-comment.php	Mon Sep 14 19:17:22 2009 +0200
@@ -1182,7 +1182,7 @@
     DB_unlockTable($_TABLES['comments']);
 
     // notify of new comment 
-    if ($_CONF['allow_reply_notifications'] == 1 && $pid > 1 && $ret == 0) {
+    if ($_CONF['allow_reply_notifications'] == 1 && $pid > 0 && $ret == 0) {
         $result = DB_query("SELECT cid, uid, deletehash FROM {$_TABLES['commentnotifications']} WHERE cid = $pid");
         $A = DB_fetchArray($result);
         if ($A !== false) {
@@ -1771,7 +1771,7 @@
     DB_change($_TABLES['commentnotifications'], 'cid', $newcid, 'mid', $cid);
 
     // notify of new published comment
-    if ($_CONF['allow_reply_notifications'] == 1 && $A['pid'] > 1) {
+    if ($_CONF['allow_reply_notifications'] == 1 && $A['pid'] > 0) {
         $result = DB_query("SELECT cid, uid, deletehash FROM {$_TABLES['commentnotifications']} WHERE cid = {$A['pid']}");
         $B = DB_fetchArray($result);
         if ($B !== false) {

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 16:11:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 16:11:23 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fix
Message-ID: <hg.7ef87f977708.1252959083.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7ef87f977708
changeset: 7318:7ef87f977708
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 20:11:17 2009 +0200
description:
E_ALL fix

diffstat:

 public_html/users.php |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r d132b4cd57f7 -r 7ef87f977708 public_html/users.php
--- a/public_html/users.php	Mon Sep 14 19:17:22 2009 +0200
+++ b/public_html/users.php	Mon Sep 14 20:11:17 2009 +0200
@@ -1179,9 +1179,11 @@
 
         // Now that we have users data see if their theme cookie is set.
         // If not set it
-        setcookie ($_CONF['cookie_theme'], $_USER['theme'], time() + 31536000,
-                   $_CONF['cookie_path'], $_CONF['cookiedomain'],
-                   $_CONF['cookiesecure']);
+        if (! empty($_USER['theme'])) {
+            setcookie($_CONF['cookie_theme'], $_USER['theme'],
+                      time() + 31536000, $_CONF['cookie_path'],
+                      $_CONF['cookiedomain'], $_CONF['cookiesecure']);
+        }
 
         if (!empty($_SERVER['HTTP_REFERER'])
                 && (strstr($_SERVER['HTTP_REFERER'], '/users.php') === false)

From geeklog-cvs at lists.geeklog.net  Mon Sep 14 16:11:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 14 Sep 2009 16:11:23 -0400
Subject: [geeklog-cvs] geeklog: Provide an excerpt of the comment to be
	moderated in a ...
Message-ID: <hg.f0488c63237c.1252959083.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f0488c63237c
changeset: 7319:f0488c63237c
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Sep 14 21:44:12 2009 +0200
description:
Provide an excerpt of the comment to be moderated in a title attribute

diffstat:

 system/lib-admin.php |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 7ef87f977708 -r f0488c63237c system/lib-admin.php
--- a/system/lib-admin.php	Mon Sep 14 20:11:17 2009 +0200
+++ b/system/lib-admin.php	Mon Sep 14 21:44:12 2009 +0200
@@ -1161,14 +1161,22 @@
             $retval = DB_getItem($_TABLES['topics'], 'topic',
                                   "tid = '{$A[3]}'");
         } elseif (($fieldname == 2) && ($type == 'comment')) {
+            $commenttext = COM_getTextContent($A['comment']);
+            $excerpt = htmlspecialchars(COM_truncate($commenttext, 140, '...'));
+
             // try to provide a link to the parent item (e.g. article, poll)
             $info = PLG_getItemInfo($A['type'], $A['sid'], 'title,url');
             if (empty($info) || empty($info[0]) || empty($info[1])) {
                 // if not available, display excerpt from the comment
-                $retval = COM_truncate(COM_getTextContent($A['comment']),
-                                       40, '...');
+                $retval = htmlspecialchars(COM_truncate($commenttext, 40,
+                                                        '...'));
+                if (strlen($commenttext) > 40) {
+                    $retval = '<span title="' . $excerpt . '">' . $retval
+                            . '</span>';
+                }
             } else {
-                $retval = COM_createLink($info[0], $info[1]);
+                $retval = COM_createLink($info[0], $info[1],
+                                         array('title' => $excerpt));
             }
         } else {
             $retval = COM_makeClickableLinks(stripslashes($fieldvalue));

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 08:17:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 08:17:31 -0400
Subject: [geeklog-cvs] geeklog: Don't add the #desc_xxx anchor when the
	documentation U...
Message-ID: <hg.cee325fef1c9.1253362651.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cee325fef1c9
changeset: 7320:cee325fef1c9
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 09:26:29 2009 +0200
description:
Don't add the #desc_xxx anchor when the documentation URL already contains a '#'

diffstat:

 system/classes/config.class.php |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r f0488c63237c -r cee325fef1c9 system/classes/config.class.php
--- a/system/classes/config.class.php	Mon Sep 14 21:44:12 2009 +0200
+++ b/system/classes/config.class.php	Sat Sep 19 09:26:29 2009 +0200
@@ -943,7 +943,11 @@
         }
 
         if (! empty($descUrl)) {
-            $retval = $descUrl . '#desc_' . $option;
+            if (strpos($descUrl, '#') === false) {
+                $retval = $descUrl . '#desc_' . $option;
+            } else {
+                $retval = $descUrl;
+            }
         }
 
         return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 08:17:31 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 08:17:31 -0400
Subject: [geeklog-cvs] geeklog: Minor optimization to cache the
	documentation URL
Message-ID: <hg.1a45dcdd9ce7.1253362651.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/1a45dcdd9ce7
changeset: 7321:1a45dcdd9ce7
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 09:44:15 2009 +0200
description:
Minor optimization to cache the documentation URL

diffstat:

 system/classes/config.class.php |  48 ++++++++++++-----------
 1 files changed, 25 insertions(+), 23 deletions(-)

diffs (66 lines):

diff -r cee325fef1c9 -r 1a45dcdd9ce7 system/classes/config.class.php
--- a/system/classes/config.class.php	Sat Sep 19 09:26:29 2009 +0200
+++ b/system/classes/config.class.php	Sat Sep 19 09:44:15 2009 +0200
@@ -916,37 +916,39 @@
     */
     function _get_ConfigHelp($group, $option)
     {
-        static $coreUrl;
+        static $docUrl;
+
+        if (! isset($docUrl)) {
+            $docUrl = array();
+        }
 
         $retval = '';
 
-        $descUrl = '';
-        if ($group == 'Core') {
-            if (isset($coreUrl)) {
-                $descUrl = $coreUrl;
-            } elseif (!empty($GLOBALS['_CONF']['site_url']) &&
-                    !empty($GLOBALS['_CONF']['path_html'])) {
-                $baseUrl = $GLOBALS['_CONF']['site_url'];
-                $doclang = COM_getLanguageName();
-                $cfg = 'docs/' . $doclang . '/config.html';
-                if (file_exists($GLOBALS['_CONF']['path_html'] . $cfg)) {
-                    $descUrl = $baseUrl . '/' . $cfg;
+        if (! isset($docUrl[$group])) {
+            if ($group == 'Core') {
+                if (!empty($GLOBALS['_CONF']['site_url']) &&
+                        !empty($GLOBALS['_CONF']['path_html'])) {
+                    $baseUrl = $GLOBALS['_CONF']['site_url'];
+                    $doclang = COM_getLanguageName();
+                    $cfg = 'docs/' . $doclang . '/config.html';
+                    if (file_exists($GLOBALS['_CONF']['path_html'] . $cfg)) {
+                        $url = $baseUrl . '/' . $cfg;
+                    } else {
+                        $url = $baseUrl . '/docs/english/config.html';
+                    }
                 } else {
-                    $descUrl = $baseUrl . '/docs/english/config.html';
+                    $url = 'http://www.geeklog.net/docs/english/config.html';
                 }
-                $coreUrl = $descUrl;
-            } else {
-                $descUrl = 'http://www.geeklog.net/docs/english/config.html';
+                $docUrl['Core'] = $url;
+            } else { // plugin
+                $docUrl[$group] = PLG_getDocumentationUrl($group, 'config');
             }
-        } else {
-            $descUrl = PLG_getDocumentationUrl($group, 'config');
         }
+        $retval = $docUrl[$group];
 
-        if (! empty($descUrl)) {
-            if (strpos($descUrl, '#') === false) {
-                $retval = $descUrl . '#desc_' . $option;
-            } else {
-                $retval = $descUrl;
+        if (! empty($retval)) {
+            if (strpos($retval, '#') === false) {
+                $retval .= '#desc_' . $option;
             }
         }
 

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 08:17:32 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 08:17:32 -0400
Subject: [geeklog-cvs] geeklog: Changed the former $cc parameter for
	COM_mail into an o...
Message-ID: <hg.6bfe0553c0e3.1253362652.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6bfe0553c0e3
changeset: 7322:6bfe0553c0e3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 11:50:37 2009 +0200
description:
Changed the former $cc parameter for COM_mail into an optional array of additional email headers

diffstat:

 public_html/docs/history   |    2 +
 public_html/lib-common.php |  115 ++++++++++++++++++-------------------
 2 files changed, 58 insertions(+), 59 deletions(-)

diffs (179 lines):

diff -r 1a45dcdd9ce7 -r 6bfe0553c0e3 public_html/docs/history
--- a/public_html/docs/history	Sat Sep 19 09:44:15 2009 +0200
+++ b/public_html/docs/history	Sat Sep 19 11:50:37 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Made the former $cc parameter for COM_mail an optional array of additional
+  email headers (using a string for that parameter still works as CC:) [Dirk]
 - Fixed reply notification for the very first comment (bug #0000973)
   [dengen, Dirk]
 - When an anonymous commentor left a name, use it in the comment notification
diff -r 1a45dcdd9ce7 -r 6bfe0553c0e3 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Sep 19 09:44:15 2009 +0200
+++ b/public_html/lib-common.php	Sat Sep 19 11:50:37 2009 +0200
@@ -3217,10 +3217,10 @@
 /**
 * Send an email.
 *
-* All emails sent by Geeklog are sent through this function now.
-*
-* NOTE: Please note that using the $cc parameter will expose the email addresses
-*       of all recipients. Use with care.
+* All emails sent by Geeklog are sent through this function.
+*
+* NOTE: Please note that using CC: will expose the email addresses of
+*       all recipients. Use with care.
 *
 * @param    string      $to         recipients name and email address
 * @param    string      $subject    subject of the email
@@ -3228,47 +3228,44 @@
 * @param    string      $from       (optional) sender of the the email
 * @param    boolean     $html       (optional) true if to be sent as HTML email
 * @param    int         $priority   (optional) add X-Priority header, if > 0
-* @param    string      $cc         (optional) other recipients (name + email)
+* @param    mixed       $optional   (optional) other headers or CC:
 * @return   boolean                 true if successful,  otherwise false
 *
 */
-function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' )
+function COM_mail($to, $subject, $message, $from = '', $html = false, $priority = 0, $optional = null)
 {
     global $_CONF;
 
     static $mailobj;
 
-    if( empty( $from ))
-    {
-        $from = COM_formatEmailAddress( $_CONF['site_name'], $_CONF['site_mail']);
-    }
-
-    $to = substr( $to, 0, strcspn( $to, "\r\n" ));
-    $cc = substr( $cc, 0, strcspn( $cc, "\r\n" ));
-    $from = substr( $from, 0, strcspn( $from, "\r\n" ));
-    $subject = substr( $subject, 0, strcspn( $subject, "\r\n" ));
-    $subject = COM_emailEscape( $subject );
-
-    if( function_exists( 'CUSTOM_mail' ))
-    {
-        return CUSTOM_mail( $to, $subject, $message, $from, $html, $priority, $cc );
-    }
-
-    include_once( 'Mail.php' );
-    include_once( 'Mail/RFC822.php' );
+    if (empty($from)) {
+        $from = COM_formatEmailAddress($_CONF['site_name'], $_CONF['site_mail']);
+    }
+
+    $to = substr($to, 0, strcspn($to, "\r\n"));
+    if (($optional != null) && !is_array($optional)) {
+        $optional = substr($optional, 0, strcspn($optional, "\r\n"));
+    }
+    $from = substr($from, 0, strcspn($from, "\r\n"));
+    $subject = substr($subject, 0, strcspn($subject, "\r\n"));
+    $subject = COM_emailEscape($subject);
+
+    if (function_exists('CUSTOM_mail')) {
+        return CUSTOM_mail($to, $subject, $message, $from, $html, $priority,
+                           $optional);
+    }
+
+    include_once 'Mail.php';
+    include_once 'Mail/RFC822.php';
 
     $method = $_CONF['mail_settings']['backend'];
 
-    if( !isset( $mailobj ))
-    {
-        if(( $method == 'sendmail' ) || ( $method == 'smtp' ))
-        {
-            $mailobj =& Mail::factory( $method, $_CONF['mail_settings'] );
-        }
-        else
-        {
+    if (! isset($mailobj)) {
+        if (($method == 'sendmail') || ($method == 'smtp')) {
+            $mailobj =& Mail::factory($method, $_CONF['mail_settings']);
+        } else {
             $method = 'mail';
-            $mailobj =& Mail::factory( $method );
+            $mailobj =& Mail::factory($method);
         }
     }
 
@@ -3276,34 +3273,28 @@
     $headers = array();
 
     $headers['From'] = $from;
-    if( $method != 'mail' )
-    {
+    if ($method != 'mail') {
         $headers['To'] = $to;
     }
-    if( !empty( $cc ))
-    {
-        $headers['Cc'] = $cc;
-    }
-    $headers['Date'] = date( 'r' ); // RFC822 formatted date
-    if( $method == 'smtp' )
-    {
-        list( $usec, $sec ) = explode( ' ', microtime());
-        $m = substr( $usec, 2, 5 );
-        $headers['Message-Id'] = '<' .  date( 'YmdHis' ) . '.' . $m
+    if (($optional != null) && !is_array($optional) && !empty($optional)) {
+        // assume old (optional) CC: header
+        $headers['Cc'] = $optional;
+    }
+    $headers['Date'] = date('r'); // RFC822 formatted date
+    if($method == 'smtp') {
+        list($usec, $sec) = explode(' ', microtime());
+        $m = substr($usec, 2, 5);
+        $headers['Message-Id'] = '<' .  date('YmdHis') . '.' . $m
                                . '@' . $_CONF['mail_settings']['host'] . '>';
     }
-    if( $html )
-    {
+    if ($html) {
         $headers['Content-Type'] = 'text/html; charset=' . $charset;
         $headers['Content-Transfer-Encoding'] = '8bit';
-    }
-    else
-    {
+    } else {
         $headers['Content-Type'] = 'text/plain; charset=' . $charset;
     }
     $headers['Subject'] = $subject;
-    if( $priority > 0 )
-    {
+    if ($priority > 0) {
         $headers['X-Priority'] = $priority;
     }
     $headers['X-Mailer'] = 'Geeklog ' . VERSION;
@@ -3317,13 +3308,19 @@
         }
     }
 
-    $retval = $mailobj->send( $to, $headers, $message );
-    if( $retval !== true )
-    {
-        COM_errorLog( $retval->toString(), 1 );
-    }
-
-    return( $retval === true ? true : false );
+    // add optional headers last
+    if (($optional != null) && is_array($optional)) {
+        foreach ($optional as $h => $v) {
+            $headers[$h] = $v;
+        }
+    }
+
+    $retval = $mailobj->send($to, $headers, $message);
+    if ($retval !== true) {
+        COM_errorLog($retval->toString(), 1);
+    }
+
+    return($retval === true ? true : false);
 }
 
 

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 08:17:33 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 08:17:33 -0400
Subject: [geeklog-cvs] geeklog: trim() name and email address in
	COM_formatEmailAddress
Message-ID: <hg.fe52314f43eb.1253362653.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fe52314f43eb
changeset: 7323:fe52314f43eb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 13:03:44 2009 +0200
description:
trim() name and email address in COM_formatEmailAddress

diffstat:

 public_html/lib-common.php |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 6bfe0553c0e3 -r fe52314f43eb public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Sep 19 11:50:37 2009 +0200
+++ b/public_html/lib-common.php	Sat Sep 19 13:03:44 2009 +0200
@@ -3196,18 +3196,20 @@
 * @return   string              formatted email address
 *
 */
-function COM_formatEmailAddress( $name, $address )
-{
+function COM_formatEmailAddress($name, $address)
+{
+    $name = trim($name);
+    $address = trim($address);
+
     if (function_exists('CUSTOM_formatEmailAddress')) {
         return CUSTOM_formatEmailAddress($name, $address);
     }
 
-    $formatted_name = COM_emailEscape( $name );
+    $formatted_name = COM_emailEscape($name);
 
     // if the name comes back unchanged, it's not UTF-8, so preg_match is fine
-    if(( $formatted_name == $name ) && preg_match( '/[^0-9a-z ]/i', $name ))
-    {
-        $formatted_name = str_replace( '"', '\\"', $formatted_name );
+    if (($formatted_name == $name) && preg_match('/[^0-9a-z ]/i', $name)) {
+        $formatted_name = str_replace('"', '\\"', $formatted_name);
         $formatted_name = '"' . $formatted_name . '"';
     }
 

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 08:17:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 08:17:34 -0400
Subject: [geeklog-cvs] geeklog: Changing the Post Mode in Advanced Editor
	mode selected...
Message-ID: <hg.269358e160f8.1253362654.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/269358e160f8
changeset: 7324:269358e160f8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 14:17:00 2009 +0200
description:
Changing the Post Mode in Advanced Editor mode selected the wrong tab (bug #0000980, patch provided by dengen)

diffstat:

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

diffs (32 lines):

diff -r fe52314f43eb -r 269358e160f8 public_html/docs/history
--- a/public_html/docs/history	Sat Sep 19 13:03:44 2009 +0200
+++ b/public_html/docs/history	Sat Sep 19 14:17:00 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Changing the Post Mode in Advanced Editor mode selected the wrong tab
+  (bug #0000980, patch provided by dengen)
 - Made the former $cc parameter for COM_mail an optional array of additional
   email headers (using a string for that parameter still works as CC:) [Dirk]
 - Fixed reply notification for the very first comment (bug #0000973)
diff -r fe52314f43eb -r 269358e160f8 public_html/javascript/storyeditor_fckeditor.js
--- a/public_html/javascript/storyeditor_fckeditor.js	Sat Sep 19 13:03:44 2009 +0200
+++ b/public_html/javascript/storyeditor_fckeditor.js	Sat Sep 19 14:17:00 2009 +0200
@@ -24,7 +24,8 @@
     }
 
     function change_editmode(obj) {
-        showhideEditorDiv("editor",1);
+        showhideEditorDiv("editor",
+                document.getElementById('navlist').childElementCount - 6);
         if (obj.value == 'html') {
             document.getElementById('html_editor').style.display='none';
             document.getElementById('text_editor').style.display='';
@@ -113,4 +114,4 @@
         oEditor1.ToolbarSet.Load( toolbar ) ;
         var oEditor2 = FCKeditorAPI.GetInstance('bodyhtml');
         oEditor2.ToolbarSet.Load( toolbar ) ;
-   }
\ No newline at end of file
+   }

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 10:20:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 10:20:23 -0400
Subject: [geeklog-cvs] geeklog: - Added meta description and meta keywords
	to polls plu...
Message-ID: <hg.27d076900eaf.1253370023.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/27d076900eaf
changeset: 7325:27d076900eaf
user:      Tom <websitemaster at cogeco.net>
date:      Mon Sep 14 09:33:05 2009 -0400
description:
- Added meta description and meta keywords to polls plugin (displays for poll results and poll vote page).
- Updated staticpage plugin to use Geeklog's meta tags language variables where needed.

diffstat:

 plugins/polls/install_defaults.php              |   6 ++++++
 plugins/polls/language/english.php              |   3 ++-
 plugins/polls/language/english_utf-8.php        |   3 ++-
 plugins/polls/sql/mssql_install.php             |   4 +++-
 plugins/polls/sql/mssql_updates.php             |   3 ++-
 plugins/polls/sql/mysql_install.php             |   4 +++-
 plugins/polls/sql/mysql_updates.php             |   3 ++-
 plugins/polls/templates/admin/polleditor.thtml  |  10 +++++++++-
 plugins/staticpages/install_defaults.php        |   2 +-
 plugins/staticpages/language/english.php        |   2 --
 plugins/staticpages/language/english_utf-8.php  |   2 --
 public_html/admin/plugins/polls/index.php       |  27 +++++++++++++++++++++++----
 public_html/admin/plugins/staticpages/index.php |   4 ++--
 public_html/docs/english/polls.html             |   5 +++++
 public_html/polls/index.php                     |  16 +++++++++++++---
 15 files changed, 73 insertions(+), 21 deletions(-)

diffs (truncated from 329 to 300 lines):

diff -r 269358e160f8 -r 27d076900eaf plugins/polls/install_defaults.php
--- a/plugins/polls/install_defaults.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/install_defaults.php	Mon Sep 14 09:33:05 2009 -0400
@@ -83,6 +83,10 @@
  */
 $_PO_DEFAULT['aftersave'] = 'list';
 
+
+// Display Meta Tags for static pages (1 = show, 0 = don't) 
+$_PO_DEFAULT['meta_tags'] = 0;
+
 // Define default permissions for new polls created from the Admin panel.
 // Permissions are perm_owner, perm_group, perm_members, perm_anon (in that
 // order). Possible values:
@@ -134,6 +138,8 @@
                 0, 0, 0, 80, true, 'polls');
         $c->add('aftersave', $_PO_DEFAULT['aftersave'], 'select',
                 0, 0, 9, 90, true, 'polls');
+        $c->add('meta_tags', $_PO_DEFAULT['meta_tags'], 'select',
+                0, 0, 0, 100, true, 'polls');        
 
         $c->add('fs_permissions', NULL, 'fieldset', 0, 1, NULL, 0, true, 'polls');
         $c->add('default_permissions', $_PO_DEFAULT['default_permissions'],
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/language/english.php
--- a/plugins/polls/language/english.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/language/english.php	Mon Sep 14 09:33:05 2009 -0400
@@ -126,7 +126,8 @@
     'polladdresstime' => 'Voter IP Address valid for',
     'delete_polls' => 'Delete Polls with Owner?',
     'aftersave' => 'After Saving Poll',
-    'default_permissions' => 'Poll Default Permissions'
+    'default_permissions' => 'Poll Default Permissions',
+    'meta_tags' => 'Enable Meta Tags'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/language/english_utf-8.php
--- a/plugins/polls/language/english_utf-8.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/language/english_utf-8.php	Mon Sep 14 09:33:05 2009 -0400
@@ -126,7 +126,8 @@
     'polladdresstime' => 'Voter IP Address valid for',
     'delete_polls' => 'Delete Polls with Owner?',
     'aftersave' => 'After Saving Poll',
-    'default_permissions' => 'Poll Default Permissions'
+    'default_permissions' => 'Poll Default Permissions',
+    'meta_tags' => 'Enable Meta Tags'
 );
 
 $LANG_configsubgroups['polls'] = array(
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/sql/mssql_install.php
--- a/plugins/polls/sql/mssql_install.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/sql/mssql_install.php	Mon Sep 14 09:33:05 2009 -0400
@@ -60,6 +60,8 @@
 CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
     [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [topic] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+    [meta_description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+    [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,    
     [voters] [numeric](8, 0) NULL ,
     [questions] [int] NOT NULL ,
     [date] [datetime] NULL ,
@@ -120,7 +122,7 @@
 
 // default poll
 
-$DEFVALUES[] = "INSERT INTO {$_TABLES['polltopics']} (pid, topic, voters, questions, date, display, is_open, hideresults, commentcode, statuscode, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklogfeaturepoll', 'Tell us your opinion about Geeklog', 0, 2, NOW(), 1, 1, 1, 0, 0, {$_USER['uid']}, #group#, 3, 2, 2, 2);";
+$DEFVALUES[] = "INSERT INTO {$_TABLES['polltopics']} (pid, topic, meta_description, meta_keywords, voters, questions, date, display, is_open, hideresults, commentcode, statuscode, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklogfeaturepoll', 'Tell us your opinion about Geeklog', 'A poll about users opinions of Geeklog.', 'Poll, Geeklog, Opinion', 0, 2, NOW(), 1, 1, 1, 0, 0, {$_USER['uid']}, #group#, 3, 2, 2, 2);";
 
 $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
 $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/sql/mssql_updates.php	Mon Sep 14 09:33:05 2009 -0400
@@ -38,7 +38,8 @@
         "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['pollquestions']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [pid] VARCHARS(40)",
-        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)"
+        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)",
+        "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER topic, ADD meta_keywords [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description"
     )
 
 );
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/sql/mysql_install.php	Mon Sep 14 09:33:05 2009 -0400
@@ -61,6 +61,8 @@
 CREATE TABLE {$_TABLES['polltopics']} (
   pid varchar(40) NOT NULL default '',
   topic varchar(255) default NULL,
+  meta_description TEXT NULL,
+  meta_keywords TEXT NULL,    
   voters mediumint(8) unsigned default NULL,
   questions int(11) NOT NULL default '0',
   date datetime default NULL,
@@ -99,7 +101,7 @@
 
 // default poll
 
-$DEFVALUES[] = "INSERT INTO {$_TABLES['polltopics']} (pid, topic, voters, questions, date, display, is_open, hideresults, commentcode, statuscode, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklogfeaturepoll', 'Tell us your opinion about Geeklog', 0, 2, NOW(), 1, 1, 1, 0, 0, {$_USER['uid']}, #group#, 3, 2, 2, 2);";
+$DEFVALUES[] = "INSERT INTO {$_TABLES['polltopics']} (pid, topic, meta_description, meta_keywords, voters, questions, date, display, is_open, hideresults, commentcode, statuscode, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklogfeaturepoll', 'Tell us your opinion about Geeklog', 'A poll about users opinions of Geeklog.', 'Poll, Geeklog, Opinion', 0, 2, NOW(), 1, 1, 1, 0, 0, {$_USER['uid']}, #group#, 3, 2, 2, 2);";
 
 $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
 $DEFVALUES[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/sql/mysql_updates.php	Mon Sep 14 09:33:05 2009 -0400
@@ -38,7 +38,8 @@
         "ALTER TABLE {$_TABLES['pollanswers']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['pollquestions']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['polltopics']} CHANGE pid pid varchar(40) NOT NULL default ''",
-        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''"
+        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''",
+        "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description TEXT NULL AFTER topic, ADD meta_keywords TEXT NULL AFTER meta_description"
     )
 
 );
diff -r 269358e160f8 -r 27d076900eaf plugins/polls/templates/admin/polleditor.thtml
--- a/plugins/polls/templates/admin/polleditor.thtml	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/polls/templates/admin/polleditor.thtml	Mon Sep 14 09:33:05 2009 -0400
@@ -7,10 +7,18 @@
                                             <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="40" maxlength="40"{xhtml}> {lang_donotusespaces}</td>
                                         </tr>
                                         <tr>
-                                            <td align="right">{lang_topic}:</td>
+                                            <td align="right" valign="top">{lang_topic}:</td>
                                             <td><input type="text" name="topic" value="{poll_topic}" size="50" maxlength="255"{xhtml}><br{xhtml}>{poll_topic_info}</td>
                                         </tr>
                                         <tr>
+                                            <td valign="top" align="right">{lang_metadescription}:</td>
+                                        <td><textarea name="meta_description" style="width:100%" rows="2">{meta_description}</textarea></td>
+                                        </tr>
+                                        <tr>
+                                            <td valign="top" align="right">{lang_metakeywords}:</td>
+                                            <td><textarea name="meta_keywords" style="width:100%" rows="2">{meta_keywords}</textarea></td>
+                                        </tr>                                          
+                                        <tr>
                                             <td align="right">{lang_mode}:</td>
                                             <td>
                                                 <select name="commentcode">
diff -r 269358e160f8 -r 27d076900eaf plugins/staticpages/install_defaults.php
--- a/plugins/staticpages/install_defaults.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/staticpages/install_defaults.php	Mon Sep 14 09:33:05 2009 -0400
@@ -110,7 +110,7 @@
 $_SP_DEFAULT['atom_max_items'] = 10;
 
 // Display Meta Tags for static pages (1 = show, 0 = don't) 
- $_SP_DEFAULT['meta_tags'] = 0;
+$_SP_DEFAULT['meta_tags'] = 0;
 
 /**
 * Initialize Static Pages plugin configuration
diff -r 269358e160f8 -r 27d076900eaf plugins/staticpages/language/english.php
--- a/plugins/staticpages/language/english.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/staticpages/language/english.php	Mon Sep 14 09:33:05 2009 -0400
@@ -107,8 +107,6 @@
     'edit' => 'Edit',
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
-    'meta_description' => 'Meta Description',
-    'meta_keywords' => 'Meta Keywords',    
     'search' => 'Search',
     'submit' => 'Submit'
 );
diff -r 269358e160f8 -r 27d076900eaf plugins/staticpages/language/english_utf-8.php
--- a/plugins/staticpages/language/english_utf-8.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/plugins/staticpages/language/english_utf-8.php	Mon Sep 14 09:33:05 2009 -0400
@@ -107,8 +107,6 @@
     'edit' => 'Edit',
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
-    'meta_description' => 'Meta Description',
-    'meta_keywords' => 'Meta Keywords',
     'search' => 'Search',
     'submit' => 'Submit'
 );
diff -r 269358e160f8 -r 27d076900eaf public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/public_html/admin/plugins/polls/index.php	Mon Sep 14 09:33:05 2009 -0400
@@ -132,6 +132,8 @@
 * @param    array   $Q              Array of poll questions
 * @param    string  $mainpage       Checkbox: poll appears on homepage
 * @param    string  $topic          The text for the topic
+* @param    string  $meta_description
+* @param    string  $meta_keywords
 * @param    int     $statuscode     (unused)
 * @param    string  $open           Checkbox: poll open for voting
 * @param    string  $hideresults    Checkbox: hide results until closed
@@ -148,7 +150,7 @@
 * @return   string                  HTML redirect or error message
 *
 */
-function savepoll($pid, $old_pid, $Q, $mainpage, $topic, $statuscode, $open,
+function savepoll($pid, $old_pid, $Q, $mainpage, $topic, $meta_description, $meta_keywords, $statuscode, $open,
                   $hideresults, $commentcode, $A, $V, $R, $owner_id, $group_id,
                   $perm_owner, $perm_group, $perm_members, $perm_anon)
 
@@ -162,6 +164,8 @@
     list($perm_owner,$perm_group,$perm_members,$perm_anon) = SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
 
     $topic = COM_stripslashes($topic);
+    $meta_description = COM_stripslashes($meta_description);
+    $meta_keywords = COM_stripslashes($meta_keywords);
     $pid = COM_sanitizeID($pid);
     $old_pid = COM_sanitizeID($old_pid);
     if (empty($pid)) {
@@ -246,6 +250,8 @@
     DB_delete($_TABLES['pollquestions'], 'pid', $del_pid);
 
     $topic = addslashes ($topic);
+    $meta_description = addslashes ($meta_description);
+    $meta_keywords = addslashes ($meta_keywords);
 
     $k = 0; // set up a counter to make sure we do assign a straight line of question id's
     $v = 0; // re-count votes sine they might have been changed
@@ -278,7 +284,7 @@
         }
     }
     // save topics after the questions so we can include question count into table
-    $sql = "'$pid','$topic',$v, $k, '" . date ('Y-m-d H:i:s');
+    $sql = "'$pid','$topic','$meta_description','$meta_keywords',$v, $k, '" . date ('Y-m-d H:i:s');
 
     if ($mainpage == 'on') {
         $sql .= "',1";
@@ -299,7 +305,7 @@
     $sql .= ",'$statuscode','$commentcode',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon";
 
     // Save poll topic
-    DB_save($_TABLES['polltopics'],"pid, topic, voters, questions, date, display, "
+    DB_save($_TABLES['polltopics'],"pid, topic, meta_description, meta_keywords, voters, questions, date, display, "
            . "is_open, hideresults, statuscode, commentcode, owner_id, group_id, "
            . "perm_owner, perm_group, perm_members, perm_anon",$sql);
 
@@ -397,6 +403,8 @@
     } else {
         $T['pid'] = COM_makeSid ();
         $T['topic'] = '';
+        $T['meta_description'] = '';
+        $T['meta_keywords'] = '';
         $T['voters'] = 0;
         $T['display'] = 1;
         $T['is_open'] = 1;
@@ -419,6 +427,16 @@
     $poll_templates->set_var('lang_topic', $LANG25[9]);
     $poll_templates->set_var('poll_topic', htmlspecialchars ($T['topic']));
     $poll_templates->set_var('lang_mode', $LANG25[1]);
+    
+    $poll_templates->set_var('lang_metadescription', $LANG_ADMIN['meta_description']);
+    $poll_templates->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
+    if (!empty($T['meta_description'])) {
+        $poll_templates->set_var('meta_description', $T['meta_description']);
+    }
+    if (!empty($T['meta_keywords'])) {
+        $poll_templates->set_var('meta_keywords', $T['meta_keywords']);        
+    }
+    
 
     $poll_templates->set_var('status_options', COM_optionList ($_TABLES['statuscodes'], 'code,name', $T['statuscode']));
     $poll_templates->set_var('comment_options', COM_optionList($_TABLES['commentcodes'],'code,name',$T['commentcode']));
@@ -600,7 +618,8 @@
             $hideresults = COM_applyFilter ($_POST['hideresults']);
         }
         $display .= savepoll ($pid, $old_pid, $_POST['question'], $mainpage,
-                        $_POST['topic'], $statuscode, $open, $hideresults,
+                        $_POST['topic'], $_POST['meta_description'], $_POST['meta_keywords'], 
+                        $statuscode, $open, $hideresults,
                         COM_applyFilter ($_POST['commentcode'], true),
                         $_POST['answer'], $_POST['votes'], $_POST['remark'],
                         COM_applyFilter ($_POST['owner_id'], true),
diff -r 269358e160f8 -r 27d076900eaf public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sat Sep 19 14:17:00 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Mon Sep 14 09:33:05 2009 -0400
@@ -304,8 +304,8 @@
         $title = htmlspecialchars(stripslashes($A['sp_title']));
     }
     $sp_template->set_var('sp_title', $title);
-    $sp_template->set_var('lang_metadescription', $LANG_STATIC['meta_description']);
-    $sp_template->set_var('lang_metakeywords', $LANG_STATIC['meta_keywords']);
+    $sp_template->set_var('lang_metadescription', $LANG_ADMIN['meta_description']);
+    $sp_template->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
     if (!empty($A['meta_description'])) {
         $sp_template->set_var('meta_description', $A['meta_description']);
     }
diff -r 269358e160f8 -r 27d076900eaf public_html/docs/english/polls.html
--- a/public_html/docs/english/polls.html	Sat Sep 19 14:17:00 2009 +0200
+++ b/public_html/docs/english/polls.html	Mon Sep 14 09:33:05 2009 -0400
@@ -90,6 +90,11 @@
     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
     </ul></td>
 </tr>
+<tr>
+  <td><a name="desc_meta_tags">meta_tags</a></td>
+  <td>false</td>
+  <td>Whether to include the meta tags of the poll when it is displayed.</td>
+</tr>
 </table>
 
 <h2>How do the polls work?</h2>
diff -r 269358e160f8 -r 27d076900eaf public_html/polls/index.php
--- a/public_html/polls/index.php	Sat Sep 19 14:17:00 2009 +0200

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 10:20:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 10:20:23 -0400
Subject: [geeklog-cvs] geeklog: Fixed broken poll upgrade procedure for 2.1.0
Message-ID: <hg.39be7f133232.1253370023.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/39be7f133232
changeset: 7326:39be7f133232
user:      Tom <websitemaster at cogeco.net>
date:      Mon Sep 14 20:40:59 2009 -0400
description:
Fixed broken poll upgrade procedure for 2.1.0

diffstat:

 plugins/polls/functions.inc         |  14 +++++++++++++-
 plugins/polls/sql/mssql_updates.php |  20 ++++++++++++++++++--
 plugins/polls/sql/mysql_updates.php |  19 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 4 deletions(-)

diffs (90 lines):

diff -r 27d076900eaf -r 39be7f133232 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Mon Sep 14 09:33:05 2009 -0400
+++ b/plugins/polls/functions.inc	Mon Sep 14 20:40:59 2009 -0400
@@ -1158,9 +1158,21 @@
                 }
             }
             
+            $current_version = '2.1.0';
+            break;
+        case '2.1.0':
+            if (isset($_UPDATES[$current_version])) {
+                $_SQL = $_UPDATES[$current_version];
+                foreach ($_SQL as $sql) {
+                    DB_query($sql);
+                }
+            }
+            
+            update_ConfValues_2_1_0();            
+            
             $current_version = '2.1.1';
             break;
-
+            
         default:
             $done = true;
         }
diff -r 27d076900eaf -r 39be7f133232 plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php	Mon Sep 14 09:33:05 2009 -0400
+++ b/plugins/polls/sql/mssql_updates.php	Mon Sep 14 20:40:59 2009 -0400
@@ -38,10 +38,26 @@
         "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['pollquestions']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [pid] VARCHARS(40)",
-        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)",
+        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)"
+    ),
+
+    '2.1.0' => array(
         "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER topic, ADD meta_keywords [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description"
     )
-
 );
 
+function update_ConfValues_2_1_0()
+{
+    global $_CONF, $_PO_DEFAULT;
+
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+    $c = config::get_instance();
+    
+    // meta tag config options.
+    $c->add('meta_tags', $_PO_DEFAULT['meta_tags'], 'select', 0, 0, 0, 100, true, 'polls');
+
+    return true;
+}
+
 ?>
diff -r 27d076900eaf -r 39be7f133232 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Mon Sep 14 09:33:05 2009 -0400
+++ b/plugins/polls/sql/mysql_updates.php	Mon Sep 14 20:40:59 2009 -0400
@@ -38,10 +38,27 @@
         "ALTER TABLE {$_TABLES['pollanswers']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['pollquestions']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['polltopics']} CHANGE pid pid varchar(40) NOT NULL default ''",
-        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''",
+        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''"
+    ),
+
+    '2.1.0' => array(
         "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description TEXT NULL AFTER topic, ADD meta_keywords TEXT NULL AFTER meta_description"
     )
 
 );
 
+function update_ConfValues_2_1_0()
+{
+    global $_CONF, $_PO_DEFAULT;
+
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+    $c = config::get_instance();
+    
+    // meta tag config options.
+    $c->add('meta_tags', $_PO_DEFAULT['meta_tags'], 'select', 0, 0, 0, 100, true, 'polls');
+
+    return true;
+}
+
 ?>

From geeklog-cvs at lists.geeklog.net  Sat Sep 19 11:58:47 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 19 Sep 2009 11:58:47 -0400
Subject: [geeklog-cvs] geeklog: Upgrading from Geeklog 1.5.2 did not extend
	the pid (po...
Message-ID: <hg.55608273b965.1253375927.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/55608273b965
changeset: 7327:55608273b965
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 17:58:30 2009 +0200
description:
Upgrading from Geeklog 1.5.2 did not extend the pid (poll id) to 40 characters. Let's try that again when upgrading to 1.6.1 ...

diffstat:

 plugins/polls/functions.inc         |  12 +++++-------
 plugins/polls/sql/mssql_updates.php |  11 +++++++----
 plugins/polls/sql/mysql_updates.php |  10 ++++++----
 public_html/docs/history            |   4 ++++
 4 files changed, 22 insertions(+), 15 deletions(-)

diffs (89 lines):

diff -r 39be7f133232 -r 55608273b965 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Mon Sep 14 20:40:59 2009 -0400
+++ b/plugins/polls/functions.inc	Sat Sep 19 17:58:30 2009 +0200
@@ -1151,15 +1151,13 @@
     while (! $done) {
         switch ($current_version) {
         case '2.0.1':
-            if (isset($_UPDATES[$current_version])) {
-                $_SQL = $_UPDATES[$current_version];
-                foreach ($_SQL as $sql) {
-                    DB_query($sql);
-                }
-            }
-            
+            $current_version = '2.0.2';
+            break;
+
+        case '2.0.2':
             $current_version = '2.1.0';
             break;
+
         case '2.1.0':
             if (isset($_UPDATES[$current_version])) {
                 $_SQL = $_UPDATES[$current_version];
diff -r 39be7f133232 -r 55608273b965 plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php	Mon Sep 14 20:40:59 2009 -0400
+++ b/plugins/polls/sql/mssql_updates.php	Sat Sep 19 17:58:30 2009 +0200
@@ -34,16 +34,19 @@
 
 $_UPDATES = array(
 
-    '2.0.1' => array(
+    '2.1.0' => array(
+        // These pid changes should have happened when upgrading from 2.0.2
+        // to 2.1.0 but were previously listed for an upgrade from 2.0.1 and
+        // therefore may have not been applied. Apply again to be sure.
         "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['pollquestions']} ALTER COLUMN [pid] VARCHARS(40)",
         "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [pid] VARCHARS(40)",
-        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)"
-    ),
+        "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)",
 
-    '2.1.0' => array(
+        // New field post-2.1.0
         "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER topic, ADD meta_keywords [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description"
     )
+
 );
 
 function update_ConfValues_2_1_0()
diff -r 39be7f133232 -r 55608273b965 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Mon Sep 14 20:40:59 2009 -0400
+++ b/plugins/polls/sql/mysql_updates.php	Sat Sep 19 17:58:30 2009 +0200
@@ -34,14 +34,16 @@
 
 $_UPDATES = array(
 
-    '2.0.1' => array(
+    '2.1.0' => array(
+        // These pid changes should have happened when upgrading from 2.0.2
+        // to 2.1.0 but were previously listed for an upgrade from 2.0.1 and
+        // therefore may have not been applied. Apply again to be sure.
         "ALTER TABLE {$_TABLES['pollanswers']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['pollquestions']} CHANGE pid pid varchar(40) NOT NULL default ''",
         "ALTER TABLE {$_TABLES['polltopics']} CHANGE pid pid varchar(40) NOT NULL default ''",
-        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''"
-    ),
+        "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''",
 
-    '2.1.0' => array(
+        // New field post-2.1.0
         "ALTER TABLE {$_TABLES['polltopics']} ADD meta_description TEXT NULL AFTER topic, ADD meta_keywords TEXT NULL AFTER meta_description"
     )
 
diff -r 39be7f133232 -r 55608273b965 public_html/docs/history
--- a/public_html/docs/history	Mon Sep 14 20:40:59 2009 -0400
+++ b/public_html/docs/history	Sat Sep 19 17:58:30 2009 +0200
@@ -74,6 +74,10 @@
 
 Polls Plugin
 ------------
+- When upgrading from Geeklog 1.5.2, the length of the poll IDs was not extended
+  to 40 characters - only fresh installs of Geeklog 1.6.0 and upgrades from
+  older versions worked correctly (cf. feature request #0000754) [Dirk]
+- Added support for meta tags and meta keywords, provided by Tom Homer
 - Introduced [poll:], [poll_vote:], and [poll_result:] autotags, allowing to
   embed polls where autotags are allowed, provided by Tom Homer
 

From geeklog-cvs at lists.geeklog.net  Sun Sep 20 04:50:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 20 Sep 2009 04:50:27 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics
Message-ID: <hg.01eed07e51e9.1253436627.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/01eed07e51e9
changeset: 7328:01eed07e51e9
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Sep 19 22:42:31 2009 +0200
description:
Cosmetics

diffstat:

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

diffs (28 lines):

diff -r 55608273b965 -r 01eed07e51e9 public_html/usersettings.php
--- a/public_html/usersettings.php	Sat Sep 19 17:58:30 2009 +0200
+++ b/public_html/usersettings.php	Sat Sep 19 22:42:31 2009 +0200
@@ -532,20 +532,18 @@
 
     $T = $GLOBALS['_DATE_TIMEZONE_DATA'];
 
-    while ($tDetails = current($T)) {
-        $tzcode = htmlspecialchars(key($T));
+    foreach ($T as $tzid => $tDetails) {
+        $tzcode = str_replace('_', ' ', $tzid);
+        $tzcode = htmlspecialchars($tzcode);
         $selection .= '<option value="' . $tzcode . '"';
         if ($timezone == $tzcode) {
-                $selection .= ' selected="selected"';
-        } else {
-                $selection .= '';
+            $selection .= ' selected="selected"';
         }
         $hours = $tDetails['offset'] / (3600 * 1000);
         if ($hours > 0) {
             $hours = "+$hours";
         }
         $selection .= ">$hours, {$tDetails['shortname']} ($tzcode)</option>" . LB;
-        next($T);
     }
     $selection .= '</select>';
     $preferences->set_var ('timezone_selector', $selection);

From geeklog-cvs at lists.geeklog.net  Sun Sep 20 04:50:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 20 Sep 2009 04:50:27 -0400
Subject: [geeklog-cvs] geeklog: Suppress possible warnings about the
	timezone setting b...
Message-ID: <hg.b973949caecc.1253436627.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b973949caecc
changeset: 7329:b973949caecc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 20 09:46:54 2009 +0200
description:
Suppress possible warnings about the timezone setting before we had a chance to set it

diffstat:

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

diffs (21 lines):

diff -r 01eed07e51e9 -r b973949caecc public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Sep 19 22:42:31 2009 +0200
+++ b/public_html/lib-common.php	Sun Sep 20 09:46:54 2009 +0200
@@ -1984,7 +1984,7 @@
         $logentry = str_replace( array( '<?', '?>' ), array( '(@', '@)' ),
                                  $logentry );
 
-        $timestamp = strftime( '%c' );
+        $timestamp = @strftime( '%c' );
 
         if (!isset($_CONF['path_layout']) &&
                 (($actionid == 2) || empty($actionid))) {
@@ -2066,7 +2066,7 @@
         $logentry = str_replace( array( '<?', '?>' ), array( '(@', '@)' ),
                                  $logentry );
 
-        $timestamp = strftime( '%c' );
+        $timestamp = @strftime( '%c' );
         $logfile = $_CONF['path_log'] . 'access.log';
 
         if( !$file = fopen( $logfile, 'a' ))

From geeklog-cvs at lists.geeklog.net  Sun Sep 20 04:50:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 20 Sep 2009 04:50:28 -0400
Subject: [geeklog-cvs] geeklog: Use PATH_SEPARATOR
Message-ID: <hg.f4103435abc5.1253436628.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f4103435abc5
changeset: 7331:f4103435abc5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 20 10:02:48 2009 +0200
description:
Use PATH_SEPARATOR

diffstat:

 system/classes/unpacker.class.php |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (16 lines):

diff -r 036926b4e089 -r f4103435abc5 system/classes/unpacker.class.php
--- a/system/classes/unpacker.class.php	Sun Sep 20 10:01:15 2009 +0200
+++ b/system/classes/unpacker.class.php	Sun Sep 20 10:02:48 2009 +0200
@@ -80,11 +80,7 @@
     function unpacker($file, $mime_type = null) {
 
         // default directory separator
-        if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
-            $this->d_sep = '\\';
-        } else {
-            $this->d_sep = '/';
-        }
+        $this->d_sep = PATH_SEPARATOR;
 
         // if the file doesn't have it's path, assume local
         if (! strstr($file, $this->d_sep)) {

From geeklog-cvs at lists.geeklog.net  Sun Sep 20 04:50:29 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 20 Sep 2009 04:50:29 -0400
Subject: [geeklog-cvs] geeklog: Added missing GPL headers
Message-ID: <hg.30e040149cbe.1253436629.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/30e040149cbe
changeset: 7332:30e040149cbe
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 20 10:41:17 2009 +0200
description:
Added missing GPL headers

diffstat:

 public_html/javascript/advanced_editor.js         |  21 ++++++++++++++++++++-
 public_html/javascript/common.js                  |   6 +++---
 public_html/javascript/configmanager.js           |   6 +++---
 public_html/javascript/moveusers.js               |   6 +++---
 public_html/javascript/profile_editor.js          |  21 ++++++++++++++++++++-
 public_html/javascript/staticpages_fckeditor.js   |  21 ++++++++++++++++++++-
 public_html/javascript/storyeditor_fckeditor.js   |  21 ++++++++++++++++++++-
 public_html/javascript/submitcomment_fckeditor.js |  23 +++++++++++++++++++++--
 public_html/javascript/submitstory_fckeditor.js   |  23 +++++++++++++++++++++--
 9 files changed, 131 insertions(+), 17 deletions(-)

diffs (281 lines):

diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/advanced_editor.js
--- a/public_html/javascript/advanced_editor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/advanced_editor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,30 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004,2005,2006 by the following authors:               |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.1    Date: Jun 4, 2006                                          |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
 // | Javascript functions for Geeklog Advanced Editor                          |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
 
 
     function enablearchive(obj) {
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/common.js
--- a/public_html/javascript/common.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/common.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,11 @@
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.3                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | Commmon javascript functions                                              |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2005,2006 by the following authors:                         |
+// | Copyright (C) 2005-2009 by the following authors:                         |
 // |                                                                           |
 // |            Blaine Lang - blaine at portalparts.com                           |
 // +---------------------------------------------------------------------------+
@@ -70,4 +70,4 @@
         } else if (option == 'toggle') {
             elementToggle(id);
         }
-    }
\ No newline at end of file
+    }
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/configmanager.js
--- a/public_html/javascript/configmanager.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/configmanager.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,11 @@
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.5                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | javascript functions to support the online configuration manager          |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2005,2006 by the following authors:                         |
+// | Copyright (C) 2005-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Aaron Blankstein  - kantai AT gmail DOT com                      |
 // +---------------------------------------------------------------------------+
@@ -191,4 +191,4 @@
  document.group.appendChild(namev);
  document.group.appendChild(action);
  document.group.submit();
-}
\ No newline at end of file
+}
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/moveusers.js
--- a/public_html/javascript/moveusers.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/moveusers.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,12 +1,12 @@
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.3                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | Set of javascript functions to support the user-move feature              |
 // | where two selectboxes are presented                                       |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004 by the following authors:                         |
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors:   Matt Kruse  - matt at mattkruse.com                               |
 // |            Blaine Lang - blaine at portalparts.com                           |
@@ -117,4 +117,4 @@
         }
     from.selectedIndex = -1;
     to.selectedIndex = -1;
-    }
\ No newline at end of file
+    }
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/profile_editor.js
--- a/public_html/javascript/profile_editor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/profile_editor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,30 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004,2005,2006 by the following authors:               |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.0    Date: Jun 24, 2006                                         |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
 // | Javascript functions for Account Profile Editor                           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
 
 // @param  string   selected    Name of div that has been selected
 // @param  int      selindex    index id of the selected tab as in 1 - 7 used to set the selected tab
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/staticpages_fckeditor.js
--- a/public_html/javascript/staticpages_fckeditor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/staticpages_fckeditor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,30 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004 by the following authors:                         |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.0    Date: Jun 4, 2005                                          |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
 // | Javascript functions for FCKEditor Integration into Geeklog               |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
 
 
     window.onload = function() {
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/storyeditor_fckeditor.js
--- a/public_html/javascript/storyeditor_fckeditor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/storyeditor_fckeditor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,11 +1,30 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004,2005,2006 by the following authors:               |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.1    Date: Jun 4, 2006                                          |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
 // | Javascript functions for FCKEditor Integration into Geeklog               |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
 
     window.onload = function() {
         var oFCKeditor1 = new FCKeditor( 'introhtml' ) ;
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/submitcomment_fckeditor.js
--- a/public_html/javascript/submitcomment_fckeditor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/submitcomment_fckeditor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,9 +1,28 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004 by the following authors:                         |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.0    Date: Jun 4, 2005                                          |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
-// | Javascript functions for FCKEditor Integration into Geeklog                |
+// | Javascript functions for FCKEditor Integration into Geeklog               |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
diff -r f4103435abc5 -r 30e040149cbe public_html/javascript/submitstory_fckeditor.js
--- a/public_html/javascript/submitstory_fckeditor.js	Sun Sep 20 10:02:48 2009 +0200
+++ b/public_html/javascript/submitstory_fckeditor.js	Sun Sep 20 10:41:17 2009 +0200
@@ -1,9 +1,28 @@
+/* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2003,2004 by the following authors:                         |
+// | Geeklog 1.6                                                               |
+// +---------------------------------------------------------------------------+
+// | Copyright (C) 2003-2009 by the following authors:                         |
 // | Version 1.0    Date: Jun 4, 2005                                          |
 // | Authors:   Blaine Lang - blaine at portalparts.com                           |
 // |                                                                           |
-// | Javascript functions for FCKEditor Integration into Geeklog                |
+// | Javascript functions for FCKEditor Integration into Geeklog               |
+// |                                                                           |
+// +---------------------------------------------------------------------------+
+// |                                                                           |
+// | 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.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 

From geeklog-cvs at lists.geeklog.net  Sun Sep 20 04:50:28 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 20 Sep 2009 04:50:28 -0400
Subject: [geeklog-cvs] geeklog: Converted CR/LF line endings to LF only - no
	change in ...
Message-ID: <hg.036926b4e089.1253436628.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/036926b4e089
changeset: 7330:036926b4e089
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 20 10:01:15 2009 +0200
description:
Converted CR/LF line endings to LF only - no change in content

diffstat:

 system/classes/unpacker.class.php |  956 +++++++++++++++++++++---------------------
 1 files changed, 478 insertions(+), 478 deletions(-)

diffs (truncated from 960 to 300 lines):

diff -r b973949caecc -r 036926b4e089 system/classes/unpacker.class.php
--- a/system/classes/unpacker.class.php	Sun Sep 20 09:46:54 2009 +0200
+++ b/system/classes/unpacker.class.php	Sun Sep 20 10:01:15 2009 +0200
@@ -1,478 +1,478 @@
-<?php
-
-/* Reminder: always indent with 4 spaces (no tabs). */
-// +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
-// +---------------------------------------------------------------------------+
-// | unpacker.class.php                                                        |
-// |                                                                           |
-// | unpacker - archive libs wrapper                                           |
-// | This class wraps calls to pecl Zip, pear Zip, pear Tar, using the best    |
-// | package available to unpack or list information about the archive.        |
-// +---------------------------------------------------------------------------+
-// | Copyright (C) 2009 by the following authors:                              |
-// |                                                                           |
-// | Authors: Justin Carlson        - justin DOT carlson AT gmail DOT com      |
-// +---------------------------------------------------------------------------+
-// |                                                                           |
-// | This program is free software; you can redistribute it and/or             |
-// | modify it under the terms of the GNU General Public License               |
-// | as published by the Free Software Foundation; either version 2            |
-// | of the License, or (at your option) any later version.                    |
-// |                                                                           |
-// | This program is distributed in the hope that it will be useful,           |
-// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
-// | GNU General Public License for more details.                              |
-// |                                                                           |
-// | You should have received a copy of the GNU General Public License         |
-// | along with this program; if not, write to the Free Software Foundation,   |
-// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
-// |                                                                           |
-// +---------------------------------------------------------------------------+
-
-/**
- * Geeklog plugin unpacker - Archive Libs Wrapper
- * 
- * This class wraps calls to pecl Zip, pear Zip, pear Tar, using the best 
- * package available to unpack or list information about the archive.
- * 
- * @author Justin Carlson, justin DOT carlson AT gmail DOT com
- * 
- */
-class unpacker {
-
-    // mime types ( these are not very reliable, varies browser to browser )
-    // for the best results, pass the real filename as well as the mime type
-    var $mime_def = array('application/zip'              => 'zip',
-    					  'application/x-zip'            => 'zip',
-    					  'application/x-zip-compressed' => 'zip',
-    					  'multipart/x-zip'              => 'zip',
-    					  'application/gzip'             => 'tar',
-    					  'application/tar'              => 'tar',
-    					  'application/x-tar'            => 'tar',
-    					  'application/x-gtar'           => 'tar',
-    					  'application/x-gzip'           => 'tar',
-    					  'application/octet-stream'     => 'tar',
-    					  'application/x-compress'       => 'tar',
-    					  'application/x-compressed'     => 'tar');
-
-    var $file = null; // archive name 
-    var $filesize = null; // archive size (in bytes)
-    var $ext = null; // archive ext 
-    var $contents = null; // archive contents 
-    var $archive = null; // archive resource handle
-    var $errorno = null; // error number ( set when returned false )
-    var $error = null; // error text ( set when returned false )
-    var $u_size = null; // uncompressed archive size 
-    var $d_sep = null; // directory separator default
-    var $type = null; // archive type  
-    var $comp = null; // archive compression type (private)
-
-
-    /**
-     * Constructor
-     * 
-     * @param string $file full path to archive
-     * @param string $mime_type mime type ( optional, application/zip, /tar, etc )
-     * @return bool $success result of loading archive passed
-     */
-    function unpacker($file, $mime_type = null) {
-
-        // default directory separator
-        if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
-            $this->d_sep = '\\';
-        } else {
-            $this->d_sep = '/';
-        }
-
-        // if the file doesn't have it's path, assume local
-        if (! strstr($file, $this->d_sep)) {
-            $file = getcwd() . $this->d_sep . $file;
-        }
-
-        // make sure the file exists
-        if (file_exists($file)) {
-
-            // copy vars
-            $this->file = $file;
-            $this->filesize = filesize($file);
-            $this->ext = strtolower(substr($file, - 4));
-
-            // if the type is passed, store it
-            if ($mime_type != null) {
-
-                if (isset($this->mime_def[$mime_type])) {
-                    $this->type = $this->mime_def[$mime_type];
-                } else {
-                    return $this->setError('400', 'Invalid MIME Type');
-                }
-
-            }
-
-            if ($this->type == null || $this->type == 'other') {
-
-                // if a known mime type was not provided, expect real filename
-                // mime types are not reliable so this is the reccommended way
-                // for example: unpacker($_FILES['foo']['name'],$type); 
-                // .tar, .tgz, .tar.gz, .tar.bz2, and .tar.bz are supported
-                if ($this->ext == 'r.gz' || $this->ext == '.tgz') {
-                    $this->type = 'tar';
-                    $this->comp = 'gz';
-                } elseif ($this->ext == 'r.bz' || $this->ext == '.bz2') {
-                    $this->type = 'tar';
-                    $this->comp = 'bz2';
-                } else {
-                    $this->type = str_replace('.', '', $this->ext);
-                }
-
-                // see if we know of a mime type for this ext
-                if (in_array($this->type, $this->mime_def) === false) {
-                    return $this->setError('400', 'Invalid File Extension');
-                }
-            }
-
-            // call the load wrapper, return result
-            return $this->load_file();
-
-        } else {
-            // file did not exist
-            return false;
-        }
-
-    }
-
-    /**
-     * Open - Constructor Wrapper
-     * This clears the vars and loads another file.
-     * ( May never be used )
-     * 
-     * @param string $file full path to archive
-     * @param string $optional_type mime type ( application/zip, /tar, etc )
-     * @return bool $success result of loading archive passed
-     */
-    function open($file, $optional_type = false) {
-
-        $this->ext = null;
-        $this->file = null;
-        $this->filesize = null;
-        $this->contents = null;
-        $this->archive = null;
-        $this->errorno = null;
-        $this->error = null;
-        $this->u_size = null;
-        $this->d_sep = null;
-        $this->type = null;
-        return $this->unpacker($file, $optional_type);
-    }
-
-    /**
-     * 
-     * Decides which loader to call, or returns false if one isn't found.
-     * 
-     * @return bool $success result of loading archive passed
-     */
-    function load_file() {
-
-        $handler = 'load_' . $this->type;
-        if (method_exists($this, $handler)) {
-            return $this->$handler();
-        } else {
-            return $this->setError('406', 'Unacceptable archive.');
-        }
-    }
-
-    /**
-     * load a zip archive
-     * 
-     * @return bool $success result of loading archive passed
-     */
-    function load_zip() {
-
-        if (function_exists('zip_open')) {
-
-            // Use PECL ZIP
-            $this->archive = new ZipArchive();
-            $result = $this->archive->open($this->file);
-            if ($result === false) {
-                return $this->setError($result, 'ZipArchive Error');
-            }
-
-        } else {
-
-            // use Pear Archive_Zip     
-            require_once 'Archive/Zip.php';
-            $this->archive = new Archive_Zip($this->file);
-            // unfortunately, we can't tell if it succeeded
-
-        }
-
-        // return resource handle or result
-        return true;
-    }
-
-    /**
-     * load a tar archive
-     * 
-     * @return bool $success result of loading archive passed
-     */
-    function load_tar() {
-
-        // use Pear Archive_Tar 
-        require_once 'Archive/Tar.php';
-        $this->archive = new Archive_Tar($this->file, $this->comp);
-
-        // unfortunately, we can't tell if it succeeded
-        return ($this->archive);
-
-    }
-
-    /**
-     * return contents of archive (wrapper)
-     * 
-     * @return array array(array('filename','size','etc')) archive contents
-     */
-    function getlist() {
-
-        // see if content are cached
-        if (is_array($this->contents)) {
-            return $this->contents;
-        }        
-
-        // not cached, load and cache the content list
-        $handler = 'list_' . $this->type;
-        if (method_exists($this, $handler)) {
-            $this->contents = $this->$handler();
-            return $this->contents;
-        } else {
-            return $this->setError('405', 'Unpacker called getlist ' . 'with unknown handler.');
-        }
-
-    }
-
-    /**
-     * return contents of zip archive
-     * 
-     * @return array array(array('filename','size','etc')) archive contents
-     */
-    function list_zip() {
-
-        // using PECL::ZipArchive
-        if (function_exists('zip_open')) {
-
-            // catch empty archive
-            if ($this->archive->numFiles < 1) {
-                return $this->setError('411', 'Archive is empty.');
-            }
-
-            // reset cache
-            $this->contents = array();
-            for ($i = 0; $i < $this->archive->numFiles; $i ++) {
-
-                // Make ZipArchive's info look like Archive_Zip's 
-                $zip_entry = $this->archive->statIndex($i);
-                $this->contents[$i]['filename'] = $zip_entry['name'];
-                $this->contents[$i]['size'] = $zip_entry['size'];
-                $this->contents[$i]['compressed'] = $zip_entry['comp_size'];
-                $this->contents[$i]['method'] = $zip_entry['comp_method'];
-
-            }
-            // return the contents list            
-            return $this->contents;
-
-        // using PEAR::Archive_Zip
-        } else {
-
-            $this->contents = $this->archive->listContent();
-            if (is_array($this->contents)) {
-                return $this->contents;
-            } else {
-                return $this->setError('411', 'Archive is empty.');
-            }
-
-        }
-    }
-
-    /**

From geeklog-cvs at lists.geeklog.net  Mon Sep 21 15:26:02 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 21 Sep 2009 15:26:02 -0400
Subject: [geeklog-cvs] geeklog: Preliminary fix for search result sorting
	(feature requ...
Message-ID: <hg.65bb4649e883.1253561162.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/65bb4649e883
changeset: 7333:65bb4649e883
user:      Sami Barakat
date:      Mon Sep 21 20:23:48 2009 +0100
description:
Preliminary fix for search result sorting (feature request #0000910)

diffstat:

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

diffs (27 lines):

diff -r 30e040149cbe -r 65bb4649e883 system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Sun Sep 20 10:41:17 2009 +0200
+++ b/system/classes/listfactory.class.php	Mon Sep 21 20:23:48 2009 +0100
@@ -545,6 +545,12 @@
             if (!$show_sort) {
                 $list_templates->set_var('show_sort', 'display:none;');
             }
+
+            // Write field
+            $list_templates->set_var('sort_text', "$sort_text...");
+            $list_templates->set_var('sort_href', "");
+            $list_templates->set_var('sort_selected', $sort_selected);
+            $list_templates->parse('page_sort', 'sort', true);
         }
 
         // Draw the sorting select box/table headings
@@ -561,8 +567,9 @@
 
                     // Show the sort arrow
                     if ($this->_sort_arr['field'] === $field['name']) {
-                        $selected = $sort_selected;
+                        //$selected = $sort_selected;
                         $direction = $this->_sort_arr['direction'] == 'asc' ? 'desc' : 'asc';
+                        $text .= " ($direction)";
                     }
 
                     $href = $this->_page_url . "order={$field['name']}&amp;direction=$direction";

From geeklog-cvs at lists.geeklog.net  Mon Sep 21 17:42:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 21 Sep 2009 17:42:23 -0400
Subject: [geeklog-cvs] geeklog: Allow external apps to contribute to search
	results (fe...
Message-ID: <hg.0b090631301e.1253569343.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0b090631301e
changeset: 7334:0b090631301e
user:      Sami Barakat
date:      Mon Sep 21 22:40:37 2009 +0100
description:
Allow external apps to contribute to search results (feature request #0000985)

diffstat:

 system/classes/listfactory.class.php    |  16 ++++++++++++++--
 system/classes/search.class.php         |   5 +++++
 system/classes/searchcriteria.class.php |  13 ++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diffs (94 lines):

diff -r 65bb4649e883 -r 0b090631301e system/classes/listfactory.class.php
--- a/system/classes/listfactory.class.php	Mon Sep 21 20:23:48 2009 +0100
+++ b/system/classes/listfactory.class.php	Mon Sep 21 22:40:37 2009 +0100
@@ -251,10 +251,10 @@
     }
 
     /**
-    * Appends a result to the list
+    * Appends a single result to the list
     *
     * @access public
-    * @param array $result An single result that will be appended to the rest
+    * @param array $result A single result that will be appended to the rest
     *
     */
     function addResult( $result )
@@ -263,6 +263,18 @@
     }
 
     /**
+    * Appends several results to the list
+    *
+    * @access public
+    * @param array $result An array of result that will be appended to the rest
+    *
+    */
+    function addResultArray( $arr )
+    {
+        $this->_preset_rows = array_merge($this->_preset_rows, $arr);
+    }
+
+    /**
     * Gets the total number of results from a query
     *
     * @access private
diff -r 65bb4649e883 -r 0b090631301e system/classes/search.class.php
--- a/system/classes/search.class.php	Mon Sep 21 20:23:48 2009 +0100
+++ b/system/classes/search.class.php	Mon Sep 21 22:40:37 2009 +0100
@@ -583,6 +583,11 @@
                     COM_errorLog($debug_info);
                 }
 
+                $api_results = $result->getResults();
+                if (!empty($api_results)) {
+                    $obj->addResultArray($api_results);
+                }
+
                 $obj->setQuery($result->getLabel(), $result->getName(), $sql, $result->getRank());
                 $this->_url_rewrite[ $result->getName() ] = $result->UrlRewriteEnable();
                 $this->_append_query[ $result->getName() ] = $result->AppendQueryEnable();
diff -r 65bb4649e883 -r 0b090631301e system/classes/searchcriteria.class.php
--- a/system/classes/searchcriteria.class.php	Mon Sep 21 20:23:48 2009 +0100
+++ b/system/classes/searchcriteria.class.php	Mon Sep 21 22:40:37 2009 +0100
@@ -40,6 +40,7 @@
     var $_rank;
     var $_url_rewrite;
     var $_append_query;
+    var $_results = array();
 
     function SearchCriteria( $pluginName, $pluginLabel )
     {
@@ -75,6 +76,11 @@
         $this->_append_query = $append_query;
     }
 
+    function setResults( $result_arr )
+    {
+        $this->_results = $result_arr;
+    }
+
     function getSQL()
     {
         return $this->_sql;
@@ -117,6 +123,11 @@
         return $this->_append_query;
     }
 
+    function getResults()
+    {
+        return $this->_results;
+    }
+
     function buildSearchSQL( $keyType, $query, $columns, $sql = '' )
     {
         if ($keyType == 'all')
@@ -167,7 +178,7 @@
         {
             $word = trim($word);
             $tmp .= '(';
-            
+
             if ($titles) {
                 $tmp .= $columns['title'] . " LIKE '%$word%' OR ";
             } else {

From geeklog-cvs at lists.geeklog.net  Mon Sep 21 20:38:34 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 21 Sep 2009 20:38:34 -0400
Subject: [geeklog-cvs] geeklog: Comments search API can now return results
	from any plu...
Message-ID: <hg.2cb6f25e4350.1253579914.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2cb6f25e4350
changeset: 7335:2cb6f25e4350
user:      Sami Barakat
date:      Tue Sep 22 01:37:10 2009 +0100
description:
Comments search API can now return results from any plugin (bug #0000902)

diffstat:

 system/classes/search.class.php         |  60 +++++++++++------------------
 system/classes/searchcriteria.class.php |  12 ++++++
 2 files changed, 35 insertions(+), 37 deletions(-)

diffs (139 lines):

diff -r 0b090631301e -r 2cb6f25e4350 system/classes/search.class.php
--- a/system/classes/search.class.php	Mon Sep 21 22:40:37 2009 +0100
+++ b/system/classes/search.class.php	Tue Sep 22 01:37:10 2009 +0100
@@ -381,33 +381,15 @@
             $sql .= "AND (s.uid = '$this->_author') ";
         }
 
-        $search = new SearchCriteria('stories', $LANG09[65]);
+        $search_s = new SearchCriteria('stories', $LANG09[65]);
         $columns = array('title' => 'title', 'introtext', 'bodytext');
-        list($sql, $ftsql) = $search->buildSearchSQL($this->_keyType, $query, $columns, $sql);
-        $search->setSQL($sql);
-        $search->setFTSQL($ftsql);
-        $search->setRank(5);
-        $search->setURLRewrite(true);
+        list($sql, $ftsql) = $search_s->buildSearchSQL($this->_keyType, $query, $columns, $sql);
+        $search_s->setSQL($sql);
+        $search_s->setFTSQL($ftsql);
+        $search_s->setRank(5);
+        $search_s->setURLRewrite(true);
 
-        return $search;
-    }
-
-    /**
-    * Performs search on all comments
-    *
-    * @author Tony Bibbs, tony AT geeklog DOT net
-    * @author Sami Barakat, s.m.barakat AT gmail DOT com
-    * @access private
-    * @return object plugin object
-    *
-    */
-    function _searchComments()
-    {
-        global $_TABLES, $_DB_dbms, $LANG09;
-
-        // Make sure the query is SQL safe
-        $query = trim(addslashes($this->_query));
-
+        // Search Story Comments
         $sql = "SELECT c.cid AS id, c.title AS title, c.comment AS description, ";
         $sql .= "UNIX_TIMESTAMP(c.date) AS date, c.uid AS uid, ";
 
@@ -442,14 +424,15 @@
             $sql .= "AND (c.uid = '$this->_author') ";
         }
 
-        $search = new SearchCriteria('comments', $LANG09[66]);
+        $search_c = new SearchCriteria('comments', array($LANG09[65],$LANG09[66]));
         $columns = array('title' => 'c.title', 'comment');
-        list($sql, $ftsql) = $search->buildSearchSQL($this->_keyType, $query, $columns, $sql);
-        $search->setSQL($sql);
-        $search->setFTSQL($ftsql);
-        $search->setRank(2);
+        list($sql, $ftsql) = $search_c->buildSearchSQL($this->_keyType, $query, $columns, $sql);
+        $search_c->setSQL($sql);
+        $search_c->setFTSQL($ftsql);
+        $search_c->setRank(2);
+        $search_c->setComment(true);
 
-        return $search;
+        return array($search_s, $search_c);
     }
 
     /**
@@ -545,13 +528,9 @@
         $result_plugins = PLG_doSearch($this->_query, $this->_dateStart, $this->_dateEnd, $this->_topic, $this->_type, $this->_author, $this->_keyType, $page, 5);
 
         // Add core searches
-        if ($this->_type == 'all' || $this->_type == 'stories')
+        if ($this->_type == 'all' || $this->_type == 'stories' || $this->_type == 'comments')
         {
-            $result_plugins[] = $this->_searchStories();
-        }
-        if ($this->_type == 'all' || $this->_type == 'comments')
-        {
-            $result_plugins[] = $this->_searchComments();
+            $result_plugins = array_merge($result_plugins, $this->_searchStories());
         }
 
         // Loop through all plugins separating the new API from the old
@@ -563,6 +542,13 @@
         {
             if (is_a($result, 'SearchCriteria'))
             {
+                if ($this->_type == 'comments' && !$result->getComment()) {
+                    if ($this->_verbose) {
+                        COM_errorLog($result->getName() . " using APIv2. Skipped as type is not comments");
+                    }
+                    continue;
+                }
+
                 $debug_info = $result->getName() . " using APIv2 with ";
 
                 if ($_CONF['search_use_fulltext'] == true && $result->getFTSQL() != '')
diff -r 0b090631301e -r 2cb6f25e4350 system/classes/searchcriteria.class.php
--- a/system/classes/searchcriteria.class.php	Mon Sep 21 22:40:37 2009 +0100
+++ b/system/classes/searchcriteria.class.php	Tue Sep 22 01:37:10 2009 +0100
@@ -41,6 +41,7 @@
     var $_url_rewrite;
     var $_append_query;
     var $_results = array();
+    var $_is_comment;
 
     function SearchCriteria( $pluginName, $pluginLabel )
     {
@@ -49,6 +50,7 @@
         $this->_rank = 3;
         $this->_url_rewrite = false;
         $this->_append_query = true;
+        $this->_is_comment = false;
     }
 
     function setSQL( $sql )
@@ -81,6 +83,11 @@
         $this->_results = $result_arr;
     }
 
+    function setComment( $bool )
+    {
+        $this->_is_comment = $bool;
+    }
+
     function getSQL()
     {
         return $this->_sql;
@@ -128,6 +135,11 @@
         return $this->_results;
     }
 
+    function getComment()
+    {
+        return $this->_is_comment;
+    }
+
     function buildSearchSQL( $keyType, $query, $columns, $sql = '' )
     {
         if ($keyType == 'all')

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 04:04:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 04:04:01 -0400
Subject: [geeklog-cvs] geeklog: Removed extra double quote (bug #0000991,
	patch provide...
Message-ID: <hg.88561d822250.1254038641.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/88561d822250
changeset: 7336:88561d822250
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 09:19:41 2009 +0200
description:
Removed extra double quote (bug #0000991, patch provided by taca)

diffstat:

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

diffs (12 lines):

diff -r 2cb6f25e4350 -r 88561d822250 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Tue Sep 22 01:37:10 2009 +0100
+++ b/public_html/docs/english/theme.html	Sun Sep 27 09:19:41 2009 +0200
@@ -343,7 +343,7 @@
 <li><tt>{lang_permissions}</tt> (headline)</li>
 <li><tt>{lang_perm_key}</tt> (legend: R = read, ...)</li>
 <li><tt>{permissions_editor}</tt> (the actual checkboxes)</li>
-<li><tt>{lang_permissions_msg}</tt> ("Note: members is all logged in member ...)</li>
+<li><tt>{lang_permissions_msg}</tt> (Note: members is all logged in member ...)</li>
 </ul>
 <p>Template files using the alternative names will continue to work, but new
 files should use the above names from now on.</p>

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 04:04:03 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 04:04:03 -0400
Subject: [geeklog-cvs] geeklog: Added search.php (cf. discussion on bug
	#0000910)
Message-ID: <hg.163196b23d3d.1254038643.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/163196b23d3d
changeset: 7337:163196b23d3d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 09:32:22 2009 +0200
description:
Added search.php (cf. discussion on bug #0000910)

diffstat:

 public_html/robots.txt |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 88561d822250 -r 163196b23d3d public_html/robots.txt
--- a/public_html/robots.txt	Sun Sep 27 09:19:41 2009 +0200
+++ b/public_html/robots.txt	Sun Sep 27 09:32:22 2009 +0200
@@ -1,6 +1,7 @@
 User-agent: *
 Disallow: /docs
 Disallow: /pingback.php
+Disallow: /search.php
 Disallow: /submit.php
 Disallow: /trackback.php
 Disallow: /usersettings.php

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 04:04:04 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 04:04:04 -0400
Subject: [geeklog-cvs] geeklog: Link titles in autotags showed up with
	backslashes befo...
Message-ID: <hg.c71c0bedca65.1254038644.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c71c0bedca65
changeset: 7338:c71c0bedca65
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 09:56:06 2009 +0200
description:
Link titles in autotags showed up with backslashes before quotes (bug #0000986)

diffstat:

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

diffs (26 lines):

diff -r 163196b23d3d -r c71c0bedca65 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Sep 27 09:32:22 2009 +0200
+++ b/plugins/links/functions.inc	Sun Sep 27 09:56:06 2009 +0200
@@ -186,6 +186,7 @@
             if (empty($autotag['parm2'])) {
                 $result = DB_query("SELECT url, title FROM {$_TABLES['links']} WHERE lid = '$lid'");
                 list($siteurl, $linktext) = DB_fetchArray($result);
+                $linktext = stripslashes($linktext);
             } else {
                 $linktext = $autotag['parm2'];
                 $siteurl = DB_getItem($_TABLES['links'], 'url', "lid = '$lid'");
diff -r 163196b23d3d -r c71c0bedca65 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 27 09:32:22 2009 +0200
+++ b/public_html/docs/history	Sun Sep 27 09:56:06 2009 +0200
@@ -72,6 +72,11 @@
 - Avoid triggering a false spam report when submitting an event with the default
   "http://" entry for the link still in place (bug #0000946) [Dirk]
 
+Links Plugin
+------------
+- Link titles in autotags showed up with backslashes before quotes (bug
+  #0000986) [Dirk]
+
 Polls Plugin
 ------------
 - When upgrading from Geeklog 1.5.2, the length of the poll IDs was not extended

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 12:21:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 12:21:41 -0400
Subject: [geeklog-cvs] geeklog: One featured story per topic is now allowed,
	with only ...
Message-ID: <hg.37fa7ba6f86e.1254068501.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/37fa7ba6f86e
changeset: 7339:37fa7ba6f86e
user:      Tom <websitemaster at cogeco.net>
date:      Sat Sep 26 11:07:25 2009 -0400
description:
One featured story per topic is now allowed, with only one being able to be displayed as featured on the frontpage.

diffstat:

 public_html/lib-common.php     |  20 ++++++++++++++------
 system/classes/story.class.php |  14 ++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r c71c0bedca65 -r 37fa7ba6f86e public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Sep 27 09:56:06 2009 +0200
+++ b/public_html/lib-common.php	Sat Sep 26 11:07:25 2009 -0400
@@ -1950,12 +1950,20 @@
 
     $curdate = date( "Y-m-d H:i:s", time() );
 
-    if( DB_getItem( $_TABLES['stories'], 'COUNT(*)', "featured = 1 AND draft_flag = 0 AND date <= '$curdate'" ) > 1 )
-    {
-        // OK, we have two featured stories, fix that
-
-        $sid = DB_getItem( $_TABLES['stories'], 'sid', "featured = 1 AND draft_flag = 0 ORDER BY date LIMIT 1" );
-        DB_query( "UPDATE {$_TABLES['stories']} SET featured = 0 WHERE sid = '$sid'" );
+    // Loop through each topic
+    $sql = "SELECT tid FROM {$_TABLES['topics']}";
+    $result = DB_query( $sql );
+    $num = DB_numRows( $result );
+    for( $i = 0; $i < $num; $i++)
+    {
+        $A = DB_fetchArray( $result );
+
+        if( DB_getItem( $_TABLES['stories'], 'COUNT(*)', "featured = 1 AND draft_flag = 0 AND tid = '{$A['tid']}' AND date <= '$curdate'" ) > 1 )
+        {
+            // OK, we have two featured stories in a topic, fix that
+            $sid = DB_getItem( $_TABLES['stories'], 'sid', "featured = 1 AND draft_flag = 0 ORDER BY date LIMIT 1" );
+            DB_query( "UPDATE {$_TABLES['stories']} SET featured = 0 WHERE sid = '$sid'" );
+        }
     }
 }
 
diff -r c71c0bedca65 -r 37fa7ba6f86e system/classes/story.class.php
--- a/system/classes/story.class.php	Sun Sep 27 09:56:06 2009 +0200
+++ b/system/classes/story.class.php	Sat Sep 26 11:07:25 2009 -0400
@@ -608,16 +608,18 @@
         }
 
         /* if a featured, non-draft, that goes live straight away, unfeature
-         * other stories:
+         * other stories in same topic:
          */
         if ($this->_featured == '1') {
             // there can only be one non-draft featured story
             if ($this->_draft_flag == 0 AND $this->_date <= time()) {
-                $id[1] = 'featured';
-                $values[1] = 1;
-                $id[2] = 'draft_flag';
-                $values[2] = 0;
-                DB_change($_TABLES['stories'], 'featured', '0', $id, $values);
+                if ($this->_frontpage == 1) {
+                    // un-feature any featured frontpage story
+                    DB_query("UPDATE {$_TABLES['stories']} SET featured = 0 WHERE featured = 1 AND draft_flag = 0 AND frontpage = 1 AND date <= NOW()");
+                }
+
+                // un-feature any featured story in the same topic
+                DB_query("UPDATE {$_TABLES['stories']} SET featured = 0 WHERE featured = 1 AND draft_flag = 0 AND tid = '{$this->_tid}' AND date <= NOW()");
             }
         }
 

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 16:09:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 16:09:05 -0400
Subject: [geeklog-cvs] geeklog: Clean up page refresh after a plugin upgrade
Message-ID: <hg.2f3460d4a1d3.1254082145.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2f3460d4a1d3
changeset: 7340:2f3460d4a1d3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 21:15:19 2009 +0200
description:
Clean up page refresh after a plugin upgrade

diffstat:

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

diffs (61 lines):

diff -r 37fa7ba6f86e -r 2f3460d4a1d3 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sat Sep 26 11:07:25 2009 -0400
+++ b/public_html/admin/plugins.php	Sun Sep 27 21:15:19 2009 +0200
@@ -359,26 +359,29 @@
 
     $retval = '';
 
-    if (strlen($pi_name) == 0) {
-        $retval .= COM_showMessageText($LANG32[12], $LANG32[13]);
-
-        return $retval;
+    if (! empty($pi_name)) {
+        $result = PLG_upgrade($pi_name);
+        if ($result > 0) {
+            if ($result === TRUE) { // Catch returns that are just true/false
+                PLG_pluginStateChange($pi_name, 'upgraded');
+                $retval = COM_refresh($_CONF['site_admin_url']
+                        . '/plugins.php?msg=60');
+            } else {    // Plugin returned a message number
+                $retval = COM_refresh($_CONF['site_admin_url']
+                        . '/plugins.php?msg=' . $result . '&amp;plugin='
+                        . $pi_name);
+            }
+            return $retval;
+        } else {  // Plugin function returned a false
+            $retval = COM_showMessage(95);
+        }
+    } else { // no plugin name given
+        $retval = COM_showMessageText($LANG32[12], $LANG32[13]);
     }
 
-    $result = PLG_upgrade($pi_name);
-    if ($result > 0 ) {
-        if ($result === TRUE) { // Catch returns that are just true/false
-            PLG_pluginStateChange($pi_name, 'upgraded');
-            $retval .= COM_refresh($_CONF['site_admin_url']
-                    . '/plugins.php?msg=60');
-        } else {  // Plugin returned a message number
-            $retval = COM_refresh($_CONF['site_admin_url']
-                    . '/plugins.php?msg=' . $result . '&amp;plugin='
-                    . $pi_name);
-        }
-    } else {  // Plugin function returned a false
-        $retval .= COM_showMessage(95);
-    }
+    $retval = COM_siteHeader('menu', $LANG32[13])
+            . $retval
+            . COM_siteFooter();
 
     return $retval;
 }
@@ -1209,9 +1212,7 @@
 
 } elseif ((($mode == $LANG32[34]) && !empty($LANG32[34])) && SEC_checkToken()) { // update
     $pi_name = COM_applyFilter($_POST['pi_name']);
-    $display .= COM_siteHeader('menu', $LANG32[13]);
     $display .= do_update($pi_name);
-    $display .= COM_siteFooter();
 
 } elseif ($mode == 'edit') {
     $display .= COM_siteHeader('menu', $LANG32[13]);

From geeklog-cvs at lists.geeklog.net  Sun Sep 27 16:09:05 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 27 Sep 2009 16:09:05 -0400
Subject: [geeklog-cvs] geeklog: The security token is only needed once in
	this form
Message-ID: <hg.db4c6eb6e843.1254082145.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/db4c6eb6e843
changeset: 7341:db4c6eb6e843
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 21:26:06 2009 +0200
description:
The security token is only needed once in this form

diffstat:

 system/lib-admin.php |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 2f3460d4a1d3 -r db4c6eb6e843 system/lib-admin.php
--- a/system/lib-admin.php	Sun Sep 27 21:15:19 2009 +0200
+++ b/system/lib-admin.php	Sun Sep 27 21:26:06 2009 +0200
@@ -1038,6 +1038,8 @@
 {
     global $_CONF, $LANG_ADMIN, $LANG32;
 
+    static $added_token;
+
     $retval = '';
     
     switch($fieldname) {
@@ -1084,8 +1086,11 @@
                 $retval = '<input type="checkbox" name="enabledplugins['
                         . $A['pi_name'] . ']" onclick="submit()" value="1"'
                         . $switch . XHTML . '>';
-                $retval .= '<input type="hidden" name="' . CSRF_TOKEN . '" '
-                        . 'value="' . $token . '"' . XHTML . '>';
+                if (! isset($added_token)) {
+                    $retval .= '<input type="hidden" name="' . CSRF_TOKEN . '" '
+                            . 'value="' . $token . '"' . XHTML . '>';
+                    $added_token = true;
+                }
             }
             break;
         default:

From geeklog-cvs at lists.geeklog.net  Wed Sep 30 19:10:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 30 Sep 2009 19:10:19 -0400
Subject: [geeklog-cvs] geeklog: Consolidated common date comparison into
	search API, fu...
Message-ID: <hg.187ee0efcee2.1254352219.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/187ee0efcee2
changeset: 7342:187ee0efcee2
user:      Sami Barakat
date:      Thu Oct 01 00:07:25 2009 +0100
description:
Consolidated common date comparison into search API, functionally the same

diffstat:

 plugins/calendar/functions.inc          |  17 +++++------------
 plugins/links/functions.inc             |  15 +++------------
 plugins/staticpages/functions.inc       |  15 +++------------
 system/classes/search.class.php         |  30 ++++++------------------------
 system/classes/searchcriteria.class.php |  18 ++++++++++++++++++
 5 files changed, 35 insertions(+), 60 deletions(-)

diffs (201 lines):

diff -r db4c6eb6e843 -r 187ee0efcee2 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Sep 27 21:26:06 2009 +0200
+++ b/plugins/calendar/functions.inc	Thu Oct 01 00:07:25 2009 +0100
@@ -1634,26 +1634,17 @@
 
     $sql = COM_getPermSQL('AND') . ' ';
 
-    if (!empty($datestart) && !empty($dateend))
-    {
-        $delim = substr($datestart, 4, 1);
-        if (!empty($delim))
-        {
-            $DS = explode($delim, $datestart);
-            $DE = explode($delim, $dateend);
-            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-            $sql .= "AND (UNIX_TIMESTAMP(datestart) BETWEEN '$startdate' AND '$enddate') ";
-        }
-    }
     if (!empty ($author)) {
         $sql .= "AND (owner_id = '$author') ";
     }
 
     // Search the public events
     $search_e = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[24]));
+
     $columns = array('title' => 'title', 'location', 'description');
+    $sql .= $search_e->getDateRangeSQL('AND', 'datestart', $datestart, $dateend);
     list($sql_tmp,$ftsql_tmp) = $search_e->buildSearchSQL($keyType, $query, $columns, $sql_e . $sql);
+
     $search_e->setSQL($sql_tmp);
     $search_e->setFTSQL($ftsql_tmp);
     $search_e->setRank(2);
@@ -1664,8 +1655,10 @@
 
     // Search personal events
     $search_p = new SearchCriteria('calendar', array($LANG_CAL_1[16],$LANG_CAL_1[23]));
+
     $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);
     $search_p->setRank(2);
diff -r db4c6eb6e843 -r 187ee0efcee2 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Sep 27 21:26:06 2009 +0200
+++ b/plugins/links/functions.inc	Thu Oct 01 00:07:25 2009 +0100
@@ -368,25 +368,16 @@
     $sql .= "FROM {$_TABLES['links']} WHERE date <> 1 ";
     $sql .= COM_getPermSQL('AND') . ' ';
 
-    if (!empty($datestart) && !empty($dateend))
-    {
-        $delim = substr($datestart, 4, 1);
-        if (!empty($delim))
-        {
-            $DS = explode($delim, $datestart);
-            $DE = explode($delim, $dateend);
-            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-            $sql .= "AND (UNIX_TIMESTAMP(date) BETWEEN '$startdate' AND '$enddate') ";
-        }
-    }
     if (!empty ($author)) {
         $sql .= "AND (owner_id = '$author') ";
     }
 
     $search = new SearchCriteria('links', $LANG_LINKS[14]);
+
     $columns = array('title' => 'title', 'description');
+    $sql .= $search->getDateRangeSQL('AND', 'date', $datestart, $dateend);
     list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+
     $search->setSQL($sql);
     $search->setFTSQL($ftsql);
     $search->setRank(3);
diff -r db4c6eb6e843 -r 187ee0efcee2 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Sep 27 21:26:06 2009 +0200
+++ b/plugins/staticpages/functions.inc	Thu Oct 01 00:07:25 2009 +0100
@@ -610,25 +610,16 @@
     $sql .= "WHERE (sp.sp_uid = u.uid) AND (sp_php <> 1) ";
     $sql .= COM_getPermSQL('AND') . COM_getLangSQL('sp_id', 'AND', 'sp') . ' ';
 
-    if (!empty($datestart) && !empty($dateend))
-    {
-        $delim = substr($datestart, 4, 1);
-        if (!empty($delim))
-        {
-            $DS = explode($delim, $datestart);
-            $DE = explode($delim, $dateend);
-            $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-            $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-            $sql .= "AND (UNIX_TIMESTAMP(sp_date) BETWEEN '$startdate' AND '$enddate') ";
-        }
-    }
     if (!empty ($author)) {
         $sql .= "AND (sp_uid = '$author') ";
     }
 
     $search = new SearchCriteria('staticpages', $LANG_STATIC['staticpages']);
+
     $columns = array('title' => 'sp_title', 'sp_content');
+    $sql .= $search->getDateRangeSQL('AND', 'sp_date', $datestart, $dateend);
     list($sql,$ftsql) = $search->buildSearchSQL($keyType, $query, $columns, $sql);
+
     $search->setSQL($sql);
     $search->setFTSQL($ftsql);
     $search->setRank(3);
diff -r db4c6eb6e843 -r 187ee0efcee2 system/classes/search.class.php
--- a/system/classes/search.class.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/system/classes/search.class.php	Thu Oct 01 00:07:25 2009 +0100
@@ -362,18 +362,6 @@
         $sql .= "WHERE (draft_flag = 0) AND (date <= NOW()) AND (u.uid = s.uid) ";
         $sql .= COM_getPermSQL('AND') . COM_getTopicSQL('AND') . COM_getLangSQL('sid', 'AND') . ' ';
 
-        if (!empty($this->_dateStart) && !empty($this->_dateEnd))
-        {
-            $delim = substr($this->_dateStart, 4, 1);
-            if (!empty($delim))
-            {
-                $DS = explode($delim, $this->_dateStart);
-                $DE = explode($delim, $this->_dateEnd);
-                $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-                $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-                $sql .= "AND (UNIX_TIMESTAMP(date) BETWEEN '$startdate' AND '$enddate') ";
-            }
-        }
         if (!empty($this->_topic)) {
             $sql .= "AND (s.tid = '$this->_topic') ";
         }
@@ -382,8 +370,11 @@
         }
 
         $search_s = new SearchCriteria('stories', $LANG09[65]);
+
         $columns = array('title' => 'title', 'introtext', 'bodytext');
+        $sql .= $search_s->getDateRangeSQL('AND', 'date', $this->_dateStart, $this->_dateEnd);
         list($sql, $ftsql) = $search_s->buildSearchSQL($this->_keyType, $query, $columns, $sql);
+
         $search_s->setSQL($sql);
         $search_s->setFTSQL($ftsql);
         $search_s->setRank(5);
@@ -405,18 +396,6 @@
         $sql .= COM_getPermSQL('AND',0,2,'s') . COM_getTopicSQL('AND',0,'s') . COM_getLangSQL('sid','AND','s') . ") ";
         $sql .= "WHERE (u.uid = c.uid) AND (s.draft_flag = 0) AND (s.commentcode >= 0) AND (s.date <= NOW()) ";
 
-        if (!empty($this->_dateStart) && !empty($this->_dateEnd))
-        {
-            $delim = substr($this->_dateStart, 4, 1);
-            if (!empty($delim))
-            {
-                $DS = explode($delim, $this->_dateStart);
-                $DE = explode($delim, $this->_dateEnd);
-                $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
-                $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
-                $sql .= "AND (UNIX_TIMESTAMP(c.date) BETWEEN '$startdate' AND '$enddate') ";
-            }
-        }
         if (!empty($this->_topic)) {
             $sql .= "AND (s.tid = '$this->_topic') ";
         }
@@ -425,8 +404,11 @@
         }
 
         $search_c = new SearchCriteria('comments', array($LANG09[65],$LANG09[66]));
+
         $columns = array('title' => 'c.title', 'comment');
+        $sql .= $search_c->getDateRangeSQL('AND', 'c.date', $this->_dateStart, $this->_dateEnd);
         list($sql, $ftsql) = $search_c->buildSearchSQL($this->_keyType, $query, $columns, $sql);
+
         $search_c->setSQL($sql);
         $search_c->setFTSQL($ftsql);
         $search_c->setRank(2);
diff -r db4c6eb6e843 -r 187ee0efcee2 system/classes/searchcriteria.class.php
--- a/system/classes/searchcriteria.class.php	Sun Sep 27 21:26:06 2009 +0200
+++ b/system/classes/searchcriteria.class.php	Thu Oct 01 00:07:25 2009 +0100
@@ -204,6 +204,24 @@
 
         return array($sql,$ftsql);
     }
+
+    function getDateRangeSQL( $type = 'WHERE', $column, $datestart, $dateend )
+    {
+        if (!empty($datestart) && !empty($dateend))
+        {
+            $delim = substr($datestart, 4, 1);
+            if (!empty($delim))
+            {
+                $DS = explode($delim, $datestart);
+                $DE = explode($delim, $dateend);
+                $startdate = mktime(0,0,0,$DS[1],$DS[2],$DS[0]);
+                $enddate = mktime(23,59,59,$DE[1],$DE[2],$DE[0]);
+                return " $type (UNIX_TIMESTAMP($column) BETWEEN '$startdate' AND '$enddate') ";
+            }
+        }
+
+        return "";
+    }
 }
 
 ?>