From geeklog-cvs at lists.geeklog.net  Sat Aug  1 07:58:19 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 01 Aug 2009 07:58:19 -0400
Subject: [geeklog-cvs] geeklog: Moved leftover hard-coded text from
	admin/sectest.php t...
Message-ID: <hg.f3dc16b9e325.1249127899.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f3dc16b9e325
changeset: 7212:f3dc16b9e325
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 11:20:46 2009 +0200
description:
Moved leftover hard-coded text from admin/sectest.php to the language files

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 +-
 public_html/admin/sectest.php    |  6 ++++--
 public_html/docs/history         |  2 ++
 8 files changed, 12 insertions(+), 8 deletions(-)

diffs (107 lines):

diff -r 45b48a8521db -r f3dc16b9e325 language/english.php
--- a/language/english.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/english.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1479,7 +1479,7 @@
     'public_html'   => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation'  => 'installation instructions',
     'directory'     => 'directory',
-    'failed_bak'    => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp'    => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it'        => 'This is a security risk and should be fixed!',
     'reachable'     => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 language/english_utf-8.php
--- a/language/english_utf-8.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/english_utf-8.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1479,7 +1479,7 @@
     'public_html'   => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation'  => 'installation instructions',
     'directory'     => 'directory',
-    'failed_bak'    => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp'    => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it'        => 'This is a security risk and should be fixed!',
     'reachable'     => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 language/german.php
--- a/language/german.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/german.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1475,7 +1475,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 language/german_formal.php
--- a/language/german_formal.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/german_formal.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1476,7 +1476,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/german_formal_utf-8.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1476,7 +1476,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 language/german_utf-8.php
--- a/language/german_utf-8.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/language/german_utf-8.php	Sat Aug 01 11:20:46 2009 +0200
@@ -1475,7 +1475,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
diff -r 45b48a8521db -r f3dc16b9e325 public_html/admin/sectest.php
--- a/public_html/admin/sectest.php	Thu Jul 30 21:00:35 2009 +0200
+++ b/public_html/admin/sectest.php	Sat Aug 01 11:20:46 2009 +0200
@@ -335,7 +335,8 @@
                                'backups ' . $LANG_SECTEST['directory']);
             @unlink($_CONF['backup_path'] . 'test.txt');
         } else {
-            $display .= '<li>Failed to create a temporary file in your backups directory. Check your directory permissions!</li>';
+            $display .= '<li>' . sprintf($LANG_SECTEST['failed_tmp'], 'backups')
+                     . '</li>';
         }
     }
 
@@ -343,7 +344,8 @@
         $display .= doTest($url, 'data/test.txt', 'data directory');
         @unlink($_CONF['path_data'] . 'test.txt');
     } else {
-        $display .= '<li>' . $LANG_SECTEST['failed_bak'] . '</li>';
+        $display .= '<li>' . sprintf($LANG_SECTEST['failed_tmp'], 'data')
+                 . '</li>';
     }
 
     $display .= checkDefaultPassword();
diff -r 45b48a8521db -r f3dc16b9e325 public_html/docs/history
--- a/public_html/docs/history	Thu Jul 30 21:00:35 2009 +0200
+++ b/public_html/docs/history	Sat Aug 01 11:20:46 2009 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Moved leftover hard-coded text from admin/sectest.php to the language files
+  [Dirk]
 - When creating Pingback excerpts, convert the other site's content to our
   site's character set, when necessary [Dirk]
 - New function COM_getTextContent converts HTML into continuous text. Used for

From geeklog-cvs at lists.geeklog.net  Sat Aug  1 07:58:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 01 Aug 2009 07:58:21 -0400
Subject: [geeklog-cvs] geeklog: Merging
Message-ID: <hg.dcded8e32765.1249127901.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/dcded8e32765
changeset: 7214:dcded8e32765
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 13:58:10 2009 +0200
description:
Merging

diffstat:

 public_html/lib-common.php |  62 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 38 deletions(-)

diffs (100 lines):

diff -r d0265584f2c7 -r dcded8e32765 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Aug 01 13:21:33 2009 +0200
+++ b/public_html/lib-common.php	Sat Aug 01 13:58:10 2009 +0200
@@ -70,7 +70,7 @@
 *
 * Must make sure that the function hasn't been disabled before calling it.
 *
-*/
+*/ 
 if (function_exists('set_error_handler')) {
     if (PHP_VERSION >= 5) {
         /* Tell the error handler to use the default error reporting options.
@@ -159,6 +159,14 @@
     }
 }
 
+/**
+* Include plugin class.
+* This is a poorly implemented class that was not very well thought out.
+* Still very necessary
+*
+*/
+
+require_once( $_CONF['path_system'] . 'lib-plugins.php' );
 
 /**
 * Include page time -- used to time how fast each page was created
@@ -187,15 +195,6 @@
 require_once( $_CONF['path_system'] . 'classes/template.class.php' );
 
 /**
-* This is the database library.
-*
-* Including this gives you a working connection to the database
-*
-*/
-
-require_once( $_CONF['path_system'] . 'lib-database.php' );
-
-/**
 * This is the security library used for application security
 *
 */
@@ -231,15 +230,6 @@
 require_once( $_CONF['path_system'] . 'lib-custom.php' );
 
 /**
-* Include plugin class.
-* This is a poorly implemented class that was not very well thought out.
-* Still very necessary
-*
-*/
-
-require_once( $_CONF['path_system'] . 'lib-plugins.php' );
-
-/**
 * Session management library
 *
 */
@@ -1801,25 +1791,21 @@
 * under the GPL.  This is not used very much in the code but you can use it
 * if you see fit
 *
-* @param        array       $A      Array to loop through and print values for
-* @return   string  Formated HTML List
-*
-*/
-
-function COM_debug( $A )
-{
-    if( !empty( $A ))
-    {
-        $retval .= LB . '<pre><p>---- DEBUG ----</p>';
-
-        for( reset( $A ); $k = key( $A ); next( $A ))
-        {
-            $retval .= sprintf( "<li>%13s [%s]</li>\n", $k, $A[$k] );
-        }
-
-        $retval .= '<p>---------------</p></pre>' . LB;
-    }
-
+* @param    array   $array    Array to loop through and print values for
+* @return   string  $retval    Formatted HTML List
+*
+*/
+
+function COM_debug($array)
+{
+    $retval = '';    
+    if(!empty($array)) {
+        $retval = '<ul><pre><p>---- DEBUG ----</p>';
+        foreach($array as $k => $v) { 
+            $retval .= sprintf("<li>%13s [%s]</li>\n", $k, $v);
+        }
+        $retval .= '<p>---------------</p></pre></ul>';
+    }    
     return $retval;
 }
 

From geeklog-cvs at lists.geeklog.net  Sat Aug  1 07:58:20 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 01 Aug 2009 07:58:20 -0400
Subject: [geeklog-cvs] geeklog: Missing global $_TABLES (reported by Jokke_K)
Message-ID: <hg.d0265584f2c7.1249127900.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d0265584f2c7
changeset: 7213:d0265584f2c7
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 13:21:33 2009 +0200
description:
Missing global $_TABLES (reported by Jokke_K)

diffstat:

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

diffs (21 lines):

diff -r f3dc16b9e325 -r d0265584f2c7 system/classes/story.class.php
--- a/system/classes/story.class.php	Sat Aug 01 11:20:46 2009 +0200
+++ b/system/classes/story.class.php	Sat Aug 01 13:21:33 2009 +0200
@@ -1458,7 +1458,7 @@
      */
     function DisplayElements($item = 'title')
     {
-        global $_CONF;
+        global $_CONF, $_TABLES;
 
         $return = '';
 
@@ -1533,7 +1533,7 @@
             break;
             
         case 'commentcode':
-            //check to see if comment_time has past
+            //check to see if comment_time has passed
             if ($this->_comment_expire != 0 && (time() > $this->_comment_expire) && $this->_commentcode == 0 ) {
                 $return = 1;
                 //if comment code is not 1, change it to 1

From geeklog-cvs at lists.geeklog.net  Sat Aug  1 16:47:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 01 Aug 2009 16:47:39 -0400
Subject: [geeklog-cvs] geeklog: Use COM_getUserDateTimeFormat,
	i.e. the user's preferre...
Message-ID: <hg.c63444adf474.1249159659.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c63444adf474
changeset: 7216:c63444adf474
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 21:39:34 2009 +0200
description:
Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for displaying the date and time in search results

diffstat:

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

diffs (25 lines):

diff -r 8c668abba68e -r c63444adf474 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 01 18:37:21 2009 +0200
+++ b/public_html/docs/history	Sat Aug 01 21:39:34 2009 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
+  displaying the date and time in search results [Dirk]
 - When disabling a feed, delete the feed file [Dirk]
 - Fixed an SQL error when the commentcode field was auto-updated (reported by
   Jokke_K) [Dirk]
diff -r 8c668abba68e -r c63444adf474 system/classes/search.class.php
--- a/system/classes/search.class.php	Sat Aug 01 18:37:21 2009 +0200
+++ b/system/classes/search.class.php	Sat Aug 01 21:39:34 2009 +0200
@@ -765,7 +765,8 @@
             }
 
             if ($row['date'] != 'LF_NULL') {
-                $row['date'] = strftime($_CONF['daytime'], intval($row['date']));
+                $dt = COM_getUserDateTimeFormat(intval($row['date']));
+                $row['date'] = $dt[0];
             }
 
             if ($row['hits'] != 'LF_NULL') {

From geeklog-cvs at lists.geeklog.net  Sat Aug  1 16:47:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 01 Aug 2009 16:47:38 -0400
Subject: [geeklog-cvs] geeklog: When disabling a feed, delete the feed file
Message-ID: <hg.8c668abba68e.1249159658.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8c668abba68e
changeset: 7215:8c668abba68e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 18:37:21 2009 +0200
description:
When disabling a feed, delete the feed file

diffstat:

 public_html/admin/syndication.php |  63 +++++++++++++++++++++++++------
 public_html/docs/history          |   3 +
 2 files changed, 53 insertions(+), 13 deletions(-)

diffs (140 lines):

diff -r dcded8e32765 -r 8c668abba68e public_html/admin/syndication.php
--- a/public_html/admin/syndication.php	Sat Aug 01 13:58:10 2009 +0200
+++ b/public_html/admin/syndication.php	Sat Aug 01 18:37:21 2009 +0200
@@ -45,6 +45,23 @@
 }
 
 /**
+* Delete a feed's file
+*
+* @param    string  filename (without the path) of the feed
+* @return   void
+*
+*/
+function deleteFeedFile($filename)
+{
+    if (! empty($filename)) {
+        $feedfile = SYND_getFeedPath($filename);
+        if (file_exists($feedfile)) {
+            @unlink($feedfile);
+        }
+    }
+}
+
+/**
 * Toggle status of a feed from enabled to disabled and back
 *
 * @param    int     $fid    ID of the feed
@@ -55,17 +72,29 @@
 {
     global $_TABLES;
 
+    $changes = false;
+
     // first disable all
-    DB_query ("UPDATE {$_TABLES['syndication']} SET is_enabled = '0'");
+    DB_query("UPDATE {$_TABLES['syndication']} SET is_enabled = 0");
     if (isset($fid_arr)) {
         foreach ($fid_arr as $fid) {
-            $feed_id = addslashes (COM_applyFilter ($fid, true));
-            if (!empty ($fid)) {
+            $feed_id = addslashes(COM_applyFilter($fid, true));
+            if (!empty($fid)) {
                 // now enable those in the array
-                DB_query ("UPDATE {$_TABLES['syndication']} SET is_enabled = '1' WHERE fid = '$fid'");
+                DB_query("UPDATE {$_TABLES['syndication']} SET is_enabled = 1 WHERE fid = '$fid'");
+                $changes = true;
             }
         }
     }
+
+    if ($changes) {
+        $result = DB_query("SELECT filename FROM {$_TABLES['syndication']} WHERE is_enabled = 0");
+        $num_feeds_off = DB_numRows($result);
+        for ($i = 0; $i < $num_feeds_off; $i++) {
+            list($feedfile) = DB_fetchArray($result);
+            deleteFeedFile($feedfile);
+        }
+    }
 }
 
 /**
@@ -92,7 +121,7 @@
 /**
 * Return list of types available for article feeds
 *
-* @return   string   an array with id/name pairs for every feed
+* @return   array   an array with id/name pairs for every feed
 *
 */
 function get_articleFeeds()
@@ -123,6 +152,12 @@
     return $options;
 }
 
+/**
+* List all feeds
+*
+* @return   string  HTML with the list of all feeds
+*
+*/
 function listfeeds()
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG33, $_IMAGE_TYPE;
@@ -508,15 +543,19 @@
         $A[$name] = addslashes ($value);
     }
 
-    DB_save ($_TABLES['syndication'], 'fid,type,topic,header_tid,format,limits,content_length,title,description,feedlogo,filename,charset,language,is_enabled,updated,update_info',
+    DB_save($_TABLES['syndication'], 'fid,type,topic,header_tid,format,limits,content_length,title,description,feedlogo,filename,charset,language,is_enabled,updated,update_info',
         "{$A['fid']},'{$A['type']}','{$A['topic']}','{$A['header_tid']}','{$A['format']}','{$A['limits']}',{$A['content_length']},'{$A['title']}','{$A['description']}','{$A['feedlogo']}','{$A['filename']}','{$A['charset']}','{$A['language']}',{$A['is_enabled']},'0000-00-00 00:00:00',NULL");
 
     if ($A['fid'] == 0) {
-        $A['fid'] = DB_insertId ();
+        $A['fid'] = DB_insertId();
     }
-    SYND_updateFeed ($A['fid']);
+    if ($A['is_enabled'] == 1) {
+        SYND_updateFeed($A['fid']);
+    } else {
+        deleteFeedFile($A['filename']);
+    }
 
-    return COM_refresh ($_CONF['site_admin_url'] . '/syndication.php?msg=58');
+    return COM_refresh($_CONF['site_admin_url'] . '/syndication.php?msg=58');
 }
 
 /**
@@ -533,9 +572,7 @@
     if ($fid > 0) {
         $feedfile = DB_getItem($_TABLES['syndication'], 'filename',
                                "fid = $fid");
-        if (!empty($feedfile)) {
-            @unlink(SYND_getFeedPath($feedfile));
-        }
+        deleteFeedFile($feedfile);
         DB_delete($_TABLES['syndication'], 'fid', $fid);
 
         return COM_refresh($_CONF['site_admin_url']
@@ -569,7 +606,7 @@
                  . COM_siteFooter ();
     }
 }
-else if (($mode == $LANG33[1]) && !empty ($LANG33[1]))
+elseif (($mode == $LANG33[1]) && !empty ($LANG33[1]))
 {
     $display .= COM_siteHeader ('menu', $LANG33[24])
              . editfeed (0, COM_applyFilter($_REQUEST['type']))
diff -r dcded8e32765 -r 8c668abba68e public_html/docs/history
--- a/public_html/docs/history	Sat Aug 01 13:58:10 2009 +0200
+++ b/public_html/docs/history	Sat Aug 01 18:37:21 2009 +0200
@@ -3,6 +3,9 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- When disabling a feed, delete the feed file [Dirk]
+- Fixed an SQL error when the commentcode field was auto-updated (reported by
+  Jokke_K) [Dirk]
 - Moved leftover hard-coded text from admin/sectest.php to the language files
   [Dirk]
 - When creating Pingback excerpts, convert the other site's content to our

From geeklog-cvs at lists.geeklog.net  Sun Aug  2 13:49:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 02 Aug 2009 13:49:58 -0400
Subject: [geeklog-cvs] geeklog: Avoid triggering a false spam report when
	submitting an...
Message-ID: <hg.e4e3e849bff8.1249235398.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e4e3e849bff8
changeset: 7217:e4e3e849bff8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 02 19:31:01 2009 +0200
description:
Avoid triggering a false spam report when submitting an event with the default "http://" entry for the link still in place (bug #0000946)

diffstat:

 plugins/calendar/functions.inc |  28 ++++++++++++++++++----------
 public_html/docs/history       |   5 +++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r c63444adf474 -r e4e3e849bff8 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Aug 01 21:39:34 2009 +0200
+++ b/plugins/calendar/functions.inc	Sun Aug 02 19:31:01 2009 +0200
@@ -471,15 +471,26 @@
     $A['description'] = (isset($A['description']) ? $A['description'] : '');
     $A['event_type']  = (isset($A['event_type']) ? $A['event_type'] : '');
 
+    if ($A['url'] == 'http://') {
+        // remove default entry now to avoid false spam reports
+        $A['url'] = '';
+    }
+
     // pseudo-formatted event description for the spam check
-    $spamcheck = COM_createLink($A['title'], $A['url']) . '<br' . XHTML . '>'
-               . $A['location'] . '<br' . XHTML . '>' . $A['address1'] . '<br' . XHTML . '>'
-               . $A['address2'] . '<br' . XHTML . '>' . $A['city'] . ', ' . $A['zipcode']
+    $spamcheck = '';
+    if (empty($A['url'])) {
+        $spamcheck .= $title;
+    } else {
+        $spamcheck .= COM_createLink($A['title'], $A['url']);
+    }
+    $spamcheck .= '<br' . XHTML . '>' . $A['location'] . '<br' . XHTML . '>'
+               . $A['address1'] . '<br' . XHTML . '>' . $A['address2']
+               . '<br' . XHTML . '>' . $A['city'] . ', ' . $A['zipcode']
                . '<br' . XHTML . '>' . $A['description'] . '</p>';
-    $result = PLG_checkforSpam ($spamcheck, $_CONF['spamx']);
+    $result = PLG_checkforSpam($spamcheck, $_CONF['spamx']);
     if ($result > 0) {
-        COM_updateSpeedlimit ('submit');
-        COM_displayMessageAndAbort ($result, 'spamx', 403, 'Forbidden');
+        COM_updateSpeedlimit('submit');
+        COM_displayMessageAndAbort($result, 'spamx', 403, 'Forbidden');
     }
 
     $A['description'] = addslashes (htmlspecialchars (COM_checkWords ($A['description'])));
@@ -492,10 +503,7 @@
     $A['event_type'] = addslashes (strip_tags (COM_checkWords ($A['event_type'])));
     $A['title'] = addslashes ($A['title']);
 
-    $A['url'] = addslashes (COM_sanitizeUrl ($A['url']));
-    if ($A['url'] == 'http://') {
-        $A['url'] = '';
-    }
+    $A['url'] = addslashes(COM_sanitizeUrl($A['url']));
 
     if (!empty ($A['eid'])) {
         $A['eid'] = addslashes (COM_applyFilter ($A['eid']));
diff -r c63444adf474 -r e4e3e849bff8 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 01 21:39:34 2009 +0200
+++ b/public_html/docs/history	Sun Aug 02 19:31:01 2009 +0200
@@ -20,6 +20,11 @@
 - Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]
 - For Remote Users, display their service name in the User Editor [Dirk]
 
+Calendar Plugin
+---------------
+- Avoid triggering a false spam report when submitting an event with the default
+  "http://" entry for the link still in place (bug #0000946) [Dirk]
+
 
 Jul 30, 2009 (1.6.0sr1)
 ------------

From geeklog-cvs at lists.geeklog.net  Sun Aug  2 13:49:58 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 02 Aug 2009 13:49:58 -0400
Subject: [geeklog-cvs] geeklog: When an error occurs in bigdump.php (during
	migration) ...
Message-ID: <hg.e770d98c2967.1249235398.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e770d98c2967
changeset: 7218:e770d98c2967
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 02 19:41:51 2009 +0200
description:
When an error occurs in bigdump.php (during migration) keep the language when sending the user back to migrate.php (bug #0000943)

diffstat:

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

diffs (29 lines):

diff -r e4e3e849bff8 -r e770d98c2967 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sun Aug 02 19:31:01 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Sun Aug 02 19:41:51 2009 +0200
@@ -386,7 +386,12 @@
 }
 
 if ($error) {
-  echo '<p><a href="migrate.php">' . $LANG_BIGDUMP[30] . '</a> ' . $LANG_BIGDUMP[31] . '</p>' . LB;
+    $backurl = 'migrate.php';
+    if (! empty($language)) {
+        $backurl .= '?language=' . $language;
+    }
+    echo '<p><a href="' . $backurl . '">' . $LANG_BIGDUMP[30] . '</a> '
+         . $LANG_BIGDUMP[31] . '</p>' . LB;
 }
 
 if ($dbconnection) mysql_close();
diff -r e4e3e849bff8 -r e770d98c2967 public_html/docs/history
--- a/public_html/docs/history	Sun Aug 02 19:31:01 2009 +0200
+++ b/public_html/docs/history	Sun Aug 02 19:41:51 2009 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- When an error occurs in bigdump.php (during migration) keep the language when
+  sending the user back to migrate.php (bug #0000943) [Dirk]
 - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
   displaying the date and time in search results [Dirk]
 - When disabling a feed, delete the feed file [Dirk]

From geeklog-cvs at lists.geeklog.net  Sun Aug  2 14:13:06 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 02 Aug 2009 14:13:06 -0400
Subject: [geeklog-cvs] geeklog: Updated Hebrew language files,
	provided by LWC
Message-ID: <hg.ac5f8a687ae5.1249236786.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ac5f8a687ae5
changeset: 7219:ac5f8a687ae5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 02 20:07:04 2009 +0200
description:
Updated Hebrew language files, provided by LWC

diffstat:

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

diffs (24 lines):

diff -r e770d98c2967 -r ac5f8a687ae5 language/hebrew_utf-8.php
--- a/language/hebrew_utf-8.php	Sun Aug 02 19:41:51 2009 +0200
+++ b/language/hebrew_utf-8.php	Sun Aug 02 20:07:04 2009 +0200
@@ -455,7 +455,7 @@
     35 => '??????????????, ?????????? ???? ?????????? ???? ???????? ?????? ???????????? ????????????.',
     36 => '????????:',
     37 => '?????????? ???? ???????? ?????????????? ????',
-    38 => "?????? ???????? ???? ???????????? ???????????? ????%s ??-<{$_CONF['site_url']}>:"
+    38 => "?????? ???????? ???? ???????????? ???????????? ????\n%s\n??-\n<{$_CONF['site_url']}>:"
 );
 
 ###############################################################################
diff -r e770d98c2967 -r ac5f8a687ae5 public_html/docs/history
--- a/public_html/docs/history	Sun Aug 02 19:41:51 2009 +0200
+++ b/public_html/docs/history	Sun Aug 02 20:07:04 2009 +0200
@@ -22,6 +22,8 @@
 - Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]
 - For Remote Users, display their service name in the User Editor [Dirk]
 
+- Updated Hebrew language files, provided by LWC
+
 Calendar Plugin
 ---------------
 - Avoid triggering a false spam report when submitting an event with the default

From geeklog-cvs at lists.geeklog.net  Mon Aug  3 05:54:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 03 Aug 2009 05:54:36 -0400
Subject: [geeklog-cvs] geeklog: Uninitialized variable (reported by Sergey)
Message-ID: <hg.acaf327849c3.1249293276.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/acaf327849c3
changeset: 7220:acaf327849c3
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Aug 03 11:50:51 2009 +0200
description:
Uninitialized variable (reported by Sergey)

diffstat:

 system/databases/mssql.class.php |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r ac5f8a687ae5 -r acaf327849c3 system/databases/mssql.class.php
--- a/system/databases/mssql.class.php	Sun Aug 02 20:07:04 2009 +0200
+++ b/system/databases/mssql.class.php	Mon Aug 03 11:50:51 2009 +0200
@@ -1144,6 +1144,7 @@
     
     //thanks to php.net for this
 function array_push_associative(&$arr) {
+  $ret = 0;
   $args = func_get_args();
   foreach ($args as $arg) {
       if (is_array($arg)) {

From geeklog-cvs at lists.geeklog.net  Wed Aug  5 07:42:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 05 Aug 2009 07:42:37 -0400
Subject: [geeklog-cvs] geeklog: Translated some more texts
Message-ID: <hg.6d5d0b1dc033.1249472557.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6d5d0b1dc033
changeset: 7222:6d5d0b1dc033
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 05 13:42:24 2009 +0200
description:
Translated some more texts

diffstat:

 language/german.php       |  20 ++++++++++----------
 language/german_utf-8.php |  20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs (74 lines):

diff -r 61b7b6405ca9 -r 6d5d0b1dc033 language/german.php
--- a/language/german.php	Wed Aug 05 13:19:07 2009 +0200
+++ b/language/german.php	Wed Aug 05 13:42:24 2009 +0200
@@ -526,14 +526,14 @@
     60 => 'pro Seite',
     61 => 'Suche korrigieren',
     62 => '#',
-    63 => 'Description',
-    64 => 'Showing %1$d - %2$d of %3$d results',
-    65 => 'Story',
-    66 => 'Comment',
-    67 => 'Show %d Results',
-    68 => 'Sort By',
-    69 => 'Titles Only',
-    70 => 'Not available ...'
+    63 => 'Beschreibung',
+    64 => 'Gezeigt werden %1$d - %2$d von %3$d Ergebnissen',
+    65 => 'Artikel',
+    66 => 'Kommentar',
+    67 => 'Zeige %d Suchergebnisse',
+    68 => 'Sortieren nach',
+    69 => 'Nur Titel durchsuchen',
+    70 => 'Nicht verf?gbar ...'
 );
 
 ###############################################################################
@@ -642,8 +642,8 @@
     51 => 'Ort',
     52 => 'L?schen',
     53 => 'Account anlegen',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Einleitung Artikel',
+    55 => 'Hauptteil Artikel'
 );
 
 ###############################################################################
diff -r 61b7b6405ca9 -r 6d5d0b1dc033 language/german_utf-8.php
--- a/language/german_utf-8.php	Wed Aug 05 13:19:07 2009 +0200
+++ b/language/german_utf-8.php	Wed Aug 05 13:42:24 2009 +0200
@@ -526,14 +526,14 @@
     60 => 'pro Seite',
     61 => 'Suche korrigieren',
     62 => '#',
-    63 => 'Description',
-    64 => 'Showing %1$d - %2$d of %3$d results',
-    65 => 'Story',
-    66 => 'Comment',
-    67 => 'Show %d Results',
-    68 => 'Sort By',
-    69 => 'Titles Only',
-    70 => 'Not available ...'
+    63 => 'Beschreibung',
+    64 => 'Gezeigt werden %1$d - %2$d von %3$d Ergebnissen',
+    65 => 'Artikel',
+    66 => 'Kommentar',
+    67 => 'Zeige %d Suchergebnisse',
+    68 => 'Sortieren nach',
+    69 => 'Nur Titel durchsuchen',
+    70 => 'Nicht verf??gbar ...'
 );
 
 ###############################################################################
@@ -642,8 +642,8 @@
     51 => 'Ort',
     52 => 'L??schen',
     53 => 'Account anlegen',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Einleitung Artikel',
+    55 => 'Hauptteil Artikel'
 );
 
 ###############################################################################

From geeklog-cvs at lists.geeklog.net  Wed Aug  5 09:16:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 05 Aug 2009 09:16:41 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_4_1_stable for changeset
	f0de67e8e930
Message-ID: <hg.7c3215e7d3b0.1249478201.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c3215e7d3b0
changeset: 7223:7c3215e7d3b0
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 05 15:16:07 2009 +0200
description:
Added tag geeklog_1_4_1_stable for changeset f0de67e8e930

diffstat:

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

diffs (8 lines):

diff -r 6d5d0b1dc033 -r 7c3215e7d3b0 .hgtags
--- a/.hgtags	Wed Aug 05 13:42:24 2009 +0200
+++ b/.hgtags	Wed Aug 05 15:16:07 2009 +0200
@@ -6,3 +6,4 @@
 401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1
 f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
 f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
+f0de67e8e9304e43062f293941dee29def2ec8db geeklog_1_4_1_stable

From geeklog-cvs at lists.geeklog.net  Thu Aug  6 10:19:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 06 Aug 2009 10:19:10 -0400
Subject: [geeklog-cvs] geeklog: Minor code cleanup - no change in
	functionality
Message-ID: <hg.7b33f42b2d98.1249568350.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7b33f42b2d98
changeset: 7224:7b33f42b2d98
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Aug 06 11:23:58 2009 +0200
description:
Minor code cleanup - no change in functionality

diffstat:

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

diffs (32 lines):

diff -r 7c3215e7d3b0 -r 7b33f42b2d98 public_html/calendar/event.php
--- a/public_html/calendar/event.php	Wed Aug 05 15:16:07 2009 +0200
+++ b/public_html/calendar/event.php	Thu Aug 06 11:23:58 2009 +0200
@@ -538,22 +538,24 @@
             $A = DB_fetchArray($result);
             if (SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],
                               $A['perm_group'],$A['perm_members'],$A['perm_anon']) > 0) {
+                $cal_templates->set_var('site_url', $_CONF['site_url']);
+                $cal_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+                $cal_templates->set_var('layout_url', $_CONF['layout_url']);
+
                 if (strftime('%B',strtotime($A['datestart'])) != $currentmonth) {
                     $str_month = $cal->getMonthName(strftime('%m',strtotime($A['datestart'])));
                     $cal_templates->set_var('lang_month', $str_month);
                     $cal_templates->set_var('event_year', strftime('%Y',strtotime($A['datestart'])));
                     $currentmonth = strftime('%B',strtotime($A['datestart']));
                 }
-                $cal_templates->set_var('event_title', stripslashes($A['title']));
-                $cal_templates->set_var('site_url', $_CONF['site_url']);
-                $cal_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
-                $cal_templates->set_var('layout_url', $_CONF['layout_url']);
+
                 $event_title = stripslashes($A['title']);
                 if (!empty($A['url'])) {
                     $event_title = COM_createLink($event_title, $A['url']);
                     $cal_templates->set_var('event_url', $A['url']);
                 }
                 $cal_templates->set_var('event_title', $event_title);
+
                 if (($_CA_CONF['personalcalendars'] == 1)
                         && !COM_isAnonUser()) {
                     $tmpresult = DB_query("SELECT * FROM {$_TABLES['personal_events']} WHERE eid='{$A['eid']}' AND uid={$_USER['uid']}");

From geeklog-cvs at lists.geeklog.net  Thu Aug  6 10:19:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 06 Aug 2009 10:19:10 -0400
Subject: [geeklog-cvs] geeklog: Reintroduced {event_begin_anchortag} and
	{event_end_anc...
Message-ID: <hg.120190f682bf.1249568350.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/120190f682bf
changeset: 7225:120190f682bf
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Aug 06 11:37:23 2009 +0200
description:
Reintroduced {event_begin_anchortag} and {event_end_anchortag} variables in event.php

diffstat:

 public_html/calendar/event.php |  19 +++++++++++++++----
 public_html/docs/history       |   2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 7b33f42b2d98 -r 120190f682bf public_html/calendar/event.php
--- a/public_html/calendar/event.php	Thu Aug 06 11:23:58 2009 +0200
+++ b/public_html/calendar/event.php	Thu Aug 06 11:37:23 2009 +0200
@@ -74,13 +74,18 @@
         $cal_template->set_var('lang_event', $LANG_CAL_1[12]);
         $event_title = stripslashes($A['title']);
 
-        if (!empty ($A['url']) && ($A['url'] != 'http://')) {
-            $cal_template->set_var ('event_url', $A['url']);
+        if (!empty($A['url']) && ($A['url'] != 'http://')) {
             $event_title = COM_createLink($event_title, $A['url']);
+            $cal_template->set_var('event_url', $A['url']);
+            $cal_template->set_var('event_begin_anchortag',
+                                   '<a href="' . $A['url'] . '">');
+            $cal_template->set_var('event_end_anchortag', '</a>');
         } else {
-            $cal_template->set_var ('event_url', '');
+            $cal_template->set_var('event_url', '');
+            $cal_template->set_var('event_begin_anchortag', '');
+            $cal_template->set_var('event_end_anchortag', '');
         }
-        $cal_template->set_var ('event_title', $event_title);
+        $cal_template->set_var('event_title', $event_title);
         $cal_template->set_var('lang_starts', $LANG_CAL_1[13]);
         $cal_template->set_var('lang_ends', $LANG_CAL_1[14]);
 
@@ -553,6 +558,12 @@
                 if (!empty($A['url'])) {
                     $event_title = COM_createLink($event_title, $A['url']);
                     $cal_templates->set_var('event_url', $A['url']);
+                    $cal_templates->set_var('event_begin_anchortag',
+                                            '<a href="' . $A['url'] . '">');
+                    $cal_templates->set_var('event_end_anchortag', '</a>');
+                } else {
+                    $cal_templates->set_var('event_begin_anchortag', '');
+                    $cal_templates->set_var('event_end_anchortag', '');
                 }
                 $cal_templates->set_var('event_title', $event_title);
 
diff -r 7b33f42b2d98 -r 120190f682bf public_html/docs/history
--- a/public_html/docs/history	Thu Aug 06 11:23:58 2009 +0200
+++ b/public_html/docs/history	Thu Aug 06 11:37:23 2009 +0200
@@ -26,6 +26,8 @@
 
 Calendar Plugin
 ---------------
+- Reintroduced {event_begin_anchortag} and {event_end_anchortag} variables
+  in event.php [Dirk]
 - The number of hits for an event was reset when editing the event [Dirk]
 - When cloning an event, the number of hits for the clone should be 0 [Dirk]
 - Avoid triggering a false spam report when submitting an event with the default

From geeklog-cvs at lists.geeklog.net  Thu Aug  6 10:19:10 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Thu, 06 Aug 2009 10:19:10 -0400
Subject: [geeklog-cvs] geeklog: Added {lang_eventid} variable
Message-ID: <hg.fe058d28a4f1.1249568350.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fe058d28a4f1
changeset: 7226:fe058d28a4f1
user:      Dirk Haun <dirk at haun-online.de>
date:      Thu Aug 06 16:18:45 2009 +0200
description:
Added {lang_eventid} variable

diffstat:

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

diffs (11 lines):

diff -r 120190f682bf -r fe058d28a4f1 public_html/admin/plugins/calendar/index.php
--- a/public_html/admin/plugins/calendar/index.php	Thu Aug 06 11:37:23 2009 +0200
+++ b/public_html/admin/plugins/calendar/index.php	Thu Aug 06 16:18:45 2009 +0200
@@ -164,6 +164,7 @@
         $A['allday'] = 0;
     }
 
+    $event_templates->set_var('lang_eventid', $LANG_CAL_ADMIN[34]);
     $event_templates->set_var('event_id', $A['eid']);
     $event_templates->set_var('lang_eventtitle', $LANG_ADMIN['title']);
     $A['title'] = str_replace('{','&#123;',$A['title']);

From geeklog-cvs at lists.geeklog.net  Fri Aug  7 04:19:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Fri, 07 Aug 2009 04:19:38 -0400
Subject: [geeklog-cvs] geeklog: Added {author_photo} and explained
	{contributedby_photo...
Message-ID: <hg.0c7207abb4e7.1249633178.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0c7207abb4e7
changeset: 7227:0c7207abb4e7
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Aug 07 10:00:40 2009 +0200
description:
Added {author_photo} and explained {contributedby_photo} in more detail

diffstat:

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

diffs (20 lines):

diff -r fe058d28a4f1 -r 0c7207abb4e7 public_html/docs/english/themevars.html
--- a/public_html/docs/english/themevars.html	Thu Aug 06 16:18:45 2009 +0200
+++ b/public_html/docs/english/themevars.html	Fri Aug 07 10:00:40 2009 +0200
@@ -343,7 +343,15 @@
     <td>Link to the story author's profile (empty for anonymous authors).</td></tr>
 <tr><td><code>contributedby_photo</code></td>
     <td><tt>&lt;img src=".../images/userphotos/Tony.gif" alt="Tony Bibbs"&gt;</tt></td>
-    <td>User photo of the story author, if provided (always empty for anonymous authors).</td></tr>
+    <td>User photo of the story author, if provided (and user photos are <a
+        href="config.html#desc_allow_user_photo">enabled</a>). For anonymous
+        users, this will be an empty string, unless use of <a
+        href="config.html#desc_use_gravatar">Gravatars</a> is enabled or a <a
+        href="config.html#desc_default_photo">default photo</a> is
+        configured.</td></tr>
+<tr><td><code>author_photo</code></td>
+    <td><i>(see above)</i></td>
+    <td>Same as <tt>{contributedby_photo}</tt></td></tr>
 <tr><td><code>camera_icon</code></td>
     <td>small camera icon and link to the author's user profile</td>
     <td>Displays the camera icon (the same as in the Who's Online block) and

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 03:26:10 2009
From: geeklog-cvs at lists.geeklog.net (Beau Mensch)
Date: Sat, 8 Aug 2009 12:56:10 +0530
Subject: [geeklog-cvs] The Free Sample you Ordered
Message-ID: <01ca1827$9a2ad550$edf3abcb@humidifiermr02>

Live a full quality life Acai Berry canhelp.

So many new things to give a test, but this one was free!

http://maxbewildered.com/


From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:37 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:37 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fix
Message-ID: <hg.d462f4810218.1249733617.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d462f4810218
changeset: 7229:d462f4810218
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 13:39:01 2009 +0200
description:
E_ALL fix

diffstat:

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

diffs (11 lines):

diff -r 5524c9cdb063 -r d462f4810218 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Aug 04 09:23:31 2009 -0400
+++ b/public_html/lib-common.php	Sat Aug 08 13:39:01 2009 +0200
@@ -990,6 +990,7 @@
     // TBD: add a plugin API and a lib-custom.php function
     $header->set_var( 'rel_links', implode( LB, $relLinks ));
 
+    $pagetitle_siteslogan = false;
     if( empty( $pagetitle ))
     {
         if( empty( $topic ))

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:36 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:36 -0400
Subject: [geeklog-cvs] geeklog: Added meta description and meta keywords to
	stories, st...
Message-ID: <hg.5524c9cdb063.1249733616.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5524c9cdb063
changeset: 7228:5524c9cdb063
user:      Tom <websitemaster at cogeco.net>
date:      Tue Aug 04 09:23:31 2009 -0400
description:
Added meta description and meta keywords to stories, staticpages and polls.
Added autotags to polls to allow for linking directly to a poll and displaying polls in stories, etc.

diffstat:

 language/english.php                                                   |   12 +-
 language/english_utf-8.php                                             |   12 +-
 plugins/polls/autoinstall.php                                          |    2 +-
 plugins/polls/functions.inc                                            |  119 ++++++++-
 plugins/polls/language/english.php                                     |    2 +
 plugins/polls/language/english_utf-8.php                               |    2 +
 plugins/staticpages/autoinstall.php                                    |    2 +-
 plugins/staticpages/functions.inc                                      |   37 ++-
 plugins/staticpages/install_defaults.php                               |    6 +-
 plugins/staticpages/language/english.php                               |    5 +-
 plugins/staticpages/language/english_utf-8.php                         |    5 +-
 plugins/staticpages/services.inc.php                                   |   17 +-
 plugins/staticpages/sql/mssql_install.php                              |    2 +
 plugins/staticpages/sql/mssql_updates.php                              |   61 +++++
 plugins/staticpages/sql/mysql_install.php                              |    2 +
 plugins/staticpages/sql/mysql_updates.php                              |   60 +++++
 plugins/staticpages/templates/admin/editor.thtml                       |    8 +
 plugins/staticpages/templates/admin/editor_advanced.thtml              |    8 +
 public_html/admin/install/config-install.php                           |    3 +
 public_html/admin/install/lib-upgrade.php                              |   10 +
 public_html/admin/plugins/staticpages/index.php                        |   18 +-
 public_html/admin/story.php                                            |    4 +
 public_html/article.php                                                |    9 +
 public_html/docs/english/config.html                                   |   14 +
 public_html/docs/english/staticpages.html                              |    5 +
 public_html/layout/professional/admin/story/storyeditor.thtml          |    8 +
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |    8 +
 public_html/lib-common.php                                             |   95 +++++++-
 public_html/polls/style.css                                            |   21 +
 public_html/siteconfig.php.dist                                        |    2 +-
 sql/mssql_tableanddata.php                                             |    2 +
 sql/mysql_tableanddata.php                                             |    2 +
 sql/updates/mssql_1.6.0_to_1.6.1.php                                   |   25 ++
 sql/updates/mysql_1.6.0_to_1.6.1.php                                   |   24 ++
 system/classes/story.class.php                                         |   39 +++
 35 files changed, 610 insertions(+), 41 deletions(-)

diffs (truncated from 1320 to 300 lines):

diff -r 0c7207abb4e7 -r 5524c9cdb063 language/english.php
--- a/language/english.php	Fri Aug 07 10:00:40 2009 +0200
+++ b/language/english.php	Tue Aug 04 09:23:31 2009 -0400
@@ -825,7 +825,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 
@@ -1573,6 +1575,8 @@
     'addchild'      => 'Add child',
     'list'          => 'list',
     'list_all'      => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',        
     'na'            => 'N/A'
 );
 
@@ -1845,6 +1849,9 @@
     'censorlist' => "Censor List",
     'ip_lookup' => "IP Lookup",
     'url_rewrite' => "Enable URL Rewrite",
+    'meta_tags' => "Meta Tags",
+    'meta_description' => "Default Meta Description",
+    'meta_keywords' => "Default Meta Keywords",    
     'default_permissions_block' => "Block Default Permissions",
     'default_permissions_story' => "Story Default Permissions",
     'default_permissions_topic' => "Topic Default Permissions",
@@ -1949,7 +1956,8 @@
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
-    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
 ?>
diff -r 0c7207abb4e7 -r 5524c9cdb063 language/english_utf-8.php
--- a/language/english_utf-8.php	Fri Aug 07 10:00:40 2009 +0200
+++ b/language/english_utf-8.php	Tue Aug 04 09:23:31 2009 -0400
@@ -825,7 +825,9 @@
     85 => 'Show All',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords'
 );
 
 
@@ -1573,6 +1575,8 @@
     'addchild'      => 'Add child',
     'list'          => 'list',
     'list_all'      => 'List all',
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',        
     'na'            => 'N/A'
 );
 
@@ -1845,6 +1849,9 @@
     'censorlist' => "Censor List",
     'ip_lookup' => "IP Lookup",
     'url_rewrite' => "Enable URL Rewrite",
+    'meta_tags' => "Meta Tags",
+    'meta_description' => "Default Meta Description",
+    'meta_keywords' => "Default Meta Keywords",
     'default_permissions_block' => "Block Default Permissions",
     'default_permissions_story' => "Story Default Permissions",
     'default_permissions_topic' => "Topic Default Permissions",
@@ -1949,7 +1956,8 @@
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
-    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
 ?>
diff -r 0c7207abb4e7 -r 5524c9cdb063 plugins/polls/autoinstall.php
--- a/plugins/polls/autoinstall.php	Fri Aug 07 10:00:40 2009 +0200
+++ b/plugins/polls/autoinstall.php	Tue Aug 04 09:23:31 2009 -0400
@@ -51,7 +51,7 @@
     $info = array(
         'pi_name'         => $pi_name,
         'pi_display_name' => $pi_display_name,
-        'pi_version'      => '2.1.0',
+        'pi_version'      => '2.1.1',
         'pi_gl_version'   => '1.6.0',
         'pi_homepage'     => 'http://www.geeklog.net/'
     );
diff -r 0c7207abb4e7 -r 5524c9cdb063 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Fri Aug 07 10:00:40 2009 +0200
+++ b/plugins/polls/functions.inc	Tue Aug 04 09:23:31 2009 -0400
@@ -450,13 +450,14 @@
 *
 * @param      string      $pid      ID for poll topic
 * @param      boolean     $showall  Show only the first question in the poll or all?
+* @param        int        $displaytype       Possible values 0 = Normal, 1 = In Block, 2 = autotag
 * @see function COM_pollResults
 * @see function COM_showPoll
 * @return       string  HTML Formatted Poll
 *
 */
 
-function POLLS_pollVote($pid, $showall = true)
+function POLLS_pollVote($pid, $showall = true, $displaytype = 0)
 {
     global $_CONF, $_TABLES, $LANG_POLLS, $LANG01, $_USER, $LANG25, $_IMAGE_TYPE;
     $retval = '';
@@ -471,6 +472,7 @@
     }
 
     $P = DB_fetchArray($topic);
+    
     if ((!isset($_COOKIE[$pid]) && !POLLS_ipAlreadyVoted($pid)) or ($P['is_open'] == 1)) {
         if ($ntopics == 1) {
             $questions_sql = "SELECT question,qid "
@@ -593,7 +595,7 @@
                 }
                 $retval =  $poll->finish($poll->parse('output', 'block')) . LB;
 
-                if ($showall && ($P['commentcode'] >= 0)) {
+                if ($showall && ($P['commentcode'] >= 0 AND $displaytype != 2)) {
                     $delete_option = (SEC_hasRights('polls.edit') &&
                         SEC_hasAccess($P['owner_id'], $P['group_id'],
                         $P['perm_owner'], $P['perm_group'], $P['perm_members'],
@@ -610,7 +612,7 @@
             }
         }
     } else {
-        $retval .= POLLS_pollResults($pid);
+        $retval .= POLLS_pollResults($pid, 0, '', '', $displaytype);
     }
 
     return $retval;
@@ -622,27 +624,33 @@
 * This will determine if a user needs to see the poll form OR the poll
 * result.
 *
-* @param        int        $sise       Size in pixels of poll results
+* @param        int        $size       Size in pixels of poll results
 * @param        string     $pid        topic ID to show (optional)
+* @param        int        $displaytype       Possible values 0 = Normal, 1 = In Block, 2 = autotag 
 * @see function COM_pollVote
 * @see function COM_pollResults
 * @return    String  HTML Formated string of Poll
 *
 */
 
-function POLLS_showPoll($size, $pid='', $showall = false )
+function POLLS_showPoll($size, $pid='', $showall = false, $displaytype = 0 )
 {
-    global $_CONF, $_PO_CONF, $_TABLES;
+    global $_CONF, $_PO_CONF, $_TABLES, $LANG_POLLS;
 
     $retval = '';
 
     DB_query("DELETE FROM {$_TABLES['pollvoters']} WHERE date < UNIX_TIMESTAMP() - {$_PO_CONF['polladdresstime']}");
+    
+    if(!empty($pid)) {
+        $Q['is_open'] = DB_getItem($_TABLES['polltopics'], 'is_open', "pid = '".$pid."'");
 
-    if(!empty($pid)) {
+        if ($displaytype == 2 && $Q['is_open'] == 0) {
+            $retval = '<div class="poll-autotag-message">' . $LANG_POLLS['pollclosed']. "</div>";
+        }        
         if(!isset($_COOKIE["poll-".$pid]) && !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
-            $retval .= POLLS_pollVote($pid);
+            $retval .= POLLS_pollVote($pid, $showall, $displaytype);
         } else {
-            $retval .= POLLS_pollResults($pid, $size);
+            $retval .= POLLS_pollResults($pid, $size, '', '', $displaytype);
         }
     } else {
         $result = DB_query("SELECT pid,topic,is_open FROM {$_TABLES['polltopics']} WHERE display = 1 ORDER BY date DESC");
@@ -654,7 +662,8 @@
             for ($i = 1; $i <= $nrows; $i++) {
                 $Q = DB_fetchArray($result);
                 $pid = $Q['pid'];
-                if ($size < 120) { // assume we're in the poll block
+                //if ($size < 120) { // assume we're in the poll block
+                if ($displaytype == 1) { // In the poll block
                     $showall = false;
                 } else { // assume we're in polls/index.php
                     $retval .= COM_startBlock($title);
@@ -662,9 +671,9 @@
                 }
 
                 if (!isset($_COOKIE["poll-".$pid]) && !POLLS_ipAlreadyVoted($pid) && ($Q['is_open'] == 1)) {
-                    $retval .= POLLS_pollVote($pid, $showall);
+                    $retval .= POLLS_pollVote($pid, $showall, $displaytype);
                 } else {
-                    $retval .= POLLS_pollResults($pid, $size);
+                    $retval .= POLLS_pollResults($pid, $size, '', '', $displaytype);
                 }
 
                 if ($size < 120) {
@@ -738,12 +747,13 @@
 * @param        int         $scale      Size in pixels to scale formatted results to
 * @param        string      $order      'ASC' or 'DESC' for Comment ordering (SQL statment ordering)
 * @param        string      $mode       Comment Mode possible values 'nocomment', 'flat', 'nested', 'threaded'
+* @param        int        $displaytype       Possible values 0 = Normal, 1 = In Block, 2 = autotag
 * @see POLLS_pollVote
 * @see POLLS_showPoll
 * @return     string   HTML Formated Poll Results
 *
 */
-function POLLS_pollResults($pid, $scale=400, $order='', $mode='')
+function POLLS_pollResults($pid, $scale=400, $order='', $mode='', $displaytype = 0)
 {
     global $_CONF, $_TABLES, $_USER, $_IMAGE_TYPE,
            $_PO_CONF, $LANG01, $LANG_POLLS, $_COM_VERBOSE, $LANG25;
@@ -771,9 +781,13 @@
     ) {
         $retval = '';
     } else {
+        if ($displaytype == 2) {
+            $retval = '<div class="poll-autotag-message">' . $LANG_POLLS['pollhidden']. "</div>";
+        }
+        
         return $retval;
     }
-
+    
     $ntopic = DB_numRows($topic );
     if ($ntopic == 1) {
         $questions_sql = "SELECT qid,pid,question "
@@ -896,7 +910,7 @@
 
             $retval .= $poll->finish($poll->parse('output', 'result' ));
 
-            if($scale > 399 && $P['commentcode'] >= 0 ) {
+            if($scale > 399 && $P['commentcode'] >= 0 && $displaytype != 2) {
                 $delete_option = (SEC_hasRights('polls.edit') &&
                     SEC_hasAccess($P['owner_id'], $P['group_id'],
                     $P['perm_owner'], $P['perm_group'], $P['perm_members'],
@@ -941,7 +955,7 @@
 
 function phpblock_polls()
 {
-    $retval = POLLS_showPoll(60);
+    $retval = POLLS_showPoll(60, '', false, 1);
     return $retval;
 }
 
@@ -1096,7 +1110,7 @@
     global $_CONF;
 
     $str = null;
-    $str = '<link rel="stylesheet" type="text/css" href="'
+    $str = LB . '<link rel="stylesheet" type="text/css" href="'
         . $_CONF['site_url'] . '/polls/style.css"' . XHTML . '>';
 
     return $str;
@@ -1143,7 +1157,8 @@
                     DB_query($sql);
                 }
             }
-            $current_version = '2.1.0';
+            
+            $current_version = '2.1.1';
             break;
 
         default:
@@ -1181,7 +1196,7 @@
 }
 
 /**
-* Return information for a poll
+* Return information for a poll                                                                                                                     
 *
 * @param    string  $pid        poll ID or '*'
 * @param    string  $what       comma-separated list of properties
@@ -1365,4 +1380,70 @@
     return $tmp;
 }
 
+/**
+* Poll Autotags
+* [poll: pid] - Displays a link to a poll using the Poll Topic as the title. A alternate title may be specified. 
+* [poll-vote: pid pid class:poll-autotag showall:1] - Width and showall not required. Class specifies the css class and Showall if set to 1, shows all questions
+* [poll-result: pid class:poll-autotag] - Width and showall not required. Class specifies the css class
+*
+*/
+function plugin_autotags_polls ($op, $content = '', $autotag = '')
+{
+    global $_TABLES;
+    
+    if ($op == 'tagname' ) {
+        return array('poll-vote','poll-result','poll');
+    } else if ($op == 'parse') {
+        $pid = COM_applyFilter ($autotag['parm1']);

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:38 -0400
Subject: [geeklog-cvs] geeklog: Missing global $_CONF
Message-ID: <hg.247556377a41.1249733618.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/247556377a41
changeset: 7230:247556377a41
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 13:39:43 2009 +0200
description:
Missing global $_CONF

diffstat:

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

diffs (12 lines):

diff -r d462f4810218 -r 247556377a41 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Aug 08 13:39:01 2009 +0200
+++ b/plugins/polls/functions.inc	Sat Aug 08 13:39:43 2009 +0200
@@ -1389,7 +1389,7 @@
 */
 function plugin_autotags_polls ($op, $content = '', $autotag = '')
 {
-    global $_TABLES;
+    global $_CONF, $_TABLES;
     
     if ($op == 'tagname' ) {
         return array('poll-vote','poll-result','poll');

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:38 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:38 -0400
Subject: [geeklog-cvs] geeklog: Renamed poll autotags to [poll_vote:],
	[poll_result:] (...
Message-ID: <hg.978e9c3ccad8.1249733618.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/978e9c3ccad8
changeset: 7231:978e9c3ccad8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 13:48:16 2009 +0200
description:
Renamed poll autotags to [poll_vote:], [poll_result:] (for consistency)

diffstat:

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

diffs (32 lines):

diff -r 247556377a41 -r 978e9c3ccad8 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Aug 08 13:39:43 2009 +0200
+++ b/plugins/polls/functions.inc	Sat Aug 08 13:48:16 2009 +0200
@@ -1392,7 +1392,7 @@
     global $_CONF, $_TABLES;
     
     if ($op == 'tagname' ) {
-        return array('poll-vote','poll-result','poll');
+        return array('poll_vote','poll_result','poll');
     } else if ($op == 'parse') {
         $pid = COM_applyFilter ($autotag['parm1']);
         $width = "300";
@@ -1408,8 +1408,8 @@
 
                 $retval = COM_createLink($title, $_CONF['site_url'] . '/polls/index.php?pid=' . $pid . '&amp;aid=-1');
                 break;
-            case 'poll-vote' :
-            case 'poll-result' :
+            case 'poll_vote' :
+            case 'poll_result' :
                 $px = explode (' ', trim ($autotag['parm2']));
                 $css_class = "poll-autotag";
                 
@@ -1430,7 +1430,7 @@
                     }
                 }
                 
-                if ($autotag['tag'] == 'poll-vote') {
+                if ($autotag['tag'] == 'poll_vote') {
                     $retval = POLLS_showPoll(0, $pid, $showall, 2);
                 } else {
                     $retval = POLLS_pollResults($pid, 0,'', '', 2);

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:40 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:40 -0400
Subject: [geeklog-cvs] geeklog: Fixed template parsing; E_ALL fixes
Message-ID: <hg.063a9a0c9afb.1249733620.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/063a9a0c9afb
changeset: 7233:063a9a0c9afb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 14:03:30 2009 +0200
description:
Fixed template parsing; E_ALL fixes

diffstat:

 public_html/admin/plugins/staticpages/index.php |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r c29961d5e4f0 -r 063a9a0c9afb public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sat Aug 08 13:57:57 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Sat Aug 08 14:03:30 2009 +0200
@@ -316,8 +316,12 @@
         $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('meta_description',$A['meta_description']);
-        $sp_template->set_var('meta_keywords',$A['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"');
@@ -386,7 +390,8 @@
         $sp_template->set_var( 'xhtml', XHTML );
         $sp_template->set_var( 'gltoken_name', CSRF_TOKEN );
         $sp_template->set_var( 'gltoken', SEC_createToken() );
-        $retval .= $sp_template->parse('output','form');
+        $sp_template->parse('output', 'form');
+        $retval .= $sp_template->finish($sp_template->get_var('output'));
     }
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:39 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:39 -0400
Subject: [geeklog-cvs] geeklog: Source code cosmetics (no change in
	functionality)
Message-ID: <hg.c29961d5e4f0.1249733619.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c29961d5e4f0
changeset: 7232:c29961d5e4f0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 13:57:57 2009 +0200
description:
Source code cosmetics (no change in functionality)

diffstat:

 plugins/polls/functions.inc |  93 +++++++++++++++++++++++-----------------------
 1 files changed, 47 insertions(+), 46 deletions(-)

diffs (111 lines):

diff -r 978e9c3ccad8 -r c29961d5e4f0 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sat Aug 08 13:48:16 2009 +0200
+++ b/plugins/polls/functions.inc	Sat Aug 08 13:57:57 2009 +0200
@@ -1387,60 +1387,61 @@
 * [poll-result: pid class:poll-autotag] - Width and showall not required. Class specifies the css class
 *
 */
-function plugin_autotags_polls ($op, $content = '', $autotag = '')
+function plugin_autotags_polls($op, $content = '', $autotag = '')
 {
     global $_CONF, $_TABLES;
-    
+
     if ($op == 'tagname' ) {
-        return array('poll_vote','poll_result','poll');
-    } else if ($op == 'parse') {
-        $pid = COM_applyFilter ($autotag['parm1']);
-        $width = "300";
-        $showall= false;
-        
-        switch( $autotag['tag'] ) {
-            case 'poll' :
-                if (!empty ($autotag['parm2'])) { 
-                    $title = COM_applyFilter($autotag['parm2']);
-                } else {
-                    $title = DB_getItem ($_TABLES['polltopics'], 'topic', "pid = '$pid'");
-                } 
+        return array('poll_vote', 'poll_result', 'poll');
+    } elseif ($op == 'parse') {
+        $pid = COM_applyFilter($autotag['parm1']);
+        $showall = false;
 
-                $retval = COM_createLink($title, $_CONF['site_url'] . '/polls/index.php?pid=' . $pid . '&amp;aid=-1');
-                break;
-            case 'poll_vote' :
-            case 'poll_result' :
-                $px = explode (' ', trim ($autotag['parm2']));
-                $css_class = "poll-autotag";
-                
-                if (is_array ($px)) {
-                    foreach ($px as $part) {
-                        if (substr ($part, 0, 6) == 'class:') {
-                            $a = explode (':', $part);
-                            $css_class = $a[1];
-                        } elseif (substr ($part, 0, 8) == 'showall:') {
-                            $a = explode (':', $part);
-                            $val = $a[1];
-                            if ($val == 1) {
-                                $showall = true;
-                            }
-                        } else {
-                            break;
+        switch ($autotag['tag']) {
+        case 'poll':
+            if (!empty($autotag['parm2'])) {
+                $title = COM_applyFilter($autotag['parm2']);
+            } else {
+                $title = DB_getItem($_TABLES['polltopics'], 'topic',
+                                    "pid = '$pid'");
+            }
+
+            $retval = COM_createLink($title, $_CONF['site_url']
+                            . '/polls/index.php?pid=' . $pid . '&amp;aid=-1');
+            break;
+
+        case 'poll_vote':
+        case 'poll_result':
+            $px = explode(' ', trim($autotag['parm2']));
+            $css_class = "poll-autotag";
+
+            if (is_array($px)) {
+                foreach ($px as $part) {
+                    if (substr($part, 0, 6) == 'class:') {
+                        $a = explode(':', $part);
+                        $css_class = $a[1];
+                    } elseif (substr($part, 0, 8) == 'showall:') {
+                        $a = explode(':', $part);
+                        $val = $a[1];
+                        if ($val == 1) {
+                            $showall = true;
                         }
+                    } else {
+                        break;
                     }
                 }
-                
-                if ($autotag['tag'] == 'poll_vote') {
-                    $retval = POLLS_showPoll(0, $pid, $showall, 2);
-                } else {
-                    $retval = POLLS_pollResults($pid, 0,'', '', 2);
-                }
-                $retval = '<div class="'.$css_class.'">'.$retval.'</div>';
-                break;
+            }
+
+            if ($autotag['tag'] == 'poll_vote') {
+                $retval = POLLS_showPoll(0, $pid, $showall, 2);
+            } else {
+                $retval = POLLS_pollResults($pid, 0,'', '', 2);
+            }
+            $retval = '<div class="' . $css_class . '">' . $retval . '</div>';
+            break;
         }
-        
-        
-        $content = str_replace ($autotag['tagstr'], $retval, $content);
+
+        $content = str_replace($autotag['tagstr'], $retval, $content);
     }
 
     return $content;

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 08:13:41 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 08:13:41 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation
Message-ID: <hg.9c9933e74ff4.1249733621.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9c9933e74ff4
changeset: 7234:9c9933e74ff4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 14:13:01 2009 +0200
description:
Updated documentation

diffstat:

 public_html/docs/history |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 063a9a0c9afb -r 9c9933e74ff4 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 08 14:03:30 2009 +0200
+++ b/public_html/docs/history	Sat Aug 08 14:13:01 2009 +0200
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Added support for meta tags and meta keywords, provided by Tom Homer
 - When an error occurs in bigdump.php (during migration) keep the language when
   sending the user back to migrate.php (bug #0000943) [Dirk]
 - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
@@ -22,7 +23,7 @@
 - Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]
 - For Remote Users, display their service name in the User Editor [Dirk]
 
-- Updated Hebrew language files, provided by LWC
+- Updated Hebrew language file, provided by LWC
 
 Calendar Plugin
 ---------------
@@ -33,6 +34,15 @@
 - Avoid triggering a false spam report when submitting an event with the default
   "http://" entry for the link still in place (bug #0000946) [Dirk]
 
+Polls Plugin
+------------
+- Introduced [poll:], [poll_vote:], and [poll_result:] autotags, allowing to
+  embed polls where autotags are allowed, provided by Tom Homer
+
+Static Pages Plugin
+-------------------
+- Added support for meta tags and meta keywords, provided by Tom Homer
+
 
 Jul 30, 2009 (1.6.0sr1)
 ------------

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 11:07:21 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 11:07:21 -0400
Subject: [geeklog-cvs] geeklog: Fixed upgrade
Message-ID: <hg.b3b624090a6b.1249744041.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b3b624090a6b
changeset: 7235:b3b624090a6b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 17:07:11 2009 +0200
description:
Fixed upgrade

diffstat:

 public_html/admin/install/index.php       |  2 +-
 public_html/admin/install/lib-upgrade.php |  2 +-
 sql/updates/mssql_1.6.0_to_1.6.1.php      |  5 +++--
 sql/updates/mysql_1.6.0_to_1.6.1.php      |  4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 9c9933e74ff4 -r b3b624090a6b public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/public_html/admin/install/index.php	Sat Aug 08 17:07:11 2009 +0200
@@ -339,7 +339,7 @@
                               . '<p>' . $LANG_INSTALL[91] . '</p>';
                 } else {
 
-                    $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2');
+                    $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2','1.6.0');
                     if (empty($curv)) {
                         // If we were unable to determine the current GL
                         // version is then ask the user what it is
diff -r 9c9933e74ff4 -r b3b624090a6b public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sat Aug 08 17:07:11 2009 +0200
@@ -478,7 +478,7 @@
             require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.6.0_to_1.6.1.php';
             INST_updateDB($_SQL);
 
-            update_ConfValues();
+            update_ConfValuesFor161();
 
             $current_gl_version = '1.6.1';
             $_SQL = '';
diff -r 9c9933e74ff4 -r b3b624090a6b sql/updates/mssql_1.6.0_to_1.6.1.php
--- a/sql/updates/mssql_1.6.0_to_1.6.1.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/sql/updates/mssql_1.6.0_to_1.6.1.php	Sat Aug 08 17:07:11 2009 +0200
@@ -7,12 +7,14 @@
  * Add new config options
  *
  */
-function update_ConfValues()
+function update_ConfValuesFor161()
 {
     global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    $c = config::get_instance();
+
     // meta tag config options.
     $c->add('meta_tags',0,'select',0,0,23,2000,TRUE);
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);
@@ -21,5 +23,4 @@
     return true;
 }
 
-
 ?>
diff -r 9c9933e74ff4 -r b3b624090a6b sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Sat Aug 08 17:07:11 2009 +0200
@@ -7,12 +7,14 @@
  * Add new config options
  *
  */
-function update_ConfValues()
+function update_ConfValuesFor161()
 {
     global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    $c = config::get_instance();
+
     // meta tag config options.
     $c->add('meta_tags',0,'select',0,0,23,2000,TRUE);
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:18:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:18:25 -0400
Subject: [geeklog-cvs] geeklog: List available autotags in the static pages
	editor
Message-ID: <hg.f1efc0a11614.1249759105.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f1efc0a11614
changeset: 7236:f1efc0a11614
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 19:51:31 2009 +0200
description:
List available autotags in the static pages editor

diffstat:

 plugins/staticpages/templates/admin/editor.thtml          |   3 ++-
 plugins/staticpages/templates/admin/editor_advanced.thtml |   3 ++-
 public_html/admin/plugins/staticpages/index.php           |  12 ++++++++++--
 public_html/docs/history                                  |   1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r b3b624090a6b -r f1efc0a11614 plugins/staticpages/templates/admin/editor.thtml
--- a/plugins/staticpages/templates/admin/editor.thtml	Sat Aug 08 17:07:11 2009 +0200
+++ b/plugins/staticpages/templates/admin/editor.thtml	Sat Aug 08 19:51:31 2009 +0200
@@ -51,7 +51,8 @@
               <td valign="top" align="right">{lang_content}:</td>
               <td>
                   <textarea name="sp_content" style="width:100%" cols="45" rows="24">{sp_content}</textarea>
-                  <br{xhtml}><span class="warningsmall">{lang_allowedhtml}</span><br{xhtml}><br{xhtml}>
+                  <br{xhtml}>
+                  {lang_allowed_html}
               </td>
           </tr>
           <tr>
diff -r b3b624090a6b -r f1efc0a11614 plugins/staticpages/templates/admin/editor_advanced.thtml
--- a/plugins/staticpages/templates/admin/editor_advanced.thtml	Sat Aug 08 17:07:11 2009 +0200
+++ b/plugins/staticpages/templates/admin/editor_advanced.thtml	Sat Aug 08 19:51:31 2009 +0200
@@ -76,7 +76,8 @@
              <tr id="advanced_editarea" style="display:{show_adveditor};">
                 <td colspan="2" style="margin-top:10px;border:1px solid #CCC;">
                   <textarea id="adv_content" name="sp_content">{sp_content}</textarea>
-                  <div class="warningsmall" style="padding:10px;">{lang_allowedhtml}</div>
+                  <br{xhtml}>
+                  {lang_allowed_html}
                 </td>
              </tr>
              <tr id="html_editarea" style="display:{show_htmleditor};">
diff -r b3b624090a6b -r f1efc0a11614 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sat Aug 08 17:07:11 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Sat Aug 08 19:51:31 2009 +0200
@@ -370,11 +370,19 @@
         }
         $sp_template->set_var('sp_content', $content);
         if ($_SP_CONF['filter_html'] == 1) {
-            $sp_template->set_var('lang_allowedhtml',
-                                  COM_allowedHTML('staticpages.edit'));
+            $allowed = COM_allowedHTML('staticpages.edit');
+            $sp_template->set_var('lang_allowedhtml', $allowed);
+            $sp_template->set_var('lang_allowed_html', $allowed);
         } else {
             $sp_template->set_var('lang_allowedhtml',
                                   $LANG_STATIC['all_html_allowed']);
+            $allowed = '<span class="warningsmall">'
+                     . $LANG_STATIC['all_html_allowed'] . ',</span>' . LB
+                     . '<div dir="ltr" class="warningsmall">';
+            $autotags = array_keys(PLG_collectTags());
+            $allowed .= '[' . implode(':], [', $autotags) . ':]';
+            $allowed .= '</div>';
+            $sp_template->set_var('lang_allowed_html', $allowed);
         }
         $sp_template->set_var ('lang_hits', $LANG_STATIC['hits']);
         if (empty ($A['sp_hits'])) {
diff -r b3b624090a6b -r f1efc0a11614 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 08 17:07:11 2009 +0200
+++ b/public_html/docs/history	Sat Aug 08 19:51:31 2009 +0200
@@ -41,6 +41,7 @@
 
 Static Pages Plugin
 -------------------
+- List available autotags in the static pages editor [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer
 
 

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:18:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:18:25 -0400
Subject: [geeklog-cvs] geeklog: Need to handle "upgrade" from plugin version
	1.5.1
Message-ID: <hg.0a579edfe4b0.1249759105.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0a579edfe4b0
changeset: 7237:0a579edfe4b0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 20:57:56 2009 +0200
description:
Need to handle "upgrade" from plugin version 1.5.1

diffstat:

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

diffs (15 lines):

diff -r f1efc0a11614 -r 0a579edfe4b0 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Aug 08 19:51:31 2009 +0200
+++ b/plugins/staticpages/functions.inc	Sat Aug 08 20:57:56 2009 +0200
@@ -1026,6 +1026,11 @@
     $done = false;
     while (! $done) {
         switch ($current_version) {
+        case '1.5.1':
+            // no db changes
+            $current_version = '1.6.0';
+            break;
+
         case '1.6.0':
             if (isset($_UPDATES[$current_version])) {
                 $_SQL = $_UPDATES[$current_version];

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:18:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:18:25 -0400
Subject: [geeklog-cvs] geeklog: Fixed copyrights, version numbers; cosmetics
Message-ID: <hg.4e31048d5d3c.1249759105.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/4e31048d5d3c
changeset: 7238:4e31048d5d3c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 21:05:28 2009 +0200
description:
Fixed copyrights, version numbers; cosmetics

diffstat:

 plugins/staticpages/sql/mssql_install.php |  12 +++++++-----
 plugins/staticpages/sql/mssql_updates.php |  14 +++++---------
 plugins/staticpages/sql/mysql_install.php |  12 ++++++++----
 plugins/staticpages/sql/mysql_updates.php |  16 +++++++---------
 4 files changed, 27 insertions(+), 27 deletions(-)

diffs (149 lines):

diff -r 0a579edfe4b0 -r 4e31048d5d3c plugins/staticpages/sql/mssql_install.php
--- a/plugins/staticpages/sql/mssql_install.php	Sat Aug 08 20:57:56 2009 +0200
+++ b/plugins/staticpages/sql/mssql_install.php	Sat Aug 08 21:05:28 2009 +0200
@@ -2,11 +2,11 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Plugin 1.4.2                                                 |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
 // | Installation SQL                                                          |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2006 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -29,10 +29,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mssql_install.php,v 1.5 2008/08/12 18:13:35 mjervis Exp $
 
-
+/**
+* MS SQL updates
+*
+* @package Staticpage
+*/
 
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['staticpage']}] (
diff -r 0a579edfe4b0 -r 4e31048d5d3c plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Sat Aug 08 20:57:56 2009 +0200
+++ b/plugins/staticpages/sql/mssql_updates.php	Sat Aug 08 21:05:28 2009 +0200
@@ -2,16 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Plugin 1.4.2                                                 |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
-// | Installation SQL                                                          |
+// | Upgrade SQL                                                               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2006 by the following authors:                         |
+// | Copyright (C) 2009 by the following authors:                              |
 // |                                                                           |
-// | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
-// |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
-// |          Blaine Lang      - langmail AT sympatico DOT ca                  |
-// |          Dirk Haun        - dirk AT haun-online DOT de                    |
+// | Authors: Tom Homer        - websitemaster AT cogeco DOT net               |
 // +---------------------------------------------------------------------------+
 // |                                                                           |
 // | This program is licensed under the terms of the GNU General Public License|
@@ -41,7 +38,6 @@
         "ALTER TABLE {$_TABLES['staticpage']} ADD meta_description [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER commentcode, ADD meta_keywords [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description"
     )
 
-
 );
 
 function update_ConfValues_1_6_0()
@@ -51,7 +47,7 @@
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
     $c = config::get_instance();
-    
+
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 
diff -r 0a579edfe4b0 -r 4e31048d5d3c plugins/staticpages/sql/mysql_install.php
--- a/plugins/staticpages/sql/mysql_install.php	Sat Aug 08 20:57:56 2009 +0200
+++ b/plugins/staticpages/sql/mysql_install.php	Sat Aug 08 21:05:28 2009 +0200
@@ -2,11 +2,11 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Plugin 1.4.2                                                 |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
 // | Installation SQL                                                          |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2006 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
 // |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
@@ -28,8 +28,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: mysql_install.php,v 1.3 2007/08/09 18:29:34 dhaun Exp $
+
+/**
+* MySQL install
+*
+* @package Staticpage
+*/
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['staticpage']} (
diff -r 0a579edfe4b0 -r 4e31048d5d3c plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Sat Aug 08 20:57:56 2009 +0200
+++ b/plugins/staticpages/sql/mysql_updates.php	Sat Aug 08 21:05:28 2009 +0200
@@ -2,16 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Static Pages Plugin 1.4.2                                                 |
+// | Static Pages Plugin 1.6                                                   |
 // +---------------------------------------------------------------------------+
-// | Installation SQL                                                          |
+// | Upgrade SQL                                                               |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2006 by the following authors:                         |
+// | Copyright (C) 2009 by the following authors:                              |
 // |                                                                           |
-// | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
-// |          Tom Willett      - twillett AT users DOT sourceforge DOT net     |
-// |          Blaine Lang      - langmail AT sympatico DOT ca                  |
-// |          Dirk Haun        - dirk AT haun-online DOT de                    |
+// | Authors: Tom Homer        - websitemaster AT cogeco DOT net               |
 // +---------------------------------------------------------------------------+
 // |                                                                           |
 // | This program is licensed under the terms of the GNU General Public License|
@@ -38,7 +35,8 @@
 $_UPDATES = array(
 
     '1.6.0' => array(
-        "ALTER TABLE {$_TABLES['staticpage']} ADD meta_description TEXT NULL AFTER commentcode, ADD meta_keywords TEXT NULL AFTER meta_description"
+        "ALTER TABLE {$_TABLES['staticpage']} ADD meta_description TEXT NULL AFTER commentcode",
+        "ALTER TABLE {$_TABLES['staticpage']} ADD meta_keywords TEXT NULL AFTER meta_description"
     )
 
 );
@@ -50,7 +48,7 @@
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
     $c = config::get_instance();
-    
+
     // meta tag config options.
     $c->add('meta_tags', $_SP_DEFAULT['meta_tags'], 'select', 0, 0, 0, 120, true, 'staticpages');
 

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:58:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:58:25 -0400
Subject: [geeklog-cvs] geeklog: Include [page_break] tag in list when all
	HTML is allow...
Message-ID: <hg.2b3961806070.1249761505.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2b3961806070
changeset: 7239:2b3961806070
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 21:26:43 2009 +0200
description:
Include [page_break] tag in list when all HTML is allowed for Root users (and the tag is enabled)

diffstat:

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

diffs (42 lines):

diff -r 4e31048d5d3c -r 2b3961806070 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Aug 08 21:05:28 2009 +0200
+++ b/public_html/lib-common.php	Sat Aug 08 21:26:43 2009 +0200
@@ -3903,18 +3903,6 @@
         {
             $html = array_merge_recursive( $_CONF['user_html'],
                                            $_CONF['admin_html'] );
-            if( $_CONF['allow_page_breaks'] == 1 )
-            {
-                $perms = explode( ',', $permissions );
-                foreach( $perms as $p )
-                {
-                    if( substr( $p, 0, 6 ) == 'story.' )
-                    {
-                        $allow_page_break = true;
-                        break;
-                    }
-                }
-            }
         }
 
         $retval .= '<div dir="ltr" class="warningsmall">';
@@ -3924,6 +3912,19 @@
         }
     }
 
+    if( $_CONF['allow_page_breaks'] == 1 )
+    {
+        $perms = explode( ',', $permissions );
+        foreach( $perms as $p )
+        {
+            if( substr( $p, 0, 6 ) == 'story.' )
+            {
+                $allow_page_break = true;
+                break;
+            }
+        }
+    }
+
     $retval .= '[code], [raw]';
 
     if( $allow_page_break )

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:58:26 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:58:26 -0400
Subject: [geeklog-cvs] geeklog: Include [code],
	[raw] only when story.* permissions are...
Message-ID: <hg.e69fb3e301ae.1249761506.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e69fb3e301ae
changeset: 7240:e69fb3e301ae
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 21:42:16 2009 +0200
description:
Include [code], [raw] only when story.* permissions are requested and available

diffstat:

 public_html/lib-common.php |  43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)

diffs (63 lines):

diff -r 2b3961806070 -r e69fb3e301ae public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Aug 08 21:26:43 2009 +0200
+++ b/public_html/lib-common.php	Sat Aug 08 21:42:16 2009 +0200
@@ -3876,7 +3876,6 @@
 
     $retval = '';
 
-    $allow_page_break = false;
     if( isset( $_CONF['skip_html_filter_for_root'] ) &&
              ( $_CONF['skip_html_filter_for_root'] == 1 ) &&
             SEC_inGroup( 'Root' ))
@@ -3912,32 +3911,28 @@
         }
     }
 
-    if( $_CONF['allow_page_breaks'] == 1 )
-    {
-        $perms = explode( ',', $permissions );
-        foreach( $perms as $p )
-        {
-            if( substr( $p, 0, 6 ) == 'story.' )
-            {
-                $allow_page_break = true;
-                break;
-            }
-        }
-    }
-
-    $retval .= '[code], [raw]';
-
-    if( $allow_page_break )
-    {
-        $retval .= ', [page_break]';
+    $with_story_perms = false;
+    $perms = explode( ',', $permissions );
+    foreach( $perms as $p )
+    {
+        if( substr( $p, 0, 6 ) == 'story.' )
+        {
+            $with_story_perms = true;
+            break;
+        }
+    }
+
+    if ($with_story_perms) {
+        $retval .= '[code], [raw], ';
+
+        if ($_CONF['allow_page_breaks'] == 1) {
+            $retval .= '[page_break], ';
+        }
     }
 
     // list autolink tags
-    $autotags = PLG_collectTags();
-    foreach( $autotags as $tag => $module )
-    {
-        $retval .= ', [' . $tag . ':]';
-    }
+    $autotags = array_keys(PLG_collectTags());
+    $retval .= '[' . implode(':], [', $autotags) . ':]';
     $retval .= '</div>';
 
     return $retval;

From geeklog-cvs at lists.geeklog.net  Sat Aug  8 15:58:27 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 08 Aug 2009 15:58:27 -0400
Subject: [geeklog-cvs] geeklog: Source code cosmetics + document that [code]
	and [raw] ...
Message-ID: <hg.594babfaeddc.1249761507.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/594babfaeddc
changeset: 7241:594babfaeddc
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 21:57:44 2009 +0200
description:
Source code cosmetics + document that [code] and [raw] may sometimes be listed even though they won't work (e.g. in comments on stories)

diffstat:

 public_html/docs/history   |   2 +
 public_html/lib-common.php |  61 ++++++++++++++----------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diffs (109 lines):

diff -r e69fb3e301ae -r 594babfaeddc public_html/docs/history
--- a/public_html/docs/history	Sat Aug 08 21:42:16 2009 +0200
+++ b/public_html/docs/history	Sat Aug 08 21:57:44 2009 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Only list [code], [raw] tags when story.* permissions are required [Dirk]
+- [page_break] was not listed when all HTML was allowed for Root users [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer
 - When an error occurs in bigdump.php (during migration) keep the language when
   sending the user back to migrate.php (bug #0000943) [Dirk]
diff -r e69fb3e301ae -r 594babfaeddc public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Aug 08 21:42:16 2009 +0200
+++ b/public_html/lib-common.php	Sat Aug 08 21:57:44 2009 +0200
@@ -3867,56 +3867,53 @@
 *
 * @param    string  $permissions    comma-separated list of rights which identify the current user as an "Admin"
 * @param    boolean $list_only      true = return only the list of HTML tags
-* @return   string  HTML <span> enclosed string
-* @see function COM_checkHTML
-*/
-function COM_allowedHTML( $permissions = 'story.edit', $list_only = false )
+* @return   string                  HTML <div>/<span> enclosed string
+* @see      function COM_checkHTML
+* @todo     Bugs: The list always includes the [code], [raw], and [page_break]
+*           tags when story.* permissions are required, even when those tags
+*           are not actually available (e.g. in comments on stories).
+*
+*/
+function COM_allowedHTML($permissions = 'story.edit', $list_only = false)
 {
     global $_CONF, $LANG01;
 
     $retval = '';
 
-    if( isset( $_CONF['skip_html_filter_for_root'] ) &&
-             ( $_CONF['skip_html_filter_for_root'] == 1 ) &&
-            SEC_inGroup( 'Root' ))
-    {
-        if( !$list_only )
-        {
-            $retval .= '<span class="warningsmall">' . $LANG01[123] . ',</span> ';
+    if (isset($_CONF['skip_html_filter_for_root']) &&
+             ($_CONF['skip_html_filter_for_root'] == 1) &&
+            SEC_inGroup('Root')) {
+
+        if (!$list_only) {
+            $retval .= '<span class="warningsmall">' . $LANG01[123]
+                    . ',</span> ';
         }
         $retval .= '<div dir="ltr" class="warningsmall">';
-    }
-    else
-    {
-        if( !$list_only )
-        {
+
+    } else {
+
+        if (! $list_only) {
             $retval .= '<span class="warningsmall">' . $LANG01[31] . '</span> ';
         }
 
-        if( empty( $permissions ) || !SEC_hasRights( $permissions ) ||
-                empty( $_CONF['admin_html'] ))
-        {
+        if (empty($permissions) || !SEC_hasRights($permissions) ||
+                empty($_CONF['admin_html'])) {
             $html = $_CONF['user_html'];
-        }
-        else
-        {
-            $html = array_merge_recursive( $_CONF['user_html'],
-                                           $_CONF['admin_html'] );
+        } else {
+            $html = array_merge_recursive($_CONF['user_html'],
+                                          $_CONF['admin_html']);
         }
 
         $retval .= '<div dir="ltr" class="warningsmall">';
-        foreach( $html as $tag => $attr )
-        {
+        foreach ($html as $tag => $attr) {
             $retval .= '&lt;' . $tag . '&gt;, ';
         }
     }
 
     $with_story_perms = false;
-    $perms = explode( ',', $permissions );
-    foreach( $perms as $p )
-    {
-        if( substr( $p, 0, 6 ) == 'story.' )
-        {
+    $perms = explode(',', $permissions);
+    foreach ($perms as $p) {
+        if (substr($p, 0, 6) == 'story.') {
             $with_story_perms = true;
             break;
         }
@@ -3930,7 +3927,7 @@
         }
     }
 
-    // list autolink tags
+    // list autotags
     $autotags = array_keys(PLG_collectTags());
     $retval .= '[' . implode(':], [', $autotags) . ':]';
     $retval .= '</div>';

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:22 -0400
Subject: [geeklog-cvs] geeklog: Use the story class for "Mail Story to a
	Friend" and sl...
Message-ID: <hg.648abfeded20.1249815802.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/648abfeded20
changeset: 7242:648abfeded20
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 10:20:32 2009 +0200
description:
Use the story class for "Mail Story to a Friend" and slightly improved the formatting in the email

diffstat:

 public_html/profiles.php |  61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diffs (124 lines):

diff -r 594babfaeddc -r 648abfeded20 public_html/profiles.php
--- a/public_html/profiles.php	Sat Aug 08 21:57:44 2009 +0200
+++ b/public_html/profiles.php	Sun Aug 09 10:20:32 2009 +0200
@@ -290,6 +290,8 @@
 {
     global $_CONF, $_TABLES, $LANG01, $LANG08;
 
+    require_once $_CONF['path_system'] . 'lib-story.php';
+
     $storyurl = COM_buildUrl($_CONF['site_url'] . '/article.php?story=' . $sid);
     if ($_CONF['url_rewrite']) {
         $retval = COM_refresh($storyurl . '?msg=85');
@@ -314,12 +316,12 @@
         return $retval;
     }
 
-    $sql = "SELECT uid,title,introtext,bodytext,commentcode,UNIX_TIMESTAMP(date) AS day,postmode FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND');
-    $result = DB_query($sql);
-    if (DB_numRows($result) == 0) {
+    $story = new Story();
+    $result = $story->loadFromDatabase($sid, 'view');
+
+    if ($result != STORY_LOADED_OK) {
         return COM_refresh($_CONF['site_url'] . '/index.php');
     }
-    $A = DB_fetchArray($result);
 
     $shortmsg = COM_stripslashes ($shortmsg);
     $mailtext = sprintf ($LANG08[23], $from, $fromemail) . LB;
@@ -336,25 +338,34 @@
 
     $mailtext .= '------------------------------------------------------------'
               . LB . LB
-              . COM_undoSpecialChars (stripslashes ($A['title'])) . LB
-              . strftime ($_CONF['date'], $A['day']) . LB;
+              . COM_undoSpecialChars($story->displayElements('title')) . LB
+              . strftime ($_CONF['date'], $story->DisplayElements('unixdate')) . LB;
 
     if ($_CONF['contributedbyline'] == 1) {
-        $author = COM_getDisplayName ($A['uid']);
+        $author = COM_getDisplayName($story->displayElements('uid'));
         $mailtext .= $LANG01[1] . ' ' . $author . LB;
     }
-    if ($A['postmode'] === 'wikitext') {
-        $mailtext .= LB
-            . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['introtext'])))).LB.LB
-            . COM_undoSpecialChars(stripslashes(strip_tags(COM_renderWikiText($A['bodytext'])))).LB.LB
-            . '------------------------------------------------------------'.LB;
-    } else {
-        $mailtext .= LB
-            . COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB
-            . COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.LB
-            . '------------------------------------------------------------'.LB;
+
+    $introtext = $story->DisplayElements('introtext');
+    $bodytext  = $story->DisplayElements('bodytext');
+    if ($story->DisplayElements('postmode') === 'wikitext') {
+        $introtext = COM_renderWikiText($introtext);
+        $bodytext  = COM_renderWikiText($bodytext);
     }
-    if ($A['commentcode'] == 0) { // comments allowed
+    $introtext = COM_undoSpecialChars(strip_tags($introtext));
+    $bodytext  = COM_undoSpecialChars(strip_tags($bodytext));
+
+    $introtext = str_replace(array("\012\015", "\015"), LB, $introtext);
+    $bodytext  = str_replace(array("\012\015", "\015"), LB, $bodytext);
+
+    $mailtext .= LB . $introtext;
+    if (! empty($bodytext)) {
+        $mailtext .= LB . LB . $bodytext;
+    }
+    $mailtext .= LB . LB 
+        . '------------------------------------------------------------' . LB;
+
+    if ($story->DisplayElements('commentcode') == 0) { // comments allowed
         $mailtext .= $LANG08[24] . LB
                   . COM_buildUrl ($_CONF['site_url'] . '/article.php?story='
                                   . $sid . '#comments');
@@ -366,7 +377,7 @@
 
     $mailto = COM_formatEmailAddress ($to, $toemail);
     $mailfrom = COM_formatEmailAddress ($from, $fromemail);
-    $subject = COM_undoSpecialChars(strip_tags(stripslashes('Re: '.$A['title'])));
+    $subject = COM_undoSpecialChars(strip_tags('Re: '.$story->DisplayElements('title')));
 
     $sent = COM_mail ($mailto, $subject, $mailtext, $mailfrom);
     COM_updateSpeedlimit ('mail');
@@ -395,6 +406,8 @@
 {
     global $_CONF, $_TABLES, $_USER, $LANG08, $LANG_LOGIN;
 
+    require_once $_CONF['path_system'] . 'lib-story.php';
+
     $retval = '';
 
     if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) ||
@@ -417,9 +430,10 @@
         return $retval;
     }
 
-    $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$sid'" . COM_getTopicSql('AND') . COM_getPermSql('AND'));
-    $A = DB_fetchArray($result);
-    if ($A['count'] == 0) {
+    $story = new Story();
+    $result = $story->loadFromDatabase($sid, 'view');
+
+    if ($result != STORY_LOADED_OK) {
         return COM_refresh($_CONF['site_url'] . '/index.php');
     }
 
@@ -438,11 +452,12 @@
 
     $mail_template = new Template($_CONF['path_layout'] . 'profiles');
     $mail_template->set_file('form', 'contactauthorform.thtml');
-    $mail_template->set_var( 'xhtml', XHTML );
+    $mail_template->set_var('xhtml', XHTML);
     $mail_template->set_var('site_url', $_CONF['site_url']);
     $mail_template->set_var('site_admin_url', $_CONF['site_admin_url']);
     $mail_template->set_var('layout_url', $_CONF['layout_url']);
     $mail_template->set_var('start_block_mailstory2friend', COM_startBlock($LANG08[17]));
+    $mail_template->set_var('story_title', $story->displayElements('title'));
     $mail_template->set_var('lang_fromname', $LANG08[20]);
     $mail_template->set_var('name', $from);
     $mail_template->set_var('lang_fromemailaddress', $LANG08[21]);

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:22 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:22 -0400
Subject: [geeklog-cvs] geeklog: Added a link back to the story to the "Mail
	Story to a ...
Message-ID: <hg.c0541179fa32.1249815802.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c0541179fa32
changeset: 7243:c0541179fa32
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 10:33:39 2009 +0200
description:
Added a link back to the story to the "Mail Story to a Friend" form

diffstat:

 public_html/docs/english/theme.html                              |   4 ++++
 public_html/docs/history                                         |   1 +
 public_html/layout/professional/profiles/contactauthorform.thtml |   4 ++++
 public_html/profiles.php                                         |  10 ++++++++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diffs (68 lines):

diff -r 648abfeded20 -r c0541179fa32 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Aug 09 10:20:32 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Aug 09 10:33:39 2009 +0200
@@ -198,6 +198,10 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Added a link back to the story to the "Mail Story to a Friend" form,
+    <tt>profiles/contactauthorform.thtml</tt>. Available variables:
+    <tt>{lang_title}</tt>, <tt>{story_title}</tt>, <tt>{story_url}</tt>,
+    <tt>{story_link}</tt>.</tt>
 <li>Added a <code>{remoteservice}</code> variable in
     <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
     service a Remote User was using to log in.</li>
diff -r 648abfeded20 -r c0541179fa32 public_html/docs/history
--- a/public_html/docs/history	Sun Aug 09 10:20:32 2009 +0200
+++ b/public_html/docs/history	Sun Aug 09 10:33:39 2009 +0200
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- 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]
 - [page_break] was not listed when all HTML was allowed for Root users [Dirk]
 - Added support for meta tags and meta keywords, provided by Tom Homer
diff -r 648abfeded20 -r c0541179fa32 public_html/layout/professional/profiles/contactauthorform.thtml
--- a/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Aug 09 10:20:32 2009 +0200
+++ b/public_html/layout/professional/profiles/contactauthorform.thtml	Sun Aug 09 10:33:39 2009 +0200
@@ -2,6 +2,10 @@
 <form action="{site_url}/profiles.php" method="post" name="contact">
     <table cellspacing="0" cellpadding="3" width="100%">
         <tr>
+            <td class="alignright"><b>{lang_title}:</b></td>
+            <td>{story_link}</td>
+        </tr>
+        <tr>
             <td class="alignright"><b>{lang_fromname}:</b></td>
             <td><input type="text" name="from" size="40" maxlength="96" value="{name}"{xhtml}></td>
         </tr>
diff -r 648abfeded20 -r c0541179fa32 public_html/profiles.php
--- a/public_html/profiles.php	Sun Aug 09 10:20:32 2009 +0200
+++ b/public_html/profiles.php	Sun Aug 09 10:33:39 2009 +0200
@@ -456,8 +456,14 @@
     $mail_template->set_var('site_url', $_CONF['site_url']);
     $mail_template->set_var('site_admin_url', $_CONF['site_admin_url']);
     $mail_template->set_var('layout_url', $_CONF['layout_url']);
-    $mail_template->set_var('start_block_mailstory2friend', COM_startBlock($LANG08[17]));
+    $mail_template->set_var('start_block_mailstory2friend',
+                            COM_startBlock($LANG08[17]));
+    $mail_template->set_var('lang_title', $LANG08[31]);
     $mail_template->set_var('story_title', $story->displayElements('title'));
+    $url = COM_buildUrl($_CONF['site_url'] . '/article.php?story=' . $sid);
+    $mail_template->set_var('story_url', $url);
+    $link = COM_createLink($story->displayElements('title'), $url);
+    $mail_template->set_var('story_link', $link);
     $mail_template->set_var('lang_fromname', $LANG08[20]);
     $mail_template->set_var('name', $from);
     $mail_template->set_var('lang_fromemailaddress', $LANG08[21]);
@@ -471,8 +477,8 @@
     $mail_template->set_var('lang_warning', $LANG08[22]);
     $mail_template->set_var('lang_sendmessage', $LANG08[16]);
     $mail_template->set_var('story_id',$sid);
-    PLG_templateSetVars ('emailstory', $mail_template);
     $mail_template->set_var('end_block', COM_endBlock());
+    PLG_templateSetVars('emailstory', $mail_template);
     $mail_template->parse('output', 'form');
     $retval .= $mail_template->finish($mail_template->get_var('output'));
 

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:23 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:23 -0400
Subject: [geeklog-cvs] geeklog: Fixed formatting and ensure that URLs don't
	end in a sl...
Message-ID: <hg.d5af47ccf048.1249815803.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d5af47ccf048
changeset: 7244:d5af47ccf048
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 11:05:38 2009 +0200
description:
Fixed formatting and ensure that URLs don't end in a slash (as per Geeklog's conventions)

diffstat:

 public_html/admin/sectest.php |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r c0541179fa32 -r d5af47ccf048 public_html/admin/sectest.php
--- a/public_html/admin/sectest.php	Sun Aug 09 10:33:39 2009 +0200
+++ b/public_html/admin/sectest.php	Sun Aug 09 11:05:38 2009 +0200
@@ -118,10 +118,14 @@
         $p = explode('/', $u2);
         if (count($p) > 1) {
             $cut = strlen($p[count($p) - 1]) + 1;
-            $url = substr($u, 0, -$cut) . '/';
+            $url = substr($u, 0, -$cut);
         }
     }
 
+    if (!empty($url) && (substr($url, -1) == '/')) {
+        $url = substr($url, 0, -1);
+    }
+
     return $url;
 }
 
@@ -192,7 +196,7 @@
     $retval = '';
 
     $retval .= '<li>';
-    $retcode = doHeadRequest($baseurl . $urltocheck, $errmsg);
+    $retcode = doHeadRequest($baseurl  . '/' . $urltocheck, $errmsg);
     if ($retcode == 777) {
         $retval .= $errmsg;
         $failed_tests++;
@@ -304,8 +308,9 @@
             $instUrl = $_CONF['site_url'] . '/docs/english/install.html';
         }
         $instUrl .= '#public_html';
-        $display .= sprintf($LANG_SECTEST['public_html'],
-                      COM_createLink($LANG_SECTEST['installation'], $instUrl));
+        $display .= '<li>' . sprintf($LANG_SECTEST['public_html'],
+                      COM_createLink($LANG_SECTEST['installation'], $instUrl))
+                 . '</li>' . LB;
         $failed_tests++;
     }
 

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:24 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Moved number of hits from the end
	of the for...
Message-ID: <hg.6d0b9414d390.1249815804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6d0b9414d390
changeset: 7245:6d0b9414d390
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 11:59:39 2009 +0200
description:
Cosmetics: Moved number of hits from the end of the form to after "Last Updated"

diffstat:

 plugins/staticpages/templates/admin/editor.thtml          |  11 ++++-------
 plugins/staticpages/templates/admin/editor_advanced.thtml |  11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r d5af47ccf048 -r 6d0b9414d390 plugins/staticpages/templates/admin/editor.thtml
--- a/plugins/staticpages/templates/admin/editor.thtml	Sun Aug 09 11:05:38 2009 +0200
+++ b/plugins/staticpages/templates/admin/editor.thtml	Sun Aug 09 11:59:39 2009 +0200
@@ -64,6 +64,10 @@
               <td>{sp_formateddate}</td>
           </tr>
           <tr>
+              <td align="right">{lang_hits}:</td>
+              <td><input type="hidden" name="sp_hits" value="{sp_hits}"{xhtml}>{sp_hits_formatted}</td>
+          </tr>
+          <tr>
               <td colspan="2"><hr{xhtml}></td>
           </tr>
           <tr>
@@ -127,13 +131,6 @@
           <tr>
               <td colspan="2">{lang_permissions_msg}</td>
           </tr>
-          <tr>
-              <td colspan="2"><hr{xhtml}></td>
-          </tr>
-          <tr>
-              <td align="right">{lang_hits}:</td>
-              <td><input type="hidden" name="sp_hits" value="{sp_hits}"{xhtml}>{sp_hits_formatted}</td>
-          </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
               <td colspan="2">
diff -r d5af47ccf048 -r 6d0b9414d390 plugins/staticpages/templates/admin/editor_advanced.thtml
--- a/plugins/staticpages/templates/admin/editor_advanced.thtml	Sun Aug 09 11:05:38 2009 +0200
+++ b/plugins/staticpages/templates/admin/editor_advanced.thtml	Sun Aug 09 11:59:39 2009 +0200
@@ -95,6 +95,10 @@
               <td>{sp_formateddate}</td>
           </tr>
           <tr>
+              <td align="right">{lang_hits}:</td>
+              <td><input type="hidden" name="sp_hits" value="{sp_hits}"{xhtml}>{sp_hits_formatted}</td>
+          </tr>
+          <tr>
               <td colspan="2"><hr{xhtml}></td>
           </tr>
           <tr>
@@ -158,13 +162,6 @@
           <tr>
               <td colspan="2">{lang_permissions_msg}</td>
           </tr>
-          <tr>
-              <td colspan="2"><hr{xhtml}></td>
-          </tr>
-          <tr>
-              <td align="right">{lang_hits}:</td>
-              <td><input type="hidden" name="sp_hits" value="{sp_hits}"{xhtml}>{sp_hits_formatted}</td>
-          </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
               <td colspan="2">

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:24 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:24 -0400
Subject: [geeklog-cvs] geeklog: E_ALL fixes
Message-ID: <hg.10f594b38261.1249815804.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/10f594b38261
changeset: 7246:10f594b38261
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 12:00:24 2009 +0200
description:
E_ALL fixes

diffstat:

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

diffs (21 lines):

diff -r 6d0b9414d390 -r 10f594b38261 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Sun Aug 09 11:59:39 2009 +0200
+++ b/public_html/admin/plugins/staticpages/index.php	Sun Aug 09 12:00:24 2009 +0200
@@ -120,7 +120,7 @@
             $sp_template->set_var ('toolbar5', $LANG24[75]);
             $sp_template->set_var('lang_nojavascript',$LANG24[77]);
             $sp_template->set_var('lang_postmode', $LANG24[4]);
-            if ($A['postmode'] == 'adveditor') {
+            if (isset($A['postmode']) && ($A['postmode'] == 'adveditor')) {
                 $sp_template->set_var('show_adveditor','');
                 $sp_template->set_var('show_htmleditor','none');
             } else {
@@ -128,7 +128,7 @@
                 $sp_template->set_var('show_htmleditor','');
             }
             $post_options = '<option value="html" selected="selected">'.$LANG_postmodes['html'].'</option>';
-            if ($A['postmode'] == 'adveditor') {
+            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>';

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 07:03:25 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 07:03:25 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Made the permission checkboxes
	look more lik...
Message-ID: <hg.07804dc28d84.1249815805.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/07804dc28d84
changeset: 7247:07804dc28d84
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 13:00:20 2009 +0200
description:
Cosmetics: Made the permission checkboxes look more like an Admin list

diffstat:

 public_html/docs/english/theme.html                                 |  24 ++++++++
 public_html/layout/professional/admin/common/edit_permissions.thtml |  24 ++++----
 public_html/layout/professional/style.css                           |   4 +
 3 files changed, 40 insertions(+), 12 deletions(-)

diffs (89 lines):

diff -r 10f594b38261 -r 07804dc28d84 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Aug 09 12:00:24 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Aug 09 13:00:20 2009 +0200
@@ -198,15 +198,39 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Cosmetics: Made the permission checkboxes look more like an Admin list,
+    <tt>admin/common/edit_permissions.thtml</tt>. Introduced new CSS class
+    <tt>admin-list-smalltable</tt>, which is almost identical to
+    <tt>admin-list-table</tt> but without the <code>width:100%;</code></li>
 <li>Added a link back to the story to the "Mail Story to a Friend" form,
     <tt>profiles/contactauthorform.thtml</tt>. Available variables:
     <tt>{lang_title}</tt>, <tt>{story_title}</tt>, <tt>{story_url}</tt>,
     <tt>{story_link}</tt>.</tt>
+<li>Added textarea fields for meta description and meta keywords to the Story
+    Editor (<tt>admin/story/storyeditor.thtml</tt>,
+    <tt>admin/story/storyeditor_advanced.thtml</tt>).</li>
 <li>Added a <code>{remoteservice}</code> variable in
     <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
     service a Remote User was using to log in.</li>
 </ul>
 
+<h3>Changes to plugin templates</h3>
+<p>Note that plugin template files are kept in a directory
+<tt>plugins/<i>pluginnname</i>/templates</tt> and not in the <tt>layout</tt>
+directory.</p>
+
+<ul>
+<li>Static Pages: In the Static Pages editor, moved the Hits display below
+    the Last Updated entry (<tt>admin/editor.thtml</tt>,
+    <tt>admin/editor_advanced.thtml</tt>).</li>
+<li>Static Pages: Added textarea fileds for meta description and meta keywords
+    in the Static Pages editor (<tt>admin/editor.thtml</tt>,
+    <tt>admin/editor_advanced.thtml</tt>).</li>
+<li>Polls: Added new CSS classes <tt>poll-autotag-message</tt>,
+    <tt>poll-autotag</tt>, <tt>poll-autotag-left</tt>, used when embedding polls
+    via the new autotags.</li>
+</ul>
+
 
 <h2><a name="changes160">Theme changes in Geeklog 1.6.0</a></h2>
 
diff -r 10f594b38261 -r 07804dc28d84 public_html/layout/professional/admin/common/edit_permissions.thtml
--- a/public_html/layout/professional/admin/common/edit_permissions.thtml	Sun Aug 09 12:00:24 2009 +0200
+++ b/public_html/layout/professional/admin/common/edit_permissions.thtml	Sun Aug 09 13:00:20 2009 +0200
@@ -1,16 +1,16 @@
-<table cellpadding="0" cellspacing="0">
+<table cellpadding="0" cellspacing="0" class="admin-list-smalltable">
     <tr>
-        <td colspan="2" class="edit-perm-up"><b>{owner}</b></td>
-        <td colspan="2" class="edit-perm-up"><b>{group}</b></td>
-        <td class="edit-perm-up"><b>{members}</b></td>
-        <td class="edit-perm-up"><b>{anonymous}</b></td>
+        <th colspan="2" class="edit-perm-up admin-list-headerfield">{owner}</th>
+        <th colspan="2" class="edit-perm-up admin-list-headerfield">{group}</th>
+        <th class="edit-perm-up admin-list-headerfield">{members}</th>
+        <th class="edit-perm-up admin-list-headerfield">{anonymous}</th>
     </tr>
-    <tr>
-        <td class="edit-perm-down"><b>R</b><br{xhtml}><input type="checkbox" name="perm_owner[]" value="2"{owner_r_checked}{xhtml}></td>
-        <td class="edit-perm-down"><b>E</b><br{xhtml}><input type="checkbox" name="perm_owner[]" value="1"{owner_e_checked}{xhtml}></td>
-        <td class="edit-perm-down"><b>R</b><br{xhtml}><input type="checkbox" name="perm_group[]" value="2"{group_r_checked}{xhtml}></td>
-        <td class="edit-perm-down"><b>E</b><br{xhtml}><input type="checkbox" name="perm_group[]" value="1"{group_e_checked}{xhtml}></td>
-        <td class="edit-perm-down"><b>R</b><br{xhtml}><input type="checkbox" name="perm_members[]" value="2"{members_checked}{xhtml}></td>
-        <td class="edit-perm-down"><b>R</b><br{xhtml}><input type="checkbox" name="perm_anon[]" value="2"{anon_checked}{xhtml}></td>
+    <tr class="pluginRow1">
+        <td class="edit-perm-down admin-list-field"><b>R</b><br{xhtml}><input type="checkbox" name="perm_owner[]" value="2"{owner_r_checked}{xhtml}></td>
+        <td class="edit-perm-down admin-list-field"><b>E</b><br{xhtml}><input type="checkbox" name="perm_owner[]" value="1"{owner_e_checked}{xhtml}></td>
+        <td class="edit-perm-down admin-list-field"><b>R</b><br{xhtml}><input type="checkbox" name="perm_group[]" value="2"{group_r_checked}{xhtml}></td>
+        <td class="edit-perm-down admin-list-field"><b>E</b><br{xhtml}><input type="checkbox" name="perm_group[]" value="1"{group_e_checked}{xhtml}></td>
+        <td class="edit-perm-down admin-list-field"><b>R</b><br{xhtml}><input type="checkbox" name="perm_members[]" value="2"{members_checked}{xhtml}></td>
+        <td class="edit-perm-down admin-list-field"><b>R</b><br{xhtml}><input type="checkbox" name="perm_anon[]" value="2"{anon_checked}{xhtml}></td>
     </tr>
 </table>
diff -r 10f594b38261 -r 07804dc28d84 public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css	Sun Aug 09 12:00:24 2009 +0200
+++ b/public_html/layout/professional/style.css	Sun Aug 09 13:00:20 2009 +0200
@@ -192,6 +192,10 @@
 .admin-menu-item { /* a single link in the menu */
   padding: 0px 5px 0px 5px;
 }
+.admin-list-smalltable {
+  text-align:left;
+  border-spacing:1px;
+}
 .admin-list-table {
   width:100%;
   text-align:left;

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 14:31:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 14:31:51 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Removed a width="180" from the
	Block Editor ...
Message-ID: <hg.220882c6414d.1249842711.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/220882c6414d
changeset: 7248:220882c6414d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 13:13:27 2009 +0200
description:
Cosmetics: Removed a width="180" from the Block Editor template that pushed the first column too far to the right

diffstat:

 public_html/docs/english/theme.html                           |  3 +++
 public_html/layout/professional/admin/block/blockeditor.thtml |  2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 07804dc28d84 -r 220882c6414d public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Aug 09 13:00:20 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Aug 09 13:13:27 2009 +0200
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<li>Cosmetics: Removed a <code>width="180"</code> from the Block Editor template
+    (<tt>admin/block/blockeditor.thtml</tt>) that pushed the first column too
+    far to the right.</li>
 <li>Cosmetics: Made the permission checkboxes look more like an Admin list,
     <tt>admin/common/edit_permissions.thtml</tt>. Introduced new CSS class
     <tt>admin-list-smalltable</tt>, which is almost identical to
diff -r 07804dc28d84 -r 220882c6414d public_html/layout/professional/admin/block/blockeditor.thtml
--- a/public_html/layout/professional/admin/block/blockeditor.thtml	Sun Aug 09 13:00:20 2009 +0200
+++ b/public_html/layout/professional/admin/block/blockeditor.thtml	Sun Aug 09 13:13:27 2009 +0200
@@ -2,7 +2,7 @@
                                 <form action="{site_admin_url}/block.php" method="post">
                                     <table cellspacing="0" cellpadding="3" width="100%">
                                         <tr>
-                                            <td width="180" class="alignright">{lang_blocktitle}:</td>
+                                            <td class="alignright">{lang_blocktitle}:</td>
                                             <td><input type="text" size="48" name="title" value="{block_title}"{xhtml}></td>
                                         </tr>
                                         <tr>

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 14:31:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 14:31:52 -0400
Subject: [geeklog-cvs] geeklog: Use SEC_removeFeatureFromDB when
	uninstalling a plugin ...
Message-ID: <hg.950d9348fed8.1249842712.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/950d9348fed8
changeset: 7250:950d9348fed8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 18:07:23 2009 +0200
description:
Use SEC_removeFeatureFromDB when uninstalling a plugin to avoid code duplication

diffstat:

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

diffs (21 lines):

diff -r 70283e536ccd -r 950d9348fed8 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Aug 09 13:18:51 2009 +0200
+++ b/system/lib-plugins.php	Sun Aug 09 18:07:23 2009 +0200
@@ -277,16 +277,7 @@
         // removing features
         $num_features = count($remvars['features']);
         for ($i = 0; $i < $num_features; $i++) {
-            $access_id = DB_getItem ($_TABLES['features'], 'ft_id',
-                                    "ft_name = '{$remvars['features'][$i]}'");
-            if (!empty($access_id)) {
-                COM_errorLog ("Attempting to remove {$remvars['features'][$i]} rights from all groups" ,1);
-                DB_delete($_TABLES['access'], 'acc_ft_id', $access_id);
-                COM_errorLog ('...success', 1);
-                COM_errorLog ("Attempting to remove the {$remvars['features'][$i]} feature", 1);
-                DB_delete($_TABLES['features'], 'ft_name', $remvars['features'][$i]);
-                COM_errorLog ('...success', 1);
-            }
+            SEC_removeFeatureFromDB($remvars['features'][$i]);
         }
 
         // uninstall feeds

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 14:31:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 14:31:52 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Removed a width="150" from the
	Links Categor...
Message-ID: <hg.70283e536ccd.1249842712.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/70283e536ccd
changeset: 7249:70283e536ccd
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 13:18:51 2009 +0200
description:
Cosmetics: Removed a width="150" from the Links Category editor template that pushed the first column too far to the right

diffstat:

 plugins/links/templates/admin/categoryeditor.thtml |  2 +-
 public_html/docs/english/theme.html                |  5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 220882c6414d -r 70283e536ccd plugins/links/templates/admin/categoryeditor.thtml
--- a/plugins/links/templates/admin/categoryeditor.thtml	Sun Aug 09 13:13:27 2009 +0200
+++ b/plugins/links/templates/admin/categoryeditor.thtml	Sun Aug 09 13:18:51 2009 +0200
@@ -3,7 +3,7 @@
     <form action="{site_admin_url}/plugins/links/category.php" method="post">
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
             <tr>
-                <td align="right" width="150">{lang_parent}:</td>
+                <td align="right">{lang_parent}:</td>
                 <td><select name="pid">{category_options}</select></td>
             </tr>
             <tr>
diff -r 220882c6414d -r 70283e536ccd public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Aug 09 13:13:27 2009 +0200
+++ b/public_html/docs/english/theme.html	Sun Aug 09 13:18:51 2009 +0200
@@ -198,7 +198,7 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
-<li>Cosmetics: Removed a <code>width="180"</code> from the Block Editor template
+<li>Cosmetics: Removed a <code>width="180"</code> from the Block editor template
     (<tt>admin/block/blockeditor.thtml</tt>) that pushed the first column too
     far to the right.</li>
 <li>Cosmetics: Made the permission checkboxes look more like an Admin list,
@@ -223,6 +223,9 @@
 directory.</p>
 
 <ul>
+<li>Links: Removed a <code>width="150"</code> from the Category editor template
+    (<tt>admin/categoryeditor.thtml</tt>) that pushed the first column too far
+    to the right.</li>
 <li>Static Pages: In the Static Pages editor, moved the Hits display below
     the Last Updated entry (<tt>admin/editor.thtml</tt>,
     <tt>admin/editor_advanced.thtml</tt>).</li>

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 14:31:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 14:31:52 -0400
Subject: [geeklog-cvs] geeklog: Show the security reminder only on the first
	page
Message-ID: <hg.db49ddb357c4.1249842712.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/db49ddb357c4
changeset: 7251:db49ddb357c4
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 19:58:27 2009 +0200
description:
Show the security reminder only on the first page

diffstat:

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

diffs (12 lines):

diff -r 950d9348fed8 -r db49ddb357c4 public_html/index.php
--- a/public_html/index.php	Sun Aug 09 18:07:23 2009 +0200
+++ b/public_html/index.php	Sun Aug 09 19:58:27 2009 +0200
@@ -144,7 +144,7 @@
     $display .= COM_showMessage (COM_applyFilter ($_GET['msg'], true), $plugin);
 }
 
-if (SEC_inGroup('Root')) {
+if (SEC_inGroup('Root') && ($page == 1)) {
     $done = DB_getItem($_TABLES['vars'], 'value', "name = 'security_check'");
     if ($done != 1) {
         /**

From geeklog-cvs at lists.geeklog.net  Sun Aug  9 14:31:53 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 09 Aug 2009 14:31:53 -0400
Subject: [geeklog-cvs] geeklog: Wiki text is already handled by the story
	class so we d...
Message-ID: <hg.abaeea30d843.1249842713.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/abaeea30d843
changeset: 7252:abaeea30d843
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 09 20:30:15 2009 +0200
description:
Wiki text is already handled by the story class so we don't need to convert it here

diffstat:

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

diffs (14 lines):

diff -r db49ddb357c4 -r abaeea30d843 public_html/profiles.php
--- a/public_html/profiles.php	Sun Aug 09 19:58:27 2009 +0200
+++ b/public_html/profiles.php	Sun Aug 09 20:30:15 2009 +0200
@@ -348,10 +348,6 @@
 
     $introtext = $story->DisplayElements('introtext');
     $bodytext  = $story->DisplayElements('bodytext');
-    if ($story->DisplayElements('postmode') === 'wikitext') {
-        $introtext = COM_renderWikiText($introtext);
-        $bodytext  = COM_renderWikiText($bodytext);
-    }
     $introtext = COM_undoSpecialChars(strip_tags($introtext));
     $bodytext  = COM_undoSpecialChars(strip_tags($bodytext));
 

From geeklog-cvs at lists.geeklog.net  Sun Aug 16 13:44:54 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 16 Aug 2009 13:44:54 -0400
Subject: [geeklog-cvs] geeklog: Send a notification when a comment goes into
	the submis...
Message-ID: <hg.e6b9b651bbce.1250444694.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e6b9b651bbce
changeset: 7253:e6b9b651bbce
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 16 17:55:44 2009 +0200
description:
Send a notification when a comment goes into the submission queue

diffstat:

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

diffs (88 lines):

diff -r abaeea30d843 -r e6b9b651bbce public_html/docs/history
--- a/public_html/docs/history	Sun Aug 09 20:30:15 2009 +0200
+++ b/public_html/docs/history	Sun Aug 16 17:55:44 2009 +0200
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- 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]
 - [page_break] was not listed when all HTML was allowed for Root users [Dirk]
diff -r abaeea30d843 -r e6b9b651bbce system/lib-comment.php
--- a/system/lib-comment.php	Sun Aug 09 20:30:15 2009 +0200
+++ b/system/lib-comment.php	Sun Aug 16 17:55:44 2009 +0200
@@ -1042,10 +1042,10 @@
  * @param    int         $pid        ID of parent comment
  * @param    string      $type       Type of comment this is (article, polls, etc)
  * @param    string      $postmode   Indicates if text is HTML or plain text
- * @return   int         0 for success, > 0 indicates error
+ * @return   int         -1 == queued, 0 == comment saved, > 0 indicates error
  *
  */
-function CMT_saveComment ($title, $comment, $sid, $pid, $type, $postmode)
+function CMT_saveComment($title, $comment, $sid, $pid, $type, $postmode)
 {
     global $_CONF, $_TABLES, $_USER, $LANG03;
 
@@ -1133,7 +1133,7 @@
                     "'$sid',$uid,'$comment',NOW(),'$title',$pid,'{$_SERVER['REMOTE_ADDR']}','$type'");
         }
 
-        $ret = -1;
+        $ret = -1; // comment queued
     } elseif ($pid > 0) {
         DB_lockTable ($_TABLES['comments']);
         
@@ -1200,11 +1200,15 @@
         }
     }
 
-    // Send notification of comment if no errors and notications enabled for comments
-    if (($ret == 0) && isset ($_CONF['notification']) &&
-            in_array ('comment', $_CONF['notification'])) {
-        CMT_sendNotification ($title, $comment, $uid, $_SERVER['REMOTE_ADDR'],
-                          $type, $cid);
+    // Send notification of comment if no errors and notifications enabled
+    // for comments
+    if ((($ret == -1) || ($ret == 0)) && isset($_CONF['notification']) &&
+            in_array('comment', $_CONF['notification'])) {
+        if ($ret == -1) {
+            $cid = 0; // comment went into the submission queue
+        }
+        CMT_sendNotification($title, $comment, $uid, $_SERVER['REMOTE_ADDR'],
+                             $type, $cid);
     }
     
     return $ret;
@@ -1218,12 +1222,12 @@
 * @param    $uid        int         user id
 * @param    $ipaddress  string      poster's IP address
 * @param    $type       string      type of comment ('article', 'poll', ...)
-* @param    $cid        int         comment id
+* @param    $cid        int         comment id (or 0 when in submission queue)
 *
 */
 function CMT_sendNotification ($title, $comment, $uid, $ipaddress, $type, $cid)
 {
-    global $_CONF, $_TABLES, $LANG03, $LANG08, $LANG09;
+    global $_CONF, $_TABLES, $LANG01, $LANG03, $LANG08, $LANG09;
 
     // we have to undo the addslashes() call from savecomment()
     $title = stripslashes ($title);
@@ -1255,8 +1259,13 @@
         $mailbody .= $comment . "\n\n";
     }
 
-    $mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
-              . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
+    if ($cid == 0) {
+        $mailbody .= $LANG01[10] . ' <' . $_CONF['site_admin_url']
+                  . "/moderation.php>\n\n";
+    } else {
+        $mailbody .= $LANG08[33] . ' <' . $_CONF['site_url']
+                  . '/comment.php?mode=view&cid=' . $cid . ">\n\n";
+    }
 
     $mailbody .= "\n------------------------------\n";
     $mailbody .= "\n$LANG08[34]\n";

From geeklog-cvs at lists.geeklog.net  Mon Aug 24 11:51:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 24 Aug 2009 11:51:50 -0400
Subject: [geeklog-cvs] geeklog: Added meta description and meta keywords to
	topics.
Message-ID: <hg.6230420fef6d.1251129110.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6230420fef6d
changeset: 7254:6230420fef6d
user:      Tom <websitemaster at cogeco.net>
date:      Mon Aug 24 09:42:00 2009 -0400
description:
Added meta description and meta keywords to topics.

diffstat:

 plugins/polls/functions.inc                                   |   4 ++--
 public_html/admin/topic.php                                   |  15 ++++++++++++---
 public_html/docs/english/config.html                          |   2 +-
 public_html/index.php                                         |  12 ++++++++++++
 public_html/layout/professional/admin/topic/topiceditor.thtml |   8 ++++++++
 sql/mssql_tableanddata.php                                    |   6 ++++--
 sql/mysql_tableanddata.php                                    |   6 ++++--
 sql/updates/mssql_1.6.0_to_1.6.1.php                          |   5 ++++-
 sql/updates/mysql_1.6.0_to_1.6.1.php                          |   4 ++++
 9 files changed, 51 insertions(+), 11 deletions(-)

diffs (201 lines):

diff -r e6b9b651bbce -r 6230420fef6d plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Aug 16 17:55:44 2009 +0200
+++ b/plugins/polls/functions.inc	Mon Aug 24 09:42:00 2009 -0400
@@ -1383,8 +1383,8 @@
 /**
 * Poll Autotags
 * [poll: pid] - Displays a link to a poll using the Poll Topic as the title. A alternate title may be specified. 
-* [poll-vote: pid pid class:poll-autotag showall:1] - Width and showall not required. Class specifies the css class and Showall if set to 1, shows all questions
-* [poll-result: pid class:poll-autotag] - Width and showall not required. Class specifies the css class
+* [poll_vote: pid pid class:poll-autotag showall:1] - Class and showall not required. Class specifies the css class and Showall if set to 1, shows all questions
+* [poll_result: pid class:poll-autotag] - Class not required. Class specifies the css class
 *
 */
 function plugin_autotags_polls($op, $content = '', $autotag = '')
diff -r e6b9b651bbce -r 6230420fef6d public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/public_html/admin/topic.php	Mon Aug 24 09:42:00 2009 -0400
@@ -174,6 +174,11 @@
     $topic_templates->set_var('max_url_length', 255);
     $topic_templates->set_var('image_url', $A['imageurl']);
 
+    $topic_templates->set_var('lang_metadescription', $LANG_ADMIN['meta_description']);
+    $topic_templates->set_var('meta_description', stripslashes($A['meta_description']));
+    $topic_templates->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
+    $topic_templates->set_var('meta_keywords', stripslashes($A['meta_keywords']));
+
     $topic_templates->set_var ('lang_defaulttopic', $LANG27[22]);
     $topic_templates->set_var ('lang_defaulttext', $LANG27[23]);
     if ($A['is_default'] == 1) {
@@ -209,6 +214,8 @@
 * @param    string  $tid            Topic ID
 * @param    string  $topic          Name of topic (what the user sees)
 * @param    string  $imageurl       (partial) URL to topic image
+* @param    string  $meta_description    Topic meta description
+* @param    string  $meta_keywords       Topic meta keywords
 * @param    int     $sortnum        number for sort order in "Topics" block
 * @param    int     $limitnews      number of stories per page for this topic
 * @param    int     $owner_id       ID of owner
@@ -221,7 +228,7 @@
 * @param    string  $is_archive     'on' if this is the archive topic
 * @return   string                  HTML redirect or error message
 */
-function savetopic($tid,$topic,$imageurl,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default,$is_archive)
+function savetopic($tid,$topic,$imageurl,$meta_description, $meta_keywords,$sortnum,$limitnews,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$is_default,$is_archive)
 {
     global $_CONF, $_TABLES, $LANG27, $MESSAGE;
 
@@ -253,6 +260,8 @@
             $imageurl = '';
         }
         $topic = addslashes ($topic);
+        $meta_description = addslashes ($meta_description);
+        $meta_keywords = addslashes ($meta_keywords);
 
         if ($is_default == 'on') {
             $is_default = 1;
@@ -280,7 +289,7 @@
             }
         }
 
-        DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum, limitnews, is_default, archive_flag, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$is_default,'$is_archive',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
+        DB_save($_TABLES['topics'],'tid, topic, imageurl, meta_description, meta_keywords, sortnum, limitnews, is_default, archive_flag, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon',"'$tid', '$topic', '$imageurl', '$meta_description', '$meta_keywords','$sortnum','$limitnews',$is_default,'$is_archive',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
 
         // update feed(s) and Older Stories block
         COM_rdfUpToDateCheck('article', $tid);
@@ -579,7 +588,7 @@
         $is_archive = $_POST['is_archive'];
     }
     $display .= savetopic (COM_applyFilter ($_POST['tid']), $_POST['topic'],
-                           $imageurl,
+                           $imageurl, $_POST['meta_description'], $_POST['meta_keywords'],
                            COM_applyFilter ($_POST['sortnum'], true),
                            COM_applyFilter ($_POST['limitnews'], true),
                            COM_applyFilter ($_POST['owner_id'], true),
diff -r e6b9b651bbce -r 6230420fef6d public_html/docs/english/config.html
--- a/public_html/docs/english/config.html	Sun Aug 16 17:55:44 2009 +0200
+++ b/public_html/docs/english/config.html	Mon Aug 24 09:42:00 2009 -0400
@@ -96,7 +96,7 @@
 <tr>
   <td valign="top"><a name="desc_meta_tags">meta_tags</a></td>
   <td valign="top">disabled</td>
-  <td valign="top">Enabled - The meta tags for stories will be displayed. If none are found, then the default will be used. The defaults will also be used for any page that doesn't have meta tags.<br>
+  <td valign="top">Enabled - The meta tags for stories and topics will be displayed. If none are found, then the default will be used. The default will also be used for any page that doesn't have meta tags.<br>
       Enabled (Default for Homepage only) - The same as Enabled except, the defaults are used only for the Homepage.<br>
     Disabled - Meta tags are not used.</td></tr>
 <tr>
diff -r e6b9b651bbce -r 6230420fef6d public_html/index.php
--- a/public_html/index.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/public_html/index.php	Mon Aug 24 09:42:00 2009 -0400
@@ -131,6 +131,18 @@
     $header = '<link rel="microsummary" href="' . $_CONF['site_url']
             . '/index.php?display=microsummary&amp;topic=' . urlencode($topic)
             . '" title="Microsummary"' . XHTML . '>';
+
+    // Meta Tags
+    If ($_CONF['meta_tags'] > 0) {
+        $result = DB_query ("SELECT meta_description, meta_keywords FROM {$_TABLES['topics']} WHERE tid = '{$topic}'");
+        $A = DB_fetchArray ($result);
+
+        $meta_description = stripslashes($A['meta_description']);
+        $meta_keywords = stripslashes($A['meta_keywords']);
+        //$meta_description = stripslashes( DB_getItem( $_TABLES['topics'], 'meta_description', "tid = '$topic'" ));
+        //$meta_keywords = stripslashes( DB_getItem( $_TABLES['topics'], 'meta_keywords', "tid = '$topic'" ));
+        $header .=  COM_createMetaTags($meta_description, $meta_keywords);
+    }
 } else {
     $header = '<link rel="microsummary" href="' . $_CONF['site_url']
             . '/index.php?display=microsummary" title="Microsummary"' . XHTML . '>';
diff -r e6b9b651bbce -r 6230420fef6d public_html/layout/professional/admin/topic/topiceditor.thtml
--- a/public_html/layout/professional/admin/topic/topiceditor.thtml	Sun Aug 16 17:55:44 2009 +0200
+++ b/public_html/layout/professional/admin/topic/topiceditor.thtml	Mon Aug 24 09:42:00 2009 -0400
@@ -25,6 +25,14 @@
                                         <td><input type="file" name="newicon"{xhtml}> ({lang_maxsize} {icon_dimensions})</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 class="alignright">{lang_defaulttopic}:</td>
                                         <td><input type="checkbox" name="is_default" {default_checked}{xhtml}> ({lang_defaulttext})</td>
                                     </tr>
diff -r e6b9b651bbce -r 6230420fef6d sql/mssql_tableanddata.php
--- a/sql/mssql_tableanddata.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/sql/mssql_tableanddata.php	Mon Aug 24 09:42:00 2009 -0400
@@ -370,6 +370,8 @@
     [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [topic] [varchar] (48) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [imageurl] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+    [meta_description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+    [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [sortnum] [smallint] NULL ,
     [limitnews] [smallint] NULL ,
     [is_default] [tinyint] NOT NULL ,
@@ -1413,8 +1415,8 @@
 
 $_SQL[] = "INSERT INTO {$_TABLES['syndication']} (type, topic, header_tid, format, limits, content_length, title, description, filename, charset, language, is_enabled, updated, update_info) VALUES ('article', '::all', 'all', 'RSS-2.0', 10, 1, 'Geeklog Site', 'Another Nifty Geeklog Site', 'geeklog.rss', 'iso-8859-1', 'en-gb', 1, getdate(), NULL)";
 
-$_SQL[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('General','General News','/images/topics/topic_news.gif',1,10,6,2,3,2,2,2)";
-$_SQL[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('Geeklog','Geeklog','/images/topics/topic_gl.gif',2,10,6,2,3,2,2,2)";
+$_SQL[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, meta_description, meta_keywords, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('General','General News','/images/topics/topic_news.gif','A topic that contains general news related posts.','News, Post, Information',1,10,6,2,3,2,2,2)";
+$_SQL[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, meta_description, meta_keywords, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('Geeklog','Geeklog','/images/topics/topic_gl.gif','A topic that contains posts about Geeklog.','Geeklog, Posts, Information',2,10,6,2,3,2,2,2)";
 
 $_SQL[] = "INSERT INTO {$_TABLES['usercomment']} (uid, commentmode, commentorder, commentlimit) VALUES (1,'nested','ASC',100)";
 $_SQL[] = "INSERT INTO {$_TABLES['usercomment']} (uid, commentmode, commentorder, commentlimit) VALUES (2,'threaded','ASC',100)";
diff -r e6b9b651bbce -r 6230420fef6d sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/sql/mysql_tableanddata.php	Mon Aug 24 09:42:00 2009 -0400
@@ -394,6 +394,8 @@
   tid varchar(20) NOT NULL default '',
   topic varchar(48) default NULL,
   imageurl varchar(255) default NULL,
+  meta_description TEXT NULL,
+  meta_keywords TEXT NULL,
   sortnum tinyint(3) default NULL,
   limitnews tinyint(3) default NULL,
   is_default tinyint(1) unsigned NOT NULL DEFAULT '0',
@@ -694,8 +696,8 @@
 
 $_DATA[] = "INSERT INTO {$_TABLES['syndication']} (type, topic, header_tid, format, limits, content_length, title, description, filename, charset, language, is_enabled, updated, update_info) VALUES ('article', '::all', 'all', 'RSS-2.0', 10, 1, 'Geeklog Site', 'Another Nifty Geeklog Site', 'geeklog.rss', 'iso-8859-1', 'en-gb', 1, '0000-00-00 00:00:00', NULL)";
 
-$_DATA[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('General','General News','/images/topics/topic_news.gif',1,10,6,2,3,2,2,2)";
-$_DATA[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('Geeklog','Geeklog','/images/topics/topic_gl.gif',2,10,6,2,3,2,2,2)";
+$_DATA[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, meta_description, meta_keywords, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('General','General News','/images/topics/topic_news.gif','A topic that contains general news related posts.','News, Post, Information',1,10,6,2,3,2,2,2)";
+$_DATA[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, meta_description, meta_keywords, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('Geeklog','Geeklog','/images/topics/topic_gl.gif','A topic that contains posts about Geeklog.','Geeklog, Posts, Information',2,10,6,2,3,2,2,2)";
 
 $_DATA[] = "INSERT INTO {$_TABLES['usercomment']} (uid, commentmode, commentorder, commentlimit) VALUES (1,'nested','ASC',100) ";
 $_DATA[] = "INSERT INTO {$_TABLES['usercomment']} (uid, commentmode, commentorder, commentlimit) VALUES (2,'threaded','ASC',100) ";
diff -r e6b9b651bbce -r 6230420fef6d sql/updates/mssql_1.6.0_to_1.6.1.php
--- a/sql/updates/mssql_1.6.0_to_1.6.1.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/sql/updates/mssql_1.6.0_to_1.6.1.php	Mon Aug 24 09:42:00 2009 -0400
@@ -1,7 +1,10 @@
 <?php
 
 // Add meta tag columns to story table 
-$_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD meta_description [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER frontpage, ADD meta_keywords [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description";
+$_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD [meta_description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER frontpage, ADD [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description";
+
+// Add meta tag columns to topics table 
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD [meta_description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER imageurl, ADD [meta_keywords] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL AFTER meta_description";
 
 /**
  * Add new config options
diff -r e6b9b651bbce -r 6230420fef6d sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sun Aug 16 17:55:44 2009 +0200
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Mon Aug 24 09:42:00 2009 -0400
@@ -3,6 +3,10 @@
 // Add meta tag columns to story table 
 $_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD meta_description TEXT NULL AFTER frontpage, ADD meta_keywords TEXT NULL AFTER meta_description";
 
+
+// Add meta tag columns to topics table 
+$_SQL[] = "ALTER TABLE {$_TABLES['topics']} ADD meta_description TEXT NULL AFTER imageurl, ADD meta_keywords TEXT NULL AFTER meta_description";
+
 /**
  * Add new config options
  *

From geeklog-cvs at lists.geeklog.net  Mon Aug 24 11:51:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 24 Aug 2009 11:51:51 -0400
Subject: [geeklog-cvs] geeklog: Updated list of theme changes
Message-ID: <hg.425111c83046.1251129111.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/425111c83046
changeset: 7255:425111c83046
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Aug 24 17:51:39 2009 +0200
description:
Updated list of theme changes

diffstat:

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

diffs (12 lines):

diff -r 6230420fef6d -r 425111c83046 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Mon Aug 24 09:42:00 2009 -0400
+++ b/public_html/docs/english/theme.html	Mon Aug 24 17:51:39 2009 +0200
@@ -212,6 +212,8 @@
 <li>Added textarea fields for meta description and meta keywords to the Story
     Editor (<tt>admin/story/storyeditor.thtml</tt>,
     <tt>admin/story/storyeditor_advanced.thtml</tt>).</li>
+<li>Added textarea fields for meta description and meta keywords to the Topic
+    Editor (<tt>admin/topic/topiceditor.thtml</tt>).</li>
 <li>Added a <code>{remoteservice}</code> variable in
     <tt>admin/user/edituser.thtml</tt> to optionally display the name of the
     service a Remote User was using to log in.</li>

From geeklog-cvs at lists.geeklog.net  Wed Aug 26 15:58:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 26 Aug 2009 15:58:43 -0400
Subject: [geeklog-cvs] geeklog: Fixed wrong function name in the
	autoinstall.php file (...
Message-ID: <hg.7b2e6047c574.1251316723.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7b2e6047c574
changeset: 7256:7b2e6047c574
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 26 21:57:15 2009 +0200
description:
Fixed wrong function name in the autoinstall.php file (bug #0000954)

diffstat:

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

diffs (35 lines):

diff -r 425111c83046 -r 7b2e6047c574 plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Mon Aug 24 17:51:39 2009 +0200
+++ b/plugins/links/autoinstall.php	Wed Aug 26 21:57:15 2009 +0200
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -146,7 +146,7 @@
         $sql = str_replace('#group#', $admin_group_id, $sql);
         DB_query($sql, 1);
         if (DB_error()) {
-            COM_error("SQL error in Links plugin postinstall, SQL: " . $sql);
+            COM_errorLog("SQL error in Links plugin postinstall, SQL: " . $sql);
             return false;
         }
     }
diff -r 425111c83046 -r 7b2e6047c574 public_html/docs/history
--- a/public_html/docs/history	Mon Aug 24 17:51:39 2009 +0200
+++ b/public_html/docs/history	Wed Aug 26 21:57:15 2009 +0200
@@ -38,6 +38,10 @@
 - 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
+------------
+- Fixed wrong function name in the autoinstall.php file (bug #0000954)
+
 Polls Plugin
 ------------
 - Introduced [poll:], [poll_vote:], and [poll_result:] autotags, allowing to

From geeklog-cvs at lists.geeklog.net  Wed Aug 26 15:58:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Wed, 26 Aug 2009 15:58:43 -0400
Subject: [geeklog-cvs] geeklog: While I'm at it: ensure consistent spelling
	of "COM_err...
Message-ID: <hg.543beb1efe9c.1251316723.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/543beb1efe9c
changeset: 7257:543beb1efe9c
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 26 21:58:30 2009 +0200
description:
While I'm at it: ensure consistent spelling of "COM_errorLog"

diffstat:

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

diffs (30 lines):

diff -r 7b2e6047c574 -r 543beb1efe9c public_html/admin/block.php
--- a/public_html/admin/block.php	Wed Aug 26 21:57:15 2009 +0200
+++ b/public_html/admin/block.php	Wed Aug 26 21:58:30 2009 +0200
@@ -703,7 +703,7 @@
         }
 
     } else {
-        COM_errorLOG("block admin error: Attempt to move an non existing block id: $bid");
+        COM_errorLog("block admin error: Attempt to move an non existing block id: $bid");
     }
     echo COM_refresh($_CONF['site_admin_url'] . "/block.php");
     exit;
diff -r 7b2e6047c574 -r 543beb1efe9c system/lib-security.php
--- a/system/lib-security.php	Wed Aug 26 21:57:15 2009 +0200
+++ b/system/lib-security.php	Wed Aug 26 21:58:30 2009 +0200
@@ -579,10 +579,10 @@
     }
 
     if ($_SEC_VERBOSE) {
-        COM_errorlog('perm_owner = ' . $perm_owner, 1);
-        COM_errorlog('perm_group = ' . $perm_group, 1);
-        COM_errorlog('perm_member = ' . $perm_members, 1);
-        COM_errorlog('perm_anon = ' . $perm_anon, 1);
+        COM_errorLog('perm_owner = ' . $perm_owner, 1);
+        COM_errorLog('perm_group = ' . $perm_group, 1);
+        COM_errorLog('perm_member = ' . $perm_members, 1);
+        COM_errorLog('perm_anon = ' . $perm_anon, 1);
         COM_errorLog('**** Leaving SEC_getPermissionValues ****', 1);
     }
 

From geeklog-cvs at lists.geeklog.net  Sat Aug 29 12:49:09 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 29 Aug 2009 12:49:09 -0400
Subject: [geeklog-cvs] geeklog: Cosmetics: Removed font-size:larger;
	for the headlines ...
Message-ID: <hg.67ec3d77f138.1251564549.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/67ec3d77f138
changeset: 7258:67ec3d77f138
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 18:48:59 2009 +0200
description:
Cosmetics: Removed font-size:larger; for the headlines in the Admin lists (bug #0000956)

diffstat:

 public_html/docs/english/theme.html       |  3 +++
 public_html/layout/professional/style.css |  4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 543beb1efe9c -r 67ec3d77f138 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Wed Aug 26 21:58:30 2009 +0200
+++ b/public_html/docs/english/theme.html	Sat Aug 29 18:48:59 2009 +0200
@@ -198,6 +198,9 @@
 <h2><a name="changes">Theme changes in Geeklog 1.6.1</a></h2>
 
 <ul>
+<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>
 <li>Cosmetics: Removed a <code>width="180"</code> from the Block editor template
     (<tt>admin/block/blockeditor.thtml</tt>) that pushed the first column too
     far to the right.</li>
diff -r 543beb1efe9c -r 67ec3d77f138 public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css	Wed Aug 26 21:58:30 2009 +0200
+++ b/public_html/layout/professional/style.css	Sat Aug 29 18:48:59 2009 +0200
@@ -163,7 +163,6 @@
   color:#000000;
   background-color:#DAE0ED;
   font-weight:bold;
-  font-size:larger;
   padding-left:3px;
   text-align:left;
 }
@@ -218,7 +217,8 @@
   text-align:left;
   padding-left:5px;
   padding-right:5px;
-  font-size:larger;
+  padding-top:2px;
+  padding-bottom:2px;
 }
 /* Menus in blocks *****************************************************************/
 .blocklist ul {

From geeklog-cvs at lists.geeklog.net  Sat Aug 29 15:16:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 29 Aug 2009 15:16:50 -0400
Subject: [geeklog-cvs] geeklog: Attempting to install with InnoDB tables
	failed with "c...
Message-ID: <hg.27241d25a32d.1251573410.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/27241d25a32d
changeset: 7259:27241d25a32d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:35:18 2009 +0200
description:
Attempting to install with InnoDB tables failed with "could not find the database"

diffstat:

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

diffs (22 lines):

diff -r 67ec3d77f138 -r 27241d25a32d public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Aug 29 18:48:59 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sat Aug 29 19:35:18 2009 +0200
@@ -370,6 +370,9 @@
                 'pass' => (isset($db['pass']) ? $db['pass'] : $_DB_pass),
                 'table_prefix' => (isset($db['table_prefix']) ? $db['table_prefix'] : $_DB_table_prefix),
                 'type' => (isset($db['type']) ? $db['type'] : $_DB_dbms) );
+    if ($db['type'] == 'mysql-innodb') {
+        $db['type'] = 'mysql';
+    }
 
     // Read in db-config.php so we can insert the DB information
     $dbconfig_file = fopen($config_file, 'r');
@@ -450,6 +453,8 @@
     $db_exists = false;
     switch ($db['type']) {
     case 'mysql':
+        // deliberate fallthrough - no "break"
+    case 'mysql-innodb':
         if (@mysql_select_db($db['name'], $db_handle)) {
             return true;
         }

From geeklog-cvs at lists.geeklog.net  Sat Aug 29 15:16:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 29 Aug 2009 15:16:51 -0400
Subject: [geeklog-cvs] geeklog: Made $use_innodb a global variable (sigh) so
	that a fre...
Message-ID: <hg.d81b526dcf81.1251573411.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d81b526dcf81
changeset: 7260:d81b526dcf81
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:57:10 2009 +0200
description:
Made $use_innodb a global variable (sigh) so that a fresh install with InnoDB tables actually creates InnoDB tables ...

diffstat:

 public_html/admin/install/index.php       |  11 ++++++-----
 public_html/admin/install/lib-upgrade.php |   2 +-
 public_html/docs/history                  |   1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r 27241d25a32d -r d81b526dcf81 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/index.php	Sat Aug 29 19:57:10 2009 +0200
@@ -47,7 +47,7 @@
  */
 function INST_installEngine($install_type, $install_step)
 {
-    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
+    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir, $use_innodb;
 
     switch ($install_step) {
 
@@ -446,7 +446,7 @@
 
                 } else {
 
-                    if (INST_createDatabaseStructures($use_innodb)) {
+                    if (INST_createDatabaseStructures()) {
                         $site_name      = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ;
                         $site_slogan    = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ;
                         $site_url       = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ;
@@ -729,13 +729,13 @@
 /**
  * Sets up the database tables
  *
- * @param   boolean $use_innodb     Whether to use InnoDB table support if using MySQL
  * @return  boolean                 True if successful
  *
  */
-function INST_createDatabaseStructures ($use_innodb = false)
+function INST_createDatabaseStructures()
 {
-    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass, $site_url;
+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
+           $site_url, $use_innodb;
 
     $_DB->setDisplayError (true);
 
@@ -884,6 +884,7 @@
 $dbconfig_path      = INST_sanitizePath($dbconfig_path);
 $step               = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1);
 $mode               = isset($_GET['mode']) ? $_GET['mode'] : (isset($_POST['mode']) ? $_POST['mode'] : '');
+$use_innodb = false;
 
 // $display holds all the outputted HTML and content
 if (defined('XHTML')) {
diff -r 27241d25a32d -r d81b526dcf81 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:57:10 2009 +0200
@@ -721,7 +721,7 @@
  */
 function INST_updateDB($_SQL)
 {
-    global $progress, $_DB, $_DB_dbms;
+    global $progress, $use_innodb, $_DB, $_DB_dbms;
 
     $_SQL = INST_checkInnodbUpgrade($_SQL);
     foreach ($_SQL as $sql) {
diff -r 27241d25a32d -r d81b526dcf81 public_html/docs/history
--- a/public_html/docs/history	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/docs/history	Sat Aug 29 19:57:10 2009 +0200
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- Fixed installation using InnoDB tables [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]

From geeklog-cvs at lists.geeklog.net  Sat Aug 29 15:16:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 29 Aug 2009 15:16:51 -0400
Subject: [geeklog-cvs] geeklog: Modernized script to convert MyISAM to
	InnoDB tables - ...
Message-ID: <hg.f88eadeac783.1251573411.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f88eadeac783
changeset: 7261:f88eadeac783
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 20:46:46 2009 +0200
description:
Modernized script to convert MyISAM to InnoDB tables - mostly cosmetics. Create 'database_engine' entries in gl_vars table

diffstat:

 public_html/admin/install/toinnodb.php |  85 +++++++++++++++------------
 1 files changed, 47 insertions(+), 38 deletions(-)

diffs (142 lines):

diff -r d81b526dcf81 -r f88eadeac783 public_html/admin/install/toinnodb.php
--- a/public_html/admin/install/toinnodb.php	Sat Aug 29 19:57:10 2009 +0200
+++ b/public_html/admin/install/toinnodb.php	Sat Aug 29 20:46:46 2009 +0200
@@ -2,15 +2,15 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.3                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | toinnodb.php                                                              |
 // |                                                                           |
 // | Change Geeklog tables from MyISAM to InnoDB.                              |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004 by the following authors:                              |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
-// | Authors: Dirk Haun - dirk at haun-online.de                                  |
+// | Authors: Dirk Haun - dirk AT haun-online DOT de                           |
 // +---------------------------------------------------------------------------+
 // |                                                                           |
 // | This program is free software; you can redistribute it and/or             |
@@ -28,21 +28,16 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: toinnodb.php,v 1.1 2004/08/14 09:05:11 dhaun Exp $
 
-require_once ('../../lib-common.php');
+require_once '../../lib-common.php';
 
-// bail if user isn't a root user
-if (!SEC_inGroup ('Root')) {
-    $display = COM_siteHeader ('menu');
-    $display .= COM_startBlock ($MESSAGE[30], '',
-                    COM_getBlockTemplate ('_msg_block', 'header'));
-    $display .= $LANG20[6];
-    $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-    $display .= COM_siteFooter ();
-    COM_accessLog ("User {$_USER['username']} tried to illegally access the optimize database screen.");
-    echo $display;
+// bail if user isn't a Root user
+if (!SEC_inGroup('Root')) {
+    $display = COM_siteHeader('menu', $MESSAGE[30])
+             . COM_showMessageText($LANG20[6], $MESSAGE[30])
+             . COM_siteFooter();
+    COM_accessLog('User ' . COM_getDisplayName() . ' tried to illegally access the optimize database screen.');
+    COM_output($display);
     exit;
 }
 
@@ -53,15 +48,19 @@
 * @return   true = InnoDB tables supported, false = not supported
 *
 */
-function innodb_supported ()
+function innodb_supported()
 {
-    $result = DB_query ("SHOW VARIABLES LIKE 'have_innodb'");
-    $A = DB_fetchArray ($result, true);
+    global $_DB_dbms;
 
-    if (strcasecmp ($A[1], 'yes') == 0) {
-        $retval = true;
-    } else {
-        $retval = false;
+    $retval = false;
+
+    if ($_DB_dbms == 'mysql') {
+        $result = DB_query("SHOW VARIABLES LIKE 'have_innodb'");
+        $A = DB_fetchArray($result, true);
+
+        if (strcasecmp($A[1], 'yes') == 0) {
+            $retval = true;
+        }
     }
 
     return $retval;
@@ -70,29 +69,39 @@
 
 // MAIN
 
-echo COM_siteHeader ('menu');
-echo COM_startBlock ('Changing tables to InnoDB');
+echo COM_siteHeader('menu', 'Changing tables to InnoDB');
+echo COM_startBlock('Changing tables to InnoDB');
 
-if (innodb_supported ()) {
+if (innodb_supported()) {
 
     echo '<p>This may take a while ...</p>' . LB;
-    flush ();
+    flush();
 
-    $opt_time = new timerobject ();
-    $opt_time->startTimer ();
+    $opt_time = new timerobject();
+    $opt_time->startTimer();
 
-    $result = DB_query ("SHOW TABLES");
-    $numTables = DB_numRows ($result);
+    DB_displayError(true);
+
+    $result = DB_query("SHOW TABLES");
+    $numTables = DB_numRows($result);
     for ($i = 0; $i < $numTables; $i++) {
-        $A = DB_fetchArray ($result, true);
-        if (in_array ($A[0], $_TABLES)) {
-            DB_query ("ALTER TABLE $A[0] TYPE=InnoDB");
+        $A = DB_fetchArray($result, true);
+        if (in_array($A[0], $_TABLES)) {
+            $make_innodb = DB_query("ALTER TABLE $A[0] TYPE=InnoDB", 1);
+            if ($make_innodb === false) {
+                echo '<p>SQL error for table "' . $A[0] . '" (ignored): '
+                     . DB_error() . '</p>' . LB;
+                flush();
+            }
         }
     }
 
-    $exectime = $opt_time->stopTimer ();
+    DB_delete($_TABLES['vars'], 'name', 'database_engine');
+    DB_query("INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_engine', 'InnoDB')");
 
-    echo '<p>Changing ' . sizeof ($_TABLES) . ' tables to InnoDB took '
+    $exectime = $opt_time->stopTimer();
+
+    echo '<p>Changing ' . count($_TABLES) . ' tables to InnoDB took '
          . $exectime . ' seconds.<p>' . LB;
 
 } else {
@@ -101,7 +110,7 @@
 
 }
 
-echo COM_endBlock ();
-echo COM_siteFooter ();
+echo COM_endBlock();
+echo COM_siteFooter();
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 05:14:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 05:14:59 -0400
Subject: [geeklog-cvs] geeklog: Typo - missing 'g' in "padding"
Message-ID: <hg.5980eb5e6b27.1251623699.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5980eb5e6b27
changeset: 7262:5980eb5e6b27
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 22:43:36 2009 +0200
description:
Typo - missing 'g' in "padding"

diffstat:

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

diffs (12 lines):

diff -r f88eadeac783 -r 5980eb5e6b27 public_html/layout/professional/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sat Aug 29 20:46:46 2009 +0200
+++ b/public_html/layout/professional/admin/story/storyeditor_advanced.thtml	Sat Aug 29 22:43:36 2009 +0200
@@ -248,7 +248,7 @@
                 <p>{lang_permissions_msg}</p>
             </fieldset>
         </div>
-        <div id="se_bottom" style="width:100%; paddin:3px; margin-top:20px;display:{show_submitoptions}">
+        <div id="se_bottom" style="width:100%; padding:3px; margin-top:20px;display:{show_submitoptions}">
             <input type="submit" value="{lang_save}" name="mode"{xhtml}>
             <span style="padding-right:10px;padding-left:10px;"><input type="submit" value="{lang_preview}" name="mode"{xhtml}></span>
             <span style="padding-right:50px;"><input type="submit" value="{lang_cancel}" name="mode"{xhtml}></span>

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 05:14:59 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 05:14:59 -0400
Subject: [geeklog-cvs] geeklog: Uploads through FCKeditor were far too
	liberal. Check i...
Message-ID: <hg.640671aac40c.1251623699.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/640671aac40c
changeset: 7263:640671aac40c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 10:15:43 2009 +0200
description:
Uploads through FCKeditor were far too liberal. Check if FCKeditor is even enabled; don't allow anonymous uploads; don't allow archive files; check for some sort of edit permission (as a temporary measure)

diffstat:

 public_html/fckeditor/editor/filemanager/connectors/php/config.php |  17 +++++++-
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 5980eb5e6b27 -r 640671aac40c public_html/fckeditor/editor/filemanager/connectors/php/config.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sat Aug 29 22:43:36 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sun Aug 30 10:15:43 2009 +0200
@@ -22,13 +22,24 @@
  * Configuration file for the File Manager Connector for PHP.
  */
 
-include ('../../../../../lib-common.php');
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'config.php') !== false) {
+    die('This file can not be used on its own!');
+}
+
+include '../../../../../lib-common.php';
 global $Config ;
 
 // SECURITY: You must explicitly enable this "connector". (Set it to "true").
 // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
 //		authenticated users can access this file or use some kind of session checking.
-$Config['Enabled'] = true ;
+$Config['Enabled'] = false;
+if (($_CONF['advanced_editor'] == 1) && !COM_isAnonUser()) {
+    // provisional permission check - we really need a .upload permission
+    $rights = implode(',', $_RIGHTS);
+    if (strpos($rights, '.edit') !== false) {
+        $Config['Enabled'] = true;
+    }
+}
 
 
 // Path to user files relative to the document root.
@@ -125,7 +136,7 @@
 
 */
 
-$Config['AllowedExtensions']['File']	= array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip') ;
+$Config['AllowedExtensions']['File']	= array('aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'swf', 'sxc', 'sxw', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml') ;
 $Config['DeniedExtensions']['File']		= array() ;
 $Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'File/' ;
 $Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:49 -0400
Subject: [geeklog-cvs] geeklog: Missing global $_TABLES (reported by Jokke_K)
Message-ID: <hg.8f8d532fa9db.1251652489.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8f8d532fa9db
changeset: 7264:8f8d532fa9db
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 01 13:21:33 2009 +0200
description:
Missing global $_TABLES (reported by Jokke_K)

diffstat:

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

diffs (21 lines):

diff -r 4d63f15781aa -r 8f8d532fa9db system/classes/story.class.php
--- a/system/classes/story.class.php	Thu Jul 30 19:44:19 2009 +0200
+++ b/system/classes/story.class.php	Sat Aug 01 13:21:33 2009 +0200
@@ -1458,7 +1458,7 @@
      */
     function DisplayElements($item = 'title')
     {
-        global $_CONF;
+        global $_CONF, $_TABLES;
 
         $return = '';
 
@@ -1533,7 +1533,7 @@
             break;
             
         case 'commentcode':
-            //check to see if comment_time has past
+            //check to see if comment_time has passed
             if ($this->_comment_expire != 0 && (time() > $this->_comment_expire) && $this->_commentcode == 0 ) {
                 $return = 1;
                 //if comment code is not 1, change it to 1

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:49 -0400
Subject: [geeklog-cvs] geeklog: Fixed wrong function name in the
	autoinstall.php file (...
Message-ID: <hg.fcf2426f5e4a.1251652489.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fcf2426f5e4a
changeset: 7265:fcf2426f5e4a
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 26 21:57:15 2009 +0200
description:
Fixed wrong function name in the autoinstall.php file (bug #0000954)

diffstat:

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

diffs (21 lines):

diff -r 8f8d532fa9db -r fcf2426f5e4a plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php	Sat Aug 01 13:21:33 2009 +0200
+++ b/plugins/links/autoinstall.php	Wed Aug 26 21:57:15 2009 +0200
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | This file provides helper functions for the automatic plugin install.     |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following authors:                              |
+// | Copyright (C) 2008-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Dirk Haun         - dirk AT haun-online DOT de                   |
 // +---------------------------------------------------------------------------+
@@ -146,7 +146,7 @@
         $sql = str_replace('#group#', $admin_group_id, $sql);
         DB_query($sql, 1);
         if (DB_error()) {
-            COM_error("SQL error in Links plugin postinstall, SQL: " . $sql);
+            COM_errorLog("SQL error in Links plugin postinstall, SQL: " . $sql);
             return false;
         }
     }

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:49 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:49 -0400
Subject: [geeklog-cvs] geeklog: Updated Hebrew language file, provided by LWC
Message-ID: <hg.199d309ccec8.1251652489.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/199d309ccec8
changeset: 7266:199d309ccec8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 02 20:07:04 2009 +0200
description:
Updated Hebrew language file, provided by LWC

diffstat:

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

diffs (12 lines):

diff -r fcf2426f5e4a -r 199d309ccec8 language/hebrew_utf-8.php
--- a/language/hebrew_utf-8.php	Wed Aug 26 21:57:15 2009 +0200
+++ b/language/hebrew_utf-8.php	Sun Aug 02 20:07:04 2009 +0200
@@ -455,7 +455,7 @@
     35 => '??????????????, ?????????? ???? ?????????? ???? ???????? ?????? ???????????? ????????????.',
     36 => '????????:',
     37 => '?????????? ???? ???????? ?????????????? ????',
-    38 => "?????? ???????? ???? ???????????? ???????????? ????%s ??-<{$_CONF['site_url']}>:"
+    38 => "?????? ???????? ???? ???????????? ???????????? ????\n%s\n??-\n<{$_CONF['site_url']}>:"
 );
 
 ###############################################################################

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:50 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:50 -0400
Subject: [geeklog-cvs] geeklog: Translated some more texts
Message-ID: <hg.15f6c0e120fd.1251652490.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/15f6c0e120fd
changeset: 7267:15f6c0e120fd
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Aug 05 13:42:24 2009 +0200
description:
Translated some more texts

diffstat:

 language/german.php       |  20 ++++++++++----------
 language/german_utf-8.php |  20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs (74 lines):

diff -r 199d309ccec8 -r 15f6c0e120fd language/german.php
--- a/language/german.php	Sun Aug 02 20:07:04 2009 +0200
+++ b/language/german.php	Wed Aug 05 13:42:24 2009 +0200
@@ -526,14 +526,14 @@
     60 => 'pro Seite',
     61 => 'Suche korrigieren',
     62 => '#',
-    63 => 'Description',
-    64 => 'Showing %1$d - %2$d of %3$d results',
-    65 => 'Story',
-    66 => 'Comment',
-    67 => 'Show %d Results',
-    68 => 'Sort By',
-    69 => 'Titles Only',
-    70 => 'Not available ...'
+    63 => 'Beschreibung',
+    64 => 'Gezeigt werden %1$d - %2$d von %3$d Ergebnissen',
+    65 => 'Artikel',
+    66 => 'Kommentar',
+    67 => 'Zeige %d Suchergebnisse',
+    68 => 'Sortieren nach',
+    69 => 'Nur Titel durchsuchen',
+    70 => 'Nicht verf?gbar ...'
 );
 
 ###############################################################################
@@ -642,8 +642,8 @@
     51 => 'Ort',
     52 => 'L?schen',
     53 => 'Account anlegen',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Einleitung Artikel',
+    55 => 'Hauptteil Artikel'
 );
 
 ###############################################################################
diff -r 199d309ccec8 -r 15f6c0e120fd language/german_utf-8.php
--- a/language/german_utf-8.php	Sun Aug 02 20:07:04 2009 +0200
+++ b/language/german_utf-8.php	Wed Aug 05 13:42:24 2009 +0200
@@ -526,14 +526,14 @@
     60 => 'pro Seite',
     61 => 'Suche korrigieren',
     62 => '#',
-    63 => 'Description',
-    64 => 'Showing %1$d - %2$d of %3$d results',
-    65 => 'Story',
-    66 => 'Comment',
-    67 => 'Show %d Results',
-    68 => 'Sort By',
-    69 => 'Titles Only',
-    70 => 'Not available ...'
+    63 => 'Beschreibung',
+    64 => 'Gezeigt werden %1$d - %2$d von %3$d Ergebnissen',
+    65 => 'Artikel',
+    66 => 'Kommentar',
+    67 => 'Zeige %d Suchergebnisse',
+    68 => 'Sortieren nach',
+    69 => 'Nur Titel durchsuchen',
+    70 => 'Nicht verf??gbar ...'
 );
 
 ###############################################################################
@@ -642,8 +642,8 @@
     51 => 'Ort',
     52 => 'L??schen',
     53 => 'Account anlegen',
-    54 => 'Story Introduction',
-    55 => 'Story Body'
+    54 => 'Einleitung Artikel',
+    55 => 'Hauptteil Artikel'
 );
 
 ###############################################################################

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:51 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:51 -0400
Subject: [geeklog-cvs] geeklog: Attempting to install with InnoDB tables
	failed with "c...
Message-ID: <hg.0fd7ed627303.1251652491.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0fd7ed627303
changeset: 7268:0fd7ed627303
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:35:18 2009 +0200
description:
Attempting to install with InnoDB tables failed with "could not find the database"

diffstat:

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

diffs (22 lines):

diff -r 15f6c0e120fd -r 0fd7ed627303 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Wed Aug 05 13:42:24 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sat Aug 29 19:35:18 2009 +0200
@@ -370,6 +370,9 @@
                 'pass' => (isset($db['pass']) ? $db['pass'] : $_DB_pass),
                 'table_prefix' => (isset($db['table_prefix']) ? $db['table_prefix'] : $_DB_table_prefix),
                 'type' => (isset($db['type']) ? $db['type'] : $_DB_dbms) );
+    if ($db['type'] == 'mysql-innodb') {
+        $db['type'] = 'mysql';
+    }
 
     // Read in db-config.php so we can insert the DB information
     $dbconfig_file = fopen($config_file, 'r');
@@ -450,6 +453,8 @@
     $db_exists = false;
     switch ($db['type']) {
     case 'mysql':
+        // deliberate fallthrough - no "break"
+    case 'mysql-innodb':
         if (@mysql_select_db($db['name'], $db_handle)) {
             return true;
         }

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:52 -0400
Subject: [geeklog-cvs] geeklog: Made $use_innodb a global variable (sigh) so
	that a fre...
Message-ID: <hg.d286e7c8b31d.1251652492.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d286e7c8b31d
changeset: 7269:d286e7c8b31d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:57:10 2009 +0200
description:
Made $use_innodb a global variable (sigh) so that a fresh install with InnoDB tables actually creates InnoDB tables ...

diffstat:

 public_html/admin/install/index.php       |  11 ++++++-----
 public_html/admin/install/lib-upgrade.php |   2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 0fd7ed627303 -r d286e7c8b31d public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/index.php	Sat Aug 29 19:57:10 2009 +0200
@@ -47,7 +47,7 @@
  */
 function INST_installEngine($install_type, $install_step)
 {
-    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir;
+    global $_CONF, $_TABLES, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_DB_dbms, $_DB_table_prefix, $_URL, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $form_label_dir, $use_innodb;
 
     switch ($install_step) {
 
@@ -446,7 +446,7 @@
 
                 } else {
 
-                    if (INST_createDatabaseStructures($use_innodb)) {
+                    if (INST_createDatabaseStructures()) {
                         $site_name      = isset($_POST['site_name']) ? $_POST['site_name'] : (isset($_GET['site_name']) ? $_GET['site_name'] : '') ;
                         $site_slogan    = isset($_POST['site_slogan']) ? $_POST['site_slogan'] : (isset($_GET['site_slogan']) ? $_GET['site_slogan'] : '') ;
                         $site_url       = isset($_POST['site_url']) ? $_POST['site_url'] : (isset($_GET['site_url']) ? $_GET['site_url'] : '') ;
@@ -729,13 +729,13 @@
 /**
  * Sets up the database tables
  *
- * @param   boolean $use_innodb     Whether to use InnoDB table support if using MySQL
  * @return  boolean                 True if successful
  *
  */
-function INST_createDatabaseStructures ($use_innodb = false)
+function INST_createDatabaseStructures()
 {
-    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass, $site_url;
+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
+           $site_url, $use_innodb;
 
     $_DB->setDisplayError (true);
 
@@ -884,6 +884,7 @@
 $dbconfig_path      = INST_sanitizePath($dbconfig_path);
 $step               = isset($_GET['step']) ? $_GET['step'] : (isset($_POST['step']) ? $_POST['step'] : 1);
 $mode               = isset($_GET['mode']) ? $_GET['mode'] : (isset($_POST['mode']) ? $_POST['mode'] : '');
+$use_innodb = false;
 
 // $display holds all the outputted HTML and content
 if (defined('XHTML')) {
diff -r 0fd7ed627303 -r d286e7c8b31d public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:35:18 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sat Aug 29 19:57:10 2009 +0200
@@ -711,7 +711,7 @@
  */
 function INST_updateDB($_SQL)
 {
-    global $progress, $_DB, $_DB_dbms;
+    global $progress, $use_innodb, $_DB, $_DB_dbms;
 
     $_SQL = INST_checkInnodbUpgrade($_SQL);
     foreach ($_SQL as $sql) {

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:52 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:52 -0400
Subject: [geeklog-cvs] geeklog: Modernized script to convert MyISAM to
	InnoDB tables - ...
Message-ID: <hg.e4342d9f4180.1251652492.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e4342d9f4180
changeset: 7270:e4342d9f4180
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 20:46:46 2009 +0200
description:
Modernized script to convert MyISAM to InnoDB tables - mostly cosmetics. Create 'database_engine' entries in gl_vars table

diffstat:

 public_html/admin/install/toinnodb.php |  85 +++++++++++++++------------
 1 files changed, 47 insertions(+), 38 deletions(-)

diffs (142 lines):

diff -r d286e7c8b31d -r e4342d9f4180 public_html/admin/install/toinnodb.php
--- a/public_html/admin/install/toinnodb.php	Sat Aug 29 19:57:10 2009 +0200
+++ b/public_html/admin/install/toinnodb.php	Sat Aug 29 20:46:46 2009 +0200
@@ -2,15 +2,15 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.3                                                               |
+// | Geeklog 1.6                                                               |
 // +---------------------------------------------------------------------------+
 // | toinnodb.php                                                              |
 // |                                                                           |
 // | Change Geeklog tables from MyISAM to InnoDB.                              |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2004 by the following authors:                              |
+// | Copyright (C) 2004-2009 by the following authors:                         |
 // |                                                                           |
-// | Authors: Dirk Haun - dirk at haun-online.de                                  |
+// | Authors: Dirk Haun - dirk AT haun-online DOT de                           |
 // +---------------------------------------------------------------------------+
 // |                                                                           |
 // | This program is free software; you can redistribute it and/or             |
@@ -28,21 +28,16 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: toinnodb.php,v 1.1 2004/08/14 09:05:11 dhaun Exp $
 
-require_once ('../../lib-common.php');
+require_once '../../lib-common.php';
 
-// bail if user isn't a root user
-if (!SEC_inGroup ('Root')) {
-    $display = COM_siteHeader ('menu');
-    $display .= COM_startBlock ($MESSAGE[30], '',
-                    COM_getBlockTemplate ('_msg_block', 'header'));
-    $display .= $LANG20[6];
-    $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-    $display .= COM_siteFooter ();
-    COM_accessLog ("User {$_USER['username']} tried to illegally access the optimize database screen.");
-    echo $display;
+// bail if user isn't a Root user
+if (!SEC_inGroup('Root')) {
+    $display = COM_siteHeader('menu', $MESSAGE[30])
+             . COM_showMessageText($LANG20[6], $MESSAGE[30])
+             . COM_siteFooter();
+    COM_accessLog('User ' . COM_getDisplayName() . ' tried to illegally access the optimize database screen.');
+    COM_output($display);
     exit;
 }
 
@@ -53,15 +48,19 @@
 * @return   true = InnoDB tables supported, false = not supported
 *
 */
-function innodb_supported ()
+function innodb_supported()
 {
-    $result = DB_query ("SHOW VARIABLES LIKE 'have_innodb'");
-    $A = DB_fetchArray ($result, true);
+    global $_DB_dbms;
 
-    if (strcasecmp ($A[1], 'yes') == 0) {
-        $retval = true;
-    } else {
-        $retval = false;
+    $retval = false;
+
+    if ($_DB_dbms == 'mysql') {
+        $result = DB_query("SHOW VARIABLES LIKE 'have_innodb'");
+        $A = DB_fetchArray($result, true);
+
+        if (strcasecmp($A[1], 'yes') == 0) {
+            $retval = true;
+        }
     }
 
     return $retval;
@@ -70,29 +69,39 @@
 
 // MAIN
 
-echo COM_siteHeader ('menu');
-echo COM_startBlock ('Changing tables to InnoDB');
+echo COM_siteHeader('menu', 'Changing tables to InnoDB');
+echo COM_startBlock('Changing tables to InnoDB');
 
-if (innodb_supported ()) {
+if (innodb_supported()) {
 
     echo '<p>This may take a while ...</p>' . LB;
-    flush ();
+    flush();
 
-    $opt_time = new timerobject ();
-    $opt_time->startTimer ();
+    $opt_time = new timerobject();
+    $opt_time->startTimer();
 
-    $result = DB_query ("SHOW TABLES");
-    $numTables = DB_numRows ($result);
+    DB_displayError(true);
+
+    $result = DB_query("SHOW TABLES");
+    $numTables = DB_numRows($result);
     for ($i = 0; $i < $numTables; $i++) {
-        $A = DB_fetchArray ($result, true);
-        if (in_array ($A[0], $_TABLES)) {
-            DB_query ("ALTER TABLE $A[0] TYPE=InnoDB");
+        $A = DB_fetchArray($result, true);
+        if (in_array($A[0], $_TABLES)) {
+            $make_innodb = DB_query("ALTER TABLE $A[0] TYPE=InnoDB", 1);
+            if ($make_innodb === false) {
+                echo '<p>SQL error for table "' . $A[0] . '" (ignored): '
+                     . DB_error() . '</p>' . LB;
+                flush();
+            }
         }
     }
 
-    $exectime = $opt_time->stopTimer ();
+    DB_delete($_TABLES['vars'], 'name', 'database_engine');
+    DB_query("INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_engine', 'InnoDB')");
 
-    echo '<p>Changing ' . sizeof ($_TABLES) . ' tables to InnoDB took '
+    $exectime = $opt_time->stopTimer();
+
+    echo '<p>Changing ' . count($_TABLES) . ' tables to InnoDB took '
          . $exectime . ' seconds.<p>' . LB;
 
 } else {
@@ -101,7 +110,7 @@
 
 }
 
-echo COM_endBlock ();
-echo COM_siteFooter ();
+echo COM_endBlock();
+echo COM_siteFooter();
 
 ?>

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:53 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:53 -0400
Subject: [geeklog-cvs] geeklog: Uploads through FCKeditor were far too
	liberal. Check i...
Message-ID: <hg.e21f228d9135.1251652493.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e21f228d9135
changeset: 7271:e21f228d9135
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 10:15:43 2009 +0200
description:
Uploads through FCKeditor were far too liberal. Check if FCKeditor is even enabled; don't allow anonymous uploads; don't allow archive files; check for some sort of edit permission (as a temporary measure)

diffstat:

 public_html/fckeditor/editor/filemanager/connectors/php/config.php |  17 +++++++-
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r e4342d9f4180 -r e21f228d9135 public_html/fckeditor/editor/filemanager/connectors/php/config.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sat Aug 29 20:46:46 2009 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sun Aug 30 10:15:43 2009 +0200
@@ -22,13 +22,24 @@
  * Configuration file for the File Manager Connector for PHP.
  */
 
-include ('../../../../../lib-common.php');
+if (strpos(strtolower($_SERVER['PHP_SELF']), 'config.php') !== false) {
+    die('This file can not be used on its own!');
+}
+
+include '../../../../../lib-common.php';
 global $Config ;
 
 // SECURITY: You must explicitly enable this "connector". (Set it to "true").
 // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
 //		authenticated users can access this file or use some kind of session checking.
-$Config['Enabled'] = true ;
+$Config['Enabled'] = false;
+if (($_CONF['advanced_editor'] == 1) && !COM_isAnonUser()) {
+    // provisional permission check - we really need a .upload permission
+    $rights = implode(',', $_RIGHTS);
+    if (strpos($rights, '.edit') !== false) {
+        $Config['Enabled'] = true;
+    }
+}
 
 
 // Path to user files relative to the document root.
@@ -125,7 +136,7 @@
 
 */
 
-$Config['AllowedExtensions']['File']	= array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip') ;
+$Config['AllowedExtensions']['File']	= array('aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'swf', 'sxc', 'sxw', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml') ;
 $Config['DeniedExtensions']['File']		= array() ;
 $Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'File/' ;
 $Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:54 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:54 -0400
Subject: [geeklog-cvs] geeklog: Updated documentation and version number
Message-ID: <hg.8e411b6a6e66.1251652494.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8e411b6a6e66
changeset: 7272:8e411b6a6e66
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 15:48:52 2009 +0200
description:
Updated documentation and version number

diffstat:

 public_html/admin/install/lib-install.php |   2 +-
 public_html/docs/english/changes.html     |  18 ++++++++++++++++++
 public_html/docs/history                  |  27 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletions(-)

diffs (76 lines):

diff -r e21f228d9135 -r 8e411b6a6e66 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Aug 30 10:15:43 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sun Aug 30 15:48:52 2009 +0200
@@ -56,7 +56,7 @@
     * This constant defines Geeklog's version number. It will be written to
     * siteconfig.php and the database (in the latter case minus any suffix).
     */
-    define('VERSION', '1.6.0sr1');
+    define('VERSION', '1.6.0sr2');
 }
 if (!defined('XHTML')) {
     define('XHTML', ' /');
diff -r e21f228d9135 -r 8e411b6a6e66 public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Aug 30 10:15:43 2009 +0200
+++ b/public_html/docs/english/changes.html	Sun Aug 30 15:48:52 2009 +0200
@@ -17,6 +17,24 @@
 list of files that have been changed since the last release.</p>
 
 
+<h2><a name="changes160sr2">Geeklog 1.6.0sr2</a></h2>
+
+<p>This release addresses the following security issue:</p>
+<ul>
+<li>Unauthorized file uploads were possible through FCKeditor.<br>
+Uploaded files still had to go through FCKeditor's filter, so it was not possible to upload scripts (and the integrity of the Geeklog site as such was not in danger). There were, however, reports that this was used to host malware.<br>
+This update prevents use of the upload feature when FCKeditor is disabled and disables it for anonymous users. It also doesn't allow uploading of archive files any more. Furthermore, you need some sort of "edit" permission now to be able to upload files through FCKeditor (this is meant as an interim measure - we will probably introduce a separate "upload" permission in future Geeklog versions).</li>
+</ul>
+
+<p>Other fixes:</p>
+<ul>
+<li>Fixed installation using InnoDB tables.</li>
+<li>Fixed a (non-exploitable) SQL error when auto-updating a story's
+    commentcode field.</li>
+<li>Fixed a wrong function name in the Links plugin.</li>
+</ul>
+
+
 <h2><a name="changes160sr1">Geeklog 1.6.0sr1</a></h2>
 
 <p>This release addresses the following security issues:</p>
diff -r e21f228d9135 -r 8e411b6a6e66 public_html/docs/history
--- a/public_html/docs/history	Sun Aug 30 10:15:43 2009 +0200
+++ b/public_html/docs/history	Sun Aug 30 15:48:52 2009 +0200
@@ -1,5 +1,32 @@
 Geeklog History/Changes:
 
+Aug 30, 2009 (1.6.0sr2)
+------------
+
+This release addresses the following security issue:
+- Unauthorized file uploads were possible through FCKeditor.
+  Uploaded files still had to go through FCKeditor's filter, so it was not
+  possible to upload scripts (and the integrity of the Geeklog site as such was
+  not in danger). There were, however, reports that this was used to host
+  malware.
+  This update prevents use of the upload feature when FCKeditor is disabled and
+  disables it for anonymous users. It also doesn't allow uploading of archive
+  files any more. Furthermore, you need some sort of "edit" permission now to
+  be able to upload files through FCKeditor (this is meant as an interim
+  measure - we will probably introduce a separate "upload" permission in future
+  Geeklog versions).
+
+Not security-related:
+- Fixed installation using InnoDB tables [Dirk]
+- Links plugin: Fixed wrong function name in the autoinstall.php file
+  (bug #0000954)
+- Fixed an SQL error (due to a missing global declaration; not exploitable) when
+  the commentcode field was auto-updated (reported by Jokke_K) [Dirk]
+
+This release also includes updated Hebrew (provided by LWC) and German language
+files.
+
+
 Jul 30, 2009 (1.6.0sr1)
 ------------
 

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:14:55 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:14:55 -0400
Subject: [geeklog-cvs] geeklog: Added tag geeklog_1_6_0sr2 for changeset
	8e411b6a6e66
Message-ID: <hg.3082f34983ea.1251652495.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3082f34983ea
changeset: 7273:3082f34983ea
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 19:14:36 2009 +0200
description:
Added tag geeklog_1_6_0sr2 for changeset 8e411b6a6e66

diffstat:

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

diffs (8 lines):

diff -r 8e411b6a6e66 -r 3082f34983ea .hgtags
--- a/.hgtags	Sun Aug 30 15:48:52 2009 +0200
+++ b/.hgtags	Sun Aug 30 19:14:36 2009 +0200
@@ -7,3 +7,4 @@
 f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
 f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
 01ee44e87dd8fa20013e8935bb714d8447180f35 geeklog_1_6_0sr1
+8e411b6a6e66e911f62c54d08a3137df30e2002b geeklog_1_6_0sr2

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:42:44 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:42:44 -0400
Subject: [geeklog-cvs] tools: Update for Geeklog 1.6.0sr2
Message-ID: <hg.e2a772170569.1251654164.-909925928@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e2a772170569
changeset: 42:e2a772170569
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 19:25:20 2009 +0200
description:
Update for Geeklog 1.6.0sr2

diffstat:

 versionchecker/versionchecker.php |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 4e0fba88a94e -r e2a772170569 versionchecker/versionchecker.php
--- a/versionchecker/versionchecker.php	Thu Jul 30 20:54:15 2009 +0200
+++ b/versionchecker/versionchecker.php	Sun Aug 30 19:25:20 2009 +0200
@@ -9,7 +9,7 @@
 <p align="left"><a href="http://www.geeklog.net/" title="go to the Geeklog homepage"><img src="http://www.geeklog.net/docs/images/newlogo.gif" alt="" width="243" height="90" border="0"></a></p>
 <?php
 
-$current = '1.6.0sr1';
+$current = '1.6.0sr2';
 $version = '';
 if (isset ($_GET['version'])) {
     $version = strip_tags ($_GET['version']);
@@ -47,8 +47,9 @@
     '1.5.2sr2'  => '1.5.2sr5',
     '1.5.2sr3'  => '1.5.2sr5',
     '1.5.2sr4'  => '1.5.2sr5',
-    '1.5.2sr5'  => '1.6.0sr1',
-    '1.6.0'     => '1.6.0sr1'
+    '1.5.2sr5'  => '1.6.0sr2',
+    '1.6.0'     => '1.6.0sr2',
+    '1.6.0sr1'  => '1.6.0sr2'
 );
 
 $v = explode ('.', $version);

From geeklog-cvs at lists.geeklog.net  Sun Aug 30 13:46:43 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 30 Aug 2009 13:46:43 -0400
Subject: [geeklog-cvs] geeklog: Synced list of changes with 1.6.0sr2
Message-ID: <hg.805a6d632c3e.1251654403.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/805a6d632c3e
changeset: 7274:805a6d632c3e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 30 19:46:34 2009 +0200
description:
Synced list of changes with 1.6.0sr2

diffstat:

 public_html/docs/english/changes.html |  18 ++++++++++++++++++
 public_html/docs/history              |  40 ++++++++++++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 10 deletions(-)

diffs (107 lines):

diff -r 640671aac40c -r 805a6d632c3e public_html/docs/english/changes.html
--- a/public_html/docs/english/changes.html	Sun Aug 30 10:15:43 2009 +0200
+++ b/public_html/docs/english/changes.html	Sun Aug 30 19:46:34 2009 +0200
@@ -16,6 +16,24 @@
 <a href="../history">ChangeLog</a>. The file <tt>docs/changed-files</tt> has a
 list of files that have been changed since the last release.</p>
 
+<h2><a name="changes160sr2">Geeklog 1.6.0sr2</a></h2>
+
+<p>This release addresses the following security issue:</p>
+<ul>
+<li>Unauthorized file uploads were possible through FCKeditor.<br>
+Uploaded files still had to go through FCKeditor's filter, so it was not possible to upload scripts (and the integrity of the Geeklog site as such was not in danger). There were, however, reports that this was used to host malware.<br>
+This update prevents use of the upload feature when FCKeditor is disabled and disables it for anonymous users. It also doesn't allow uploading of archive files any more. Furthermore, you need some sort of "edit" permission now to be able to upload files through FCKeditor (this is meant as an interim measure - we will probably introduce a separate "upload" permission in future Geeklog versions).</li>
+</ul>
+
+<p>Other fixes:</p>
+<ul>
+<li>Fixed installation using InnoDB tables.</li>
+<li>Fixed a (non-exploitable) SQL error when auto-updating a story's
+    commentcode field.</li>
+<li>Fixed a wrong function name in the Links plugin.</li>
+</ul>
+
+
 <h2><a name="changes160sr1">Geeklog 1.6.0sr1</a></h2>
 
 <p>This release addresses the following security issues:</p>
diff -r 640671aac40c -r 805a6d632c3e public_html/docs/history
--- a/public_html/docs/history	Sun Aug 30 10:15:43 2009 +0200
+++ b/public_html/docs/history	Sun Aug 30 19:46:34 2009 +0200
@@ -1,9 +1,8 @@
 Geeklog History/Changes:
 
-??? ??, 2009 (1.6.1)
-------------
-
-- Fixed installation using InnoDB tables [Dirk]
+Oct ??, 2009 (1.6.1)
+------------
+
 - 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]
@@ -14,8 +13,6 @@
 - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
   displaying the date and time in search results [Dirk]
 - When disabling a feed, delete the feed file [Dirk]
-- Fixed an SQL error when the commentcode field was auto-updated (reported by
-  Jokke_K) [Dirk]
 - Moved leftover hard-coded text from admin/sectest.php to the language files
   [Dirk]
 - When creating Pingback excerpts, convert the other site's content to our
@@ -28,8 +25,6 @@
 - Use $LANG_ADMIN['na'] instead of hard-coding 'N/A' in several places [Dirk]
 - For Remote Users, display their service name in the User Editor [Dirk]
 
-- Updated Hebrew language file, provided by LWC
-
 Calendar Plugin
 ---------------
 - Reintroduced {event_begin_anchortag} and {event_end_anchortag} variables
@@ -39,10 +34,6 @@
 - 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
-------------
-- Fixed wrong function name in the autoinstall.php file (bug #0000954)
-
 Polls Plugin
 ------------
 - Introduced [poll:], [poll_vote:], and [poll_result:] autotags, allowing to
@@ -54,6 +45,33 @@
 - Added support for meta tags and meta keywords, provided by Tom Homer
 
 
+Aug 30, 2009 (1.6.0sr2)
+------------
+
+This release addresses the following security issue:
+- Unauthorized file uploads were possible through FCKeditor.
+  Uploaded files still had to go through FCKeditor's filter, so it was not
+  possible to upload scripts (and the integrity of the Geeklog site as such was
+  not in danger). There were, however, reports that this was used to host
+  malware.
+  This update prevents use of the upload feature when FCKeditor is disabled and
+  disables it for anonymous users. It also doesn't allow uploading of archive
+  files any more. Furthermore, you need some sort of "edit" permission now to
+  be able to upload files through FCKeditor (this is meant as an interim
+  measure - we will probably introduce a separate "upload" permission in future
+  Geeklog versions).
+
+Not security-related:
+- Fixed installation using InnoDB tables [Dirk]
+- Links plugin: Fixed wrong function name in the autoinstall.php file
+  (bug #0000954)
+- Fixed an SQL error (due to a missing global declaration; not exploitable) when
+  the commentcode field was auto-updated (reported by Jokke_K) [Dirk]
+
+This release also includes updated Hebrew (provided by LWC) and German language
+files.
+
+
 Jul 30, 2009 (1.6.0sr1)
 ------------
 

From geeklog-cvs at lists.geeklog.net  Mon Aug 31 14:16:01 2009
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 31 Aug 2009 14:16:01 -0400
Subject: [geeklog-cvs] geeklog: Fixed description of comment form changes
	(thanks, Ben)
Message-ID: <hg.fecf9cc82e81.1251742561.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/fecf9cc82e81
changeset: 7275:fecf9cc82e81
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Aug 31 20:15:48 2009 +0200
description:
Fixed description of comment form changes (thanks, Ben)

diffstat:

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

diffs (17 lines):

diff -r 805a6d632c3e -r fecf9cc82e81 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html	Sun Aug 30 19:46:34 2009 +0200
+++ b/public_html/docs/english/theme.html	Mon Aug 31 20:15:48 2009 +0200
@@ -313,9 +313,10 @@
 
 <h3>Comments</h3>
 
-<p>The <tt>commentform.thtml</tt> and <tt>commentform.thtml</tt> template files
-were changed to include a security token and a <code>{notifcation}</code>
-variable (for the new option to be notified of followup comments).</p>
+<p>The <tt>commentform.thtml</tt> and <tt>commentform_advanced.thtml</tt>
+template files were changed to include a security token and a
+<code>{notification}</code> variable (for the new option to be notified of
+followup comments).</p>
 
 <h3>Plugins</h3>