From geeklog-cvs at lists.geeklog.net  Mon Dec  1 14:27:28 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 01 Dec 2008 14:27:28 -0500
Subject: [geeklog-cvs] geeklog: No need to index the "reply to this" links -
	added a re...
Message-ID: <hg.86ce6afc56ba.1228159648.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/86ce6afc56ba
changeset: 6489:86ce6afc56ba
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 01 11:20:01 2008 +0100
description:
No need to index the "reply to this" links - added a rel="nofollow"

diffstat:

1 file changed, 7 insertions(+), 6 deletions(-)
system/lib-comment.php |   13 +++++++------

diffs (27 lines):

diff -r 8dfc96e19331 -r 86ce6afc56ba system/lib-comment.php
--- a/system/lib-comment.php	Sun Nov 30 13:04:17 2008 +0100
+++ b/system/lib-comment.php	Mon Dec 01 11:20:01 2008 +0100
@@ -427,16 +427,17 @@
 
         // create a reply to link
         $reply_link = '';
-        if( $ccode == 0 ) {
+        if ($ccode == 0) {
             $reply_link = $_CONF['site_url'] . '/comment.php?sid=' . $A['sid']
                         . '&amp;pid=' . $A['cid'] . '&amp;title='
-                        . urlencode( $A['title'] ) . '&amp;type=' . $A['type'];
-            $reply_option = COM_createLink($LANG01[43], $reply_link ) . ' | ';
-            $template->set_var( 'reply_option', $reply_option );
+                        . urlencode($A['title']) . '&amp;type=' . $A['type'];
+            $reply_option = COM_createLink($LANG01[43], $reply_link,
+                                           array('rel' => 'nofollow')) . ' | ';
+            $template->set_var('reply_option', $reply_option);
         } else {
-            $template->set_var( 'reply_option', '' );
+            $template->set_var('reply_option', '');
         }
-        $template->set_var( 'reply_link', $reply_link );
+        $template->set_var('reply_link', $reply_link);
 
         // format title for display, must happen after reply_link is created
         $A['title'] = htmlspecialchars( $A['title'] );


From geeklog-cvs at lists.geeklog.net  Tue Dec  2 14:10:40 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 02 Dec 2008 14:10:40 -0500
Subject: [geeklog-cvs] geeklog: The security token was missing from the
	trackback edito...
Message-ID: <hg.99b7c9b19065.1228245040.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/99b7c9b19065
changeset: 6490:99b7c9b19065
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Dec 02 20:01:27 2008 +0100
description:
The security token was missing from the trackback editor template file (reported and patch provided by hiroron, bug #0000778)

diffstat:

3 files changed, 5 insertions(+)
public_html/docs/history                                              |    2 ++
public_html/docs/theme.html                                           |    2 ++
public_html/layout/professional/admin/trackback/trackbackeditor.thtml |    1 +

diffs (35 lines):

diff -r 86ce6afc56ba -r 99b7c9b19065 public_html/docs/history
--- a/public_html/docs/history	Mon Dec 01 11:20:01 2008 +0100
+++ b/public_html/docs/history	Tue Dec 02 20:01:27 2008 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- The security token was missing from the trackback editor template file
+  (reported and patch provided by hiroron, bug #0000778)
 - Removed rel="tag" from topic links in lib-story.php as that would indicate a
   Microformat with a slightly different meaning [Dirk]
 - Fixed inconsistencies and various small mistakes when displaying "Access
diff -r 86ce6afc56ba -r 99b7c9b19065 public_html/docs/theme.html
--- a/public_html/docs/theme.html	Mon Dec 01 11:20:01 2008 +0100
+++ b/public_html/docs/theme.html	Tue Dec 02 20:01:27 2008 +0100
@@ -203,6 +203,8 @@
 <li>Added a <tt>print.css</tt> stylesheet to be used by the
     <tt>printable.thtml</tt> template files for articles and the static pages
     plugin.</li>
+<li>The security token was missing from the trackback editor form,
+    <tt>admin/trackback/trackbackeditor.thtml</tt></li>
 </ul>
 
 <h3>Plugins</h3>
diff -r 86ce6afc56ba -r 99b7c9b19065 public_html/layout/professional/admin/trackback/trackbackeditor.thtml
--- a/public_html/layout/professional/admin/trackback/trackbackeditor.thtml	Mon Dec 01 11:20:01 2008 +0100
+++ b/public_html/layout/professional/admin/trackback/trackbackeditor.thtml	Tue Dec 02 20:01:27 2008 +0100
@@ -36,6 +36,7 @@
             <td colspan="2">
                 <input type="submit" value="{lang_send}" name="mode[0]"{xhtml}>
                 <input type="submit" value="{lang_preview}" name="mode[1]"{xhtml}>
+                <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
             </td>
         </tr>
     </table>


From geeklog-cvs at lists.geeklog.net  Tue Dec  2 14:10:40 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Tue, 02 Dec 2008 14:10:40 -0500
Subject: [geeklog-cvs] geeklog: The owner of a static page changed to the
	user who last...
Message-ID: <hg.6a6f1eceb787.1228245040.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6a6f1eceb787
changeset: 6491:6a6f1eceb787
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Dec 02 20:10:27 2008 +0100
description:
The owner of a static page changed to the user who last edited it (bug #0000777)

diffstat:

1 file changed, 2 insertions(+)
public_html/docs/history |    2 ++

diffs (12 lines):

diff -r 99b7c9b19065 -r 6a6f1eceb787 public_html/docs/history
--- a/public_html/docs/history	Tue Dec 02 20:01:27 2008 +0100
+++ b/public_html/docs/history	Tue Dec 02 20:10:27 2008 +0100
@@ -87,6 +87,8 @@
 
 Static Pages plugin
 -------------------
+- The owner of a static page changed to the user who last edited it
+  (bug #0000777) [Dirk]
 - The printable.thtml template file uses the HTML Strict doctype and print.css
   now [Dirk]
 - Fixed call to WS_makeId when sp_id was longer than STATICPAGE_MAX_ID_LENGTH


From geeklog-cvs at lists.geeklog.net  Sat Dec  6 16:48:45 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sat, 06 Dec 2008 16:48:45 -0500
Subject: [geeklog-cvs] geeklog: Updated Hebrew language file for the install
	script, pr...
Message-ID: <hg.c6164068baad.1228600125.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c6164068baad
changeset: 6492:c6164068baad
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Dec 06 21:31:14 2008 +0100
description:
Updated Hebrew language file for the install script, provided by LWC

diffstat:

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

diffs (51 lines):

diff -r 6a6f1eceb787 -r c6164068baad public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Tue Dec 02 20:10:27 2008 +0100
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sat Dec 06 21:31:14 2008 +0100
@@ -148,25 +148,25 @@
     0 => '???????????? ????????????',
     1 => '???????????? ???? Geeklog ',
     2 => ' ????????????!',
-    3 => '???? ??????????, ???????????? ???????????? ???? ',
-    4 => ' Geeklog. ?????? ?????? ?????? ?????????? ???? ?????????? ???????????? ????????.',
+    3 => '???? ??????????, ???????????? ',
+    4 => ' Geeklog. ?????? ?????? ?????? ?????? ?????????? ???? ?????????? ???????????? ????????.',
     5 => '?????? ?????????????? ???????? ??-Geeklog ???????? ????????, ?????? ???????????? ???????????? ????:',
     6 => '???? ??????????:',
     7 => 'Admin',
     8 => '??????????:',
     9 => 'password',
     10 => '?????????? ??????????',
-    11 => '???? ??????????',
+    11 => '???? ?????????? ????????',
     12 => '??????????',
-    13 => '???????? ???? ?????????? ???? ???????????? ??????????,',
-    14 => '?????????? ????',
-    15 => '?????????? ????????????.',
-    16 => '?????????? ???????????? ????',
-    17 => '??????',
-    18 => '?????????? ????',
+    13 => '?????????? ???? ?????????? ???? ???? ???????????? ????????????,',
+    14 => '?????????? ??-',
+    15 => '???? ?????????? ????????????.',
+    16 => '?????????? ???? ?????????????? ????',
+    17 => '?????? ????',
+    18 => '?????????? ??:',
     19 => '<strong>???????? ????:</strong> ?????? ???? ?????????? ???????? ????????????, ?????????? ?????????? ?????? ???? ?????????????? ?????????? ???????????? ?????? ?????? ???????? ???? ?????????? ????????.  ???? ???????????? ???? ?????????? ?????? ???? ?????? <b>NewAdmin</b> ?????????????? ?????? <b>password</b>',
-    20 => '??????????',
-    21 => '????????????'
+    20 => '???????????? ????',
+    21 => '?????????? ????'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 6a6f1eceb787 -r c6164068baad public_html/docs/history
--- a/public_html/docs/history	Tue Dec 02 20:10:27 2008 +0100
+++ b/public_html/docs/history	Sat Dec 06 21:31:14 2008 +0100
@@ -62,6 +62,7 @@
 - Fixed an issue with story expiry dates on PHP 4/Windows (reported by zeb)
   [Mike]
 
+- Updated Hebrew language file for the install script, provided by LWC
 - Updated Japanese language files, provided by the Geeklog.jp group
 - Updated Polish language files, provided by Robert Stadnik
 - Updated Slovenian language file for the Links plugin, provided by gape


From geeklog-cvs at lists.geeklog.net  Sun Dec  7 11:50:36 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 07 Dec 2008 11:50:36 -0500
Subject: [geeklog-cvs] geeklog: Fixed updating feeds after changing topic
	permissions (...
Message-ID: <hg.0ff7507bb972.1228668636.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0ff7507bb972
changeset: 6493:0ff7507bb972
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 07 17:01:00 2008 +0100
description:
Fixed updating feeds after changing topic permissions (bug #0000779)

diffstat:

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

diffs (25 lines):

diff -r c6164068baad -r 0ff7507bb972 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sat Dec 06 21:31:14 2008 +0100
+++ b/public_html/admin/topic.php	Sun Dec 07 17:01:00 2008 +0100
@@ -282,8 +282,8 @@
         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");
 
         // update feed(s) and Older Stories block
-        COM_rdfUpToDateCheck ('geeklog', $tid);
-        COM_olderStuff ();
+        COM_rdfUpToDateCheck('article', $tid);
+        COM_olderStuff();
 
         $retval = COM_refresh ($_CONF['site_admin_url'] . '/topic.php?msg=13');
     } else {
diff -r c6164068baad -r 0ff7507bb972 public_html/docs/history
--- a/public_html/docs/history	Sat Dec 06 21:31:14 2008 +0100
+++ b/public_html/docs/history	Sun Dec 07 17:01:00 2008 +0100
@@ -3,6 +3,7 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Fixed updating feeds after changing topic permissions (bug #0000779) [Dirk]
 - The security token was missing from the trackback editor template file
   (reported and patch provided by hiroron, bug #0000778)
 - Removed rel="tag" from topic links in lib-story.php as that would indicate a


From geeklog-cvs at lists.geeklog.net  Sun Dec  7 11:50:37 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 07 Dec 2008 11:50:37 -0500
Subject: [geeklog-cvs] geeklog: Fixed updating feeds when a topic is deleted
Message-ID: <hg.aa674828dc38.1228668637.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/aa674828dc38
changeset: 6494:aa674828dc38
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 07 17:04:33 2008 +0100
description:
Fixed updating feeds when a topic is deleted

diffstat:

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

diffs (14 lines):

diff -r 0ff7507bb972 -r aa674828dc38 public_html/admin/topic.php
--- a/public_html/admin/topic.php	Sun Dec 07 17:01:00 2008 +0100
+++ b/public_html/admin/topic.php	Sun Dec 07 17:04:33 2008 +0100
@@ -435,8 +435,8 @@
     DB_delete ($_TABLES['topics'], 'tid', $tid);
 
     // update feed(s) and Older Stories block
-    COM_rdfUpToDateCheck ('geeklog');
-    COM_olderStuff ();
+    COM_rdfUpToDateCheck('article');
+    COM_olderStuff();
 
     return COM_refresh ($_CONF['site_admin_url'] . '/topic.php?msg=14');
 }


From geeklog-cvs at lists.geeklog.net  Sun Dec  7 11:50:38 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 07 Dec 2008 11:50:38 -0500
Subject: [geeklog-cvs] geeklog: Fixed call to update event feeds when an
	event is deleted
Message-ID: <hg.e43f92739fbb.1228668638.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e43f92739fbb
changeset: 6495:e43f92739fbb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 07 17:14:42 2008 +0100
description:
Fixed call to update event feeds when an event is deleted

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
plugins/calendar/functions.inc |    2 +-

diffs (12 lines):

diff -r aa674828dc38 -r e43f92739fbb plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Dec 07 17:04:33 2008 +0100
+++ b/plugins/calendar/functions.inc	Sun Dec 07 17:14:42 2008 +0100
@@ -830,7 +830,7 @@
 
         DB_delete($_TABLES['events'], 'eid', $eid);
         DB_delete($_TABLES['personal_events'], 'eid', $eid);
-        COM_rdfUpToDateCheck('geeklog', 'calendar', $eid);
+        COM_rdfUpToDateCheck('calendar');
 
         return COM_refresh($_CONF['site_admin_url'] . '/plugins/calendar/index.php?msg=18');
     } elseif ($type == 'submission') {


From geeklog-cvs at lists.geeklog.net  Sun Dec  7 11:50:38 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 07 Dec 2008 11:50:38 -0500
Subject: [geeklog-cvs] geeklog: Cosmetics: Missing linefeed after
	<atom:link> element
Message-ID: <hg.ad7471d342ae.1228668638.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ad7471d342ae
changeset: 6496:ad7471d342ae
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 07 17:38:30 2008 +0100
description:
Cosmetics: Missing linefeed after <atom:link> element

diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
system/classes/syndication/feedparserbase.class.php |    6 +++---

diffs (18 lines):

diff -r e43f92739fbb -r ad7471d342ae system/classes/syndication/feedparserbase.class.php
--- a/system/classes/syndication/feedparserbase.class.php	Sun Dec 07 17:14:42 2008 +0100
+++ b/system/classes/syndication/feedparserbase.class.php	Sun Dec 07 17:38:30 2008 +0100
@@ -246,11 +246,11 @@
       */
     function _injectExtendingTags()
     {
-        $xml = '';
-        if( is_array( $this->extensions ) )
+      $xml = '';
+      if( is_array( $this->extensions ) )
       {
         $this->extensions = array_unique($this->extensions);
-            $xml .= implode("\n", $this->extensions);
+        $xml .= implode("\n", $this->extensions) . "\n";
       }
       return $xml;
     }


From geeklog-cvs at lists.geeklog.net  Mon Dec  8 06:04:39 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 08 Dec 2008 06:04:39 -0500
Subject: [geeklog-cvs] geeklog: Forgot to check in the actual fix for bug
	#0000777 (see...
Message-ID: <hg.3a5ce8b95415.1228734279.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3a5ce8b95415
changeset: 6497:3a5ce8b95415
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 08 12:04:27 2008 +0100
description:
Forgot to check in the actual fix for bug #0000777 (see changeset 6491)

diffstat:

1 file changed, 6 insertions(+), 2 deletions(-)
plugins/staticpages/services.inc.php |    8 ++++++--

diffs (25 lines):

diff -r ad7471d342ae -r 3a5ce8b95415 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sun Dec 07 17:38:30 2008 +0100
+++ b/plugins/staticpages/services.inc.php	Mon Dec 08 12:04:27 2008 +0100
@@ -103,7 +103,9 @@
         }
     }
 
-    $args['sp_uid'] = $_USER['uid'];
+    if (!isset($args['sp_uid'])) {
+        $args['sp_uid'] = $_USER['uid'];
+    }
 
     if (empty($args['sp_title']) && !empty($args['title'])) {
         $args['sp_title'] = $args['title'];
@@ -118,7 +120,9 @@
         $args['sp_tid'] = $args['category'][0];
     }
 
-    $args['owner_id'] = $_USER['uid'];
+    if (!isset($args['owner_id'])) {
+        $args['owner_id'] = $_USER['uid'];
+    }
 
     if (empty($args['group_id'])) {
         $args['group_id'] = SEC_getFeatureGroup('staticpages.edit', $_USER['uid']);


From geeklog-cvs at lists.geeklog.net  Sun Dec 14 07:34:08 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 14 Dec 2008 07:34:08 -0500
Subject: [geeklog-cvs] geeklog: When calling COM_getYearFormOptions with a
	$startoffset...
Message-ID: <hg.453d8ee3823d.1229258048.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/453d8ee3823d
changeset: 6564:453d8ee3823d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 14 13:31:34 2008 +0100
description:
When calling COM_getYearFormOptions with a $startoffset parameter, the list of years was off by one (bug #0000783)

diffstat:

2 files changed, 9 insertions(+), 18 deletions(-)
public_html/docs/history   |    2 ++
public_html/lib-common.php |   25 +++++++------------------

diffs (57 lines):

diff -r aada550ce91e -r 453d8ee3823d public_html/docs/history
--- a/public_html/docs/history	Tue Dec 09 11:51:29 2008 +0100
+++ b/public_html/docs/history	Sun Dec 14 13:31:34 2008 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- When calling COM_getYearFormOptions with a $startoffset parameter, the list
+  of years was off by one (bug #0000783; patch provided by hiroron)
 - Fixed updating feeds after changing topic permissions (bug #0000779) [Dirk]
 - The security token was missing from the trackback editor template file
   (reported and patch provided by hiroron, bug #0000778)
diff -r aada550ce91e -r 453d8ee3823d public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Dec 09 11:51:29 2008 +0100
+++ b/public_html/lib-common.php	Sun Dec 14 13:31:34 2008 +0100
@@ -4895,34 +4895,23 @@
 * @return string  HTML years as option values
 */
 
-function COM_getYearFormOptions( $selected = '', $startoffset=0, $endoffset=5 )
+function COM_getYearFormOptions($selected = '', $startoffset = -1, $endoffset = 5)
 {
     $year_options = '';
-    if ($startoffset != 0)
-    {
-        $start_year = date ( 'Y' ) + $startoffset;
-    }
-    else
-    {
-        $start_year = date( 'Y', time() );
-    }
-    $cur_year = date( 'Y', time() );
+    $start_year  = date('Y') + $startoffset;
+    $cur_year    = date('Y', time());
     $finish_year = $cur_year + $endoffset;
 
-    if( !empty( $selected ))
-    {
-        if( $selected < $cur_year )
-        {
+    if (!empty($selected)) {
+        if ($selected < $cur_year) {
             $start_year = $selected;
         }
     }
 
-    for( $i = $start_year - 1; $i <= $finish_year; $i++ )
-    {
+    for ($i = $start_year; $i <= $finish_year; $i++) {
         $year_options .= '<option value="' . $i . '"';
 
-        if( $i == $selected )
-        {
+        if ($i == $selected) {
             $year_options .= ' selected="selected"';
         }
 


From geeklog-cvs at lists.geeklog.net  Sun Dec 14 15:41:33 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 14 Dec 2008 15:41:33 -0500
Subject: [geeklog-cvs] geeklog: Reverted language file changes that are only
	needed in ...
Message-ID: <hg.834541cdcbc8.1229287293.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/834541cdcbc8
changeset: 6565:834541cdcbc8
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 14 17:58:21 2008 +0100
description:
Reverted language file changes that are only needed in HEAD

diffstat:

52 files changed, 57 insertions(+), 263 deletions(-)
language/english.php                                       |   55 +++---------
language/english_utf-8.php                                 |   51 ++---------
language/german.php                                        |   16 ---
language/german_formal.php                                 |   16 ---
language/german_formal_utf-8.php                           |   16 ---
language/german_utf-8.php                                  |   16 ---
plugins/links/language/english.php                         |    1 
plugins/links/language/english_utf-8.php                   |    1 
plugins/links/language/german.php                          |    3 
plugins/links/language/german_formal.php                   |    3 
plugins/links/language/german_formal_utf-8.php             |    3 
plugins/links/language/german_utf-8.php                    |    3 
plugins/staticpages/language/chinese_simplified_utf-8.php  |    3 
plugins/staticpages/language/chinese_traditional_utf-8.php |    3 
plugins/staticpages/language/czech.php                     |    3 
plugins/staticpages/language/czech_utf-8.php               |    3 
plugins/staticpages/language/danish.php                    |    3 
plugins/staticpages/language/danish_utf-8.php              |    3 
plugins/staticpages/language/dutch.php                     |    3 
plugins/staticpages/language/dutch_utf-8.php               |    3 
plugins/staticpages/language/english.php                   |    2 
plugins/staticpages/language/english_utf-8.php             |    2 
plugins/staticpages/language/estonian.php                  |   11 --
plugins/staticpages/language/estonian_utf-8.php            |   11 --
plugins/staticpages/language/farsi_utf-8.php               |    3 
plugins/staticpages/language/french_canada.php             |    3 
plugins/staticpages/language/french_canada_utf-8.php       |    3 
plugins/staticpages/language/german.php                    |    3 
plugins/staticpages/language/german_formal.php             |    3 
plugins/staticpages/language/german_formal_utf-8.php       |    3 
plugins/staticpages/language/german_utf-8.php              |    3 
plugins/staticpages/language/hebrew_utf-8.php              |    3 
plugins/staticpages/language/italian.php                   |    3 
plugins/staticpages/language/italian_utf-8.php             |    3 
plugins/staticpages/language/japanese_utf-8.php            |    5 -
plugins/staticpages/language/korean.php                    |    3 
plugins/staticpages/language/korean_utf-8.php              |    3 
plugins/staticpages/language/polish.php                    |    3 
plugins/staticpages/language/polish_utf-8.php              |    3 
plugins/staticpages/language/portuguese_brazil.php         |    3 
plugins/staticpages/language/portuguese_brazil_utf-8.php   |    3 
plugins/staticpages/language/slovenian.php                 |    3 
plugins/staticpages/language/slovenian_utf-8.php           |    3 
plugins/staticpages/language/spanish.php                   |    3 
plugins/staticpages/language/spanish_utf-8.php             |    3 
plugins/staticpages/language/swedish.php                   |    3 
plugins/staticpages/language/swedish_utf-8.php             |    3 
plugins/staticpages/language/turkish.php                   |    3 
plugins/staticpages/language/turkish_utf-8.php             |    3 
plugins/staticpages/language/ukrainian.php                 |    3 
plugins/staticpages/language/ukrainian_koi8-u.php          |    3 
plugins/staticpages/language/ukrainian_utf-8.php           |    3 

diffs (truncated from 1061 to 300 lines):

diff -r 453d8ee3823d -r 834541cdcbc8 language/english.php
--- a/language/english.php	Sun Dec 14 13:31:34 2008 +0100
+++ b/language/english.php	Sun Dec 14 17:58:21 2008 +0100
@@ -364,10 +364,7 @@
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
-    159 => 'This email was generated automatically. Please do not reply to this email.',
-    160 => '(max. %d x %d pixels, %d bytes; %s)',
-    161 => 'will be scaled down',
-    162 => 'will not be scaled'
+    159 => 'This email was generated automatically. Please do not reply to this email.'
 );
 
 ###############################################################################
@@ -1026,24 +1023,7 @@
     35 => 'Edit',
     36 => 'Code',
     37 => 'Data',
-    38 => 'Update!',
-    39 => 'Upload a plugin',
-    40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
-    41 => 'Upload',
-
-    // to match the PHP error constants,
-    // http://www.php.net/manual/en/features.file-upload.errors.php
-    // TBD: move to a separate $LANG array
-     99 => 'An unknown error occured',
-    100 => 'Ok.',
-    101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
-    102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
-    103 => 'The uploaded file was only partially uploaded.',
-    104 => 'No file was uploaded.',
-    105 => '(undefined error)',
-    106 => 'Missing a temporary folder.',
-    107 => 'Failed to write file to disk.',
-    108 => 'File upload stopped by extension.'
+    38 => 'Update!'
 );
 
 ###############################################################################
@@ -1134,24 +1114,24 @@
     26 => '',
     27 => 'Message successfully sent.',
     28 => 'The plugin has been successfully saved',
-    29 => 'Sorry, you do not have access to this administration page.  Please note that all attempts to access unauthorized features are logged',
+    29 => '',
     30 => 'Access Denied',
-    31 => '',
-    32 => '',
-    33 => '',
+    31 => 'Sorry, you do not have access to the story administration page.  Please note that all attempts to access unauthorized features are logged',
+    32 => 'Sorry, you do not have access to the topic administration page.  Please note that all attempts to access unauthorized features are logged',
+    33 => 'Sorry, you do not have access to the block administration page.  Please note that all attempts to access unauthorized features are logged',
     34 => '',
     35 => '',
     36 => '',
-    37 => '',
-    38 => '',
-    39 => '',
+    37 => 'Sorry, you do not have access to the user administration page.  Please note that all attempts to access unauthorized features are logged',
+    38 => 'Sorry, you do not have access to the plugin administration page.  Please note that all attempts to access unauthorized features are logged',
+    39 => 'Sorry, you do not have access to the mail administration page.  Please note that all attempts to access unauthorized features are logged',
     40 => 'System Message',
-    41 => '',
-    42 => '',
-    43 => '',
+    41 => 'Sorry, you do not have access to the word replacement page.  Please note that all attempts to access unauthorized features are logged',
+    42 => 'Your word has been successfully saved.',
+    43 => 'The word has been successfully deleted.',
     44 => 'The plugin was successfully installed!',
     45 => 'The plugin was successfully deleted.',
-    46 => '',
+    46 => 'Sorry, you do not have access to the database backup utility.  Please note that all attempts to access unauthorized features are logged',
     47 => 'This functionality only works under *nix.  If you are running *nix as your operating system then your cache has been successfully cleared. If you are on Windows, you will need to search for files name adodb_*.php and remove them manually.',
     48 => "Thank you for applying for a membership with {$_CONF['site_name']}. Our team will review your application. If approved, your password will be emailed to you at the email address you just entered.",
     49 => 'Your group has been successfully saved.',
@@ -1201,12 +1181,8 @@
     93 => 'Database back up was successful.',
     94 => 'Backup Failed: Filesize less than 1kb',
     95 => 'There was an error.',
-    96 => '',
-    97 => 'Not all required fields have been passed validation - default custom membership message',
-    98 => 'The plugin was successfully uploaded.',
-    99 => 'The plugin already exists.',
-    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
-    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.'
+    96 => 'Sorry, you do not have access to the configuration administration page.  Please note that all attempts to access unauthorized features are logged.',
+    97 => 'Not all required fields have been passed validation - default custom membership message'
 );
 
 ###############################################################################
@@ -1761,7 +1737,6 @@
     'debug_image_upload' => "Debug Image Uploading?",
     'keep_unscaled_image' => "Keep Unscaled Image?",
     'allow_user_scaling' => "Allow User Scaling?",
-    'jpeg_quality' => 'JPEG Quality?',
     'max_image_width' => "Max Image Width?",
     'max_image_height' => "Max Image Height?",
     'max_image_size' => "Max Image Size?",
diff -r 453d8ee3823d -r 834541cdcbc8 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Dec 14 13:31:34 2008 +0100
+++ b/language/english_utf-8.php	Sun Dec 14 17:58:21 2008 +0100
@@ -364,10 +364,7 @@
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
-    159 => 'This email was generated automatically. Please do not reply to this email.',
-    160 => '(max. %d x %d pixels, %d bytes; %s)',
-    161 => 'will be scaled down',
-    162 => 'will not be scaled'
+    159 => 'This email was generated automatically. Please do not reply to this email.'
 );
 
 ###############################################################################
@@ -1026,24 +1023,7 @@
     35 => 'Edit',
     36 => 'Code',
     37 => 'Data',
-    38 => 'Update!',
-    39 => 'Upload a plugin',
-    40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
-    41 => 'Upload',
-
-    // to match the PHP error constants,
-    // http://www.php.net/manual/en/features.file-upload.errors.php
-    // TBD: move to a separate $LANG array
-     99 => 'An unknown error occured',
-    100 => 'Ok.',
-    101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
-    102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
-    103 => 'The uploaded file was only partially uploaded.',
-    104 => 'No file was uploaded.',
-    105 => '(undefined error)',
-    106 => 'Missing a temporary folder.',
-    107 => 'Failed to write file to disk.',
-    108 => 'File upload stopped by extension.'
+    38 => 'Update!'
 );
 
 ###############################################################################
@@ -1134,24 +1114,24 @@
     26 => '',
     27 => 'Message successfully sent.',
     28 => 'The plugin has been successfully saved',
-    29 => 'Sorry, you do not have access to this administration page.  Please note that all attempts to access unauthorized features are logged',
+    29 => '',
     30 => 'Access Denied',
-    31 => '',
-    32 => '',
-    33 => '',
+    31 => 'Sorry, you do not have access to the story administration page.  Please note that all attempts to access unauthorized features are logged',
+    32 => 'Sorry, you do not have access to the topic administration page.  Please note that all attempts to access unauthorized features are logged',
+    33 => 'Sorry, you do not have access to the block administration page.  Please note that all attempts to access unauthorized features are logged',
     34 => '',
     35 => '',
     36 => '',
-    37 => '',
-    38 => '',
-    39 => '',
+    37 => 'Sorry, you do not have access to the user administration page.  Please note that all attempts to access unauthorized features are logged',
+    38 => 'Sorry, you do not have access to the plugin administration page.  Please note that all attempts to access unauthorized features are logged',
+    39 => 'Sorry, you do not have access to the mail administration page.  Please note that all attempts to access unauthorized features are logged',
     40 => 'System Message',
-    41 => '',
+    41 => 'Sorry, you do not have access to the word replacement page.  Please note that all attempts to access unauthorized features are logged',
     42 => 'Your word has been successfully saved.',
     43 => 'The word has been successfully deleted.',
     44 => 'The plugin was successfully installed!',
     45 => 'The plugin was successfully deleted.',
-    46 => '',
+    46 => 'Sorry, you do not have access to the database backup utility.  Please note that all attempts to access unauthorized features are logged',
     47 => 'This functionality only works under *nix.  If you are running *nix as your operating system then your cache has been successfully cleared. If you are on Windows, you will need to search for files name adodb_*.php and remove them manually.',
     48 => "Thank you for applying for a membership with {$_CONF['site_name']}. Our team will review your application. If approved, your password will be emailed to you at the email address you just entered.",
     49 => 'Your group has been successfully saved.',
@@ -1201,12 +1181,8 @@
     93 => 'Database back up was successful.',
     94 => 'Backup Failed: Filesize less than 1kb',
     95 => 'There was an error.',
-    96 => '',
-    97 => 'Not all required fields have been passed validation - default custom membership message',
-    98 => 'The plugin was successfully uploaded.',
-    99 => 'The plugin already exists.',
-    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
-    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.'
+    96 => 'Sorry, you do not have access to the configuration administration page.  Please note that all attempts to access unauthorized features are logged.',
+    97 => 'Not all required fields have been passed validation - default custom membership message'
 );
 
 ###############################################################################
@@ -1761,7 +1737,6 @@
     'debug_image_upload' => "Debug Image Uploading?",
     'keep_unscaled_image' => "Keep Unscaled Image?",
     'allow_user_scaling' => "Allow User Scaling?",
-    'jpeg_quality' => 'JPEG Quality?',
     'max_image_width' => "Max Image Width?",
     'max_image_height' => "Max Image Height?",
     'max_image_size' => "Max Image Size?",
diff -r 453d8ee3823d -r 834541cdcbc8 language/german.php
--- a/language/german.php	Sun Dec 14 13:31:34 2008 +0100
+++ b/language/german.php	Sun Dec 14 17:58:21 2008 +0100
@@ -367,10 +367,7 @@
     156 => 'Account l?schen',
     157 => 'L?schen',
     158 => 'Zeitzone',
-    159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
-    160 => '(max. %d x %d Pixel, %d Bytes; %s)',
-    161 => 'wird ggfs. skaliert',
-    162 => 'wird nicht skaliert'
+    159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.'
 );
 
 ###############################################################################
@@ -1119,7 +1116,7 @@
     26 => '',
     27 => 'Nachricht wurde verschickt.',
     28 => 'Das Plugin wurde gespeichert.',
-    29 => 'Du hast keinen Zugriff auf diese Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werden protokolliert.',
+    29 => '',
     30 => 'Zugriff verweigert',
     31 => 'Du hast keinen Zugriff auf die Artikel-Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werden protokolliert.',
     32 => 'Du hast keinen Zugriff auf die Kategorie-Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werden protokolliert.',
@@ -1187,11 +1184,7 @@
     94 => 'Backup Failed: Dateigr??e unter 1kb',
     95 => 'Es gab einen Fehler.',
     96 => 'Sorry, kein Zugang zur Admin-Seite. Unzul?ssige Zugangsversuche werden gelogged.',
-    97 => 'Not all required fields have been passed validation - default custom membership message',
-    98 => 'The plugin was successfully uploaded.',
-    99 => 'The plugin already exists.',
-    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
-    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.'
+    97 => 'Not all required fields have been passed validation - default custom membership message'
 );
 
 ###############################################################################
@@ -1753,7 +1746,6 @@
     'debug_image_upload' => 'Debug Image-Upload?',
     'keep_unscaled_image' => 'Bild in Originalgr??e behalten?',
     'allow_user_scaling' => 'User darf skalieren?',
-    'jpeg_quality' => 'JPEG-Qualit?t?',
     'max_image_width' => 'Max. Bildbreite?',
     'max_image_height' => 'Max. Bildh?he?',
     'max_image_size' => 'Max. Bildgr??e?',
@@ -1796,7 +1788,7 @@
     'sg_site' => 'Site',
     'sg_stories' => 'Artikel und Trackbacks',
     'sg_theme' => 'Theme',
-    'sg_blocks' => 'Blocks',
+    'sg_blocks' => 'Bl?cke',
     'sg_users' => 'User und Beitr?ge',
     'sg_images' => 'Images',
     'sg_locale' => 'Sprache und Lokalisierung',
diff -r 453d8ee3823d -r 834541cdcbc8 language/german_formal.php
--- a/language/german_formal.php	Sun Dec 14 13:31:34 2008 +0100
+++ b/language/german_formal.php	Sun Dec 14 17:58:21 2008 +0100
@@ -368,10 +368,7 @@
     156 => 'Account l?schen',
     157 => 'L?schen',
     158 => 'Zeitzone',
-    159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.',
-    160 => '(max. %d x %d Pixel, %d Bytes; %s)',
-    161 => 'wird ggfs. skaliert',
-    162 => 'wird nicht skaliert'
+    159 => 'Diese E-Mail wurde automatisch generiert. Bitte nicht auf diese E-Mail antworten.'
 );
 
 ###############################################################################
@@ -1120,7 +1117,7 @@
     26 => '',
     27 => 'Nachricht wurde verschickt.',
     28 => 'Das Plugin wurde gespeichert.',
-    29 => 'Sie haben keinen Zugriff auf diese Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werden protokolliert.',
+    29 => '',
     30 => 'Zugriff verweigert',
     31 => 'Sie haben keinen Zugriff auf die Artikel-Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werden protokolliert.',
     32 => 'Sie haben keinen Zugriff auf die Kategorie-Administrationsseite. Alle Versuche, auf Bereiche ohne entsprechende Berechtigung zuzugreifen, werdenprotokolliert.',
@@ -1188,11 +1185,7 @@
     94 => 'Backup Failed: Dateigr??e unter 1kb',
     95 => 'Es gab einen Fehler.',
     96 => 'Sorry, kein Zugang zur Admin-Seite. Unzul?ssige Zugangsversuche werden gelogged.',
-    97 => 'Not all required fields have been passed validation - default custom membership message',
-    98 => 'The plugin was successfully uploaded.',
-    99 => 'The plugin already exists.',
-    100 => 'The plugin file you uploaded was not a GZip or Zip compressed archive.',
-    101 => 'There are no topics (that you have access to). You need at least one topic to be able to submit stories.'
+    97 => 'Not all required fields have been passed validation - default custom membership message'
 );
 
 ###############################################################################
@@ -1754,7 +1747,6 @@
     'debug_image_upload' => 'Debug Image-Upload?',
     'keep_unscaled_image' => 'Bild in Originalgr??e behalten?',
     'allow_user_scaling' => 'User darf skalieren?',
-    'jpeg_quality' => 'JPEG-Qualit?t?',
     'max_image_width' => 'Max. Bildbreite?',
     'max_image_height' => 'Max. Bildh?he?',
     'max_image_size' => 'Max. Bildgr??e?',
@@ -1797,7 +1789,7 @@
     'sg_site' => 'Site',
     'sg_stories' => 'Artikel und Trackbacks',


From geeklog-cvs at lists.geeklog.net  Sun Dec 14 15:41:34 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 14 Dec 2008 15:41:34 -0500
Subject: [geeklog-cvs] geeklog: Reverted changes that shouldn't be in this
	branch
Message-ID: <hg.37b794db151d.1229287295.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/37b794db151d
changeset: 6566:37b794db151d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 14 21:36:53 2008 +0100
description:
Reverted changes that shouldn't be in this branch

diffstat:

51 files changed, 1177 insertions(+), 3438 deletions(-)
plugins/links/install_defaults.php                          |    8 
plugins/polls/sql/mssql_install.php                         |    8 
plugins/polls/sql/mysql_install.php                         |   14 
plugins/polls/templates/admin/polleditor.thtml              |    9 
plugins/staticpages/services.inc.php                        |    5 
public_html/admin/block.php                                 |   39 
public_html/admin/database.php                              |   35 
public_html/admin/group.php                                 |   21 
public_html/admin/install/bigdump.php                       |  395 -----
public_html/admin/install/config-install.php                |    1 
public_html/admin/install/install-plugins.php               |  527 -------
public_html/admin/install/language/english.php              |  137 -
public_html/admin/install/language/german.php               |    8 
public_html/admin/install/layout/style.css                  |  296 +---
public_html/admin/install/lib-install.php                   |  760 -----------
public_html/admin/install/migrate.php                       |  637 ---------
public_html/admin/install/success.php                       |   20 
public_html/admin/mail.php                                  |   20 
public_html/admin/plugins.php                               |  357 -----
public_html/admin/plugins/calendar/index.php                |   18 
public_html/admin/plugins/calendar/install.php              |    4 
public_html/admin/plugins/links/category.php                |   11 
public_html/admin/plugins/links/index.php                   |    4 
public_html/admin/plugins/polls/index.php                   |    4 
public_html/admin/plugins/spamx/index.php                   |   17 
public_html/admin/plugins/spamx/install.php                 |    4 
public_html/admin/plugins/staticpages/index.php             |   23 
public_html/admin/plugins/staticpages/install.php           |    4 
public_html/admin/sectest.php                               |   16 
public_html/admin/story.php                                 |   54 
public_html/admin/syndication.php                           |   25 
public_html/admin/topic.php                                 |   29 
public_html/admin/trackback.php                             |   28 
public_html/admin/user.php                                  |    2 
public_html/docs/config.html                                |   13 
public_html/docs/links.html                                 |    7 
public_html/docs/theme.html                                 |   25 
public_html/getimage.php                                    |   66 
public_html/layout/professional/article/printable.thtml     |    4 
public_html/layout/professional/preferences/userphoto.thtml |    2 
public_html/layout/professional/print.css                   |   11 
public_html/links/index.php                                 |   70 -
public_html/staticpages/index.php                           |    4 
public_html/submit.php                                      |   18 
public_html/usersettings.php                                |   12 
sql/mssql_tableanddata.php                                  |  394 +++++
sql/mysql_tableanddata.php                                  |  353 ++++-
sql/updates/mssql_1.5.1_to_1.5.2.php                        |   42 
sql/updates/mysql_1.5.1_to_1.5.2.php                        |   43 
system/classes/config.class.php                             |    2 
system/lib-story.php                                        |    9 

diffs (truncated from 5906 to 300 lines):

diff -r 834541cdcbc8 -r 37b794db151d plugins/links/install_defaults.php
--- a/plugins/links/install_defaults.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/links/install_defaults.php	Sun Dec 14 21:36:53 2008 +0100
@@ -134,12 +134,6 @@
 $_LI_DEFAULT['show_category_descriptions'] = true;
 
 /**
- * open links in new window
- * Whether to open external links in a new window or not.
- */
-$_LI_DEFAULT['new_window'] = false;
-
-/**
  * Links root category id
  */
 $_LI_DEFAULT['root'] = 'site';
@@ -188,8 +182,6 @@
         $c->add('show_top10', $_LI_DEFAULT['show_top10'], 'select',
                 0, 0, 1, 40, true, 'links');
         $c->add('show_category_descriptions', $_LI_DEFAULT['show_category_descriptions'], 'select', 0, 0, 1, 50, true, 'links');
-        $c->add('new_window', $_LI_DEFAULT['new_window'], 'select',
-                0, 0, 1, 55, true, 'links');
 
         $c->add('fs_admin', NULL, 'fieldset', 0, 1, NULL, 0, true, 'links');
         $c->add('hidenewlinks', $_LI_DEFAULT['hidenewlinks'], 'select',
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/sql/mssql_install.php
--- a/plugins/polls/sql/mssql_install.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/sql/mssql_install.php	Sun Dec 14 21:36:53 2008 +0100
@@ -35,7 +35,7 @@
 
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
-    [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+    [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [qid] [int] NOT NULL ,
     [aid] [tinyint] NOT NULL ,
     [answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
@@ -47,14 +47,14 @@
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
     [qid] [int] NOT NULL ,
-    [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+    [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 ) ON [PRIMARY]
 ";
 
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
-    [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+    [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [topic] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
     [voters] [numeric](8, 0) NULL ,
     [questions] [int] NOT NULL ,
@@ -76,7 +76,7 @@
 $_SQL[] = "
 CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
     [id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
-    [pid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+    [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
     [date] [numeric](10, 0) NULL
 ) ON [PRIMARY]
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/sql/mysql_install.php	Sun Dec 14 21:36:53 2008 +0100
@@ -34,7 +34,7 @@
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pollanswers']} (
-  pid varchar(40) NOT NULL default '',
+  pid varchar(20) NOT NULL default '',
   qid mediumint(9) NOT NULL default 0,
   aid tinyint(3) unsigned NOT NULL default '0',
   answer varchar(255) default NULL,
@@ -46,16 +46,16 @@
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pollquestions']} (
-  qid mediumint(9) NOT NULL DEFAULT '0',
-  pid varchar(40) NOT NULL default '',
-  question varchar(255) NOT NULL,
-  PRIMARY KEY (qid, pid)
+    qid mediumint(9) NOT NULL DEFAULT '0',
+    pid varchar(20) NOT NULL,
+    question varchar(255) NOT NULL,
+    PRIMARY KEY (qid, pid)
 ) TYPE=MyISAM
 ";
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['polltopics']} (
-  pid varchar(40) NOT NULL default '',
+  pid varchar(20) NOT NULL,
   topic varchar(255) default NULL,
   voters mediumint(8) unsigned default NULL,
   questions int(11) NOT NULL default '0',
@@ -83,7 +83,7 @@
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pollvoters']} (
   id int(10) unsigned NOT NULL auto_increment,
-  pid varchar(20) NOT NULL,
+  pid varchar(20) NOT NULL default '',
   ipaddress varchar(15) NOT NULL default '',
   date int(10) unsigned default NULL,
   PRIMARY KEY  (id)
diff -r 834541cdcbc8 -r 37b794db151d plugins/polls/templates/admin/polleditor.thtml
--- a/plugins/polls/templates/admin/polleditor.thtml	Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/polls/templates/admin/polleditor.thtml	Sun Dec 14 21:36:53 2008 +0100
@@ -4,7 +4,7 @@
                                     <table cellspacing="0" cellpadding="2" width="100%">
                                         <tr>
                                             <td align="right">{lang_pollid}:</td>
-                                            <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="40" maxlength="40"{xhtml}> {lang_donotusespaces}</td>
+                                            <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
                                         </tr>
                                         <tr>
                                             <td align="right">{lang_topic}:</td>
@@ -42,10 +42,5 @@
                                     <p>{lang_permissionskey}</p>
                                     <div>{permissions_editor}</div>
                                     <p>{lang_permissions_msg}</p>
-                                    <p>
-                                    <input type="submit" name="mode" value="{lang_save}"{xhtml}>
-                                    <input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}
-                                    <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
-                                    <input type="hidden" value="{poll_id}" name="old_pid"{xhtml}>
-                                    </p>
+                                    <p><input type="submit" name="mode" value="{lang_save}"{xhtml}><input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}></p>
                                 </form>
diff -r 834541cdcbc8 -r 37b794db151d plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/plugins/staticpages/services.inc.php	Sun Dec 14 21:36:53 2008 +0100
@@ -377,7 +377,7 @@
         $url = COM_buildURL($_CONF['site_url'] . '/staticpages/index.php?page='
                             . $sp_id);
         $output .= PLG_afterSaveSwitch($_SP_CONF['aftersave'], $url,
-                                       'staticpages', 19);
+                                       'staticpages');
 
         $svc_msg['id'] = $sp_id;
         return PLG_RET_OK;
@@ -405,8 +405,7 @@
     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
            $LANG_LOGIN;
 
-    $output = COM_refresh($_CONF['site_admin_url']
-                          . '/plugins/staticpages/index.php?msg=20');
+    $output = COM_refresh($_CONF['site_admin_url'] . '/plugins/staticpages/index.php');
 
     if (empty($args['sp_id']) && !empty($args['id']))
         $args['sp_id'] = $args['id'];
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/block.php
--- a/public_html/admin/block.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/block.php	Sun Dec 14 21:36:53 2008 +0100
@@ -37,19 +37,21 @@
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
+require_once $_CONF['path_system'] . 'lib-security.php';
 
 // Uncomment the line below if you need to debug the HTTP variables being passed
 // to the script.  This will sometimes cause errors but it will allow you to see
 // the data being passed in a POST operation
 // echo COM_debug($_POST);
 
-$display = '';
-
-if (!SEC_hasRights('block.edit')) {
-    $display .= COM_siteHeader('menu', $MESSAGE[30])
-             . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
-             . COM_siteFooter();
-    COM_accessLog("User {$_USER['username']} tried to illegally access the block administration screen");
+if (!SEC_hasRights ('block.edit')) {
+    $display .= COM_siteHeader ('menu', $MESSAGE[30])
+        . COM_startBlock ($MESSAGE[30], '',
+                          COM_getBlockTemplate ('_msg_block', 'header'))
+        . $MESSAGE[33]
+        . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
+        . COM_siteFooter ();
+    COM_accessLog ("User {$_USER['username']} tried to illegally access the block administration screen");
     echo $display;
     exit;
 }
@@ -511,10 +513,13 @@
         $access = SEC_hasAccess ($owner_id, $group_id, $perm_owner, $perm_group,
                 $perm_members, $perm_anon);
     }
-    if (($access < 3) || !hasBlockTopicAccess($tid) || !SEC_inGroup($group_id)) {
-        $retval .= COM_siteHeader('menu', $MESSAGE[30])
-                . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
-                . COM_siteFooter();
+    if (($access < 3) || !hasBlockTopicAccess ($tid) || !SEC_inGroup ($group_id)) {
+        $retval .= COM_siteHeader('menu', $MESSAGE[30]);
+        $retval .= COM_startBlock ($MESSAGE[30], '',
+                            COM_getBlockTemplate ('_msg_block', 'header'));
+        $retval .= $MESSAGE[33];
+        $retval .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
+        $retval .= COM_siteFooter();
         COM_accessLog("User {$_USER['username']} tried to illegally create or edit block $bid.");
 
         return $retval;
@@ -842,8 +847,16 @@
     $display .= listblocks();
     $display .= COM_siteFooter();
 } else {  // 'cancel' or no mode at all
-    $display .= COM_siteHeader('menu', $LANG21[19]);
-    $display .= COM_showMessageFromParameter();
+    $display .= COM_siteHeader ('menu', $LANG21[19]);
+    $msg = 0;
+    if (isset ($_POST['msg'])) {
+        $msg = COM_applyFilter ($_POST['msg'], true);
+    } else if (isset ($_GET['msg'])) {
+        $msg = COM_applyFilter ($_GET['msg'], true);
+    }
+    if ($msg > 0) {
+        $display .= COM_showMessage ($msg);
+    }
     $display .= listblocks();
 
     $display .= COM_siteFooter();
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/database.php
--- a/public_html/admin/database.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/database.php	Sun Dec 14 21:36:53 2008 +0100
@@ -36,23 +36,13 @@
 
 require_once '../lib-common.php';
 require_once 'auth.inc.php';
-
-$display = '';
-
-// If user isn't a Root user or if the backup feature is disabled, bail.
-if (!SEC_inGroup('Root') OR ($_CONF['allow_mysqldump'] == 0)) {
-    $display .= COM_siteHeader('menu', $LANG_DB_BACKUP['last_ten_backups'])
-             . COM_showMessageText($MESSAGE[29], $MESSAGE[30])
-             . COM_siteFooter();
-    COM_accessLog("User {$_USER['username']} tried to illegally access the database backup screen.");
-    echo $display;
-    exit;
-}
+require_once $_CONF['path_system'] . 'lib-security.php';
 
 /**
-* This page allows all Root admins to create a database backup.  It's pretty
-* simple actually.  The admin clicks a button, we do a mysqldump to a file in
-* the following format: geeklog_db_backup_YYYY_MM_DD_hh_mm_ss.sql  That's it.
+* This page allows all Root admins to create a database backup.  This will not
+* allow the removal of past backups.  It's pretty simple actually.  The admin
+* clicks a button, we do a mysqldump to a file in the following format:
+* geeklog_db_backup_YYYY_MM_DD.sql  That's it.
 */
 
 /**
@@ -263,6 +253,19 @@
 // MAIN
 $display = '';
 
+// If user isn't a root user or if the backup feature is disabled, bail.
+if (!SEC_inGroup('Root') OR $_CONF['allow_mysqldump'] == 0) {
+    $display .= COM_siteHeader('menu', $LANG_DB_BACKUP['last_ten_backups']);
+    $display .= COM_startBlock($MESSAGE[30], '',
+                    COM_getBlockTemplate('_msg_block', 'header'));
+    $display .= $MESSAGE[46];
+    $display .= COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+    $display .= COM_siteFooter();
+    COM_accessLog("User {$_USER['username']} tried to illegally access the database backup screen.");
+    echo $display;
+    exit;
+}
+
 $mode = '';
 if (isset($_GET['mode'])) {
     if ($_GET['mode'] == 'backup') {
@@ -308,8 +311,6 @@
             }
         }
     }
-} else {
-    $display .= COM_showMessageFromParameter();
 }
 
 // Show all backups
diff -r 834541cdcbc8 -r 37b794db151d public_html/admin/group.php
--- a/public_html/admin/group.php	Sun Dec 14 17:58:21 2008 +0100
+++ b/public_html/admin/group.php	Sun Dec 14 21:36:53 2008 +0100
@@ -37,7 +37,7 @@
 /**
 * This file is the Geeklog Group administration page
 *
-* @author   Tony Bibbs  <tony AT tonybibbs DOT com>
+* @author   Tony Bibbs  <tony at tonybibbs.com>
 *
 */
 
@@ -59,11 +59,14 @@
 $display = '';
 
 // Make sure user has rights to access this page
-if (!SEC_hasRights('group.edit')) {
-    $display .= COM_siteHeader('menu', $MESSAGE[30])


From geeklog-cvs at lists.geeklog.net  Sun Dec 14 16:02:03 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Sun, 14 Dec 2008 16:02:03 -0500
Subject: [geeklog-cvs] geeklog: Wrong variables
Message-ID: <hg.8ef676172fdb.1229288523.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8ef676172fdb
changeset: 6567:8ef676172fdb
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 14 21:49:32 2008 +0100
description:
Wrong variables

diffstat:

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

diffs (15 lines):

diff -r 37b794db151d -r 8ef676172fdb public_html/links/index.php
--- a/public_html/links/index.php	Sun Dec 14 21:36:53 2008 +0100
+++ b/public_html/links/index.php	Sun Dec 14 21:49:32 2008 +0100
@@ -348,9 +348,9 @@
                  . '/links/portal.php?what=link&amp;item=' . $A['lid']);
     $template->set_var ('link_url', $url);
     $template->set_var ('link_actual_url', $A['url']);
-    $template->set_var ('link_actual_url_encoded', urlencode($actualUrl));
+    $template->set_var ('link_actual_url_encoded', urlencode($A['url']));
     $template->set_var ('link_name', stripslashes ($A['title']));
-    $template->set_var ('link_name_encoded', urlencode($title));
+    $template->set_var ('link_name_encoded', urlencode($A['title']));
     $template->set_var ('link_hits', COM_numberFormat ($A['hits']));
     $template->set_var ('link_description',
                         nl2br (stripslashes ($A['description'])));


From geeklog-cvs at lists.geeklog.net  Mon Dec 15 04:09:46 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 15 Dec 2008 04:09:46 -0500
Subject: [geeklog-cvs] geeklog: Added missing half of the fix for filling
	out the email...
Message-ID: <hg.34a340e909f3.1229332186.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/34a340e909f3
changeset: 6568:34a340e909f3
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 15 10:09:27 2008 +0100
description:
Added missing half of the fix for filling out the email addresses in the install script (cf. bug #0000759)

diffstat:

1 file changed, 6 insertions(+)
public_html/admin/install/index.php |    6 ++++++

diffs (17 lines):

diff -r 8ef676172fdb -r 34a340e909f3 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Dec 14 21:49:32 2008 +0100
+++ b/public_html/admin/install/index.php	Mon Dec 15 10:09:27 2008 +0100
@@ -332,7 +332,13 @@
             $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : 'http://' . $_SERVER['HTTP_HOST'] . preg_replace('/\/install.*/', '', $_SERVER['PHP_SELF']) ; 
             $host_name = explode(':', $_SERVER['HTTP_HOST']);
             $host_name = $host_name[0];
+            if (empty($_CONF['site_mail'])) {
+                $_CONF['site_mail'] = 'admin at example.com';
+            }
             $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : ($_CONF['site_mail'] != 'admin at example.com' ? $_CONF['site_mail'] : 'admin@' . $host_name);
+            if (empty($_CONF['noreply_mail'])) {
+                $_CONF['noreply_mail'] = 'noreply at example.com';
+            }
             $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : ($_CONF['noreply_mail'] != 'noreply at example.com' ? $_CONF['noreply_mail'] : 'noreply@' . $host_name);
             if (isset($_POST['utf8']) && ($_POST['utf8'] == 'on')) {
                 $utf8 = true;


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:31 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:31 -0500
Subject: [geeklog-cvs] geeklog: Implemented extended API for PLG_getItemInfo
Message-ID: <hg.0d0c4bff08d5.1229943091.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/0d0c4bff08d5
changeset: 6569:0d0c4bff08d5
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Dec 20 15:41:14 2008 +0100
description:
Implemented extended API for PLG_getItemInfo

diffstat:

4 files changed, 163 insertions(+), 100 deletions(-)
public_html/admin/trackback.php |   38 ++------
system/lib-plugins.php          |   40 ++++++---
system/lib-story.php            |  168 +++++++++++++++++++++++++++------------
system/lib-trackback.php        |   17 ---

diffs (truncated from 417 to 300 lines):

diff -r 4422583786be -r 0d0c4bff08d5 public_html/admin/trackback.php
--- a/public_html/admin/trackback.php	Sun Dec 14 09:43:17 2008 +0100
+++ b/public_html/admin/trackback.php	Sat Dec 20 15:41:14 2008 +0100
@@ -168,7 +168,7 @@
     $cid = addslashes ($id);
     $result = DB_query ("SELECT sid,type FROM {$_TABLES['trackback']} WHERE cid = '$cid'");
     list ($sid, $type) = DB_fetchArray ($result);
-    $url = getItemInfo ($type, $sid, 'url');
+    $url = PLG_getItemInfo($type, $sid, 'url');
 
     if (TRB_allowDelete ($sid, $type)) {
         TRB_deleteTrackbackComment ($id);
@@ -222,7 +222,7 @@
 
     $retval = '';
 
-    list ($url, $text) = getItemInfo ($type, $id, 'url,description');
+    list($url, $text) = PLG_getItemInfo($type, $id, 'url,description');
 
     // extract all links from the text
     preg_match_all ("/<a[^>]*href=[\"']([^\"']*)[\"'][^>]*>(.*?)<\/a>/i", $text,
@@ -327,7 +327,7 @@
 
     $retval = '';
 
-    list ($itemurl,$feedurl) = getItemInfo ($type, $id, 'url,feed');
+    list($itemurl,$feedurl) = PLG_getItemInfo($type, $id, 'url,feed');
 
     $template = new Template ($_CONF['path_layout'] . 'admin/trackback');
     $template->set_file (array ('list' => 'pinglist.thtml',
@@ -451,24 +451,6 @@
     }
 
     return $retval;
-}
-
-/**
-* Wrapper for STORY_getItemInfo / PLG_getItemInfo to keep things readable
-*
-* @param    string  $type   type of entry ('article' = story, else plugin)
-* @param    string  $id     ID of that entry
-* @param    string  $what   info requested
-* @return   mixed           requested info, as a string or array of strings
-*
-*/
-function getItemInfo ($type, $id, $what)
-{
-    if ($type == 'article') {
-        return STORY_getItemInfo ($id, $what);
-    } else {
-        return PLG_getItemInfo ($type, $id, $what);
-    }
 }
 
 /**
@@ -932,8 +914,8 @@
     }
     $id = COM_applyFilter ($_REQUEST['id']);
     if (!empty ($id)) {
-        list ($url, $title, $excerpt) = getItemInfo ($type, $id,
-                                                     'url,title,excerpt');
+        list($url, $title, $excerpt) = PLG_getItemInfo($type, $id,
+                                                       'url,title,excerpt');
         $excerpt = trim (strip_tags ($excerpt));
         $blog = TRB_filterBlogname ($_CONF['site_name']);
 
@@ -996,7 +978,7 @@
         }
     }
 
-    $title = getItemInfo ($type, $id, 'title');
+    $title = PLG_getItemInfo($type, $id, 'title');
 
     $display .= COM_siteHeader ('menu', $LANG_TRB['send_pings']);
     $display .= COM_startBlock (sprintf ($LANG_TRB['send_pings_for'], $title));
@@ -1086,7 +1068,7 @@
         $type = 'article';
     }
 
-    $fulltext = getItemInfo ($type, $id, 'description');
+    $fulltext = PLG_getItemInfo($type, $id, 'description');
 
     $display .= COM_siteHeader ('menu', $LANG_TRB['trackback'])
               . COM_startBlock ($LANG_TRB['select_url'], $_CONF['site_url']
@@ -1111,7 +1093,7 @@
 
     $trackbackUrl = TRB_detectTrackbackUrl ($url);
 
-    list ($url, $title, $excerpt) = getItemInfo ($type, $id,
+    list($url, $title, $excerpt) = PLG_getItemInfo($type, $id,
                                                  'url,title,excerpt');
     $excerpt = trim (strip_tags ($excerpt));
     $blog = TRB_filterBlogname ($_CONF['site_name']);
@@ -1152,8 +1134,8 @@
         $id = COM_applyFilter ($_REQUEST['id']);
         $type = COM_applyFilter ($_REQUEST['type']);
         if (!empty ($id) && !empty ($type)) {
-            list ($newurl, $newtitle, $newexcerpt) =
-                                getItemInfo ($type, $id, 'url,title,excerpt');
+            list($newurl, $newtitle, $newexcerpt) =
+                            PLG_getItemInfo($type, $id, 'url,title,excerpt');
             $newexcerpt = trim (strip_tags ($newexcerpt));
 
             if (empty ($url) && !empty ($newurl)) {
diff -r 4422583786be -r 0d0c4bff08d5 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Dec 14 09:43:17 2008 +0100
+++ b/system/lib-plugins.php	Sat Dec 20 15:41:14 2008 +0100
@@ -1962,16 +1962,21 @@
 /**
 * Ask plugin for information about one of its items
 *
-* @param    string  $type       plugin type
-* @param    string  $id         ID of an item under the plugin's control
+* @param    string  $type       plugin type (incl. 'article' for stories)
+* @param    string  $id         ID of an item under the plugin's control or '*'
 * @param    string  $what       comma-separated list of item properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
 * Item properties that can be requested:
-* 'url'         - URL of the item
-* 'title'       - title of the item
-* 'excerpt'     - short description of the item
-* 'description' - full description of the item
+* 'date-created'  - creation date, if available
+* 'date-modified' - date of last modification, if available
+* 'description'   - full description of the item
+* 'excerpt'       - short description of the item
+* 'id'            - ID of the item, e.g. sid for articles
+* 'title'         - title of the item
+* 'url'           - URL of the item
 *
 * 'excerpt' and 'description' may return the same value. Properties should be
 * returned in the order they are listed in $what. Properties that are not
@@ -1979,14 +1984,27 @@
 * Return false for errors (e.g. access denied, item does not exist, etc.).
 *
 */
-function PLG_getItemInfo ($type, $id, $what)
+function PLG_getItemInfo($type, $id, $what, $uid = 0, $options = array())
 {
-    $args[1] = $id;
-    $args[2] = $what;
+    if ($type == 'article') {
 
-    $function = 'plugin_getiteminfo_' . $type;
+        global $_CONF;
 
-    return PLG_callFunctionForOnePlugin ($function, $args);
+        require_once $_CONF['path_system'] . 'lib-story.php';
+
+        return STORY_getItemInfo($id, $what, $uid, $options);
+
+    } else {
+
+        $args[1] = $id;
+        $args[2] = $what;
+        $args[3] = $uid;
+        $args[4] = $options;
+
+        $function = 'plugin_getiteminfo_' . $type;
+
+        return PLG_callFunctionForOnePlugin($function, $args);
+    }
 }
 
 /**
diff -r 4422583786be -r 0d0c4bff08d5 system/lib-story.php
--- a/system/lib-story.php	Sun Dec 14 09:43:17 2008 +0100
+++ b/system/lib-story.php	Sat Dec 20 15:41:14 2008 +0100
@@ -692,59 +692,103 @@
 * This is the story equivalent of PLG_getItemInfo. See lib-plugins.php for
 * details.
 *
-* @param    string  $sid    story ID
-* @param    string  $what   comma-separated list of story properties
-* @return   mixed           string or array of strings with the information
+* @param    string  $sid        story ID or '*'
+* @param    string  $what       comma-separated list of story properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
+* @return   mixed               string or array of strings with the information
 *
 */
-function STORY_getItemInfo ($sid, $what)
+function STORY_getItemInfo($sid, $what, $uid = 0, $options = array())
 {
     global $_CONF, $_TABLES;
 
-    $properties = explode (',', $what);
-    $fields = array ();
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
     foreach ($properties as $p) {
         switch ($p) {
-            case 'description':
-                $fields[] = 'introtext';
-                $fields[] = 'bodytext';
-                break;
-            case 'excerpt':
-                $fields[] = 'introtext';
-                break;
-            case 'feed':
-                $fields[] = 'tid';
-                break;
-            case 'title':
-                $fields[] = 'title';
-                break;
-            default: // including 'url'
-                // nothing to do
-                break;
+        case 'date-created':
+            $fields[] = 'UNIX_TIMESTAMP(date) AS unixdate';
+            break;
+        case 'description':
+            $fields[] = 'introtext';
+            $fields[] = 'bodytext';
+            break;
+        case 'excerpt':
+            $fields[] = 'introtext';
+            break;
+        case 'feed':
+            $fields[] = 'tid';
+            break;
+        case 'id':
+            $fields[] = 'sid';
+            break;
+        case 'title':
+            $fields[] = 'title';
+            break;
+        case 'url':
+            if ($sid == '*') {
+                // in this case, we need the sid to build the URL
+                $fields[] = 'sid';
+            }
+            break;
+        default:
+            // nothing to do
+            break;
         }
     }
 
-    if (count ($fields) > 0) {
-        $result = DB_query ("SELECT " . implode (',', $fields)
-                    . " FROM {$_TABLES['stories']} WHERE sid = '$sid'"
-                    . COM_getPermSql ('AND') . COM_getTopicSql ('AND'));
-        $A = DB_fetchArray ($result);
-    } else {
-        $A = array ();
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
     }
 
-    $retval = array ();
-    foreach ($properties as $p) {
-        switch ($p) {
+    // prepare SQL request
+    if ($sid == '*') {
+        $where = '';
+        $permOp = 'WHERE';
+    } else {
+        $where = " WHERE sid = '$sid'";
+        $permOp = 'AND';
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSql($permOp, $uid)
+                 . COM_getTopicSql('AND', $uid);
+    } else {
+        $permSql = COM_getPermSql($permOp) . COM_getTopicSql('AND');
+    }
+    $sql = "SELECT " . implode(',', $fields)
+            . " FROM {$_TABLES['stories']}" . $where . $permSql;
+    if ($sid != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+            case 'date-created':
+                $props['date-created'] = $A['unixdate'];
+                break;
             case 'description':
-                $retval[] = trim (PLG_replaceTags (stripslashes ($A['introtext']) . ' ' . stripslashes ($A['bodytext'])));
+                $props['description'] = trim(PLG_replaceTags(stripslashes($A['introtext']) . ' ' . stripslashes($A['bodytext'])));
                 break;
             case 'excerpt':


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:32 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:32 -0500
Subject: [geeklog-cvs] geeklog: Implemented PLG_getItemInfo for the Static
	Pages plugin
Message-ID: <hg.b8bacdfde384.1229943092.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b8bacdfde384
changeset: 6570:b8bacdfde384
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Dec 20 16:30:35 2008 +0100
description:
Implemented PLG_getItemInfo for the Static Pages plugin

diffstat:

1 file changed, 141 insertions(+), 2 deletions(-)
plugins/staticpages/functions.inc |  143 ++++++++++++++++++++++++++++++++++++-

diffs (155 lines):

diff -r 0d0c4bff08d5 -r b8bacdfde384 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sat Dec 20 15:41:14 2008 +0100
+++ b/plugins/staticpages/functions.inc	Sat Dec 20 16:30:35 2008 +0100
@@ -1213,10 +1213,149 @@
 /**
  * Return true since this plugin supports webservices
  *
- * @return  bool	True, of webservices are supported
+ * @return  bool	True, if webservices are supported
  */
-function plugin_wsEnabled_staticpages() {
+function plugin_wsEnabled_staticpages()
+{
     return true;
 }
 
+/**
+* Return information for a static page
+*
+* @param    string  $sp_id      static page ID or '*'
+* @param    string  $what       comma-separated list of properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
+* @return   mixed               string or array of strings with the information
+*
+*/
+function plugin_getiteminfo_staticpages($sp_id, $what, $uid = 0, $options = array())
+{
+    global $_CONF, $_TABLES;
+
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
+    foreach ($properties as $p) {
+        switch ($p) {
+        case 'date-modified':
+            $fields[] = 'UNIX_TIMESTAMP(sp_date) AS unixdate';
+            break;
+        case 'description':
+        case 'excerpt':
+            $fields[] = 'sp_content';
+            $fields[] = 'sp_php';
+            break;
+        case 'id':
+            $fields[] = 'sp_id';
+            break;
+        case 'title':
+            $fields[] = 'sp_title';
+            break;
+        case 'url':
+            if ($sp_id == '*') {
+                // in this case, we need the sp_id to build the URL
+                $fields[] = 'sp_id';
+            }
+            break;
+        default:
+            // nothing to do
+            break;
+        }
+    }
+
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
+    }
+
+    // prepare SQL request
+    if ($sp_id == '*') {
+        $where = '';
+        $permOp = 'WHERE';
+    } else {
+        $where = " WHERE sp_id = '$sp_id'";
+        $permOp = 'AND';
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSql($permOp, $uid);
+    } else {
+        $permSql = COM_getPermSql($permOp);
+    }
+    $sql = "SELECT " . implode(',', $fields)
+            . " FROM {$_TABLES['staticpage']}" . $where . $permSql;
+    if ($sp_id != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+            case 'date-modified':
+                $props['date-modified'] = $A['unixdate'];
+                break;
+            case 'description':
+            case 'excerpt':
+                $props[$p] = SP_render_content(stripslashes($A['sp_content']),
+                                                            $A['sp_php']);
+                break;
+            case 'id':
+                $props['id'] = $A['sp_id'];
+                break;
+            case 'title':
+                $props['title'] = stripslashes($A['sp_title']);
+                break;
+            case 'url':
+                if (empty($A['sp_id'])) {
+                    $props['url'] = COM_buildUrl($_CONF['site_url']
+                            . '/staticpages/index.php?page=' . $sp_id);
+                } else {
+                    $props['url'] = COM_buildUrl($_CONF['site_url']
+                            . '/staticpages/index.php?page=' . $A['sp_id']);
+                }
+                break;
+            default:
+                // return empty string for unknown properties
+                $props[$p] = '';
+                break;
+            }
+        }
+
+        $mapped = array();
+        foreach ($props as $key => $value) {
+            if ($sp_id == '*') {
+                if ($value != '') {
+                    $mapped[$key] = $value;
+                }
+            } else {
+                $mapped[] = $value;
+            }
+        }
+
+        if ($sp_id == '*') {
+            $retval[] = $mapped;
+        } else {
+            $retval = $mapped;
+            break;
+        }
+    }
+
+    if (($sp_id != '*') && (count($retval) == 1)) {
+        $retval = $retval[0];
+    }
+
+    return $retval;
+}
+
 ?>


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:33 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:33 -0500
Subject: [geeklog-cvs] geeklog: Implemented PLG_getItemInfo for the Calendar
	plugin
Message-ID: <hg.b54a1c596ed1.1229943093.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b54a1c596ed1
changeset: 6571:b54a1c596ed1
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Dec 20 19:39:16 2008 +0100
description:
Implemented PLG_getItemInfo for the Calendar plugin

diffstat:

1 file changed, 131 insertions(+)
plugins/calendar/functions.inc |  131 ++++++++++++++++++++++++++++++++++++++++

diffs (139 lines):

diff -r b8bacdfde384 -r b54a1c596ed1 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sat Dec 20 16:30:35 2008 +0100
+++ b/plugins/calendar/functions.inc	Sat Dec 20 19:39:16 2008 +0100
@@ -1810,4 +1810,135 @@
     return $retval;
 }
 
+/**
+* Return information for an event
+*
+* @param    string  $eid        event ID or '*'
+* @param    string  $what       comma-separated list of properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
+* @return   mixed               string or array of strings with the information
+*
+*/
+function plugin_getiteminfo_calendar($eid, $what, $uid = 0, $options = array())
+{
+    global $_CONF, $_TABLES;
+
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
+    foreach ($properties as $p) {
+        switch ($p) {
+        // no date! we don't keep track of the _item's_ create/modify dates!
+        case 'description':
+        case 'excerpt':
+            $fields[] = 'description';
+            break;
+        case 'id':
+            $fields[] = 'eid';
+            break;
+        case 'title':
+            $fields[] = 'title';
+            break;
+        case 'url':
+            if ($eid == '*') {
+                // in this case, we need the eid to build the URL
+                $fields[] = 'eid';
+            }
+            break;
+        default:
+            // nothing to do
+            break;
+        }
+    }
+
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
+    }
+
+    // prepare SQL request
+    if ($eid == '*') {
+        $where = '';
+        $permOp = 'WHERE';
+    } else {
+        $where = " WHERE eid = '$eid'";
+        $permOp = 'AND';
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSql($permOp, $uid);
+    } else {
+        $permSql = COM_getPermSql($permOp);
+    }
+    $sql = "SELECT " . implode(',', $fields)
+            . " FROM {$_TABLES['events']}" . $where . $permSql;
+    if ($eid != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+            case 'description':
+            case 'excerpt':
+                $props[$p] = $A['description'];
+                break;
+            case 'id':
+                $props['id'] = $A['eid'];
+                break;
+            case 'title':
+                $props['title'] = stripslashes($A['title']);
+                break;
+            case 'url':
+                if (empty($A['eid'])) {
+                    $props['url'] = $_CONF['site_url'] . '/calendar/event.php?'
+                                  . 'eid=' . $eid;
+                } else {
+                    $props['url'] = $_CONF['site_url'] . '/calendar/event.php?'
+                                  . 'eid=' . $A['eid'];
+                }
+                break;
+            default:
+                // return empty string for unknown properties
+                $props[$p] = '';
+                break;
+            }
+        }
+
+        $mapped = array();
+        foreach ($props as $key => $value) {
+            if ($eid == '*') {
+                if ($value != '') {
+                    $mapped[$key] = $value;
+                }
+            } else {
+                $mapped[] = $value;
+            }
+        }
+
+        if ($eid == '*') {
+            $retval[] = $mapped;
+        } else {
+            $retval = $mapped;
+            break;
+        }
+    }
+
+    if (($eid != '*') && (count($retval) == 1)) {
+        $retval = $retval[0];
+    }
+
+    return $retval;
+}
+
 ?>


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:34 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:34 -0500
Subject: [geeklog-cvs] geeklog: Implemented PLG_getItemInfo for the Links
	plugin
Message-ID: <hg.67a914873db2.1229943094.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/67a914873db2
changeset: 6572:67a914873db2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 09:27:23 2008 +0100
description:
Implemented PLG_getItemInfo for the Links plugin

diffstat:

1 file changed, 137 insertions(+)
plugins/links/functions.inc |  137 +++++++++++++++++++++++++++++++++++++++++++

diffs (145 lines):

diff -r b54a1c596ed1 -r 67a914873db2 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sat Dec 20 19:39:16 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 09:27:23 2008 +0100
@@ -1442,4 +1442,141 @@
     return $retval;
 }
 
+/**
+* Return information for a link
+*
+* @param    string  $lid        link ID or '*'
+* @param    string  $what       comma-separated list of properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
+* @return   mixed               string or array of strings with the information
+*
+*/
+function plugin_getiteminfo_links($lid, $what, $uid = 0, $options = array())
+{
+    global $_CONF, $_TABLES;
+
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
+    foreach ($properties as $p) {
+        switch ($p) {
+        case 'date-modified':
+            $fields[] = 'UNIX_TIMESTAMP(date) AS unixdate';
+            break;
+        case 'description':
+        case 'excerpt':
+            $fields[] = 'description';
+            break;
+        case 'id':
+            $fields[] = 'lid';
+            break;
+        case 'title':
+            $fields[] = 'title';
+            break;
+        case 'url':
+            if ($lid == '*') {
+                // in this case, we need the lid to build the URL
+                $fields[] = 'lid';
+            }
+            break;
+        default:
+            // nothing to do
+            break;
+        }
+    }
+
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
+    }
+
+    // prepare SQL request
+    if ($lid == '*') {
+        $where = '';
+        $permOp = 'WHERE';
+    } else {
+        $where = " WHERE lid = '$lid'";
+        $permOp = 'AND';
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSql($permOp, $uid);
+    } else {
+        $permSql = COM_getPermSql($permOp);
+    }
+    $sql = "SELECT " . implode(',', $fields)
+            . " FROM {$_TABLES['links']}" . $where . $permSql;
+    if ($lid != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+            case 'date-modified':
+                $props['date-modified'] = $A['unixdate'];
+                break;
+            case 'description':
+            case 'excerpt':
+                $props[$p] = stripslashes($A['description']);
+                break;
+            case 'id':
+                $props['id'] = $A['lid'];
+                break;
+            case 'title':
+                $props['title'] = stripslashes($A['title']);
+                break;
+            case 'url':
+                if (empty($A['lid'])) {
+                    $props['url'] = COM_buildUrl($_CONF['site_url']
+                            . '/links/portal.php?what=link&amp;item=' . $lid);
+                } else {
+                    $props['url'] = COM_buildUrl($_CONF['site_url']
+                            . '/links/portal.php?what=link&amp;item='
+                            . $A['lid']);
+                }
+                break;
+            default:
+                // return empty string for unknown properties
+                $props[$p] = '';
+                break;
+            }
+        }
+
+        $mapped = array();
+        foreach ($props as $key => $value) {
+            if ($lid == '*') {
+                if ($value != '') {
+                    $mapped[$key] = $value;
+                }
+            } else {
+                $mapped[] = $value;
+            }
+        }
+
+        if ($lid == '*') {
+            $retval[] = $mapped;
+        } else {
+            $retval = $mapped;
+            break;
+        }
+    }
+
+    if (($lid != '*') && (count($retval) == 1)) {
+        $retval = $retval[0];
+    }
+
+    return $retval;
+}
+
 ?>


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:35 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:35 -0500
Subject: [geeklog-cvs] geeklog: Fixed STORY_getItemInfo - need to check the
	draft flag ...
Message-ID: <hg.675d4c3b5229.1229943095.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/675d4c3b5229
changeset: 6573:675d4c3b5229
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 09:37:59 2008 +0100
description:
Fixed STORY_getItemInfo - need to check the draft flag and for a publish date in the future

diffstat:

1 file changed, 5 insertions(+), 6 deletions(-)
system/lib-story.php |   11 +++++------

diffs (26 lines):

diff -r 67a914873db2 -r 675d4c3b5229 system/lib-story.php
--- a/system/lib-story.php	Sun Dec 21 09:27:23 2008 +0100
+++ b/system/lib-story.php	Sun Dec 21 09:37:59 2008 +0100
@@ -749,17 +749,16 @@
 
     // prepare SQL request
     if ($sid == '*') {
-        $where = '';
-        $permOp = 'WHERE';
+        $where = ' WHERE';
     } else {
-        $where = " WHERE sid = '$sid'";
-        $permOp = 'AND';
+        $where = " WHERE (sid = '$sid') AND";
     }
+    $where .= ' (draft_flag = 0) AND (date <= NOW())';
     if ($uid > 0) {
-        $permSql = COM_getPermSql($permOp, $uid)
+        $permSql = COM_getPermSql('AND', $uid)
                  . COM_getTopicSql('AND', $uid);
     } else {
-        $permSql = COM_getPermSql($permOp) . COM_getTopicSql('AND');
+        $permSql = COM_getPermSql('AND') . COM_getTopicSql('AND');
     }
     $sql = "SELECT " . implode(',', $fields)
             . " FROM {$_TABLES['stories']}" . $where . $permSql;


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:35 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:35 -0500
Subject: [geeklog-cvs] geeklog: Implemented PLG_getItemInfo for the Polls
	plugin
Message-ID: <hg.cc8e9fd9ef90.1229943095.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/cc8e9fd9ef90
changeset: 6574:cc8e9fd9ef90
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 10:00:36 2008 +0100
description:
Implemented PLG_getItemInfo for the Polls plugin

diffstat:

1 file changed, 130 insertions(+)
plugins/polls/functions.inc |  130 +++++++++++++++++++++++++++++++++++++++++++

diffs (138 lines):

diff -r 675d4c3b5229 -r cc8e9fd9ef90 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Dec 21 09:37:59 2008 +0100
+++ b/plugins/polls/functions.inc	Sun Dec 21 10:00:36 2008 +0100
@@ -1121,4 +1121,134 @@
     return 3001;
 }
 
+/**
+* Return information for a poll
+*
+* @param    string  $pid        poll ID or '*'
+* @param    string  $what       comma-separated list of properties
+* @param    int     $uid        if > 0: only return items accessible by user
+* @param    array   $options    (reserved for future extensions)
+* @return   mixed               string or array of strings with the information
+*
+*/
+function plugin_getiteminfo_polls($pid, $what, $uid = 0, $options = array())
+{
+    global $_CONF, $_TABLES;
+
+    // parse $what to see what we need to pull from the database
+    $properties = explode(',', $what);
+    $fields = array();
+    foreach ($properties as $p) {
+        switch ($p) {
+        case 'date-modified':
+            $fields[] = 'UNIX_TIMESTAMP(date) AS unixdate';
+            break;
+        case 'id':
+            $fields[] = 'pid';
+            break;
+        case 'title':
+            $fields[] = 'topic';
+            break;
+        case 'url':
+            if ($pid == '*') {
+                // in this case, we need the pid to build the URL
+                $fields[] = 'pid';
+            }
+            break;
+        default:
+            // nothing to do
+            break;
+        }
+    }
+
+    $fields = array_unique($fields);
+
+    if (count($fields) == 0) {
+        $retval = array();
+
+        return $retval;
+    }
+
+    // prepare SQL request
+    if ($pid == '*') {
+        $where = '';
+        $permOp = 'WHERE';
+    } else {
+        $where = " WHERE pid = '$pid'";
+        $permOp = 'AND';
+    }
+    if ($uid > 0) {
+        $permSql = COM_getPermSql($permOp, $uid);
+    } else {
+        $permSql = COM_getPermSql($permOp);
+    }
+    $sql = "SELECT " . implode(',', $fields)
+            . " FROM {$_TABLES['polltopics']}" . $where . $permSql;
+    if ($pid != '*') {
+        $sql .= ' LIMIT 1';
+    }
+
+    $result = DB_query($sql);
+    $numRows = DB_numRows($result);
+
+    $retval = array();
+    for ($i = 0; $i < $numRows; $i++) {
+        $A = DB_fetchArray($result);
+
+        $props = array();
+        foreach ($properties as $p) {
+            switch ($p) {
+            case 'date-modified':
+                $props['date-modified'] = $A['unixdate'];
+                break;
+            case 'id':
+                $props['id'] = $A['pid'];
+                break;
+            case 'title':
+                $props['title'] = $A['topic'];
+                break;
+            case 'url':
+                if (empty($A['pid'])) {
+                    $props['url'] = $_CONF['site_url']
+                                  . '/polls/index.php?pid=' . $pid
+                                  . '&amp;aid=-1';
+                } else {
+                    $props['url'] = $_CONF['site_url']
+                                  . '/polls/index.php?pid=' . $A['pid']
+                                  . '&amp;aid=-1';
+                }
+                break;
+            default:
+                // return empty string for unknown properties
+                $props[$p] = '';
+                break;
+            }
+        }
+
+        $mapped = array();
+        foreach ($props as $key => $value) {
+            if ($pid == '*') {
+                if ($value != '') {
+                    $mapped[$key] = $value;
+                }
+            } else {
+                $mapped[] = $value;
+            }
+        }
+
+        if ($pid == '*') {
+            $retval[] = $mapped;
+        } else {
+            $retval = $mapped;
+            break;
+        }
+    }
+
+    if (($pid != '*') && (count($retval) == 1)) {
+        $retval = $retval[0];
+    }
+
+    return $retval;
+}
+
 ?>


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:37 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:37 -0500
Subject: [geeklog-cvs] geeklog: addslashes can't hurt ...
Message-ID: <hg.95c24df5898d.1229943097.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/95c24df5898d
changeset: 6575:95c24df5898d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 10:06:37 2008 +0100
description:
addslashes can't hurt ...

diffstat:

5 files changed, 5 insertions(+), 5 deletions(-)
plugins/calendar/functions.inc    |    2 +-
plugins/links/functions.inc       |    2 +-
plugins/polls/functions.inc       |    2 +-
plugins/staticpages/functions.inc |    2 +-
system/lib-story.php              |    2 +-

diffs (60 lines):

diff -r cc8e9fd9ef90 -r 95c24df5898d plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Dec 21 10:00:36 2008 +0100
+++ b/plugins/calendar/functions.inc	Sun Dec 21 10:06:37 2008 +0100
@@ -1865,7 +1865,7 @@
         $where = '';
         $permOp = 'WHERE';
     } else {
-        $where = " WHERE eid = '$eid'";
+        $where = " WHERE eid = '" . addslashes($eid) . "'";
         $permOp = 'AND';
     }
     if ($uid > 0) {
diff -r cc8e9fd9ef90 -r 95c24df5898d plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 10:00:36 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 10:06:37 2008 +0100
@@ -1499,7 +1499,7 @@
         $where = '';
         $permOp = 'WHERE';
     } else {
-        $where = " WHERE lid = '$lid'";
+        $where = " WHERE lid = '" . addslashes($lid) . "'";
         $permOp = 'AND';
     }
     if ($uid > 0) {
diff -r cc8e9fd9ef90 -r 95c24df5898d plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Dec 21 10:00:36 2008 +0100
+++ b/plugins/polls/functions.inc	Sun Dec 21 10:06:37 2008 +0100
@@ -1174,7 +1174,7 @@
         $where = '';
         $permOp = 'WHERE';
     } else {
-        $where = " WHERE pid = '$pid'";
+        $where = " WHERE pid = '" . addslashes($pid) . "'";
         $permOp = 'AND';
     }
     if ($uid > 0) {
diff -r cc8e9fd9ef90 -r 95c24df5898d plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Dec 21 10:00:36 2008 +0100
+++ b/plugins/staticpages/functions.inc	Sun Dec 21 10:06:37 2008 +0100
@@ -1278,7 +1278,7 @@
         $where = '';
         $permOp = 'WHERE';
     } else {
-        $where = " WHERE sp_id = '$sp_id'";
+        $where = " WHERE sp_id = '" . addslashes($sp_id) . "'";
         $permOp = 'AND';
     }
     if ($uid > 0) {
diff -r cc8e9fd9ef90 -r 95c24df5898d system/lib-story.php
--- a/system/lib-story.php	Sun Dec 21 10:00:36 2008 +0100
+++ b/system/lib-story.php	Sun Dec 21 10:06:37 2008 +0100
@@ -751,7 +751,7 @@
     if ($sid == '*') {
         $where = ' WHERE';
     } else {
-        $where = " WHERE (sid = '$sid') AND";
+        $where = " WHERE (sid = '" . addslashes($sid) . "') AND";
     }
     $where .= ' (draft_flag = 0) AND (date <= NOW())';
     if ($uid > 0) {


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:38 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:38 -0500
Subject: [geeklog-cvs] geeklog: Fixed wrong use of COM_isAnonUser in
	COM_getPermSQL (si...
Message-ID: <hg.7c7b50e5a41f.1229943098.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c7b50e5a41f
changeset: 6576:7c7b50e5a41f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 12:28:09 2008 +0100
description:
Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since Geeklog 1.5.0)

diffstat:

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

diffs (23 lines):

diff -r 95c24df5898d -r 7c7b50e5a41f public_html/docs/history
--- a/public_html/docs/history	Sun Dec 21 10:06:37 2008 +0100
+++ b/public_html/docs/history	Sun Dec 21 12:28:09 2008 +0100
@@ -3,6 +3,7 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
 - When calling COM_getYearFormOptions with a $startoffset parameter, the list
   of years was off by one (bug #0000783; patch provided by hiroron)
 - Fixed updating feeds after changing topic permissions (bug #0000779) [Dirk]
diff -r 95c24df5898d -r 7c7b50e5a41f public_html/lib-common.php
--- a/public_html/lib-common.php	Sun Dec 21 10:06:37 2008 +0100
+++ b/public_html/lib-common.php	Sun Dec 21 12:28:09 2008 +0100
@@ -5385,7 +5385,7 @@
     }
 
     $UserGroups = array();
-    if( COM_isAnonUser() || ( $uid == $_USER['uid'] ))
+    if(( empty( $_USER['uid'] ) && ( $uid == 1 )) || ( $uid == $_USER['uid'] ))
     {
         if( empty( $_GROUPS ))
         {


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:40 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:40 -0500
Subject: [geeklog-cvs] geeklog: Introduced function LINKS_getCategorySQL and
	fixed visi...
Message-ID: <hg.529a538dbb47.1229943100.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/529a538dbb47
changeset: 6577:529a538dbb47
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 13:46:59 2008 +0100
description:
Introduced function LINKS_getCategorySQL and fixed visibility of link categories in the Top 10 Links list and site statistics

diffstat:

3 files changed, 87 insertions(+), 11 deletions(-)
plugins/links/functions.inc |   92 ++++++++++++++++++++++++++++++++++++++-----
public_html/docs/history    |    4 +
public_html/links/index.php |    2 

diffs (165 lines):

diff -r 7c7b50e5a41f -r 529a538dbb47 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 12:28:09 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 13:46:59 2008 +0100
@@ -220,19 +220,19 @@
 * @return   array(number of links, number of clicks);
 *
 */
-function LINKS_countLinksAndClicks ()
+function LINKS_countLinksAndClicks()
 {
     global $_TABLES;
 
-    $result = DB_query ("SELECT COUNT(*) AS count,SUM(hits) AS clicks FROM {$_TABLES['links']}" . COM_getPermSQL ());
-    $A = DB_fetchArray ($result);
+    $result = DB_query("SELECT COUNT(*) AS count,SUM(hits) AS clicks FROM {$_TABLES['links']}" . COM_getPermSQL() . LINKS_getCategorySQL('AND'));
+    $A = DB_fetchArray($result);
     $total_links = $A['count'];
     $total_clicks = $A['clicks'];
-    if (empty ($total_clicks)) {
+    if (empty($total_clicks)) {
         $total_clicks = 0;
     }
 
-    return array ($total_links, $total_clicks);
+    return array($total_links, $total_clicks);
 }
 
 /**
@@ -248,11 +248,11 @@
 {
     global $_CONF, $_TABLES, $LANG_LINKS_STATS;
 
-    require_once ($_CONF['path_system'] . 'lib-admin.php');
+    require_once $_CONF['path_system'] . 'lib-admin.php';
 
     $retval = '';
 
-    $result = DB_query ("SELECT lid,url,title,hits FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
+    $result = DB_query("SELECT lid,url,title,hits FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL('AND') . LINKS_getCategorySQL('AND') . " ORDER BY hits DESC LIMIT 10");
     $nrows  = DB_numRows ($result);
     if ($nrows > 0) {
         $header_arr = array(
@@ -1503,9 +1503,10 @@
         $permOp = 'AND';
     }
     if ($uid > 0) {
-        $permSql = COM_getPermSql($permOp, $uid);
+        $permSql = COM_getPermSql($permOp, $uid)
+                 . LINKS_getCategorySQL('AND', $uid);
     } else {
-        $permSql = COM_getPermSql($permOp);
+        $permSql = COM_getPermSql($permOp) . LINKS_getCategorySQL('AND');
     }
     $sql = "SELECT " . implode(',', $fields)
             . " FROM {$_TABLES['links']}" . $where . $permSql;
@@ -1579,4 +1580,77 @@
     return $retval;
 }
 
+/**
+* Return SQL expression to check for allowed categories.
+*
+* Creates part of an SQL expression that can be used to only request links
+* from categories to which the user has access to.
+*
+* Note that this function does SQL requests, so you should cache
+* the resulting SQL expression if you need it more than once.
+*
+* @param    string  $type   part of the SQL expr. e.g. 'WHERE', 'AND'
+* @param    int     $u_id   user id or 0 = current user
+* @param    string  $table  table name if ambiguous (e.g. in JOINs)
+* @return   string          SQL expression string (may be empty)
+* @see      COM_getTopicSQL
+*
+*/
+function LINKS_getCategorySQL($type = 'WHERE', $u_id = 0, $table = '')
+{
+    global $_TABLES, $_USER, $_GROUPS;
+
+    $categorysql = ' ' . $type . ' ';
+
+    if (!empty($table)) {
+        $table .= '.';
+    }
+
+    $UserGroups = array();
+    if (($u_id <= 0) || (isset($_USER['uid']) && ($u_id == $_USER['uid']))) {
+        if (!COM_isAnonUser()) {
+            $uid = $_USER['uid'];
+        } else {
+            $uid = 1;
+        }
+        $UserGroups = $_GROUPS;
+    } else {
+        $uid = $u_id;
+        $UserGroups = SEC_getUserGroups($uid);
+    }
+
+    if (empty($UserGroups)) {
+        // this shouldn't really happen, but if it does, handle user
+        // like an anonymous user
+        $uid = 1;
+    }
+
+    if (SEC_inGroup('Root', $uid)) {
+        return '';
+    }
+
+    $parents = array('root');
+    $cids = array();
+
+    do {
+        $result = DB_query("SELECT cid FROM {$_TABLES['linkcategories']}"
+                           . COM_getPermSQL('WHERE', $uid) . " AND pid IN ('"
+                           . implode("','", $parents) . "')");
+
+        $parents = array();
+        while ($C = DB_fetchArray($result)) {
+            $parents[] = $C['cid'];
+            $cids[] = $C['cid'];
+        }
+    } while (count($parents) > 0);
+
+    if (count($cids) > 0) {
+        $categorysql .= "({$table}cid IN ('" . implode("','", $cids) . "'))";
+    } else {
+        $categorysql .= '0';
+    }
+
+    return $categorysql;
+}
+
 ?>
diff -r 7c7b50e5a41f -r 529a538dbb47 public_html/docs/history
--- a/public_html/docs/history	Sun Dec 21 12:28:09 2008 +0100
+++ b/public_html/docs/history	Sun Dec 21 13:46:59 2008 +0100
@@ -1,6 +1,6 @@
 Geeklog History/Changes:
 
-??? ??, 2008 (1.5.2)
+??? ??, 2009 (1.6.0)
 ------------
 
 - Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
@@ -77,6 +77,8 @@
 
 Links plugin
 ------------
+- Introduced function LINKS_getCategorySQL and fixed visibility of link
+  categories in the Top 10 Links list and site statistics [Dirk]
 - Added an option to allow opening external links in a new window (feature
   request #0000693). Use with care, please [Dirk]
 - Only external links are marked with class="ext-link" [Dirk]
diff -r 7c7b50e5a41f -r 529a538dbb47 public_html/links/index.php
--- a/public_html/links/index.php	Sun Dec 21 12:28:09 2008 +0100
+++ b/public_html/links/index.php	Sun Dec 21 13:46:59 2008 +0100
@@ -267,7 +267,7 @@
 
     if ($nrows == 0) {
         if (($cid == $_LI_CONF['root']) && ($page <= 1) && $_LI_CONF['show_top10']) {
-            $result = DB_query ("SELECT lid,url,title,description,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
+            $result = DB_query("SELECT lid,url,title,description,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL('AND') . LINKS_getCategorySQL('AND') . " ORDER BY hits DESC LIMIT 10");
             $nrows  = DB_numRows ($result);
             if ($nrows > 0) {
                 $linklist->set_var ('link_details', '');


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:40 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:40 -0500
Subject: [geeklog-cvs] geeklog: Updated documentation and parameter
	description
Message-ID: <hg.9e7938c5ba84.1229943100.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9e7938c5ba84
changeset: 6578:9e7938c5ba84
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 16:26:28 2008 +0100
description:
Updated documentation and parameter description

diffstat:

7 files changed, 17 insertions(+), 18 deletions(-)
plugins/calendar/functions.inc    |    4 +---
plugins/links/functions.inc       |    4 +---
plugins/polls/functions.inc       |    4 +---
plugins/staticpages/functions.inc |    4 +---
public_html/docs/history          |   11 +++++++++++
system/lib-plugins.php            |    4 +---
system/lib-story.php              |    4 +---

diffs (179 lines):

diff -r 529a538dbb47 -r 9e7938c5ba84 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc	Sun Dec 21 13:46:59 2008 +0100
+++ b/plugins/calendar/functions.inc	Sun Dec 21 16:26:28 2008 +0100
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.95 2008/09/21 08:37:07 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -1815,7 +1813,7 @@
 *
 * @param    string  $eid        event ID or '*'
 * @param    string  $what       comma-separated list of properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
diff -r 529a538dbb47 -r 9e7938c5ba84 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 13:46:59 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 16:26:28 2008 +0100
@@ -35,8 +35,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.111 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -1447,7 +1445,7 @@
 *
 * @param    string  $lid        link ID or '*'
 * @param    string  $what       comma-separated list of properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
diff -r 529a538dbb47 -r 9e7938c5ba84 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Sun Dec 21 13:46:59 2008 +0100
+++ b/plugins/polls/functions.inc	Sun Dec 21 16:26:28 2008 +0100
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.92 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -1126,7 +1124,7 @@
 *
 * @param    string  $pid        poll ID or '*'
 * @param    string  $what       comma-separated list of properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
diff -r 529a538dbb47 -r 9e7938c5ba84 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Sun Dec 21 13:46:59 2008 +0100
+++ b/plugins/staticpages/functions.inc	Sun Dec 21 16:26:28 2008 +0100
@@ -33,8 +33,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.127 2008/09/21 08:37:08 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
     die('This file can not be used on its own.');
@@ -1225,7 +1223,7 @@
 *
 * @param    string  $sp_id      static page ID or '*'
 * @param    string  $what       comma-separated list of properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
diff -r 529a538dbb47 -r 9e7938c5ba84 public_html/docs/history
--- a/public_html/docs/history	Sun Dec 21 13:46:59 2008 +0100
+++ b/public_html/docs/history	Sun Dec 21 16:26:28 2008 +0100
@@ -3,6 +3,7 @@
 ??? ??, 2009 (1.6.0)
 ------------
 
+- Implemented extended API for PLG_getItemInfo [mystral-kk, Dirk]
 - Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
 - When calling COM_getYearFormOptions with a $startoffset parameter, the list
   of years was off by one (bug #0000783; patch provided by hiroron)
@@ -73,10 +74,12 @@
 
 Calendar plugin
 ---------------
+- Added support for PLG_getItemInfo [Dirk]
 - Make {event_url} available in eventdetails.thtml [Dirk]
 
 Links plugin
 ------------
+- Added support for PLG_getItemInfo [Dirk]
 - Introduced function LINKS_getCategorySQL and fixed visibility of link
   categories in the Top 10 Links list and site statistics [Dirk]
 - Added an option to allow opening external links in a new window (feature
@@ -87,6 +90,7 @@
 
 Polls plugin
 ------------
+- Added support for PLG_getItemInfo [Dirk]
 - Extended length of poll IDs to 40 characters (feature request #0000754) [Dirk]
 - Fixed SQL error when poll questions contained single quotes (bug #0000756)
   [Dirk]
@@ -94,6 +98,7 @@
 
 Static Pages plugin
 -------------------
+- Added support for PLG_getItemInfo [Dirk]
 - The owner of a static page changed to the user who last edited it
   (bug #0000777) [Dirk]
 - The printable.thtml template file uses the HTML Strict doctype and print.css
@@ -102,6 +107,12 @@
   (found by Marc Maier) [Dirk]
 - Display "successfully saved" and "successfully deleted" messages, just like
   every other plugin and built-in function does (bug #0000644) [Dirk]
+
+
+Jan ??, 2009 (1.5.2)
+------------
+
+(TBD)
 
 
 Sep 22, 2008 (1.5.1)
diff -r 529a538dbb47 -r 9e7938c5ba84 system/lib-plugins.php
--- a/system/lib-plugins.php	Sun Dec 21 13:46:59 2008 +0100
+++ b/system/lib-plugins.php	Sun Dec 21 16:26:28 2008 +0100
@@ -30,8 +30,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-plugins.php,v 1.150 2008/09/21 08:37:11 dhaun Exp $
 
 /**
 * This is the plugin library for Geeklog.  This is the API that plugins can
@@ -1965,7 +1963,7 @@
 * @param    string  $type       plugin type (incl. 'article' for stories)
 * @param    string  $id         ID of an item under the plugin's control or '*'
 * @param    string  $what       comma-separated list of item properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *
diff -r 529a538dbb47 -r 9e7938c5ba84 system/lib-story.php
--- a/system/lib-story.php	Sun Dec 21 13:46:59 2008 +0100
+++ b/system/lib-story.php	Sun Dec 21 16:26:28 2008 +0100
@@ -32,8 +32,6 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: lib-story.php,v 1.133 2008/09/21 08:37:12 dhaun Exp $
 
 if (strpos(strtolower($_SERVER['PHP_SELF']), 'lib-story.php') !== false) {
     die('This file can not be used on its own!');
@@ -694,7 +692,7 @@
 *
 * @param    string  $sid        story ID or '*'
 * @param    string  $what       comma-separated list of story properties
-* @param    int     $uid        if > 0: only return items accessible by user
+* @param    int     $uid        user ID or 0 = current user
 * @param    array   $options    (reserved for future extensions)
 * @return   mixed               string or array of strings with the information
 *


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:41 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:41 -0500
Subject: [geeklog-cvs] geeklog: Fixed visibility of links in What's New block
Message-ID: <hg.9f698f138492.1229943101.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9f698f138492
changeset: 6579:9f698f138492
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 16:30:40 2008 +0100
description:
Fixed visibility of links in What's New block

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
plugins/links/functions.inc |    2 +-

diffs (12 lines):

diff -r 9e7938c5ba84 -r 9f698f138492 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 16:26:28 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 16:30:40 2008 +0100
@@ -124,7 +124,7 @@
     $retval = '';
 
     // Get newest links
-    $sql = "SELECT lid,title FROM {$_TABLES['links']} WHERE (date >= (DATE_SUB(NOW(), INTERVAL {$_LI_CONF['newlinksinterval']} SECOND)))" . COM_getPermSQL( 'AND' ) . ' ORDER BY date DESC LIMIT 15';
+    $sql = "SELECT lid,title FROM {$_TABLES['links']} WHERE (date >= (DATE_SUB(NOW(), INTERVAL {$_LI_CONF['newlinksinterval']} SECOND)))" . COM_getPermSQL('AND') . LINKS_getCategorySQL('AND') . ' ORDER BY date DESC LIMIT 15';
     $result = DB_query($sql);
     $nrows = DB_numRows($result);
 


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 05:51:43 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 05:51:43 -0500
Subject: [geeklog-cvs] geeklog: Fixed Links search
Message-ID: <hg.22c2a7257ee6.1229943103.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/22c2a7257ee6
changeset: 6580:22c2a7257ee6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 18:39:25 2008 +0100
description:
Fixed Links search

diffstat:

1 file changed, 11 insertions(+), 11 deletions(-)
plugins/links/functions.inc |   22 +++++++++++-----------

diffs (64 lines):

diff -r 9f698f138492 -r 22c2a7257ee6 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 16:30:40 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 18:39:25 2008 +0100
@@ -361,13 +361,13 @@
 
     // link search
     $select = 'SELECT lid,title,url,owner_id,hits,UNIX_TIMESTAMP(date) AS day';
-    $sql = " FROM {$_TABLES['links']} WHERE date <> 1 ";
+    $sql = " FROM {$_TABLES['links']} WHERE date <> 1";
 
     if (!empty ($query)) {
         if ($keyType == 'phrase') {
             $mysearchterm = addslashes ($query);
-            $sql .= " AND (description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%')";
+            $sql .= " AND ((description LIKE '%$mysearchterm%')"
+                 . " OR (title LIKE '%$mysearchterm%'))";
         } else if ($keyType == 'all') {
             $mywords = explode (' ', $query);
             $sql .= ' AND (';
@@ -375,8 +375,8 @@
             foreach ($mywords AS $mysearchterm) {
                 $mysearchterm = addslashes (trim ($mysearchterm));
                 if (!empty ($mysearchterm)) {
-                    $tmp .= "(description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%') AND ";
+                    $tmp .= "((description LIKE '%$mysearchterm%')"
+                         . " OR (title LIKE '%$mysearchterm%')) AND ";
                 }
             }
             $tmp = substr ($tmp, 0, strlen ($tmp) - 5);
@@ -388,16 +388,16 @@
             foreach ($mywords AS $mysearchterm) {
                 $mysearchterm = addslashes (trim ($mysearchterm));
                 if (!empty ($mysearchterm)) {
-                    $tmp .= "(description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%') OR ";
+                    $tmp .= "((description LIKE '%$mysearchterm%')"
+                         . " OR (title LIKE '%$mysearchterm%')) OR ";
                 }
             }
             $tmp = substr ($tmp, 0, strlen ($tmp) - 4);
             $sql .= $tmp . ')';
         } else {  // quick search
             $mysearchterm = addslashes ($query);
-            $sql .= " AND (description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%')";
+            $sql .= " AND ((description LIKE '%$mysearchterm%')"
+                 . " OR (title LIKE '%$mysearchterm%'))";
         }
     }
 
@@ -413,9 +413,9 @@
     }
 
     if (!empty ($author)) {
-        $sql .= "AND (owner_id = '$author')";
+        $sql .= " AND (owner_id = '$author')";
     }
-    $sql .= COM_getPermSQL ('AND');
+    $sql .= COM_getPermSQL('AND') . LINKS_getCategorySQL('AND');
     $sql .= ' GROUP BY date, lid, cid, url, description, title, hits, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon ORDER BY date DESC';
     $l = ($perpage * $page) - $perpage;
     $sql .= ' LIMIT ' . $l . ',' . $perpage;


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 06:01:29 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 06:01:29 -0500
Subject: [geeklog-cvs] geeklog: Fixed wrong use of COM_isAnonUser in
	COM_getPermSQL (si...
Message-ID: <hg.67afff11b45f.1229943689.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/67afff11b45f
changeset: 6581:67afff11b45f
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 12:28:09 2008 +0100
description:
Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since Geeklog 1.5.0)

diffstat:

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

diffs (23 lines):

diff -r 34a340e909f3 -r 67afff11b45f public_html/docs/history
--- a/public_html/docs/history	Mon Dec 15 10:09:27 2008 +0100
+++ b/public_html/docs/history	Sun Dec 21 12:28:09 2008 +0100
@@ -3,6 +3,7 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
 - When calling COM_getYearFormOptions with a $startoffset parameter, the list
   of years was off by one (bug #0000783; patch provided by hiroron)
 - Fixed updating feeds after changing topic permissions (bug #0000779) [Dirk]
diff -r 34a340e909f3 -r 67afff11b45f public_html/lib-common.php
--- a/public_html/lib-common.php	Mon Dec 15 10:09:27 2008 +0100
+++ b/public_html/lib-common.php	Sun Dec 21 12:28:09 2008 +0100
@@ -5385,7 +5385,7 @@
     }
 
     $UserGroups = array();
-    if( COM_isAnonUser() || ( $uid == $_USER['uid'] ))
+    if(( empty( $_USER['uid'] ) && ( $uid == 1 )) || ( $uid == $_USER['uid'] ))
     {
         if( empty( $_GROUPS ))
         {


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 06:01:30 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 06:01:30 -0500
Subject: [geeklog-cvs] geeklog: Fixed Links search
Message-ID: <hg.e402d4122df2.1229943690.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e402d4122df2
changeset: 6582:e402d4122df2
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Dec 21 18:39:25 2008 +0100
description:
Fixed Links search

diffstat:

1 file changed, 11 insertions(+), 11 deletions(-)
plugins/links/functions.inc |   22 +++++++++++-----------

diffs (64 lines):

diff -r 67afff11b45f -r e402d4122df2 plugins/links/functions.inc
--- a/plugins/links/functions.inc	Sun Dec 21 12:28:09 2008 +0100
+++ b/plugins/links/functions.inc	Sun Dec 21 18:39:25 2008 +0100
@@ -363,13 +363,13 @@
 
     // link search
     $select = 'SELECT lid,title,url,owner_id,hits,UNIX_TIMESTAMP(date) AS day';
-    $sql = " FROM {$_TABLES['links']} WHERE date <> 1 ";
+    $sql = " FROM {$_TABLES['links']} WHERE date <> 1";
 
     if (!empty ($query)) {
         if ($keyType == 'phrase') {
             $mysearchterm = addslashes ($query);
-            $sql .= " AND (description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%')";
+            $sql .= " AND ((description LIKE '%$mysearchterm%')"
+                 . " OR (title LIKE '%$mysearchterm%'))";
         } else if ($keyType == 'all') {
             $mywords = explode (' ', $query);
             $sql .= ' AND (';
@@ -377,8 +377,8 @@
             foreach ($mywords AS $mysearchterm) {
                 $mysearchterm = addslashes (trim ($mysearchterm));
                 if (!empty ($mysearchterm)) {
-                    $tmp .= "(description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%') AND ";
+                    $tmp .= "((description LIKE '%$mysearchterm%')"
+                         . " OR (title LIKE '%$mysearchterm%')) AND ";
                 }
             }
             $tmp = substr ($tmp, 0, strlen ($tmp) - 5);
@@ -390,16 +390,16 @@
             foreach ($mywords AS $mysearchterm) {
                 $mysearchterm = addslashes (trim ($mysearchterm));
                 if (!empty ($mysearchterm)) {
-                    $tmp .= "(description LIKE '%$mysearchterm%')"
-                         . " OR (title LIKE '%$mysearchterm%') OR ";
+                    $tmp .= "((description LIKE '%$mysearchterm%')"
+                         . " OR (title LIKE '%$mysearchterm%')) OR ";
                 }
             }
             $tmp = substr ($tmp, 0, strlen ($tmp) - 4);
             $sql .= $tmp . ')';
         } else {  // quick search
             $mysearchterm = addslashes ($query);
-            $sql .= " AND (description LIKE '%$mysearchterm%')"
-                 . " OR (title LIKE '%$mysearchterm%')";
+            $sql .= " AND ((description LIKE '%$mysearchterm%')"
+                 . " OR (title LIKE '%$mysearchterm%'))";
         }
     }
 
@@ -415,9 +415,9 @@
     }
 
     if (!empty ($author)) {
-        $sql .= "AND (owner_id = '$author')";
+        $sql .= " AND (owner_id = '$author')";
     }
-    $sql .= COM_getPermSQL ('AND');
+    $sql .= COM_getPermSQL('AND');
     $sql .= ' GROUP BY date, lid, cid, url, description, title, hits, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon ORDER BY date DESC';
     $l = ($perpage * $page) - $perpage;
     $sql .= ' LIMIT ' . $l . ',' . $perpage;


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 06:01:33 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 06:01:33 -0500
Subject: [geeklog-cvs] geeklog: Fixed STORY_getItemInfo - need to check the
	draft flag ...
Message-ID: <hg.d68e45650544.1229943693.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/d68e45650544
changeset: 6583:d68e45650544
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 22 12:00:58 2008 +0100
description:
Fixed STORY_getItemInfo - need to check the draft flag and for a publish date in the future

diffstat:

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

diffs (31 lines):

diff -r e402d4122df2 -r d68e45650544 public_html/docs/history
--- a/public_html/docs/history	Sun Dec 21 18:39:25 2008 +0100
+++ b/public_html/docs/history	Mon Dec 22 12:00:58 2008 +0100
@@ -4,6 +4,8 @@
 ------------
 
 - Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
+- Fixed STORY_getItemInfo - need to check the draft flag and for a publish date
+  in the future [mystral-kk, Dirk]
 - When calling COM_getYearFormOptions with a $startoffset parameter, the list
   of years was off by one (bug #0000783; patch provided by hiroron)
 - Fixed updating feeds after changing topic permissions (bug #0000779) [Dirk]
@@ -64,6 +66,7 @@
 
 Links plugin
 ------------
+- Missing parentheses my have resulted in incorrect search results [Dirk]
 - Added urlencoded versions of {link_actual_url} and {link_name} [Dirk]
 - Prevent overwriting existing links when changing the link ID [Dirk]
 
diff -r e402d4122df2 -r d68e45650544 system/lib-story.php
--- a/system/lib-story.php	Sun Dec 21 18:39:25 2008 +0100
+++ b/system/lib-story.php	Mon Dec 22 12:00:58 2008 +0100
@@ -727,6 +727,7 @@
     if (count ($fields) > 0) {
         $result = DB_query ("SELECT " . implode (',', $fields)
                     . " FROM {$_TABLES['stories']} WHERE sid = '$sid'"
+                    . ' AND (draft_flag = 0) AND (date <= NOW())';
                     . COM_getPermSql ('AND') . COM_getTopicSql ('AND'));
         $A = DB_fetchArray ($result);
     } else {


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 09:19:28 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 09:19:28 -0500
Subject: [geeklog-cvs] geeklog: Admin lists allowed non-sortable columns to
	be sortable...
Message-ID: <hg.2638dcb8940d.1229955568.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2638dcb8940d
changeset: 6584:2638dcb8940d
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 22 15:11:36 2008 +0100
description:
Admin lists allowed non-sortable columns to be sortable (bug #0000791)

diffstat:

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

diffs (31 lines):

diff -r 22c2a7257ee6 -r 2638dcb8940d public_html/docs/history
--- a/public_html/docs/history	Sun Dec 21 18:39:25 2008 +0100
+++ b/public_html/docs/history	Mon Dec 22 15:11:36 2008 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.0)
 ------------
 
+- Admin lists allowed non-sortable columns to be sortable (reported and patch
+  provided by hiroron, bug #0000791)
 - Implemented extended API for PLG_getItemInfo [mystral-kk, Dirk]
 - Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
 - When calling COM_getYearFormOptions with a $startoffset parameter, the list
diff -r 22c2a7257ee6 -r 2638dcb8940d system/lib-admin.php
--- a/system/lib-admin.php	Sun Dec 21 18:39:25 2008 +0100
+++ b/system/lib-admin.php	Mon Dec 22 15:11:36 2008 +0100
@@ -372,13 +372,14 @@
     if (!empty ($order_for_query)) { # concat order string
         $order_sql = "ORDER BY $order_for_query $direction";
     }
-    $th_subtags = ''; // other tags in the th, such as onlick and mouseover
+    $th_subtags = ''; // other tags in the th, such as onclick and mouseover
     $header_text = ''; // title as displayed to the user
     // HEADER FIELDS array(text, field, sort, class)
     // this part defines the contents & format of the header fields
 
     for ($i=0; $i < count( $header_arr ); $i++) { #iterate through all headers
         $header_text = $header_arr[$i]['text'];
+        $th_subtags = '';
         if ($header_arr[$i]['sort'] != false) { # is this sortable?
             if ($order==$header_arr[$i]['field']) { # is this currently sorted?
                 $header_text .= $img_arrow;


From geeklog-cvs at lists.geeklog.net  Mon Dec 22 09:22:49 2008
From: geeklog-cvs at lists.geeklog.net (geeklog-cvs at lists.geeklog.net)
Date: Mon, 22 Dec 2008 09:22:49 -0500
Subject: [geeklog-cvs] geeklog: Admin lists allowed non-sortable columns to
	be sortable...
Message-ID: <hg.75f54388c20b.1229955769.1485632861@qs1489.pair.com>

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/75f54388c20b
changeset: 6585:75f54388c20b
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 22 15:22:36 2008 +0100
description:
Admin lists allowed non-sortable columns to be sortable (bug #0000791)

diffstat:

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

diffs (31 lines):

diff -r d68e45650544 -r 75f54388c20b public_html/docs/history
--- a/public_html/docs/history	Mon Dec 22 12:00:58 2008 +0100
+++ b/public_html/docs/history	Mon Dec 22 15:22:36 2008 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Admin lists allowed non-sortable columns to be sortable (reported and patch
+  provided by hiroron, bug #0000791)
 - Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
 - Fixed STORY_getItemInfo - need to check the draft flag and for a publish date
   in the future [mystral-kk, Dirk]
diff -r d68e45650544 -r 75f54388c20b system/lib-admin.php
--- a/system/lib-admin.php	Mon Dec 22 12:00:58 2008 +0100
+++ b/system/lib-admin.php	Mon Dec 22 15:22:36 2008 +0100
@@ -372,13 +372,14 @@
     if (!empty ($order_for_query)) { # concat order string
         $order_sql = "ORDER BY $order_for_query $direction";
     }
-    $th_subtags = ''; // other tags in the th, such as onlick and mouseover
+    $th_subtags = ''; // other tags in the th, such as onclick and mouseover
     $header_text = ''; // title as displayed to the user
     // HEADER FIELDS array(text, field, sort, class)
     // this part defines the contents & format of the header fields
 
     for ($i=0; $i < count( $header_arr ); $i++) { #iterate through all headers
         $header_text = $header_arr[$i]['text'];
+        $th_subtags = '';
         if ($header_arr[$i]['sort'] != false) { # is this sortable?
             if ($order==$header_arr[$i]['field']) { # is this currently sorted?
                 $header_text .= $img_arrow;