From geeklog-cvs-admin at lists.geeklog.net  Fri Aug  1 09:20:19 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 1 Aug 2003 08:20:19 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.49,1.50
Message-ID: <200308011320.h71DKJP21509@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory geeklog_prod:/tmp/cvs-serv21474/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Added missing global variables ... :embarrassed:


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** install.php	27 Jun 2003 09:27:04 -0000	1.49
--- install.php	1 Aug 2003 13:20:17 -0000	1.50
***************
*** 157,161 ****
  
  function INST_createDatabaseStructures() {
!     global $_CONF, $_DB_dbms, $_TABLES;
  
      // Because the create table syntax can vary from dbms-to-dbms we are
--- 157,161 ----
  
  function INST_createDatabaseStructures() {
!     global $_CONF, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass, $_TABLES;
  
      // Because the create table syntax can vary from dbms-to-dbms we are




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug  5 15:48:28 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 5 Aug 2003 14:48:28 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs install.html,1.18,1.19 themevars.html,1.3,1.4
Message-ID: <200308051948.h75JmSP10889@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv10872

Modified Files:
	install.html themevars.html 
Log Message:
Updated documentation


Index: install.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/install.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** install.html	16 Jul 2003 09:45:43 -0000	1.18
--- install.html	5 Aug 2003 19:48:26 -0000	1.19
***************
*** 470,474 ****
  						<div align="left">
  							<p>If you still have problems, please do one or more of the following:</p>
! 							<p>1) Go to <a href="http://www.geeklog.net">http://www.geeklog.net</a> and check out the Support section. The Support section includes a <a href="http://www.geeklog.net/staticpages/index.php?page=20011218115325696">FAQ</a> and a <a href="http://www.geeklog.net/search.php">search system</a> (try searching for the error message, if you get one).</p>
  							<p>2) Visit the mailing list archives at <a href="http://lists.geeklog.net/pipermail/geeklog-users/">http://lists.geeklog.net/pipermail/geeklog-users/</a>. You can also <a href="http://lists.geeklog.net/listinfo/geeklog-users">subscribe to the mailing list</a> and post your question to the Geeklog community.</p>
  							<p>3) Try the chat room at <b>irc.freenode.net, channel #geeklog</b>. Please have all your path information in config.php and lib-common.php readily available.</p>
--- 470,474 ----
  						<div align="left">
  							<p>If you still have problems, please do one or more of the following:</p>
! 							<p>1) Go to <a href="http://www.geeklog.net">http://www.geeklog.net</a> and check out the Support section. The Support section includes a <a href="http://www.geeklog.net/faqman/">FAQ</a> and a <a href="http://www.geeklog.net/search.php">search system</a> (try searching for the error message, if you get one).</p>
  							<p>2) Visit the mailing list archives at <a href="http://lists.geeklog.net/pipermail/geeklog-users/">http://lists.geeklog.net/pipermail/geeklog-users/</a>. You can also <a href="http://lists.geeklog.net/listinfo/geeklog-users">subscribe to the mailing list</a> and post your question to the Geeklog community.</p>
  							<p>3) Try the chat room at <b>irc.freenode.net, channel #geeklog</b>. Please have all your path information in config.php and lib-common.php readily available.</p>

Index: themevars.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/themevars.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** themevars.html	16 Jul 2003 09:45:43 -0000	1.3
--- themevars.html	5 Aug 2003 19:48:26 -0000	1.4
***************
*** 54,63 ****
      <th width="63%">Description</th></tr>
  <tr><td><code>site_url</code></td>
!     <td><tt>http://www.yoursite.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
          <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
          file).</td></tr>
  <tr><td><code>layout_url</code></td>
!     <td><tt>http://www.yoursite.com/layout/XSilver</tt></td>
      <td>The URL of the layout folder of the user's current theme.</td></tr>
  <tr><td><code>page_title</code></td>
--- 54,63 ----
      <th width="63%">Description</th></tr>
  <tr><td><code>site_url</code></td>
!     <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
          <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
          file).</td></tr>
  <tr><td><code>layout_url</code></td>
!     <td><tt>http://www.example.com/layout/XSilver</tt></td>
      <td>The URL of the layout folder of the user's current theme.</td></tr>
  <tr><td><code>page_title</code></td>
***************
*** 66,70 ****
          of the current story.</td></tr>
  <tr><td><code>background_image</code></td>
!     <td><tt>http://www.yoursite.com/layout/<br>XSilver/images/bg.gif</tt></td>
      <td>Points to a file named <tt>bg.gif</tt> in the <tt>images</tt> folder of
          the current theme, intended to be used as a background image.</td></tr>
--- 66,70 ----
          of the current story.</td></tr>
  <tr><td><code>background_image</code></td>
!     <td><tt>http://www.example.com/layout/<br>XSilver/images/bg.gif</tt></td>
      <td>Points to a file named <tt>bg.gif</tt> in the <tt>images</tt> folder of
          the current theme, intended to be used as a background image.</td></tr>
***************
*** 92,101 ****
          <code>$_CONF['date']</code>.</td></tr>
  <tr><td><code>site_logo</code></td>
!     <td><tt>http://www.yoursite.com/layout/<br>XSilver/images/logo.gif</tt></td>
      <td>Points to a file named <tt>logo.gif</tt> in the <tt>images</tt>
          directory of the current theme, intended to be used as the site's
          logo.</td></tr>
  <tr><td><code>css_url</code></td>
!     <td><tt>http://www.yoursite.com/layout/<br>XSilver/style.css</tt></td>
      <td>Points to the style sheet of the current theme.</td></tr>
  <tr><td><code>theme</code></td>
--- 92,101 ----
          <code>$_CONF['date']</code>.</td></tr>
  <tr><td><code>site_logo</code></td>
!     <td><tt>http://www.example.com/layout/<br>XSilver/images/logo.gif</tt></td>
      <td>Points to a file named <tt>logo.gif</tt> in the <tt>images</tt>
          directory of the current theme, intended to be used as the site's
          logo.</td></tr>
  <tr><td><code>css_url</code></td>
!     <td><tt>http://www.example.com/layout/<br>XSilver/style.css</tt></td>
      <td>Points to the style sheet of the current theme.</td></tr>
  <tr><td><code>theme</code></td>
***************
*** 105,108 ****
--- 105,118 ----
      <td>iso-8859-1</td>
      <td>The character set for the current language file.</td></tr>
+ <tr><td><code>rss_url</code></td>
+     <td><tt>http://www.example.com/backend/geeklog.rdf</tt></td>
+     <td>The URL of your site's RSS feed (identical to <code>{rdf_file}</code>.
+         This variable is also available in the site's
+         <tt>footer.thtml</tt>.</td></tr>
+ <tr><td><code>rdf_file</code></td>
+     <td><tt>http://www.example.com/backend/geeklog.rdf</tt></td>
+     <td>The URL of your site's RSS feed (identical to <code>{rss_url}</code>.
+         This variable is also available in the site's
+         <tt>footer.thtml</tt>.</td></tr>
  </table>
  
***************
*** 122,131 ****
      <th width="63%">Description</th></tr>
  <tr><td><code>site_url</code></td>
!     <td><tt>http://www.yoursite.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
          <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
          file).</td></tr>
  <tr><td><code>layout_url</code></td>
!     <td><tt>http://www.yoursite.com/layout/XSilver</tt></td>
      <td>The URL of the layout folder of the user's current theme.</td></tr>
  <tr><td><code>story_date</code></td>
--- 132,141 ----
      <th width="63%">Description</th></tr>
  <tr><td><code>site_url</code></td>
!     <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
          <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
          file).</td></tr>
  <tr><td><code>layout_url</code></td>
!     <td><tt>http://www.example.com/layout/XSilver</tt></td>
      <td>The URL of the layout folder of the user's current theme.</td></tr>
  <tr><td><code>story_date</code></td>
***************
*** 208,212 ****
      <th width="63%">Description</th></tr>
  <tr><td><code>comments_url</code></td>
!     <td><tt>http://www.yoursite.com/article.php<br>?story=20021022234959146#comments</tt></td>
      <td>URL of the comments section (when a story is displayed on a separate
          page).</td></tr>
--- 218,222 ----
      <th width="63%">Description</th></tr>
  <tr><td><code>comments_url</code></td>
!     <td><tt>http://www.example.com/article.php<br>?story=20021022234959146#comments</tt></td>
      <td>URL of the comments section (when a story is displayed on a separate
          page).</td></tr>
***************
*** 255,259 ****
          his/her full name, the user name is used instead.</td></tr>
  <tr><td><code>start_contributedby_anchortag</code></td>
!     <td><code>&lt;a class="storybyline" href="http://www.yoursite.com/<br>users.php?mode=profile&amp;uid=7"&gt;</code></td>
      <td>Opening tag for a link to the story author's profile (empty for
          anonymous authors).</td></tr>
--- 265,269 ----
          his/her full name, the user name is used instead.</td></tr>
  <tr><td><code>start_contributedby_anchortag</code></td>
!     <td><code>&lt;a class="storybyline" href="http://www.example.com/<br>users.php?mode=profile&amp;uid=7"&gt;</code></td>
      <td>Opening tag for a link to the story author's profile (empty for
          anonymous authors).</td></tr>
***************
*** 263,267 ****
          anonymous authors).</td></tr>
  <tr><td><code>contributedby_url</code></td>
!     <td><tt>http://www.yoursite.com/<br>users.php?mode=profile&amp;uid=7</tt></td>
      <td>Link to the story author's profile (empty for anonymous authors).</td></tr>
  <tr><td><code>contributedby_photo</code></td>
--- 273,277 ----
          anonymous authors).</td></tr>
  <tr><td><code>contributedby_url</code></td>
!     <td><tt>http://www.example.com/<br>users.php?mode=profile&amp;uid=7</tt></td>
      <td>Link to the story author's profile (empty for anonymous authors).</td></tr>
  <tr><td><code>contributedby_photo</code></td>
***************
*** 279,287 ****
      <th width="63%">Description</th></tr>
  <tr><td><code>story_anchortag_and_image</code></td>
!     <td><code>&lt;a href="http://www.yoursite.com/<br>index.php?topic=Geeklog"&gt;&lt;img src="..." ...&gt;&lt;/a&gt;</code> <small>(shortened)</small></td>
      <td>Topic icon for the story's topic, enclosed in a link to the site's 
          index page, sorted by topic.</td></tr>
  <tr><td><code>story_topic_image</code></td>
!     <td><code>&lt;img align="right" src="http://www.yoursite.com/<br>images/topics/topic_gl.gif" alt="Geeklog" title="Geeklog"&gt;</code></td>
      <td>Topic icon for the story.</td></tr>
  <tr><td><code>story_topic_id</code></td>
--- 289,297 ----
      <th width="63%">Description</th></tr>
  <tr><td><code>story_anchortag_and_image</code></td>
!     <td><code>&lt;a href="http://www.example.com/<br>index.php?topic=Geeklog"&gt;&lt;img src="..." ...&gt;&lt;/a&gt;</code> <small>(shortened)</small></td>
      <td>Topic icon for the story's topic, enclosed in a link to the site's 
          index page, sorted by topic.</td></tr>
  <tr><td><code>story_topic_image</code></td>
!     <td><code>&lt;img align="right" src="http://www.example.com/<br>images/topics/topic_gl.gif" alt="Geeklog" title="Geeklog"&gt;</code></td>
      <td>Topic icon for the story.</td></tr>
  <tr><td><code>story_topic_id</code></td>
***************
*** 292,296 ****
      <td>Topic name (as seen on the Sections block).</td></tr>
  <tr><td><code>story_topic_url</code></td>
!     <td><code>&lt;a href="http://www.yoursite.com/<br>index.php?topic=General"&gt;</code></td>
      <td>URL to your site's index page, so that only stories with the story's
          topic are displayed.</td></tr>
--- 302,306 ----
      <td>Topic name (as seen on the Sections block).</td></tr>
  <tr><td><code>story_topic_url</code></td>
!     <td><code>&lt;a href="http://www.example.com/<br>index.php?topic=General"&gt;</code></td>
      <td>URL to your site's index page, so that only stories with the story's
          topic are displayed.</td></tr>
***************
*** 308,312 ****
      <td>Link to open the story in the admin's story editor.</td></tr>
  <tr><td><code>edit_url</code></td>
!     <td><tt>http://www.yoursite.com/admin/story.php<br>?mode=edit&amp;sid=20021022234959146</tt></td>
      <td>URL to open the story in the admin's story editor</td></tr>
  <tr><td><code>lang_edit_text</code></td>
--- 318,322 ----
      <td>Link to open the story in the admin's story editor.</td></tr>
  <tr><td><code>edit_url</code></td>
!     <td><tt>http://www.example.com/admin/story.php<br>?mode=edit&amp;sid=20021022234959146</tt></td>
      <td>URL to open the story in the admin's story editor</td></tr>
  <tr><td><code>lang_edit_text</code></td>




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug  6 05:49:59 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 6 Aug 2003 04:49:59 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs install.html,1.19,1.20
Message-ID: <200308060949.h769nxP26343@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv26322

Modified Files:
	install.html 
Log Message:
Added complete error message for typical "mysql.class.php could not be found" error.


Index: install.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/install.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** install.html	5 Aug 2003 19:48:26 -0000	1.19
--- install.html	6 Aug 2003 09:49:56 -0000	1.20
***************
*** 325,332 ****
  <table width="95%" border="0" cellspacing="0" cellpadding="4"><tr>
  <td bgcolor="#ffedf2">
! <p><b>I get the following error:</b></p>
  <p><code>Warning: main(some/path/to/system/databases/mysql.class.php): failed to open stream: No such file or directory in /path/to/your/system/lib-database.php on line 110</code></p>
  </td></tr><tr><td>
! <p><small>(line number may vary)</small></p>
  <p><strong>Answer:</strong></p>
  <p>The path that you've entered for the <b>$_CONF['path']</b> variable in config.php is not correct. Make sure you typed it correctly. Also make sure it uses
--- 325,333 ----
  <table width="95%" border="0" cellspacing="0" cellpadding="4"><tr>
  <td bgcolor="#ffedf2">
! <p><b>I get the following errors:</b></p>
  <p><code>Warning: main(some/path/to/system/databases/mysql.class.php): failed to open stream: No such file or directory in /path/to/your/system/lib-database.php on line 110</code></p>
+ <p><code>Fatal error: main(): Failed opening required 'some/path/to/system/databases/mysql.class.php' (include_path='.:/some/other/path/') in /some/path/to/system/lib-database.php on line 110</code></p>
  </td></tr><tr><td>
! <p><small>(line numbers may vary)</small></p>
  <p><strong>Answer:</strong></p>
  <p>The path that you've entered for the <b>$_CONF['path']</b> variable in config.php is not correct. Make sure you typed it correctly. Also make sure it uses




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug  6 09:37:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 6 Aug 2003 08:37:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs install.html,1.20,1.21
Message-ID: <200308061337.h76DbvP30485@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv30462

Modified Files:
	install.html 
Log Message:
Added two more anchors for easy reference to common problems.


Index: install.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/install.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** install.html	6 Aug 2003 09:49:56 -0000	1.20
--- install.html	6 Aug 2003 13:37:55 -0000	1.21
***************
*** 427,430 ****
--- 427,431 ----
  	<td valign="top" bgcolor="#ffdbd5">
  		<div align="center">
+                         <a name="permission-denied"></a>
  			<table width="95%" border="0" cellspacing="0" cellpadding="4">
  				<tr>
***************
*** 446,451 ****
  				</tr>
  			</table>
! 			<br>
! 			<br>
  			<table width="95%" border="0" cellspacing="0" cellpadding="4">
  				<tr>
--- 447,452 ----
  				</tr>
  			</table>
! 			<a name="headers-already-sent"><br>
! 			<br></a>
  			<table width="95%" border="0" cellspacing="0" cellpadding="4">
  				<tr>




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug  6 09:42:24 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 6 Aug 2003 08:42:24 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.116,1.117
Message-ID: <200308061342.h76DgOP30646@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv30629

Modified Files:
	history 
Log Message:
Updated list of changes


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** history	17 Jul 2003 17:19:07 -0000	1.116
--- history	6 Aug 2003 13:42:22 -0000	1.117
***************
*** 1,4 ****
--- 1,50 ----
  GeekLog History/Changes:
  
+ - Display the search form again if the query returned no results.
+ - Make sure we're not attempting to send a Daily Digest email to Anonymous.
+ - Prevent admin from changing a user's email address to one that's already used
+   by someone else (bug #24). The error message you get when you try this may
+   be confusing, though ("The username you tried saving already exists.") since
+   I don't want to introduce new texts in the language file at this point. To
+   be corrected later.
+ - Fixed a problem with the cookie timeout: When a user edited his/her profile,
+   the cookie timeout defaulted to 1 hour, while the default in config.php was
+   usually much longer (default: 1 week). So after editing their profile for the
+   first time, users didn't stay logged in as long as before (unless they
+   noticed that and changed the cookie timeout accordingly themselves).
+ - Fixed problems in the install script when trying to find out the MySQL
+   version number.
+ - Fixed a problem collecting links for the What's Related block when the article
+   contained (uploaded) images.
+ - Words from a search query are now hightlighted in comments as well.
+ - You can now use variables {rss_url} and {rdf_file} in both the site header
+   and footer. Both variables hold the URL to the RSS feed.
+ - Fixed an occassional "call to member function of non-object" error message
+   in lib-plugins.php.
+ - Make sure the RSS feed and Older Stories block are updated when a story is
+   deleted.
+ - The language selection will only list files that end in .php and do not
+   start with a '.'.
+ - Fixed links to a user's comments from the Last 10 Comments block in the user
+   profile.
+ - Removed '&query=' from links in search results if the query was empty.
+ - Anonymous users couldn't use the advanced search even if
+   $_CONF['searchloginrequired'] was not set.
+ - Fix to disallow access to the extended search for anonymous users (i.e.
+   $_CONF['searchloginrequired'] works again as it did in 1.3.7)
+ - Fixed search by date.
+ - Template variable {uid_value} was always empty in the user's profile edit
+   form (in usersettings.php).
+ 
+ - New French (Canada) language file, provided by Jean-Francois Allard.
+ - Updated Dutch language file, provided by W. Niemans.
+ - Updated Bulgarian language file, provided by Vassil Simeonov and Itso Banov.
+ - Updated Spanish language file, provided by Angel Romero.
+ 
+ - New French (Canada) language file for the Static Pages plugin, provided by
+   Jean-Francois Allard.
+ - New Dutch language file for the Static Pages plugin, provided by W. Niemans.
+ 
+ 
  July 17, 2003 (1.3.8)
  -------------




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug  6 16:10:34 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 6 Aug 2003 15:10:34 -0500
Subject: [geeklog-cvs] journal functions.inc,1.6,1.7
Message-ID: <200308062010.h76KAYP06712@internal.geeklog.net>

Update of /usr/cvs/geeklog/journal
In directory geeklog_prod:/tmp/cvs-serv6690

Modified Files:
	functions.inc 
Log Message:
Implemented plugin_getheadercode_journal() so that each journal with an RSS feed will have a <link> to that feed in the site's header.


Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/journal/functions.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** functions.inc	31 Jul 2003 17:58:40 -0000	1.6
--- functions.inc	6 Aug 2003 20:10:32 -0000	1.7
***************
*** 1046,1049 ****
--- 1046,1087 ----
  
  /**
+ * For any journal with an RSS feed, add an RSS link to the site's header.
+ *
+ * Note: Requires Geeklog 1.3.8 and a theme that has {plg_headercode} in its
+ *       <head> section in header.thtml.
+ *
+ * @return   string   link tags for each journal with an RSS feed
+ *
+ */
+ function plugin_getheadercode_journal ()
+ {
+     global $_TABLES, $_CONF;
+ 
+     $retval = '';
+ 
+     $feedpath = $_CONF['rdf_file'];
+     $pos = strrpos ($feedpath, '/');
+     $feed = substr ($feedpath, 0, $pos + 1);
+     $feedpath = substr_replace ($feed, $_CONF['site_url'], 0,
+                                 strlen ($_CONF['path_html']) - 1);
+ 
+     $result = DB_query ("SELECT jrn_id,jrn_name FROM {$_TABLES['journal']} WHERE jrn_public = 1 AND jrn_feed = 1");
+     $num = DB_numRows ($result);
+     for ($i = 0; $i < $num; $i++) {
+         $A = DB_fetchArray ($result);
+         $title = $A['jrn_name'];
+         if (strlen ($title) > 20) {
+             $title = substr ($title, 0, 17) . '...';
+         }
+         $title = htmlspecialchars ($title);
+         $retval .= '<link rel="alternate" type="application/rss+xml" href="'
+                 . $feedpath . sprintf ('journal%d.rss', $A['jrn_id'])
+                 . '" title="RSS: ' . $title . '">' . LB;
+     }
+ 
+     return $retval;
+ }
+ 
+ /**
  * Removes the datastructures for this plugin from the Geeklog database
  *




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug  7 06:23:19 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 7 Aug 2003 05:23:19 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.51,1.52
Message-ID: <200308071023.h77ANJP22030@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory geeklog_prod:/tmp/cvs-serv21991

Modified Files:
	install.php 
Log Message:
When upgrading, make the selection of the old Geeklog version default to the last one in the list (instead of the first one, i.e. 1.2.5-1).


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** install.php	3 Aug 2003 08:15:42 -0000	1.51
--- install.php	7 Aug 2003 10:23:16 -0000	1.52
***************
*** 140,145 ****
          $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
!         for ($j = 1; $j <= count($old_versions); $j++) {
!            $versiondd .= '<option>' . current($old_versions) . '</option>';
             next($old_versions);
          }
--- 140,150 ----
          $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
!         $cnt = count ($old_versions);
!         for ($j = 1; $j <= $cnt; $j++) {
!            $versiondd .= '<option';
!            if ($j == $cnt) {
!                $versiondd .= ' selected="selected"';
!            }
!            $versiondd .= '>' . current ($old_versions) . '</option>';
             next($old_versions);
          }




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug  7 18:18:05 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 7 Aug 2003 17:18:05 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.117,1.118
Message-ID: <200308072218.h77MI5P04020@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv4006

Modified Files:
	history 
Log Message:
Updated list of changes


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** history	6 Aug 2003 13:42:22 -0000	1.117
--- history	7 Aug 2003 22:18:03 -0000	1.118
***************
*** 1,4 ****
--- 1,11 ----
  GeekLog History/Changes:
  
+ August ?, 2003 (1.3.8sp1)
+ --------------
+ 
+ - When upgrading, the install script will now default the version selection to
+   the last version in the list (currently: 1.3.7) instead of the first one
+   (1.2.5-1).
+ - Don't allow HTML in static page titles (bug #26).
  - Display the search form again if the query returned no results.
  - Make sure we're not attempting to send a Daily Digest email to Anonymous.
***************
*** 8,16 ****
    I don't want to introduce new texts in the language file at this point. To
    be corrected later.
! - Fixed a problem with the cookie timeout: When a user edited his/her profile,
!   the cookie timeout defaulted to 1 hour, while the default in config.php was
!   usually much longer (default: 1 week). So after editing their profile for the
!   first time, users didn't stay logged in as long as before (unless they
!   noticed that and changed the cookie timeout accordingly themselves).
  - Fixed problems in the install script when trying to find out the MySQL
    version number.
--- 15,24 ----
    I don't want to introduce new texts in the language file at this point. To
    be corrected later.
! - Fixed a problem with the cookie timeout: When a user edited his/her profile
!   for the first time, the cookie timeout defaulted to 1 hour, while the default
!   in config.php was usually much longer (default: 1 week). So after editing
!   their profile for the first time, users didn't stay logged in as long as
!   before (unless they noticed that and changed the cookie timeout accordingly
!   themselves).
  - Fixed problems in the install script when trying to find out the MySQL
    version number.




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug  8 04:14:31 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 8 Aug 2003 03:14:31 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.118,1.119
Message-ID: <200308080814.h788EVP14623@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv14610

Modified Files:
	history 
Log Message:
Set date, fixed typo ...


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** history	7 Aug 2003 22:18:03 -0000	1.118
--- history	8 Aug 2003 08:14:29 -0000	1.119
***************
*** 1,5 ****
  GeekLog History/Changes:
  
! August ?, 2003 (1.3.8sp1)
  --------------
  
--- 1,5 ----
  GeekLog History/Changes:
  
! August 8, 2003 (1.3.8sr1)
  --------------
  




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug  8 04:15:11 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 8 Aug 2003 03:15:11 -0500
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.93,1.94
Message-ID: <200308080815.h788FBP14652@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory geeklog_prod:/tmp/cvs-serv14628

Modified Files:
	config.php 
Log Message:
Set version number to 1.3.8sr1


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** config.php	17 Jul 2003 17:19:55 -0000	1.93
--- config.php	8 Aug 2003 08:15:09 -0000	1.94
***************
*** 479,483 ****
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.8');
  }
  
--- 479,483 ----
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.8sr1');
  }
  




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug  8 04:17:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 8 Aug 2003 03:17:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs install.html,1.21,1.22
Message-ID: <200308080817.h788H8P14702@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv14688

Modified Files:
	install.html 
Log Message:
Refer to geeklog-1.3.8sr1.tar.gz as the name of the tarball.


Index: install.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/install.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** install.html	6 Aug 2003 13:37:55 -0000	1.21
--- install.html	8 Aug 2003 08:17:06 -0000	1.22
***************
*** 139,143 ****
  			<li>Unpack the tarball *within* your web tree by running the following in your shell (this assumes you have ssh access and that you are working with the tarball <i>on the designated server </i>- this can be locally or hosted elsewhere):<br>
  				<br>
! 				<code>tar -zxvf geeklog-1.3.8.tar.gz</code><br>
  				<br>
  				<b>FTP, Windows Users:</b> unpack the tarball on your <i>local computer</i> and upload the result to your designated server. Everything uploads as ASCII except the images.<br>
--- 139,143 ----
  			<li>Unpack the tarball *within* your web tree by running the following in your shell (this assumes you have ssh access and that you are working with the tarball <i>on the designated server </i>- this can be locally or hosted elsewhere):<br>
  				<br>
! 				<code>tar -zxvf geeklog-1.3.8sr1.tar.gz</code><br>
  				<br>
  				<b>FTP, Windows Users:</b> unpack the tarball on your <i>local computer</i> and upload the result to your designated server. Everything uploads as ASCII except the images.<br>




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug  8 05:02:55 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 8 Aug 2003 04:02:55 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs changes.html,1.16,1.17
Message-ID: <200308080902.h7892rP15630@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv15611

Modified Files:
	changes.html 
Log Message:
Added list of 1.3.8sr1 changes


Index: changes.html
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/changes.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** changes.html	17 Jul 2003 17:19:07 -0000	1.16
--- changes.html	8 Aug 2003 09:02:48 -0000	1.17
***************
*** 23,26 ****
--- 23,52 ----
  of files that have been changed since the last release.</p>
  
+ <h2><a name="changes138sr1">Geeklog 1.3.8sr1</a></h2>
+ 
+ <p>Geeklog 1.3.8sr1 is a bugfix release over Geeklog 1.3.8. It contains a
+ variety of (mostly minor) bugfixes. None of those fixes are security-related.</p>
+ 
+ <h3>Bugfixes</h3>
+ 
+ <ul>
+ <li>Fixes to the new search to restore pre-1.3.8 behavior (display search form
+     again if no results are returned, handling of
+     <tt>$_CONF['searchloginrequired']</tt>, etc.). Also fixed the search by
+     date.</li>
+ <li>Fixed problems in the install script when trying to identify the MySQL
+     version. The install script failed silently on PHP 4.0.4 and earlier
+     versions.</li>
+ <li>Fixed a problem with the What's Related block on stories that contain
+     images.</li>
+ <li>Skip user "Anonymous" when sending out the Daily Digest.
+ <li>Prevent admin from changing a user's email address to one that's already
+     used by another user.</li>
+ <li>Update RSS feed and Older Stories block when deleting a story.</li>
+ </ul>
+ 
+ <p>The full 1.3.8sr1 tarball also includes new and updated language files
+ (see the Changelog for details).</p>
+ 
  <h2><a name="changes138">Geeklog 1.3.8</a></h2>
  




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 06:49:26 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 05:49:26 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin event.php,1.39,1.40
Message-ID: <200308121049.h7CAnQP20229@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv20215

Modified Files:
	event.php 
Log Message:
In the event editor, don't display the "delete" button for new events.


Index: event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** event.php	19 Jun 2003 20:01:41 -0000	1.39
--- event.php	12 Aug 2003 10:49:24 -0000	1.40
***************
*** 104,113 ****
                                COM_getBlockTemplate ('_admin_block', 'header'));
  
-     if ($A['eid'] == '') { 
- 		$A['eid'] = COM_makesid(); 
- 	}
- 
      if (!empty($A['eid']) && SEC_hasRights('event.edit')) {
          $event_templates->set_var('delete_option', "<input type=\"submit\" value=\"$LANG22[22]\" name=\"mode\">");
      }
  
--- 104,113 ----
                                COM_getBlockTemplate ('_admin_block', 'header'));
  
      if (!empty($A['eid']) && SEC_hasRights('event.edit')) {
          $event_templates->set_var('delete_option', "<input type=\"submit\" value=\"$LANG22[22]\" name=\"mode\">");
+     }
+ 
+     if ($A['eid'] == '') { 
+         $A['eid'] = COM_makesid(); 
      }
  




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 16:59:23 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 15:59:23 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/syndication - New directory
Message-ID: <200308122059.h7CKxNP25916@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25905/Classic/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/syndication - New directory
Message-ID: <200308122101.h7CL11P25981@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/Yahoo/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/clean/admin/syndication - New directory
Message-ID: <200308122101.h7CL11P25985@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/clean/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/syndication - New directory
Message-ID: <200308122101.h7CL11P25983@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/Smooth_Blue/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/syndication - New directory
Message-ID: <200308122101.h7CL11P25989@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/Digital_Monochrome/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/gameserver/admin/syndication - New directory
Message-ID: <200308122101.h7CL11P25987@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/gameserver/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:01:02 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:01:02 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/syndication - New directory
Message-ID: <200308122101.h7CL12P25991@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv25953/XSilver/admin/syndication

Log Message:
Directory /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/syndication added to the repository





From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/images/icons feed.gif,NONE,1.1
Message-ID: <200308122110.h7CLA7P26381@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/images/icons
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/images/icons

Added Files:
	feed.gif 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feed.gif ---
(This appears to be a binary file; contents omitted.)




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:06 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:06 -0500
Subject: [geeklog-cvs] geeklog-1.3/language english.php,1.98,1.99
Message-ID: <200308122110.h7CLA6P26370@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv26144/language

Modified Files:
	english.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/english.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** english.php	5 Jul 2003 22:37:59 -0000	1.98
--- english.php	12 Aug 2003 21:10:04 -0000	1.99
***************
*** 79,83 ****
  	36 => "on",
  	37 => "No user stories",
! 	38 => "",
  	39 => "Refresh",
  	40 => "",
--- 79,83 ----
  	36 => "on",
  	37 => "No user stories",
! 	38 => 'Content Syndication',
  	39 => "Refresh",
  	40 => "",
***************
*** 1020,1024 ****
      55 => 'An email has been sent to you and should arrive momentarily. Please follow the directions in the message to set a new password for your account.',
      56 => 'The email address provided is already in use for another account.',
!     57 => 'Your account has been successfully deleted.'
  );
  
--- 1020,1026 ----
      55 => 'An email has been sent to you and should arrive momentarily. Please follow the directions in the message to set a new password for your account.',
      56 => 'The email address provided is already in use for another account.',
!     57 => 'Your account has been successfully deleted.',
!     58 => 'Your feed has been successfully saved.',
!     59 => 'The feed has been successfully deleted.'
  );
  
***************
*** 1059,1062 ****
--- 1061,1104 ----
  );
  
+ // for syndication.php
+ 
+ $LANG33 = array (
+     1 => 'create feed',
+     2 => 'save',
+     3 => 'delete',
+     4 => 'cancel',
+     10 => 'Content Syndication',
+     11 => 'New Feed',
+     12 => 'Admin Home',
+     13 => 'To modify or delete a feed, click on the feed\'s title below. To create a new feed, click on New Feed above.',
+     14 => 'Title',
+     15 => 'Type',
+     16 => 'Filename',
+     17 => 'Format',
+     18 => 'last updated',
+     19 => 'Enabled',
+     20 => 'Yes',
+     21 => 'No',
+     22 => '<i>(no feeds)</i>',
+     23 => 'all Stories',
+     24 => 'Feed Editor',
+     25 => 'Feed Title',
+     26 => 'Limit',
+     27 => 'Length of entries',
+     28 => '(0 = no text, 1 = full text, other = limit to that number of chars.)',
+     29 => 'Description',
+     30 => 'Last Update',
+     31 => 'Character Set',
+     32 => 'Language',
+     33 => 'Topic',
+     34 => 'Entries',
+     35 => 'Hours',
+     36 => 'Select type of feed',
+     37 => 'You have at least one plugin installed that supports content syndication. Below you will need to select whether you want to create a Geeklog feed or a feed from one of the plugins.',
+     38 => 'Error: Missing Fields',
+     39 => 'Please fill in the Feed Title, Description, and Filename.',
+     40 => 'Please enter a  number of entries or number of hours.'
+ );
+ 
  $LANG_ACCESS = array(
  	access => "Access",
***************
*** 1108,1122 ****
      listthem => 'list',
      usersingroup => 'Users in group %s'
- );
- 
- #admin/word.php
- $LANG_WORDS = array(
-     editor => "Word Replacment editor",
-     wordid => "Word ID",
-     intro => "To modify or delete a word, click on that word.  To create a new word replacement click the new word button to the left.",
-     wordmanager => "Word Manager",
-     word => "Word",
-     replacmentword => "Replacment Word",
-     newword => "New Word"
  );
  
--- 1150,1153 ----




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA7P26393@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/Smooth_Blue/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA7P26401@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/Yahoo/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA7P26387@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/Classic/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.243,1.244 submit.php,1.54,1.55
Message-ID: <200308122110.h7CLA7P26374@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv26144/public_html

Modified Files:
	lib-common.php submit.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.243
retrieving revision 1.244
diff -C2 -d -r1.243 -r1.244
*** lib-common.php	5 Aug 2003 19:03:50 -0000	1.243
--- lib-common.php	12 Aug 2003 21:10:04 -0000	1.244
***************
*** 143,146 ****
--- 143,153 ----
  
  /**
+ * This is the syndication library used to offer (RSS) feeds.
+ *
+ */
+ 
+ require_once( $_CONF['path_system'] . 'lib-syndication.php' );
+ 
+ /**
  * This is the custom library.
  *
***************
*** 1268,1506 ****
  
  /**
- * Creates a vaild RDF file from the stories
  *
! * The core of this code has been lifted from phpweblog which is licenced
! * under the GPL. It has since been heavily modified.
  *
! * @see function COM_rdfUpToDateCheck
  *
  */
! 
! function COM_exportRDF()
  {
!     global $_TABLES, $_CONF, $LANG01;
  
      if( $_CONF['backend'] > 0 )
      {
!         $outputfile = $_CONF['rdf_file'];
!         if( !empty( $_CONF['default_charset'] ))
!         {
!             $rdencoding = $_CONF['default_charset'];
!         }
!         else
!         {
!             $rdencoding = 'UTF-8';
!         }
!         $rdtitle = htmlspecialchars( $_CONF['site_name'] );
!         $rdlink = $_CONF['site_url'];
!         $rddescr = htmlspecialchars( $_CONF['site_slogan'] );
!         if( !empty( $_CONF['rdf_language'] ))
!         {
!             $rdlang = $_CONF['rdf_language'];
!         }
!         else
!         {
!             $rdlang = $_CONF['locale'];
!         }
! 
!         $where = '';
!         if( !empty( $_CONF['rdf_limit'] ))
!         {
!             if( substr( $_CONF['rdf_limit'], -1 ) == 'h' ) // last xx hours
!             {
!                 $limit = '';
!                 $hours = substr( $_CONF['rdf_limit'], 0, -1 );
!                 $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
!             }
!             else
!             {
!                 $limit = ' LIMIT ' . $_CONF['rdf_limit'];
!             }
!         }
!         else
!         {
!             $limit = ' LIMIT 10';
!         }
! 
!         // get list of topics that anonymous users have access to
!         $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
!                              . COM_getPermSQL( 'WHERE', 1 ));
!         $tnumrows = DB_numRows( $tresult );
!         $tlist = '';
!         for( $i = 1; $i <= $tnumrows; $i++ )
!         {
!             $T = DB_fetchArray( $tresult );
!             $tlist .= "'" . $T['tid'] . "'";
!             if( $i < $tnumrows )
!             {
!                 $tlist .= ',';
!             }
!         }
!         if( !empty( $tlist ))
!         {
!             $where .= " AND (tid IN ($tlist))";
!         }
! 
!         $result = DB_query( "SELECT sid,title,introtext FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limit" );
! 
!         if( !$file = @fopen( $outputfile, w ))
!         {
!             COM_errorLog( "{$LANG01[54]} $outputfile", 1 );
!         }
!         else
          {
!             fputs( $file, "<?xml version=\"1.0\" encoding=\"$rdencoding\"?>\n\n" );
!             fputs( $file, "<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n \"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n" );
!             fputs( $file, "<rss version=\"0.91\">\n\n" );
!             fputs( $file, "<channel>\n" );
!             fputs( $file, "<title>$rdtitle</title>\n" );
!             fputs( $file, "<link>$rdlink</link>\n" );
!             fputs( $file, "<description>$rddescr</description>\n" );
!             fputs( $file, "<language>$rdlang</language>\n\n" );
! 
!             $sids = '';
!             $nrows = DB_numRows( $result );
  
!             for( $i = 1; $i <= $nrows; $i++ )
              {
!                 $row = DB_fetchArray( $result );
!                 $sids .= $row['sid'];
! 
!                 if( $i <> $nrows )
!                 {
!                     $sids .= ',';
!                 }
! 
!                 $title = 'title';
!                 $link = 'sid';
! 
!                 if( $_CONF['rdf_storytext'] > 0 )
                  {
!                     $desc = '<description>';
! 
!                     $storytext = stripslashes( strip_tags( $row['introtext'] ));
!                     $storytext = trim( $storytext );
!                     $storytext = preg_replace( "/(\015)/", "", $storytext);
! 
!                     if( $_CONF['rdf_storytext'] > 1 )
!                     {
!                         if( strlen( $storytext ) > $_CONF['rdf_storytext'] )
!                         {
!                             $storytext = substr( $storytext, 0,
!                                     $_CONF['rdf_storytext'] ) . '...';
!                         }
!                     }
! 
!                     $desc .= htmlspecialchars( $storytext )
!                           . "</description>\n";
                  }
                  else
                  {
!                     $desc = '';
!                 }
! 
!                 fputs ( $file, "<item>\n" );
! 
!                 $title = '<title>'
!                        . htmlspecialchars( stripslashes( $row[$title] ))
!                        . "</title>\n";
!                 $link  = '<link>' . $_CONF['site_url'] . '/article.php?story='
!                        . $row[$link] . "</link>\n";
! 
!                 fputs( $file,  $title );
!                 fputs( $file,  $link );
!                 if( !empty( $desc ))
!                 {
!                     fputs( $file,  $desc );
                  }
-                 fputs( $file, "</item>\n\n" );
-             }
- 
-             DB_query( "UPDATE {$_TABLES['vars']} SET value = '$sids' WHERE name = 'rdf_sids'" );
- 
-             fputs( $file, "</channel>\n" );
-             fputs( $file, "</rss>\n" );
-             fclose( $file );
-         }
-     }
- }
- 
- /**
- *
- * Checks to see if RDF file needs updating and updates it if so.
- * Checks to see if we need to update the RDF as a result
- * of an article with a future publish date reaching it's
- * publish time and if so updates the RDF file.
- *
- * @see function COM_exportRDF
- *
- */
- 
- function COM_rdfUpToDateCheck()
- {
-     global $_TABLES, $_CONF;
- 
-     if( $_CONF['backend'] > 0 )
-     {
-         $where = '';
-         if( !empty( $_CONF['rdf_limit'] ))
-         {
-             if( substr( $_CONF['rdf_limit'], -1 ) == 'h' ) // last xx hours
-             {
-                 $limit = '';
-                 $hours = substr( $_CONF['rdf_limit'], 0, -1 );
-                 $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
              }
              else
              {
!                 $limit = ' LIMIT ' . $_CONF['rdf_limit'];
!             }
!         }
!         else
!         {
!             $limit = ' LIMIT 10';
!         }
! 
!         // get list of topics that anonymous users have access to
!         $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
!                              . COM_getPermSQL( 'WHERE', 1 ));
!         $tnumrows = DB_numRows( $tresult );
!         $tlist = '';
!         for( $i = 1; $i <= $tnumrows; $i++ )
!         {
!             $T = DB_fetchArray( $tresult );
!             $tlist .= "'" . $T['tid'] . "'";
!             if( $i < $tnumrows )
!             {
!                 $tlist .= ',';
              }
!         }
!         if( !empty( $tlist ))
!         {
!             $where .= " AND (tid IN ($tlist))";
!         }
! 
!         $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limit" );
!         $nrows = DB_numRows( $result );
!         $sids = '';
! 
!         for( $i = 1; $i <= $nrows; $i++ )
!         {
!             $A = DB_fetchArray( $result );
!             $sids .= $A['sid'];
! 
!             if( $i <> $nrows )
              {
!                 $sids .= ',';
              }
          }
- 
-         $last_rdf_sids = DB_getItem( $_TABLES['vars'], 'value',
-                                      "name = 'rdf_sids'" );
- 
-         if( $sids <> $last_rdf_sids )
-         {
-             COM_exportRDF ();
-         }
      }
  }
--- 1275,1323 ----
  
  /**
  *
! * Checks to see if RDF file needs updating and updates it if so.
! * Checks to see if we need to update the RDF as a result
! * of an article with a future publish date reaching it's
! * publish time and if so updates the RDF file.
  *
! * @see file lib-syndication.php
  *
  */
! function COM_rdfUpToDateCheck()
  {
!     global $_CONF, $_TABLES;
  
      if( $_CONF['backend'] > 0 )
      {
!         $result = DB_query( "SELECT fid,type,topic,limits,update_info FROM {$_TABLES['syndication']} WHERE is_enabled = 1" );
!         $num = DB_numRows( $result );
!         for( $i = 0; $i < $num; $i++)
          {
!             $A = DB_fetchArray( $result );
  
!             $is_current = true;
!             if( $A['type'] == 'geeklog' )
              {
!                 if( $A['topic'] == '::all' )
                  {
!                     $is_current = SYND_feedUpdateCheckAll( $A['update_info'],
!                                                            $A['limits'] );
                  }
                  else
                  {
!                     $is_current = SYND_feedUpdateChecktopic( $A['topic'],
!                             $A['update_info'], $A['limits'] );
                  }
              }
              else
              {
!                 $is_current = PLG_feedUpdateCheck( $A['type'], $A['fid'],
!                         $A['topic'], $A['update_info'], $A['limits'] );
              }
!             if( !$is_current )
              {
!                 SYND_updateFeed( $A['fid'] );
              }
          }
      }
  }
***************
*** 2461,2464 ****
--- 2278,2293 ----
              $adminmenu->set_var( 'option_label', $LANG01[105] );
              $adminmenu->set_var( 'option_count', 'N/A' );
+ 
+             $retval .= $adminmenu->parse( 'item',
+                     ( $thisUrl == $url ) ? 'current' : 'option' );
+         }
+ 
+         if(( $_CONF['backend'] == 1 ) && SEC_inGroup( 'Root' ))
+         {
+             $url = $_CONF['site_admin_url'] . '/syndication.php';
+             $adminmenu->set_var( 'option_url', $url );
+             $adminmenu->set_var( 'option_label', $LANG01[38] );
+             $count = DB_count( $_TABLES['syndication'] );
+             $adminmenu->set_var( 'option_count', $count );
  
              $retval .= $adminmenu->parse( 'item',

Index: submit.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/submit.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** submit.php	25 Jun 2003 08:39:02 -0000	1.54
--- submit.php	12 Aug 2003 21:10:04 -0000	1.55
***************
*** 711,714 ****
--- 711,717 ----
                  $related = addslashes (COM_whatsRelated ($introtext, $_USER['uid'], $A['tid']));
                  DB_save ($_TABLES['stories'], 'sid,uid,tid,title,introtext,related,date,commentcode,postmode,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon', "{$A["sid"]},{$_USER['uid']},'{$A["tid"]}','{$A['title']}','{$A["introtext"]}','{$related}',NOW(),{$_CONF['comment_code']},'{$A["postmode"]}',{$_USER['uid']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
+ 
+                 COM_rdfUpToDateCheck ();
+                 COM_olderStuff ();
                  if (isset ($_CONF['notification']) && in_array ('story', $_CONF['notification'])) {
                      $A['uid'] = $_USER['uid'];




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin syndication.php,NONE,1.1 moderation.php,1.41,1.42 story.php,1.99,1.100
Message-ID: <200308122110.h7CLA7P26379@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/admin

Modified Files:
	moderation.php story.php 
Added Files:
	syndication.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: syndication.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.3                                                               |
// +---------------------------------------------------------------------------+
// | syndication.php                                                           |
// |                                                                           |
// | Geeklog content syndication administration                                |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2003 by the following authors:                              |
// |                                                                           |
// | Authors: Dirk Haun         - dirk at haun-online.de                          |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is free software; you can redistribute it and/or             |
// | modify it under the terms of the GNU General Public License               |
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
// | GNU General Public License for more details.                              |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: syndication.php,v 1.1 2003/08/12 21:10:05 dhaun Exp $


require_once ('../lib-common.php');

if (!SEC_inGroup ('Root')) {
    $display .= COM_siteHeader ()
        . COM_startBlock ($MESSAGE[30], '',
                          COM_getBlockTemplate ('_msg_block', 'header'))
        . $MESSAGE[31]
        . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
        . COM_siteFooter ();
    echo $display;
    exit;
}

/**
* Display a list of all available feeds.
*
* @return   string   HTML for the block that contains the list of feeds
*
*/
function listfeeds ()
{
    global $_CONF, $_TABLES, $LANG33;

    $retval = '';

    $feed_template = new Template ($_CONF['path_layout'] . 'admin/syndication');
    $feed_template->set_file (array ('list' => 'listfeeds.thtml',
                                     'row' => 'listitem.thtml'));

    $retval .= COM_startBlock ($LANG33[10], '',
                               COM_getBlockTemplate ('_admin_block', 'header'));
    $feed_template->set_var ('site_url', $_CONF['site_url']);
    $feed_template->set_var ('site_admin_url', $_CONF['site_admin_url']);
    $feed_template->set_var ('layout_url', $_CONF['layout_url']);

    $feed_template->set_var ('lang_newfeed', $LANG33[11]);
    $feed_template->set_var ('lang_adminhome', $LANG33[12]);
    $feed_template->set_var ('lang_instructions', $LANG33[13]);

    $feed_template->set_var ('lang_title', $LANG33[14]);
    $feed_template->set_var ('lang_type', $LANG33[15]);
    $feed_template->set_var ('lang_filename', $LANG33[16]);
    $feed_template->set_var ('lang_format', $LANG33[17]);
    $feed_template->set_var ('lang_updated', $LANG33[18]);
    $feed_template->set_var ('lang_enabled', $LANG33[19]);

    $result = DB_query ("SELECT *,UNIX_TIMESTAMP(updated) as date FROM {$_TABLES['syndication']}");
    $num = DB_numRows ($result);

    if ($num == 0) {
        $feed_template->set_var ('feed_title', $LANG33[22]);
        $feed_template->parse ('feedlist_items', 'row', true);
    } else {
        $feedpath = $_CONF['rdf_file'];
        $pos = strrpos ($feedpath, '/');
        $feed = substr ($feedpath, 0, $pos + 1);
        $url = substr_replace ($feed, $_CONF['site_url'], 0,
                               strlen ($_CONF['path_html']) - 1);

        for ($i = 0; $i < $num; $i++) {
            $A = DB_fetchArray ($result);

            $link = '<a href="' . $url . $A['filename'] . '">' . $A['filename']
                  . '</a>';

            $feed_template->set_var ('feed_id', $A['fid']);
            $feed_template->set_var ('feed_title', $A['title']);
            $feed_template->set_var ('feed_type', ucwords ($A['type']));
            $feed_template->set_var ('feed_format', ucwords ($A['format']));
            $feed_template->set_var ('feed_filename', $A['filename']);
            $feed_template->set_var ('feed_filename_and_link', $link);
            $feed_template->set_var ('feed_updated',
                                     strftime ($_CONF['daytime'], $A['date']));
            if ($A['is_enabled'] == 1) {
                $enabled = $LANG33[20];
            } else {
                $enabled = $LANG33[21];
            }
            $feed_template->set_var ('feed_enabled', $enabled);
            $feed_template->parse ('feedlist_items', 'row', true);
        }
    }

    $retval .= $feed_template->finish ($feed_template->parse ('output','list'));
    $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));

    return $retval;
}

/**
* Create a list of all available feed formats. Assumes there is a class named
* xxx.feed.class.php for every format "xxx" (in system/classes).
*
* @return   array   array of names of feed formats (and classes)
*
*/
function find_feedFormats ()
{
    global $_CONF;

    $formats = array ();
    $fd = opendir ($_CONF['path_system'] . '/classes');
    while (($file = @readdir ($fd)) !== false) {
        if (preg_match ('/(.*)\.feed\.class\.php$/i', $file, $match)) {
            $formats[] = $match[1];
        }
    }

    sort ($formats);

    return $formats;
}

/**
* Create a list of feed types that Geeklog offers.
*
* @return   string   an array with id/name pairs for every feed
*
*/
function get_geeklogFeeds ()
{
    global $_CONF, $_TABLES, $LANG33;

    $options = array ();

    $sql = "SELECT tid,topic FROM {$_TABLES['topics']} WHERE perm_anon >= 2 ORDER BY ";
    if ($_CONF['sortmethod'] == 'alpha') {
        $sql .= 'topic ASC';
    } else {
        $sql .= 'sortnum';
    }
    $result = DB_query ($sql);
    $num = DB_numRows ($result);

    if ($num > 0) {
        $options[] = array ('id' => '::all', 'name' => $LANG33[23]);
    }

    for ($i = 0; $i < $num; $i++) {
        $A = DB_fetchArray ($result);
        $options[] = array ('id' => $A['tid'], 'name' => $A['topic']);
    }

    return $options;
}

/**
* Display the feed editor.
*
* @param    int      $fid    feed id (0 for new feeds)
* @param    string   $type   type of feed, e.g. 'geeklog'
* @return   string           HTML for the feed editor
*
*/
function editfeed ($fid = 0, $type = '')
{
    global $_CONF, $_TABLES, $LANG33;

    if ($fid > 0) {
        $result = DB_query ("SELECT *,UNIX_TIMESTAMP(updated) AS date FROM {$_TABLES['syndication']} WHERE fid = '$fid'");
        $A = DB_fetchArray ($result);
        $fid = $A['fid'];
    }
    if ($fid == 0) {
        if (!empty ($type)) { // set defaults
            $A['fid'] = $fid;
            $A['type'] = $type;
            $A['format'] = 'rss';
            $A['limits'] = $_CONF['rdf_limit'];
            $A['content_length'] = $_CONF['rdf_storytext'];
            $A['language'] = $_CONF['rdf_language'];
            $A['charset'] = $_CONF['default_charset'];
            $A['is_enabled'] = 1;
        } else {
            return COM_refresh ($_CONF['site_admin_url'] . '/syndication.php');
        }
    }

    $retval = '';

    $feed_template = new Template ($_CONF['path_layout'] . 'admin/syndication');
    $feed_template->set_file ('editor', 'feededitor.thtml');

    $feed_template->set_var ('site_url', $_CONF['site_url']);
    $feed_template->set_var ('site_admin_url', $_CONF['site_admin_url']);
    $feed_template->set_var ('layout_url', $_CONF['layout_url']);

    $feed_template->set_var ('start_feed_editor', COM_startBlock ($LANG33[24],
            '', COM_getBlockTemplate ('_admin_block', 'header')));
    $feed_template->set_var ('end_block',
            COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));

    $feed_template->set_var ('lang_feedtitle', $LANG33[25]);
    $feed_template->set_var ('lang_enabled', $LANG33[19]);
    $feed_template->set_var ('lang_format', $LANG33[17]);
    $feed_template->set_var ('lang_limits', $LANG33[26]);
    $feed_template->set_var ('lang_content_length', $LANG33[27]);
    $feed_template->set_var ('lang_clen_explain', $LANG33[28]);
    $feed_template->set_var ('lang_description', $LANG33[29]);
    $feed_template->set_var ('lang_filename', $LANG33[16]);
    $feed_template->set_var ('lang_updated', $LANG33[30]);
    $feed_template->set_var ('lang_type', $LANG33[15]);
    $feed_template->set_var ('lang_charset', $LANG33[31]);
    $feed_template->set_var ('lang_language', $LANG33[32]);
    $feed_template->set_var ('lang_topic', $LANG33[33]);

    $feed_template->set_var('lang_save', $LANG33[2]);
    $feed_template->set_var('lang_cancel', $LANG33[4]);
    if ($A['fid'] > 0) {
        $feed_template->set_var ('delete_option', '<input type="submit" value="'
                                 . $LANG33[3] . '" name="mode"');
    }
    $feed_template->set_var ('feed_id', $A['fid']);
    $feed_template->set_var ('feed_title', $A['title']);
    $feed_template->set_var ('feed_description', $A['description']);
    $feed_template->set_var ('feed_content_length', $A['content_length']);
    $feed_template->set_var ('feed_filename', $A['filename']);
    $feed_template->set_var ('feed_type', $A['type']);
    $feed_template->set_var ('feed_type_display', ucwords ($A['type']));
    $feed_template->set_var ('feed_charset', $A['charset']);
    $feed_template->set_var ('feed_language', $A['language']);

    $nicedate = COM_getUserDateTimeFormat ($A['date']);
    $feed_template->set_var ('feed_updated', $nicedate[0]);

    $formats = find_feedFormats ();
    $selection = '<select name="format">' . LB;
    foreach ($formats as $f) {
        $selection .= '<option value="' . $f . '"';
        if ($A['format'] == $f) {
            $selection .= ' selected="selected"';
        }
        $selection .= '>' . ucwords ($f) . '</option>' . LB;
    }
    $selection .= '</select>' . LB;
    $feed_template->set_var ('feed_format', $selection);

    $limits = $A['limits'];
    $hours = false;
    if (substr ($A['limits'], -1) == 'h') {
        $limits = substr ($A['limits'], 0, -1);
        $hours = true;
    }
    $selection = '<select name="limits_in">' . LB;
    $selection .= '<option value="0"';
    if (!$hours) {
        $selection .= ' selected="selected"';
    }
    $selection .= '>' . $LANG33[34] . '</option>' . LB;
    $selection .= '<option value="1"';
    if ($hours) {
        $selection .= ' selected="selected"';
    }
    $selection .= '>' . $LANG33[35] . '</option>' . LB;
    $selection .= '</select>' . LB;
    $feed_template->set_var ('feed_limits', $limits);
    $feed_template->set_var ('feed_limits_what', $selection);

    if ($A['type'] == 'geeklog') {
        $options = get_geeklogFeeds ();
    } else {
        $options = PLG_getFeedNames ($A['type']);
    }
    $selection = '<select name="topic">' . LB;
    foreach ($options as $o) {
        $selection .= '<option value="' . $o['id'] . '"';
        if ($A['topic'] == $o['id']) {
            $selection .= ' selected="selected"';
        }
        $selection .= '>' . $o['name'] . '</option>' . LB;
    }
    $selection .= '</select>' . LB;
    $feed_template->set_var ('feed_topic', $selection);

    if ($A['is_enabled'] == 1) {
        $feed_template->set_var ('is_enabled', 'checked="checked"');
    } else {
        $feed_template->set_var ('is_enabled', '');
    }

    $retval .= $feed_template->finish ($feed_template->parse ('output',
                                                              'editor'));
    return $retval;
}

/**
* Create a new feed. This is an extra step to take once you have a plugin
* installed that supports the new Feed functions in the Plugin API. This
* will let you select for which plugin (or Geeklog) you're creating the feed.
*
* @return   string   HTML for the complete page (selection or feed editor)
*
*/
function newfeed ()
{
    global $_CONF, $LANG33;

    $retval = '';

    $plugins = PLG_supportingFeeds ();
    if (sizeof ($plugins) == 0) {
        // none of the installed plugins are supporting feeds
        // - go directly to the feed editor
        $retval = COM_siteHeader ('menu')
                . editfeed (0, 'geeklog')
                . COM_siteFooter ();
    } else {
        $selection = '<select name="type">' . LB;
        $selection .= '<option value="geeklog">Geeklog</option>' . LB;
        foreach ($plugins as $p) {
            $selection .= '<option value="' . $p . '">' . ucwords ($p)
                       . '</option>' . LB;
        }
        $selection .= '</select>' . LB;

        $feed_template = new Template ($_CONF['path_layout']
                                       . 'admin/syndication');
        $feed_template->set_file ('type', 'selecttype.thtml');

        $feed_template->set_var ('site_url', $_CONF['site_url']);
        $feed_template->set_var ('site_admin_url', $_CONF['site_admin_url']);
        $feed_template->set_var ('layout_url', $_CONF['layout_url']);

        $feed_template->set_var ('type_selection', $selection);

        $feed_template->set_var ('lang_explain', $LANG33[37]);
        $feed_template->set_var ('lang_go', $LANG33[1]);

        $retval .= COM_siteHeader ('menu');
        $retval .= COM_startBlock ($LANG33[36], '',
                COM_getBlockTemplate ('_admin_block', 'header'));
        $retval .= $feed_template->finish ($feed_template->parse ('output',
                                                                  'type'));
        $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
        $retval .= COM_siteFooter ();
    }

    return $retval;
}

/**
* Save feed.
*
* @param    array    $A
* @return   string   HTML redirect on success or feed editor + error message
*
*/
function savefeed ($A)
{
    global $_CONF, $_TABLES, $LANG33;

    foreach ($A as $name => $value) {
        $A[$name] = COM_stripslashes ($value);
    }

    if ($A['is_enabled'] == 'on') {
        $A['is_enabled'] = 1;
    } else {
        $A['is_enabled'] = 0;
    }

    if (empty ($A['title']) || empty ($A['description']) ||
            empty ($A['filename'])) {
        $retval = COM_siteHeader ('menu')
                . COM_startBlock ($LANG33[38], '',
                        COM_getBlockTemplate ('_msg_block', 'header'))
                . $LANG33[39]
                . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
                . editfeed ($A['fid'], $A['type'])
                . COM_siteFooter ();
        return $retval;
    }
    if ($A['limits'] <= 0) {
        $retval = COM_siteHeader ('menu')
                . COM_startBlock ($LANG33[38], '',
                        COM_getBlockTemplate ('_msg_block', 'header'))
                . $LANG33[40]
                . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
                . editfeed ($A['fid'], $A['type'])
                . COM_siteFooter ();
        return $retval;
    }
    if ($A['limits_in'] == 1) {
        $A['limits'] .= 'h';
    }

    // we can compensate if these are missing ...
    if (empty ($A['charset'])) {
        $A['charset'] = $_CONF['default_charset'];
        if (empty ($A['charset'])) {
            $A['charset'] = 'UTF-8';
        }
    }
    if (empty ($A['language'])) {
        $A['language'] = $_CONF['rdf_language'];
        if (empty ($A['language'])) {
            $A['language'] = $_CONF['locale'];
        }
    }
    if ($A['content_length'] < 0) {
        $A['content_length'] = 0;
    }

    foreach ($A as $name => $value) {
        $A[$name] = addslashes ($value);
    }

    DB_save ($_TABLES['syndication'], 'fid,type,topic,format,limits,content_length,title,description,filename,charset,language,is_enabled,updated,update_info',
        "{$A['fid']},'{$A['type']}','{$A['topic']}','{$A['format']}','{$A['limits']}',{$A['content_length']},'{$A['title']}','{$A['description']}','{$A['filename']}','{$A['charset']}','{$A['language']}',{$A['is_enabled']},'0000-00-00 00:00:00',NULL");

    if ($A['fid'] == 0) {
        $A['fid'] = DB_insertId ();
    }
    SYND_updateFeed ($A['fid']);

    return COM_refresh ($_CONF['site_admin_url'] . '/syndication.php?msg=58');
}

/**
* Delete a feed.
*
* @param    int      $fid   feed id
* @return   string          HTML redirect
*
*/
function deletefeed ($fid)
{
    global $_CONF, $_TABLES;

    if ($fid > 0) {
        DB_delete ($_TABLES['syndication'], 'fid', $fid);

        return COM_refresh ($_CONF['site_admin_url']
                            . '/syndication.php?msg=59');
    }

    return COM_refresh ($_CONF['site_admin_url'] . '/syndication.php');
}


// MAIN
$display = '';

if (count ($HTTP_POST_VARS) == 0) {
    $http_input_vars = $HTTP_GET_VARS;
} else {
    $http_input_vars = $HTTP_POST_VARS;
}

if ($http_input_vars['mode'] == 'edit') {
    if ($http_input_vars['fid'] == 0) {
        $display .= newfeed ();
    } else {
        $display .= COM_siteHeader ('menu')
                 . editfeed ($http_input_vars['fid'])
                 . COM_siteFooter ();
    }
}
else if (($http_input_vars['mode'] == $LANG33[1]) && !empty ($LANG33[1]))
{
    $display .= COM_siteHeader ('menu')
             . editfeed (0, $http_input_vars['type'])
             . COM_siteFooter ();
}
else if (($http_input_vars['mode'] == $LANG33[2]) && !empty ($LANG33[2]))
{
    $display .= savefeed ($http_input_vars);
}
else if (($http_input_vars['mode'] == $LANG33[3]) && !empty ($LANG33[3]))
{
    $display .= deletefeed ($http_input_vars['fid']);
}
else
{
    $display .= COM_siteHeader ('menu')
             . COM_showMessage ($http_input_vars['msg'])
             . listfeeds ()
             . COM_siteFooter ();
}

echo $display;

?>

Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** moderation.php	14 Jul 2003 10:35:09 -0000	1.41
--- moderation.php	12 Aug 2003 21:10:05 -0000	1.42
***************
*** 548,553 ****
--- 548,559 ----
                  "{$A['sid']},{$A['uid']},'{$A['tid']}','{$A['title']}','{$A['introtext']}','{$A['related']}','{$A['date']}',{$_CONF['comment_code']},'{$A['postmode']}',{$A['owner_id']},{$T['group_id']},{$T['perm_owner']},{$T['perm_group']},{$T['perm_members']},{$T['perm_anon']}");
                  DB_delete($_TABLES["storysubmission"],"$id",$mid[$i]);
+ 
+                 COM_rdfUpToDateCheck ();    
+                 COM_olderStuff ();    
              } else if ($type == 'draft') {
                  DB_query ("UPDATE {$_TABLES['stories']} SET draft_flag = 0 WHERE sid = {$mid[$i]}");
+ 
+                 COM_rdfUpToDateCheck ();    
+                 COM_olderStuff ();    
              } else {
                  // This is called in case this is a plugin. There may be some

Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** story.php	25 Jul 2003 10:08:55 -0000	1.99
--- story.php	12 Aug 2003 21:10:05 -0000	1.100
***************
*** 910,917 ****
          DB_save($_TABLES['stories'],'sid,uid,tid,title,introtext,bodytext,hits,date,comments,related,featured,commentcode,statuscode,postmode,frontpage,draft_flag,numemails,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,show_topic_icon',"$sid,$uid,'$tid','$title','$introtext','$bodytext',$hits,'$date','$comments','$related',$featured,'$commentcode','$statuscode','$postmode','$frontpage',$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$show_topic_icon", $return_to);
  
!         // If this is done as part of moderation stuff then delete the submission
          if ($type == 'submission') {
              DB_delete($_TABLES['storysubmission'],'sid',$sid);
          }
      } else {
          $display .= COM_siteHeader('menu');
--- 910,919 ----
          DB_save($_TABLES['stories'],'sid,uid,tid,title,introtext,bodytext,hits,date,comments,related,featured,commentcode,statuscode,postmode,frontpage,draft_flag,numemails,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,show_topic_icon',"$sid,$uid,'$tid','$title','$introtext','$bodytext',$hits,'$date','$comments','$related',$featured,'$commentcode','$statuscode','$postmode','$frontpage',$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$show_topic_icon", $return_to);
  
!         // If this is done as part of the moderation then delete the submission
          if ($type == 'submission') {
              DB_delete($_TABLES['storysubmission'],'sid',$sid);
          }
+         COM_rdfUpToDateCheck ();
+         COM_olderStuff ();
      } else {
          $display .= COM_siteHeader('menu');
***************
*** 962,966 ****
  
      // update RSS feed and Older Stories block
!     COM_exportRDF ();
      COM_olderStuff ();
  
--- 964,968 ----
  
      // update RSS feed and Older Stories block
!     COM_rdfUpToDateCheck ();
      COM_olderStuff ();
  




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA7P26389@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/Digital_Monochrome/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/gameserver/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA8P26415@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/gameserver/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:06 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:06 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.120,1.121
Message-ID: <200308122110.h7CLA6P26367@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv26144/docs

Modified Files:
	history 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** history	9 Aug 2003 11:47:41 -0000	1.120
--- history	12 Aug 2003 21:10:04 -0000	1.121
***************
*** 1,4 ****
--- 1,13 ----
  GeekLog History/Changes:
  
+ - New Admin interface for content syndication (RSS feeds etc.). This lets you
+   create feeds for all the stories and per topic. Plugins can also provide
+   feeds (through extensions of the Plugin API). Additional feed formats
+   (other than RSS) can be implemented as new classes (xxx.feed.class.php).
+   Includes new admin/syndication template directory.
+ - Don't display the "delete" button in the Admin's Event editor when we're
+   editing a new event (reported by Simon Lord).
+ 
+ 
  August 9, 2003 (1.3.8-1)
  --------------




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:07 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:07 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA7P26395@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/XSilver/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/system lib-syndication.php,NONE,1.1 lib-database.php,1.26,1.27 lib-plugins.php,1.22,1.23
Message-ID: <200308122110.h7CLA8P26425@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system
In directory geeklog_prod:/tmp/cvs-serv26144/system

Modified Files:
	lib-database.php lib-plugins.php 
Added Files:
	lib-syndication.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: lib-syndication.php ---
<?php 

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.3                                                               |
// +---------------------------------------------------------------------------+
// | lib-syndication.php                                                       |
// |                                                                           |
// | Geeklog syndication library.                                              |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2003 by the following authors:                              |
// |                                                                           |
// | Authors: Dirk Haun        - dirk at haun-online.de                           |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is free software; you can redistribute it and/or             |
// | modify it under the terms of the GNU General Public License               |
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
// | GNU General Public License for more details.                              |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: lib-syndication.php,v 1.1 2003/08/12 21:10:06 dhaun Exp $

// set to true to enable debug output in error.log
$_SYND_DEBUG = false;

/**
* Check if a feed for all stories needs to be updated.
*
* @param    string   $update_info   list of story ids
* @param    string   $limit         number of entries or number of hours
* @return   bool                    false = feed needs to be updated
*
*/
function SYND_feedUpdateCheckAll( $update_info, $limit )
{
    global $_TABLES, $_CONF;

    $where = '';
    if( !empty( $limit ))
    {
        if( substr( $limit, -1 ) == 'h' ) // last xx hours
        {
            $limitsql = '';
            $hours = substr( $limit, 0, -1 );
            $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
        }
        else
        {
            $limitsql = ' LIMIT ' . $limit;
        }
    }
    else
    {
        $limitsql = ' LIMIT 10';
    }

    // get list of topics that anonymous users have access to
    $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
                         . COM_getPermSQL( 'WHERE', 1 ));
    $tnumrows = DB_numRows( $tresult );
    $tlist = '';
    for( $i = 1; $i <= $tnumrows; $i++ )
    {
        $T = DB_fetchArray( $tresult );
        $tlist .= "'" . $T['tid'] . "'";
        if( $i < $tnumrows )
        {
            $tlist .= ',';
        }
    }
    if( !empty( $tlist ))
    {
        $where .= " AND (tid IN ($tlist))";
    }

    $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limitsql" );
    $nrows = DB_numRows( $result );
    $sids = '';

    $sids = array ();
    for( $i = 0; $i < $nrows; $i++ )
    {
        $A = DB_fetchArray( $result );
        $sids[] = $A['sid'];
    }
    $current = implode( ',', $sids );

    if ($_SYND_DEBUG) {
        COM_errorLog ("Update check for all stories: comparing new list ($current) with old list ($update_info)", 1);
    }

    return ( $current != $update_info ) ? false : true;
}

/**
* Check if a feed for stories from a topic needs to be updated.
*
* @param    string   $tid           topic id
* @param    string   $update_info   list of story ids
* @param    string   $limit         number of entries or number of hours
* @return   bool                    false = feed needs to be updated
*
*/
function SYND_feedUpdateCheckTopic( $tid, $update_info, $limit )
{
    global $_TABLES, $_CONF;

    $where = '';
    if( !empty( $limit ))
    {
        if( substr( $limit, -1 ) == 'h' ) // last xx hours
        {
            $limitsql = '';
            $hours = substr( $limit, 0, -1 );
            $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
        }
        else
        {
            $limitsql = ' LIMIT ' . $limit;
        }
    }
    else
    {
        $limitsql = ' LIMIT 10';
    }

    $result = DB_query( "SELECT sid FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() AND tid = '$tid' AND perm_anon > 0 ORDER BY date DESC $limitsql" );
    $nrows = DB_numRows( $result );
    $sids = '';

    $sids = array ();
    for( $i = 0; $i < $nrows; $i++ )
    {
        $A = DB_fetchArray( $result );
        $sids[] = $A['sid'];
    }
    $current = implode( ',', $sids );

    if ($_SYND_DEBUG) {
        COM_errorLog ("Update check for topic $tid: comparing new list ($current) with old list ($update_info)", 1);
    }

    return ( $current != $update_info ) ? false : true;
}

/*
* Get content for a feed that holds stories from one topic.
*
* @param    string   $tid      topic id
* @param    string   $limit    number of entries or number of stories
* @param    string   $link     link to topic
* @param    string   $update   list of story ids
* @return   array              content of the feed
*
*/
function SYND_getFeedContentPerTopic( $tid, $limit, &$link, &$update )
{
    global $_TABLES, $_CONF, $LANG01;

    $content = array ();

    if( DB_getItem( $_TABLES['topics'], 'perm_anon', "tid = '$tid'") >= 2)
    {
        $where = '';
        if( !empty( $limit ))
        {
            if( substr( $limit, -1 ) == 'h' ) // last xx hours
            {
                $limitsql = '';
                $hours = substr( $limit, 0, -1 );
                $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
            }
            else
            {
                $limitsql = ' LIMIT ' . $limit;
            }
        }
        else
        {
            $limitsql = ' LIMIT 10';
        }

        $result = DB_query( "SELECT sid,uid,title,introtext,postmode,UNIX_TIMESTAMP(date) AS modified FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() AND tid = '$tid' AND perm_anon > 0 ORDER BY date DESC $limitsql" );

        $sids = array();
        $nrows = DB_numRows( $result );

        for( $i = 1; $i <= $nrows; $i++ )
        {
            $row = DB_fetchArray( $result );
            $sids[] = $row['sid'];

            $storytitle = stripslashes( $row['title'] );

            $storytext = stripslashes( $row['introtext'] );
            $storytext = trim( $storytext );
            $storytext = preg_replace( "/(\015)/", "", $storytext );

            $storylink = $_CONF['site_url'] . '/article.php?story='
                       . $row['sid'];

            $content[] = array( 'title'  => $storytitle,
                                'text'   => $storytext,
                                'link'   => $storylink,
                                'uid'    => $row['uid'],
                                'date'   => $row['modified'],
                                'format' => $row['postmode']
                              );
        }
    }

    $link = $_CONF['site_url'] . '/index.php?topic=' . $tid;
    $update = implode( ',', $sids );

    return $content;
}

/*
* Get content for a feed that holds all stories.
*
* @param    string   $limit    number of entries or number of stories
* @param    string   $link     link to homepage
* @param    string   $update   list of story ids
* @return   array              content of the feed
*
*/
function SYND_getFeedContentAll( $limit, &$link, &$update )
{
    global $_TABLES, $_CONF, $LANG01;

    $where = '';
    if( !empty( $limit ))
    {
        if( substr( $limit, -1 ) == 'h' ) // last xx hours
        {
            $limitsql = '';
            $hours = substr( $limit, 0, -1 );
            $where = " AND date >= DATE_SUB(NOW(),INTERVAL $hours HOUR)";
        }
        else
        {
            $limitsql = ' LIMIT ' . $limit;
        }
    }
    else
    {
        $limitsql = ' LIMIT 10';
    }

    // get list of topics that anonymous users have access to
    $tresult = DB_query( "SELECT tid FROM {$_TABLES['topics']}"
                         . COM_getPermSQL( 'WHERE', 1 ));
    $tnumrows = DB_numRows( $tresult );
    $tlist = '';
    for( $i = 1; $i <= $tnumrows; $i++ )
    {
        $T = DB_fetchArray( $tresult );
        $tlist .= "'" . $T['tid'] . "'";
        if( $i < $tnumrows )
        {
            $tlist .= ',';
        }
    }
    if( !empty( $tlist ))
    {
        $where .= " AND (tid IN ($tlist))";
    }

    $result = DB_query( "SELECT sid,uid,title,introtext,postmode,UNIX_TIMESTAMP(date) AS modified FROM {$_TABLES['stories']} WHERE draft_flag = 0 AND date <= NOW() $where AND perm_anon > 0 ORDER BY date DESC $limitsql" );

    $content = array();
    $sids = array();
    $nrows = DB_numRows( $result );

    for( $i = 1; $i <= $nrows; $i++ )
    {
        $row = DB_fetchArray( $result );
        $sids[] = $row['sid'];

        $storytitle = stripslashes( $row['title'] );

        $storytext = stripslashes( $row['introtext'] );
        $storytext = trim( $storytext );
        $storytext = preg_replace( "/(\015)/", "", $storytext );

        $storylink = $_CONF['site_url'] . '/article.php?story=' . $row['sid'];

        $content[] = array( 'title'  => $storytitle,
                            'text'   => $storytext,
                            'link'   => $storylink,
                            'uid'    => $row['uid'],
                            'date'   => $row['modified'],
                            'format' => $row['postmode']
                          );
    }

    $link = $_CONF['site_url'];
    $update = implode( ',', $sids );

    return $content;
}

/**
* Update a feed.
*
* @param   int   $fid   feed id
*
*/
function SYND_updateFeed( $fid )
{
    global $_CONF, $_TABLES;

    $result = DB_query( "SELECT * FROM {$_TABLES['syndication']} WHERE fid = $fid");
    $A = DB_fetchArray( $result );
    if( $A['is_enabled'] == 1 )
    {
        require_once( $_CONF['path_system'] . 'classes/' . $A['format']
                      . '.feed.class.php' );
        $feed = new $A['format']();
        $feed->setFeedfile( $A['filename'] );
        $feed->setFeedformats( $A['content_length'], $A['language'],
                               $A['charset'] );

        $link = '';
        $data = '';
        if( $A['type'] == 'geeklog' )
        {
            if( $A['topic'] == '::all')
            {
                $content = SYND_getFeedContentAll( $A['limits'], $link, $data );
            }
            else // feed for a single topic only
            {
                $content = SYND_getFeedContentPerTopic( $A['topic'],
                        $A['limits'], $link, $data );
            }
        }
        else
        {
            $content = PLG_getFeedContent( $A['type'], $fid, $link, $data );
        }
        if( empty( $link ))
        {
            $link = $_CONF['site_url'];
        }
        $feed->setFeedinfo( $link, $A['title'], $A['description'] );
        $feed->write( $content );

        if( empty( $data ))
        {
            $data = 'NULL';
        }
        else
        {
            $data = "'" . $data . "'";
        }

        if ($_SYND_DEBUG) {
            COM_errorLog ("update_info for feed $fid is $data", 1);
        }

        DB_query( "UPDATE {$_TABLES['syndication']} SET updated = NOW(), update_info = $data WHERE fid = $fid");
    }
}

?>

Index: lib-database.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-database.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** lib-database.php	5 Jul 2003 10:19:09 -0000	1.26
--- lib-database.php	12 Aug 2003 21:10:06 -0000	1.27
***************
*** 81,84 ****
--- 81,85 ----
  $_TABLES['stories']             = $_DB_table_prefix . 'stories';
  $_TABLES['storysubmission']     = $_DB_table_prefix . 'storysubmission';
+ $_TABLES['syndication']         = $_DB_table_prefix . 'syndication';
  $_TABLES['topics']              = $_DB_table_prefix . 'topics';
  $_TABLES['tzcodes']             = $_DB_table_prefix . 'tzcodes';
***************
*** 176,184 ****
      $_DB->dbSave($table,$fields,$values);
  
-     if ($table == $_TABLES['stories']) {
-        COM_exportRDF();
-        COM_olderStuff();
-     }
- 
      if (!empty($return_page)) {
         print COM_refresh("$return_page");
--- 177,180 ----
***************
*** 204,212 ****
      $_DB->dbDelete($table,$id,$value);
  
-     if ($table == $_TABLES['stories']) {
-         COM_exportRDF();
-         COM_olderStuff();
-     }
- 
      if (!empty($return_page)) {
          print COM_refresh("$return_page");
--- 200,203 ----
***************
*** 256,264 ****
      $_DB->dbChange($table,$item_to_set,$value_to_set,$id,$value,$supress_quotes);
  
-     if ($table == $_TABLES['stories']) {
-         COM_exportRDF();
-         COM_olderStuff();
-     }
- 
      if (!empty($return_page)) {
          print COM_refresh("$return_page");
--- 247,250 ----
***************
*** 305,313 ****
  
      $_DB->dbCopy($table,$fields,$values,$tablefrom,$id,$value);
- 
-     if ($table == $_TABLES['stories']) {
-         COM_exportRDF();
-         COM_olderStuff();
-     }
  
      if (!empty($return_page)) {
--- 291,294 ----

Index: lib-plugins.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** lib-plugins.php	25 Jul 2003 10:44:39 -0000	1.22
--- lib-plugins.php	12 Aug 2003 21:10:06 -0000	1.23
***************
*** 810,814 ****
          }
      }
! 	return $headercode;
  }
  
--- 810,928 ----
          }
      }
! 
!     return $headercode;
! }
! 
! /**
! * Prepare a list of all plugins that support feeds. To do this, we re-use
! * plugin_getfeednames_<plugin name> and only keep the names of those plugins
! * which support that function
! *
! * @return   array   array of plugin names (can be empty)
! *
! */
! function PLG_supportingFeeds ()
! {
!     global $_TABLES;
! 
!     $plugins = array ();
! 
!     $result = DB_query ("SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_enabled = 1");
!     $nrows = DB_numRows ($result);
!     for ($i = 0; $i < $nrows; $i++) {
!         $A = DB_fetchArray ($result);
!         $function = 'plugin_getfeednames_' . $A['pi_name'];
!         if (function_exists ($function)) {
!             $feeds = $function ();
!             if (is_array ($feeds) && (sizeof ($feeds) > 0)) {
!                 $plugins[] = $A['pi_name'];
!             }
!         }
!     }
! 
!     return $plugins;
! }
! 
! /**
! * Ask the plugin for a list of feeds it supports. The plugin is expected to
! * return an array of id/name pairs where 'id' is the plugin's internal id
! * for the feed and 'name' is what will be presented to the user.
! *
! * @param    string   plugin   plugin name
! * @return   array             array of id/name pairs
! *
! */
! function PLG_getFeedNames ($plugin)
! {
!     global $_TABLES;
! 
!     $feeds = array ();
! 
!     if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = '$plugin'") == 1) {
!         $function = 'plugin_getfeednames_' . $plugin;
!         if (function_exists ($function)) {
!             $feeds = $function ();
!         }
!     }
! 
!     return $feeds;
! }
! 
! /**
! * Get the content of a feed from the plugin.
! * The plugin is expected to return an array holding the content of the feed
! * and to fill in 'link' (some link that represents the same content on the
! * site as that in the feed) and 'update_data' (to be stored for later up-to-date
! * checks.
! *
! * @param    string   plugin        plugin name
! * @param    int      feed          feed id
! * @param    string   link          link to content on the site
! * @param    string   update_data   information for later up-to-date checks
! * @return   array                  content of feed
! *
! */
! function PLG_getFeedContent ($plugin, $feed, &$link, &$update_data)
! {
!     global $_TABLES;
! 
!     $content = array ();
! 
!     if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = '$plugin'") == 1) {
!         $function = 'plugin_getfeedcontent_' . $plugin;
!         if (function_exists ($function)) {
!             $content = $function ($feed, $link, $update_data);
!         }
!     }
! 
!     return $content;
! }
! 
! /**
! * The plugin is expected to check if the feed content needs to be updated.
! * This is called from COM_rdfUpToDateCheck() every time Geeklog's index.php
! * is displayed - it should try to be as efficient as possible ...
! *
! * @param    string   plugin   plugin name
! * @param    int      feed     feed id
! * @param    string   topic    "topic" of the feed - plugin specific
! * @param    string   limit    number of entries or number of hours
! * @return   bool              false = feed has to be updated, true = ok
! *
! */
! function PLG_feedUpdateCheck ($plugin, $feed, $topic, $update_data, $limit)
! {
!     global $_TABLES;
! 
!     $is_current = true;
! 
!     if (DB_getItem ($_TABLES['plugins'], 'pi_enabled', "pi_name = '$plugin'") == 1) {
!         $function = 'plugin_feedupdatecheck_' . $plugin;
!         if (function_exists ($function)) {
!             $is_current = $function ($feed, $topic, $update_data, $limit);
!         }
!     }
! 
!     return $is_current;
  }
  




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/sql mysql_tableanddata.php,1.55,1.56
Message-ID: <200308122110.h7CLA8P26420@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql
In directory geeklog_prod:/tmp/cvs-serv26144/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


Index: mysql_tableanddata.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/sql/mysql_tableanddata.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** mysql_tableanddata.php	5 Aug 2003 08:30:49 -0000	1.55
--- mysql_tableanddata.php	12 Aug 2003 21:10:06 -0000	1.56
***************
*** 413,416 ****
--- 413,439 ----
  
  $_SQL[30] = "
+ CREATE TABLE {$_TABLES['syndication']} (
+   fid int unsigned NOT NULL auto_increment,
+   type varchar(30) NOT NULL default 'geeklog',
+   topic varchar(48) NOT NULL default '::all',
+   format varchar(20) NOT NULL default 'rss',
+   limits varchar(5) NOT NULL default '10',
+   content_length smallint(5) unsigned NOT NULL default '0',
+   title varchar(40) NOT NULL default '',
+   description text,
+   filename varchar(40) NOT NULL default 'geeklog.rdf',
+   charset varchar(20) NOT NULL default 'UTF-8',
+   language varchar(20) NOT NULL default 'en-gb',
+   is_enabled tinyint(1) unsigned NOT NULL default '1',
+   updated datetime NOT NULL default '0000-00-00 00:00:00',
+   update_info text,
+   PRIMARY KEY (fid),
+   INDEX syndication_type(type),
+   INDEX syndication_is_enabled(is_enabled),
+   INDEX syndication_updated(updated)
+ ) TYPE=MyISAM
+ ";
+ 
+ $_SQL[31] = "
  CREATE TABLE {$_TABLES['topics']} (
    tid varchar(20) NOT NULL default '',
***************
*** 430,434 ****
  ";
  
! $_SQL[31] = "
  CREATE TABLE {$_TABLES['tzcodes']} (
    tz char(3) NOT NULL default '',
--- 453,457 ----
  ";
  
! $_SQL[32] = "
  CREATE TABLE {$_TABLES['tzcodes']} (
    tz char(3) NOT NULL default '',
***************
*** 439,443 ****
  ";
  
! $_SQL[32] = "
  CREATE TABLE {$_TABLES['usercomment']} (
    uid mediumint(8) NOT NULL default '1',
--- 462,466 ----
  ";
  
! $_SQL[33] = "
  CREATE TABLE {$_TABLES['usercomment']} (
    uid mediumint(8) NOT NULL default '1',
***************
*** 449,453 ****
  ";
  
! $_SQL[33] = "
  CREATE TABLE {$_TABLES['userindex']} (
    uid mediumint(8) NOT NULL default '1',
--- 472,476 ----
  ";
  
! $_SQL[34] = "
  CREATE TABLE {$_TABLES['userindex']} (
    uid mediumint(8) NOT NULL default '1',
***************
*** 464,468 ****
  ";
  
! $_SQL[34] = "
  CREATE TABLE {$_TABLES['userinfo']} (
    uid mediumint(8) NOT NULL default '1',
--- 487,491 ----
  ";
  
! $_SQL[35] = "
  CREATE TABLE {$_TABLES['userinfo']} (
    uid mediumint(8) NOT NULL default '1',
***************
*** 478,482 ****
  ";
  
! $_SQL[35] = "
  CREATE TABLE {$_TABLES['userprefs']} (
    uid mediumint(8) NOT NULL default '1',
--- 501,505 ----
  ";
  
! $_SQL[36] = "
  CREATE TABLE {$_TABLES['userprefs']} (
    uid mediumint(8) NOT NULL default '1',
***************
*** 493,497 ****
  ";
  
! $_SQL[36] = "
  CREATE TABLE {$_TABLES['users']} (
    uid mediumint(8) NOT NULL auto_increment,
--- 516,520 ----
  ";
  
! $_SQL[37] = "
  CREATE TABLE {$_TABLES['users']} (
    uid mediumint(8) NOT NULL auto_increment,
***************
*** 513,517 ****
  ";
  
! $_SQL[37] = "
  CREATE TABLE {$_TABLES['vars']} (
    name varchar(20) NOT NULL default '',
--- 536,540 ----
  ";
  
! $_SQL[38] = "
  CREATE TABLE {$_TABLES['vars']} (
    name varchar(20) NOT NULL default '',
***************
*** 521,525 ****
  ";
  
! $_SQL[38] = "
  CREATE TABLE {$_TABLES['article_images']} (
    ai_sid varchar(20) NOT NULL,
--- 544,548 ----
  ";
  
! $_SQL[39] = "
  CREATE TABLE {$_TABLES['article_images']} (
    ai_sid varchar(20) NOT NULL,
***************
*** 530,534 ****
  ";
  
! $_SQL[39] = "
  CREATE TABLE {$_TABLES['staticpage']} (
    sp_id varchar(20) NOT NULL default '',
--- 553,557 ----
  ";
  
! $_SQL[40] = "
  CREATE TABLE {$_TABLES['staticpage']} (
    sp_id varchar(20) NOT NULL default '',
***************
*** 750,753 ****
--- 773,778 ----
  
  $_DATA[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('20030101120556538',2,'GeekLog','Are you secure?','<p>This is a reminder to secure your site once you have Geeklog up and running. What you should do:</p>\r\r<ol>\r<li>Change the default password for all Admin accounts.</li>\r<li>Remove the install directory (you won\'t need it any more).</li>\r</ol>','2003-01-01 12:05:56','html') ";
+ 
+ $_DATA[] = "INSERT INTO {$_TABLES['syndication']} (type, topic, format, limits, content_length, title, description, filename, charset, language, is_enabled, updated, update_info) VALUES ('geeklog', '::all', 'rss', 10, 0, 'Geeklog Site', 'Another Nifty Geeklog Site', 'geeklog.rdf', 'UTF-8', 'en-gb', 1, '0000-00-00 00:00:00', NULL)";
  
  $_DATA[] = "INSERT INTO {$_TABLES['topics']} (tid, topic, imageurl, sortnum, limitnews, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('General','General News','/images/topics/topic_news.gif',1,10,6,2,3,2,2,2)";




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/system/classes rss.feed.class.php,NONE,1.1
Message-ID: <200308122110.h7CLA8P26428@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv26144/system/classes

Added Files:
	rss.feed.class.php 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: rss.feed.class.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.3                                                               |
// +---------------------------------------------------------------------------+
// | rss.feed.class.php                                                        |
// |                                                                           |
// | Geeklog class for RSS 0.91 feeds.                                         |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2003 by the following authors:                         |
// |                                                                           |
// | Authors: Tony Bibbs       - tony AT geeklog DOT net                       |
// |          Dirk Haun        - dirk AT haun-online DOT de                    |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is free software; you can redistribute it and/or             |
// | modify it under the terms of the GNU General Public License               |
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
// | GNU General Public License for more details.                              |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: rss.feed.class.php,v 1.1 2003/08/12 21:10:06 dhaun Exp $

/**
* Geeklog RSS 0.91 class
*
* Parts of this code have originally been lifted from phpweblog which is
* licenced under the GPL. It has since been heavily modified.
*
* @author Dirk Haun <dirk AT haun-online DOT de>
* @package net.geeklog.rss
*
*/
class Rss {
    /**
    * @access private
    * @var string
    */
    var $_feedfile = 'geeklog.rdf';

    /**
    * @access private
    * @var string
    */
    var $_feedpath = '';

    /**
    * @access private
    * @var string
    */
    var $_feedurl = '';

    /**
    * @access private
    * @var string
    */
    var $_sitelink = '';

    /**
    * @access private
    * @var string
    */
    var $_feedtitle = '';

    /**
    * @access private
    * @var string
    */
    var $_feeddesc = '';

    /**
    * @access private
    * @var string
    */
    var $_feedlang = 'en-gb';

    /**
    * @access private
    * @var string
    */
    var $_feedencoding = 'UTF-8';

    /**
    * @access private
    * @var int
    */
    var $_feedcontentlen = 0;


    /**
    * Constructor
    *
    * Initializes private variables.
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access public
    *
    */
    function Rss ()
    {
        global $_CONF;

        if (!empty ($_CONF['default_charset'])) {
            $this->_feedencoding = $_CONF['default_charset'];
        } else {
            $this->_feedencoding = 'UTF-8';
        }

        if (!empty ($_CONF['rdf_language'])) {
            $this->_feedlang = $_CONF['rdf_language'];
        } else {
            $this->_feedlang = $_CONF['locale'];
        }
    }

    /**
    * Set file name for the RSS feed.
    *
    * @param   string   filename   actual file name, e.g. 'geeklog.rdf'
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access public
    *
    */
    function setFeedfile ($filename = '')
    {
        global $_CONF;

        if (!empty ($filename)) {
            $this->_feedfile = $filename;
        } else {
            $pos = strrpos ($_CONF['rdf_file'], '/');
            $this->_feedfile = substr ($_CONF['rdf_file'], $pos + 1);
        }
        $path = $_CONF['rdf_file'];
        $pos = strrpos ($path, '/');
        $path = substr ($path, 0, $pos + 1);
        $this->_feedpath = $path . $this->_feedfile;
        $this->_feedurl = substr_replace ($path, $_CONF['site_url'], 0,
                                          strlen ($_CONF['path_html']) - 1);
    }

    /**
    * Set information for an RSS feed.
    *
    * @param string   link    link to the site where this feed originates
    * @param string   title   (short) title of the feed
    * @param string   desc    (longer) description of the feed
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access public
    *
    */
    function setFeedinfo ($link = '', $title = '', $desc = '')
    {
        $this->_sitelink = $link;
        $this->_feedtitle = $title;
        $this->_feeddesc = $desc;
    }

    /**
    * Set formats for an RSS feed.
    *
    * @param int      contentlen    length of the content of an entry
    * @param string   language      feed language, e.g. 'en-gb'
    * @param string   encoding      feed encoding, e.g. 'UTF-8'
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access public
    *
    */
    function setFeedformats ($contentlen = 0, $language = '', $encoding = '')
    {
        $this->_feedcontentlen = $contentlen;

        if (!empty ($language)) {
            $this->_feedlang = $language;
        }

        if (!empty ($encoding)) {
            $this->_feedencoding = $encoding;
        }
    }

    /**
    * Format the content of an item
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access private
    *
    */
    function _formatContent ($text)
    {
        $storytext = trim (strip_tags ($text));
        $storytext = preg_replace ("/(\015)/", "", $storytext);
        if ($this->_feedcontentlen > 1) {
            if (strlen ($storytext) > $this->_feedcontentlen) {
                $storytext = substr ($storytext, 0, $this->_feedcontentlen - 3)
                           . '...';
            }
        }

        return htmlspecialchars ($storytext);
    }

    /**
    * Write the actual feed file.
    *
    * @author Dirk Haun <dirk AT haun-online DOT de>
    * @access public
    *
    */
    function write ($content)
    {
        global $LANG01;

        if (sizeof ($content) == 0) {
            return false;
        }

        $success = false;

        if ($fd = @fopen ($this->_feedpath, 'w')) {
            fputs ($fd, "<?xml version=\"1.0\" encoding=\"$this->_feedencoding\"?>\n\n");
            // according to <http://feeds.archive.org/validator/>, this
            // shouldn't be used any more ...
            // fputs ($fd, "<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n \"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n");

            fputs ($fd, "<rss version=\"0.91\">\n");
            fputs ($fd, "<channel>\n");
            fputs ($fd, '<title>' . htmlspecialchars ($this->_feedtitle)
                        . "</title>\n");
            fputs ($fd, '<link>' . htmlspecialchars ($this->_sitelink)
                        . "</link>\n");
            fputs ($fd, '<description>' . htmlspecialchars ($this->_feeddesc)
                        . "</description>\n");
            fputs ($fd, '<language>' . $this->_feedlang . "</language>\n\n");

            foreach ($content as $entry) {
                $desc = '';
                if ($this->_feedcontentlen > 0) {
                    $desc = '<description>'
                          . $this->_formatContent ($entry['text'])
                          . "</description>\n";
                }
                $title = '<title>' . htmlspecialchars ($entry['title'])
                       . "</title>\n";
                $link = '<link>' . htmlspecialchars ($entry['link'])
                      . "</link>\n";

                fputs ($fd, "<item>\n");
                fputs ($fd, $title);
                fputs ($fd, $link);
                if (!empty ($desc)) {
                    fputs ($fd, $desc);
                }
                fputs ($fd, "</item>\n\n");
            }

            fputs ($fd, "</channel>\n");
            fputs ($fd, "</rss>\n");

            fclose ($fd);

            $success = true;
        } else {
            COM_errorLog ($LANG01[54] . ' ' . $this->_feedpath, 1);
        }

        return $success;
    }
}

?>




From geeklog-cvs-admin at lists.geeklog.net  Tue Aug 12 17:10:08 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Tue, 12 Aug 2003 16:10:08 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/clean/admin/syndication feededitor.thtml,NONE,1.1 listfeeds.thtml,NONE,1.1 listitem.thtml,NONE,1.1 selecttype.thtml,NONE,1.1
Message-ID: <200308122110.h7CLA8P26413@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/admin/syndication
In directory geeklog_prod:/tmp/cvs-serv26144/public_html/layout/clean/admin/syndication

Added Files:
	feededitor.thtml listfeeds.thtml listitem.thtml 
	selecttype.thtml 
Log Message:
Admin interface for Content Syndication; Extensions to the Plugin API to allow plugins to create feeds; Other feed formats can be implemented as classes.


--- NEW FILE: feededitor.thtml ---
{start_feed_editor}
<form action="{site_admin_url}/syndication.php" method="post">
<table border="0" cellspacing="0" cellpadding="3" width="100%">
<tr>
  <td align="right">{lang_feedtitle}:</td>
  <td><input type="text" size="48" name="title" value="{feed_title}"></td>
</tr>
<tr>
  <td align="right">{lang_enabled}:</td>
  <td><input type="checkbox" name="is_enabled" {is_enabled}></td>
</tr>
<tr>
  <td align="right">{lang_type}:</td>
  <td>{feed_type_display}
    <input type="hidden" name="type" value="{feed_type}"></td>
</tr>
<tr>
  <td align="right">{lang_topic}:</td>
  <td>{feed_topic}</td>
</tr>
<tr>
  <td align="right">{lang_format}:</td>
  <td>{feed_format}</td>
</tr>
<tr>
  <td align="right">{lang_limits}:</td>
  <td><input type="text" size="4" name="limits" value="{feed_limits}"> {feed_limits_what}</td>
</tr>
<tr>
  <td align="right">{lang_content_length}:</td>
  <td><input type="text" size="4" name="content_length" value="{feed_content_length}"> <small>{lang_clen_explain}</small></td>
</tr>
<tr>
  <td align="right" valign="top">{lang_description}:</td>
  <td><textarea name="description" cols="50" rows="8" wrap="virtual">{feed_description}</textarea></td>
</tr>
<tr>
  <td align="right">{lang_filename}:</td>
  <td><input type="text" size="40" name="filename" value="{feed_filename}"></td>
</tr>
<tr>
  <td align="right">{lang_charset}:</td>
  <td><input type="text" size="20" name="charset" value="{feed_charset}"></td>
</tr>
<tr>
  <td align="right">{lang_language}:</td>
  <td><input type="text" size="20" name="language" value="{feed_language}"></td>
</tr>
<tr>
  <td align="right">{lang_updated}:</td>
  <td>{feed_updated}</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
  <td colspan="2">
    <input type="submit" value="{lang_save}" name="mode">
    <input type="submit" value="{lang_cancel}" name="mode">
    {delete_option}
    <input type="hidden" name="fid" value="{feed_id}">
  </td>
</tr>
</table>
</form>
{end_block}

--- NEW FILE: listfeeds.thtml ---
<table border="0" cellspacing="0" cellpadding=2 width="100%">
<tr>
  <td rowspan="2"><img src="{site_url}/images/icons/feed.gif" alt=""></td>
  <td>[ <a href="{site_admin_url}/syndication.php?mode=edit">{lang_newfeed}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
</tr>
<tr>
  <td>{lang_instructions}</td>
</tr>
</table>
<table cellpadding="0" cellspacing="3" border="0" width="100%">
<tr>
  <th align="left">{lang_title}</th>
  <th>{lang_type}</th>
  <th>{lang_format}</th>
  <th>{lang_filename}</th>
  <th>{lang_updated}</th>
  <th>{lang_enabled}</th>
</tr>
{feedlist_items}
<tr>
  <td colspan="6">{google_paging}</td>
</tr>
</table>


--- NEW FILE: listitem.thtml ---
<tr align="center">
  <td align="left">
    <a href="{site_admin_url}/syndication.php?mode=edit&amp;fid={feed_id}">{feed_title}</a>
  </td>
  <td align="center">{feed_type}</td>
  <td>{feed_format}</td>
  <td>{feed_filename_and_link}</td>
  <td>{feed_updated}</td>
  <td>{feed_enabled}</td>
</tr>

--- NEW FILE: selecttype.thtml ---
<form action="{site_admin_url}/syndication.php" method="POST">
<p>{lang_explain}</p>
<p align="center">{type_selection}&nbsp;&nbsp;&nbsp;
  <input type="submit" value="{lang_go}" name="mode"></p>
</form>




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 13 05:00:28 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 13 Aug 2003 04:00:28 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.53,1.54
Message-ID: <200308130900.h7D90SP00981@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install
In directory geeklog_prod:/tmp/cvs-serv946/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Update for Content Syndication


Index: install.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** install.php	11 Aug 2003 08:53:04 -0000	1.53
--- install.php	13 Aug 2003 09:00:26 -0000	1.54
***************
*** 47,51 ****
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.8');
  }
  
--- 47,51 ----
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.9');
  }
  
***************
*** 138,142 ****
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          $cnt = count ($old_versions);
--- 138,142 ----
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          $cnt = count ($old_versions);
***************
*** 479,482 ****
--- 479,496 ----
  
              $current_gl_version = '1.3.8';
+             $_SQL = '';
+             break;
+         case '1.3.8':
+             require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.8_to_1.3.9.php');
+             for ($i = 1; $i <= count($_SQL); $i++) {
+                 DB_query(current($_SQL));
+                 next($_SQL);
+             }
+ 
+             $pos = strrpos ($_CONF['rdf_file'], '/');
+             $filename = substr ($_CONF['rdf_file'], $pos + 1);
+             DB_query ("INSERT INTO {$_TABLES['syndication']} (title, description, limits, content_length, filename, charset, language, is_enabled, updated, update_info) VALUES ('{$_CONF['site_name']}', '{$_CONF['site_slogan']}', '{$_CONF['rdf_limit']}', {$_CONF['rdf_storytext']}, '{$filename}', '{$_CONF['default_charset']}', '{$_CONF['rdf_language']}', {$_CONF['backend']}, '0000-00-00 00:00:00', NULL)");
+ 
+             $current_gl_version = '1.3.9';
              $_SQL = '';
              break;




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 13 05:00:28 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 13 Aug 2003 04:00:28 -0500
Subject: [geeklog-cvs] geeklog-1.3/sql/updates mysql_1.3.8_to_1.3.9.php,NONE,1.1
Message-ID: <200308130900.h7D90SP00982@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql/updates
In directory geeklog_prod:/tmp/cvs-serv946/sql/updates

Added Files:
	mysql_1.3.8_to_1.3.9.php 
Log Message:
Update for Content Syndication


--- NEW FILE: mysql_1.3.8_to_1.3.9.php ---
<?php

$_SQL[] = "CREATE TABLE {$_TABLES['syndication']} (
  fid int unsigned NOT NULL auto_increment,
  type varchar(30) NOT NULL default 'geeklog',
  topic varchar(48) NOT NULL default 'all',
  format varchar(20) NOT NULL default 'rss',
  limits varchar(5) NOT NULL default '10',
  content_length smallint(5) unsigned NOT NULL default '0',
  title varchar(40) NOT NULL default '',
  description text,
  filename varchar(40) NOT NULL default 'geeklog.rdf',
  charset varchar(20) NOT NULL default 'UTF-8',
  language varchar(20) NOT NULL default 'en-gb',
  is_enabled tinyint(1) unsigned NOT NULL default '1',
  updated datetime NOT NULL default '0000-00-00 00:00:00',
  update_info text,
  PRIMARY KEY (fid),
  INDEX syndication_type(type),
  INDEX syndication_is_enabled(is_enabled),
  INDEX syndication_updated(updated)
) TYPE=MyISAM";

$_SQL[] = "DELETE FROM {$_TABLES['vars']} WHERE name = 'rdf_sids'";

?>




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 13 05:23:26 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 13 Aug 2003 04:23:26 -0500
Subject: [geeklog-cvs] geeklog-1.3/sql/updates mysql_1.3.8_to_1.3.9.php,1.1,1.2
Message-ID: <200308130923.h7D9NPP01497@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/sql/updates
In directory geeklog_prod:/tmp/cvs-serv1485

Modified Files:
	mysql_1.3.8_to_1.3.9.php 
Log Message:
Fixed default for 'topic'.


Index: mysql_1.3.8_to_1.3.9.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/sql/updates/mysql_1.3.8_to_1.3.9.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql_1.3.8_to_1.3.9.php	13 Aug 2003 09:00:26 -0000	1.1
--- mysql_1.3.8_to_1.3.9.php	13 Aug 2003 09:23:21 -0000	1.2
***************
*** 4,8 ****
    fid int unsigned NOT NULL auto_increment,
    type varchar(30) NOT NULL default 'geeklog',
!   topic varchar(48) NOT NULL default 'all',
    format varchar(20) NOT NULL default 'rss',
    limits varchar(5) NOT NULL default '10',
--- 4,8 ----
    fid int unsigned NOT NULL auto_increment,
    type varchar(30) NOT NULL default 'geeklog',
!   topic varchar(48) NOT NULL default '::all',
    format varchar(20) NOT NULL default 'rss',
    limits varchar(5) NOT NULL default '10',




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 13 06:43:01 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 13 Aug 2003 05:43:01 -0500
Subject: [geeklog-cvs] geeklog-1.3/language german.php,1.83,1.84 german_formal.php,1.3,1.4
Message-ID: <200308131043.h7DAh1P01947@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv1932

Modified Files:
	german.php german_formal.php 
Log Message:
Updated German language files.


Index: german.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** german.php	5 Jul 2003 18:45:00 -0000	1.83
--- german.php	13 Aug 2003 10:42:59 -0000	1.84
***************
*** 84,90 ****
  	35 => "Abmelden",
  	36 => "am",
! 	37 => "Keine Artikel.",
! 	38 => '',
! 	39 => "Neuladen",
  	40 => '',
  	41 => "G?ste",
--- 84,90 ----
  	35 => "Abmelden",
  	36 => "am",
! 	37 => 'Keine Artikel.',
! 	38 => 'Content Syndication',
! 	39 => 'Neuladen',
  	40 => '',
  	41 => "G?ste",
***************
*** 1026,1030 ****
      55 => 'Du solltest in K?rze eine E-Mail erhalten, in der beschrieben wird, wie Du ein neues Passwort f?r Deinen Account eingeben kannst.',
      56 => 'Die angegebene E-Mail-Adresse wird schon f?r einen anderen Account verwendet.',
!     57 => 'Dein Account wurde gel?scht.'
  );
  
--- 1026,1032 ----
      55 => 'Du solltest in K?rze eine E-Mail erhalten, in der beschrieben wird, wie Du ein neues Passwort f?r Deinen Account eingeben kannst.',
      56 => 'Die angegebene E-Mail-Adresse wird schon f?r einen anderen Account verwendet.',
!     57 => 'Dein Account wurde gel?scht.',
!     58 => 'Der Feed wurde gespeichert.',
!     59 => 'Der Feed wurde gel?scht.'
  );
  
***************
*** 1063,1066 ****
--- 1065,1108 ----
      30 => 'Plugin l?schen?',
      31 => 'Bist Du sicher, dass Du dieses Plugin l?schen willst? Dies wird alle Daten und Datenstrukturen l?schen, die dieses Plugin benutzt. Wenn Du sicher bist, dann klicke jetzt bitte noch einmal auf L?schen.'
+ );
+ 
+ // for syndication.php
+ 
+ $LANG33 = array (
+     1 => 'Feed anlegen',
+     2 => 'Speichern',
+     3 => 'L?schen',
+     4 => 'Abbruch',
+     10 => 'Content Syndication',
+     11 => 'Neuer Feed',
+     12 => 'Admin Home',
+     13 => 'Um einen Feed zu ?ndern oder zu l?schen, auf den Titel des Feeds (s.u.) klicken. Um einen neuen Feed anzulegen, auf Neuer Feed (s.o.) klicken.',
+     14 => 'Titel',
+     15 => 'Art',
+     16 => 'Dateiname',
+     17 => 'Format',
+     18 => 'letztes Update',
+     19 => 'Aktiv',
+     20 => 'Ja',
+     21 => 'Nein',
+     22 => '<i>(keine Feeds)</i>',
+     23 => 'alle Artikel',
+     24 => 'Feed-Editor',
+     25 => 'Feed-Titel',
+     26 => 'Limit',
+     27 => 'L?nge d. Eintr?ge',
+     28 => '(0 = ohne Text, 1 = kompletter Text, anderer Wert = nur so viele Zeichen)',
+     29 => 'Beschreibung',
+     30 => 'Letztes Update',
+     31 => 'Zeichensatz',
+     32 => 'Sprache',
+     33 => 'Kategorie',
+     34 => 'Eintr?ge',
+     35 => 'Stunden',
+     36 => 'Art des Feeds festlegen',
+     37 => 'Du hast (mindestens) ein Plugin installiert, das Content Syndication unterst?tzt. Bitte w?hle zun?chst aus, ob Du einen Feed f?r Geeklog oder f?r ein Plugin anlegen willst.',
+     38 => 'Fehler: Nicht alle Felder ausgef?llt',
+     39 => 'Bitte die Felder Feed-Titel, Beschreibung und Dateiname ausf?llen.',
+     40 => 'Bitte ein Limit (Anzahl Eintr?ge oder Anzahl Stunden) eingeben.'
  );
  

Index: german_formal.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german_formal.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** german_formal.php	5 Jul 2003 18:45:48 -0000	1.3
--- german_formal.php	13 Aug 2003 10:42:59 -0000	1.4
***************
*** 301,307 ****
      86 => 'Alle Artikel und Kommentare von',
  	87 => 'Ihr Username',
!     88 => 'Jemand (m?glicherweise Sie selbst) haben ein neues Passwort f?r Ihren Account "%s" auf ' . $_CONF['site_name'] . ' <' . $_CONF['site_url'] . "> angefordert.\n\nWenn Sie tats?chlich ein neues Passwort ben?tigst, klicken Sie bitte auf den folgenden Link:\n\n",
!     89 => 'M?chten Sie Ihr Passwort nicht ?ndern, so kannst diese E-Mail einfach ignoriert bleiben (Ihr bisheriges Passwort bleibt dann unver?ndert g?ltig).\n\n',
!     90 => 'Hier kannst  jetzt ein neues Passwort f?r Ihren Account eingeben werden . Ihr altes Passwort bleibt noch solange g?ltig, bis Sie dieses Formular abschicken.',
      91 => 'Neues Passwort',
      92 => 'Neues Passwort eingeben',
--- 301,307 ----
      86 => 'Alle Artikel und Kommentare von',
  	87 => 'Ihr Username',
!     88 => 'Jemand (m?glicherweise Sie selbst) hat ein neues Passwort f?r Ihren Account "%s" auf ' . $_CONF['site_name'] . ' <' . $_CONF['site_url'] . "> angefordert.\n\nWenn Sie tats?chlich ein neues Passwort ben?tigst, klicken Sie bitte auf den folgenden Link:\n\n",
!     89 => 'M?chten Sie Ihr Passwort nicht ?ndern, so k?nnen Sie diese E-Mail einfach ignorieren (Ihr bisheriges Passwort bleibt dann unver?ndert g?ltig).\n\n',
!     90 => 'Hier k?nnen Sie jetzt ein neues Passwort f?r Ihren Account eingeben. Ihr altes Passwort bleibt noch solange g?ltig, bis Sie dieses Formular abschicken.',
      91 => 'Neues Passwort',
      92 => 'Neues Passwort eingeben',
***************
*** 1021,1026 ****
      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 => 'Danke, dass Sie sich bei ' . $_CONF['site_name'] . ' angemeldet hast. Ihr Aufnahmeantrag wird von unserem Team gepr?ft. Sobald er akzeptiert wird, werden Sie ein Passwort per E-Mail erhalten.',
!     49 => "Ihre Gruppe wurde gespeichert.",
!     50 => "Die Gruppe wurde gel?scht."
  );
  
--- 1021,1035 ----
      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 => 'Danke, dass Sie sich bei ' . $_CONF['site_name'] . ' angemeldet hast. Ihr Aufnahmeantrag wird von unserem Team gepr?ft. Sobald er akzeptiert wird, werden Sie ein Passwort per E-Mail erhalten.',
!     49 => 'Ihre Gruppe wurde gespeichert.',
!     50 => 'Die Gruppe wurde gel?scht.',
!     51 => 'Dieser Username ist schon vergeben. Bitte w?hlen Sie einen anderen.',
!     52 => 'Die angegebene E-Mail-Adresse scheint nicht g?ltig zu sein.',
!     53 => 'Ihr neues Passwort wurde gespeichert. Bitte melden Sie sich nun mit dem neuen Passwort an.',
!     54 => 'Diese Anfrage f?r ein neues Passwort ist nicht mehr g?ltig. Bitte fordern Sie erneut ein neues Passwort an.',
!     55 => 'Sie sollten in K?rze eine E-Mail erhalten, in der beschrieben wird, wie Sie ein neues Passwort f?r Ihren Account eingeben k?nnen.',
!     56 => 'Die angegebene E-Mail-Adresse wird schon f?r einen anderen Account verwendet.',
!     57 => 'Ihr Account wurde gel?scht.',
!     58 => 'Der Feed wurde gespeichert.',
!     59 => 'Der Feed wurde gel?scht.'
  );
  
***************
*** 1059,1062 ****
--- 1068,1111 ----
      30 => 'Plugin l?schen?',
      31 => 'Sind Sie sicher, dass Sie dieses Plugin l?schen wollen? Dies wird alle Dateien, Daten und Datenstrukturen l?schen, die dieses Plugin benutzt. Wenn Sie sicher sind, dann klicken Sie jetzt bitte noch einmal auf L?schen.'
+ );
+ 
+ // for syndication.php
+ 
+ $LANG33 = array (
+     1 => 'Feed anlegen',
+     2 => 'Speichern',
+     3 => 'L?schen',
+     4 => 'Abbruch',
+     10 => 'Content Syndication',
+     11 => 'Neuer Feed',
+     12 => 'Admin Home',
+     13 => 'Um einen Feed zu ?ndern oder zu l?schen, auf den Titel des Feeds (s.u.) klicken. Um einen neuen Feed anzulegen, auf Neuer Feed (s.o.) klicken.',
+     14 => 'Titel',
+     15 => 'Art',
+     16 => 'Dateiname',
+     17 => 'Format',
+     18 => 'letztes Update',
+     19 => 'Aktiv',
+     20 => 'Ja',
+     21 => 'Nein',
+     22 => '<i>(keine Feeds)</i>',
+     23 => 'alle Artikel',
+     24 => 'Feed-Editor',
+     25 => 'Feed-Titel',
+     26 => 'Limit',
+     27 => 'L?nge d. Eintr?ge',
+     28 => '(0 = ohne Text, 1 = kompletter Text, anderer Wert = nur so viele Zeichen)',
+     29 => 'Beschreibung',
+     30 => 'Letztes Update',
+     31 => 'Zeichensatz',
+     32 => 'Sprache',
+     33 => 'Kategorie',
+     34 => 'Eintr?ge',
+     35 => 'Stunden',
+     36 => 'Art des Feeds festlegen',
+     37 => 'Sie haben (mindestens) ein Plugin installiert, das Content Syndication unterst?tzt. Bitte w?hlen Sie zun?chst aus, ob Sie einen Feed f?r Geeklog oder f?r ein Plugin anlegen wollen.',
+     38 => 'Fehler: Nicht alle Felder ausgef?llt',
+     39 => 'Bitte die Felder Feed-Titel, Beschreibung und Dateiname ausf?llen.',
+     40 => 'Bitte ein Limit (Anzahl Eintr?ge oder Anzahl Stunden) eingeben.'
  );
  




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 13 14:33:20 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 13 Aug 2003 13:33:20 -0500
Subject: [geeklog-cvs] geeklog-1.3/language german_formal.php,1.4,1.5
Message-ID: <200308131833.h7DIXKP06509@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv6493

Modified Files:
	german_formal.php 
Log Message:
Fixed some phrases


Index: german_formal.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german_formal.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** german_formal.php	13 Aug 2003 10:42:59 -0000	1.4
--- german_formal.php	13 Aug 2003 18:33:18 -0000	1.5
***************
*** 239,243 ****
  	24 => "Ihr Passwort wird Ihnen an die angegebene E-Mail-Adresse geschickt.",
  	25 => "Passwort vergessen?",
! 	26 => "Geben Sie Ihren Usernamen ein und klicken Sie auf Passwort schicken. Ein neues Passwort wird dann an die gespeicherte E-Mail-Adresse geschickt.",
  	27 => "Jetzt anmelden!",
  	28 => "Passwort schicken",
--- 239,243 ----
  	24 => "Ihr Passwort wird Ihnen an die angegebene E-Mail-Adresse geschickt.",
  	25 => "Passwort vergessen?",
! 	26 => 'Geben Sie <em>entweder</em> Ihren Usernamen <em>oder</em> die E-Mail-Adresse ein, mit der Sie sich angemeldet haben, und klicken Sie dann auf "Passwort schicken". Eine E-Mail mit einer Anleitung, wie Sie ein neues Passwort eingeben k?nnen, wird dann an die gespeicherte E-Mail-Adresse geschickt.',
  	27 => "Jetzt anmelden!",
  	28 => "Passwort schicken",
***************
*** 301,306 ****
      86 => 'Alle Artikel und Kommentare von',
  	87 => 'Ihr Username',
!     88 => 'Jemand (m?glicherweise Sie selbst) hat ein neues Passwort f?r Ihren Account "%s" auf ' . $_CONF['site_name'] . ' <' . $_CONF['site_url'] . "> angefordert.\n\nWenn Sie tats?chlich ein neues Passwort ben?tigst, klicken Sie bitte auf den folgenden Link:\n\n",
!     89 => 'M?chten Sie Ihr Passwort nicht ?ndern, so k?nnen Sie diese E-Mail einfach ignorieren (Ihr bisheriges Passwort bleibt dann unver?ndert g?ltig).\n\n',
      90 => 'Hier k?nnen Sie jetzt ein neues Passwort f?r Ihren Account eingeben. Ihr altes Passwort bleibt noch solange g?ltig, bis Sie dieses Formular abschicken.',
      91 => 'Neues Passwort',
--- 301,306 ----
      86 => 'Alle Artikel und Kommentare von',
  	87 => 'Ihr Username',
!     88 => 'Jemand (m?glicherweise Sie selbst) hat ein neues Passwort f?r Ihren Account "%s" auf ' . $_CONF['site_name'] . ' <' . $_CONF['site_url'] . "> angefordert.\n\nWenn Sie tats?chlich ein neues Passwort ben?tigen, klicken Sie bitte auf den folgenden Link:\n\n",
!     89 => "M?chten Sie Ihr Passwort nicht ?ndern, so k?nnen Sie diese E-Mail einfach ignorieren (Ihr bisheriges Passwort bleibt dann unver?ndert g?ltig).\n\n",
      90 => 'Hier k?nnen Sie jetzt ein neues Passwort f?r Ihren Account eingeben. Ihr altes Passwort bleibt noch solange g?ltig, bis Sie dieses Formular abschicken.',
      91 => 'Neues Passwort',




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 14 09:44:34 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 14 Aug 2003 08:44:34 -0500
Subject: [geeklog-cvs] geeklog-1.3/plugins/staticpages/language turkish.php,NONE,1.1
Message-ID: <200308141344.h7EDiYP17122@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/plugins/staticpages/language
In directory geeklog_prod:/tmp/cvs-serv17110

Added Files:
	turkish.php 
Log Message:
New Turkish language file for the Static Pages plugin, provided by ScriptEvi.com


--- NEW FILE: turkish.php ---
<?php

###############################################################################
# turkish.php
# This is the turkish language page for the Geeklog Static Page Plug-in!
#
# Copyright (C) 2003 ScriptEvi.com
# webmaster at scriptevi.com
# http://www.scriptevi.com
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
#
###############################################################################

###############################################################################
# Array Format: 
# $LANGXX[YY]:	$LANG - variable name
#		  	XX - file id number
#			YY - phrase id number
###############################################################################


$LANG_STATIC= array(
    newpage => 'Yeni Sayfa',
    adminhome => 'Y?netim Sayfas?',
    staticpages => 'Statik Sayfalar',
    staticpageeditor => 'Statik Sayfa D?zenleyicisi',
    writtenby => 'Yazan',
    date => 'Son G?ncelleme',
    title => 'Ba?l?k',
    content => '??erik',
    hits => 'Hit',
    staticpagelist => 'Statik Sayfa Listesi',
    url => 'URL',
    edit => 'D?zenle',
    lastupdated => 'Son G?ncelleme',
    pageformat => 'Sayfa Format?',
    leftrightblocks => 'Sol & Sa? Bloklar',
    blankpage => 'Bo? Sayfa',
    noblocks => 'Bloklar Yok',
    leftblocks => 'Sol Bloklar',
    addtomenu => 'Men?ye Ekle',
    label => 'Etiket',
    nopages => 'Hen?z sistemde statik sayfalar yok',
    save => 'kaydet',
    preview => '?nizleme',
    delete => 'sil',
    cancel => 'vazge?',
    access_denied => 'Giri? Engellendi',
    access_denied_msg => 'Statik Sayfalar y?netim sayfalar?na yetkisiz giri? demesi yap?yorsunuz. Not: Bu sayfalara yetkisiz giri? denemelerinin hepsi kaydedilmektedir',
    all_html_allowed => 'B?t?n HTML kodlar? kullan?labilir',
    results => 'Statik Sayfalar Sonu?lar?',
    author => 'Yazar',
    no_title_or_content => 'En az?ndan <b>Ba?l?k</b> ve <b>??erik</b> b?l?mlerini doldurmal?s?n?z.',
    no_such_page_logged_in => '?zg?n?z '.$_USER['username'].'..',
    no_such_page_anon => 'L?tfen giri? yap?n..',
    no_page_access_msg => "Bu olabilir ??nk? giri? yapmad?n?z yada {$_CONF["site_name"]} nin kay?tl? bir ?yesi de?ilsiniz. {$_CONF["site_name"]} nin t?m ?yelik giri?lerini elde etmek i?in l?tfen <a href=\"{$_CONF['site_url']}/users.php?mode=new\"> yeni bir ?ye olun</a>",
    php_msg => 'PHP: ',
    php_warn => 'Uyar?: ?ayet bu se?ene?i kullan?rsan?z, sayfan?z PHP kodunda de?erlendirilir. Dikkatli kullan?n !!',
    exit_msg => '??k?? Tipi: ',
    exit_info => 'Giri? Mesaj? ?stemeyi olanakl? k?lar. Normal g?venlik kontrol? ve mesaj? i?in i?areti kald?r?n.',
    deny_msg => 'Bu sayfaya giri? engellendi. Bu sayfa ta??nd? yada kald?r?ld? veya yeterli izniniz yok.',
    stats_headline => 'Top On Statik Sayfa',
    stats_page_title => 'Sayfa Ba?l???',
    stats_hits => 'Hit',
    stats_no_hits => 'It appears that there are no static pages on this site or no one has ever viewed them.',
    id => 'ID',
    duplicate_id => 'Bu statik sayfa i?in se?ti?iniz ID zaten kullan?l?yor. L?tfen ba?ka ID se?in.',
    instructions => 'Bir statik sayfay? d?zenlemek yada silmek isterseniz, a?a??daki sayfa numaras?na t?klay?n?z. Bir statik sayfay? g?r?nt?leme, g?rmek istedi?iniz sayfan?n ba?l???na t?kly?n?z. Yeni bir statik sayfa yaratmak i?in ?stteki Yeni Sayfa linkine t?klay?n. [C] \'ye t?klayarak varolan sayfan?n bir kopyas?n? yarat?rs?n?z.',
    centerblock => 'Ortablok: ',
    centerblock_msg => '??aretlenirse, bu statik sayfa index sayfas?nda bir orta blokda g?r?nt?lenecektir.',
    topic => 'Konu: ',
    position => 'Pozisyon: ',
    all_topics => 'Hepsi',
    no_topic => 'Sadece Ana Sayfa',
    position_top => 'Sayfan?n ?st?',
    position_feat => 'G?n?n Yaz?s?ndan Sonra',
    position_bottom => 'Sayfan?n Alt?',
    position_entire => 'Tam Sayfa',
    head_centerblock => 'Ortablok',
    centerblock_no => 'Yok',
    centerblock_top => '?st',
    centerblock_feat => 'G?n. Yaz?s?',
    centerblock_bottom => 'Alt',
    centerblock_entire => 'Tam Sayfa'
);

?>




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 14 09:45:49 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 14 Aug 2003 08:45:49 -0500
Subject: [geeklog-cvs] geeklog-1.3/language turkish.php,1.2,1.3
Message-ID: <200308141345.h7EDjnP17155@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv17142

Modified Files:
	turkish.php 
Log Message:
Updated Turkish language file, provided by ScriptEvi.com


Index: turkish.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/turkish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** turkish.php	8 Jun 2003 08:21:27 -0000	1.2
--- turkish.php	14 Aug 2003 13:45:46 -0000	1.3
***************
*** 6,11 ****
  # Special thanks to Mischa Polivanov for his work on this project
  #
! # Copyright (C) 2003 Sinan Ussakli
! # sinan at ussakli.net
  #
  # This program is free software; you can redistribute it and/or
--- 6,12 ----
  # Special thanks to Mischa Polivanov for his work on this project
  #
! # Copyright (C) 2003 ScriptEvi.com
! # webmaster at scriptevi.com
! # http://www.scriptevi.com
  #
  # This program is free software; you can redistribute it and/or
***************
*** 44,54 ****
  $LANG01 = array(
  	1 => "Ekleyen:",
! 	2 => "okumaya devam et",
  	3 => "yorum",
  	4 => "De?i?tir",
! 	5 => "Oy kullan",
  	6 => "Sonu?lar",
  	7 => "Anket Sonu?lar?",
! 	8 => "oylar",
  	9 => "Y?netici kontrolleri:",
  	10 => "G?nderilenler",
--- 45,55 ----
  $LANG01 = array(
  	1 => "Ekleyen:",
! 	2 => "devam?",
  	3 => "yorum",
  	4 => "De?i?tir",
! 	5 => "Oy Kullan",
  	6 => "Sonu?lar",
  	7 => "Anket Sonu?lar?",
! 	8 => "oy",
  	9 => "Y?netici kontrolleri:",
  	10 => "G?nderilenler",
***************
*** 66,73 ****
  	22 => "Kullan?c? Tan?mlay?c?s?",
  	23 => "G?venlik Seviyesi",
! 	24 => "Herhangi",
  	25 => "Yorum Ekle",
  	26 => "A?a??daki yorumlar?n sorumlulu?u g?nderene aittir. Sitemiz herhangi bir sorumluluk kabul etmez.",
! 	27 => "En Yeni G?nderilen",
  	28 => "Sil",
  	29 => "Hi? yorum yap?lmam??.",
--- 67,74 ----
  	22 => "Kullan?c? Tan?mlay?c?s?",
  	23 => "G?venlik Seviyesi",
! 	24 => "?simsiz Kullan?c?",
  	25 => "Yorum Ekle",
  	26 => "A?a??daki yorumlar?n sorumlulu?u g?nderene aittir. Sitemiz herhangi bir sorumluluk kabul etmez.",
! 	27 => "En Son",
  	28 => "Sil",
  	29 => "Hi? yorum yap?lmam??.",
***************
*** 77,81 ****
  	33 => "Hata, kay?t dosyas?na yaz?lam?yor",
  	34 => "Hata",
! 	35 => "??k?? yap",
  	36 => "",
  	37 => "Kullan?c?lardan hi? bir yaz? gelmemi?",
--- 78,82 ----
  	33 => "Hata, kay?t dosyas?na yaz?lam?yor",
  	34 => "Hata",
! 	35 => "??k?? Yap",
  	36 => "",
  	37 => "Kullan?c?lardan hi? bir yaz? gelmemi?",
***************
*** 100,104 ****
  	56 => "Oy kullan",
  	57 => "?ifre",
! 	58 => "Sisteme gir",
  	59 => "Hala ?ye de?ilmisiniz?<br><a href=\"{$_CONF['site_url']}/users.php?mode=new\">?ye olun</a>",
  	60 => "Yorum G?nder",
--- 101,105 ----
  	56 => "Oy kullan",
  	57 => "?ifre",
! 	58 => "Sisteme Gir",
  	59 => "Hala ?ye de?ilmisiniz?<br><a href=\"{$_CONF['site_url']}/users.php?mode=new\">?ye olun</a>",
  	60 => "Yorum G?nder",
***************
*** 109,117 ****
  	65 => "Bas?labilir Hali",
  	66 => "Takvimim",
! 	67 => "", //in turkish welcome to comes after site name. ie. GeekLog Site Welcome to
  	68 => "ana Sayfa",
  	69 => "ileti?im",
  	70 => "ara",
! 	71 => "contribute",
  	72 => "web kaynaklar?",
  	73 => "ge?mi? anketler",
--- 110,118 ----
  	65 => "Bas?labilir Hali",
  	66 => "Takvimim",
! 	67 => " ne Ho? Geldiniz", //in turkish welcome to comes after site name. ie. GeekLog Site Welcome to
  	68 => "ana Sayfa",
  	69 => "ileti?im",
  	70 => "ara",
! 	71 => "yaz? ekle",
  	72 => "web kaynaklar?",
  	73 => "ge?mi? anketler",
***************
*** 135,141 ****
  	91 => "Yarat?lma s?resi:",
  	92 => "saniye",
! 	93 => "Kopya Hakk?",
  	94 => "Bu sayfalarda yay?mlanan materyalin t?m haklar? sahiplerine aittir.",
! 	95 => "G??:",
  	96 => "Gruplar",
      97 => "Kelime Listesi",
--- 136,142 ----
  	91 => "Yarat?lma s?resi:",
  	92 => "saniye",
! 	93 => "Copyright",
  	94 => "Bu sayfalarda yay?mlanan materyalin t?m haklar? sahiplerine aittir.",
! 	95 => "Powered By:",
  	96 => "Gruplar",
      97 => "Kelime Listesi",
***************
*** 146,152 ****
      102 => 'Site Etkinlikleri',
      103 => 'Veritaban? Yedekleri',
!     104 => 'taraf?ndan',
      105 => 'Kullan?c?lara Mesaj',
!     106 => 'G?r?n?mler',
      107 => 'GL S?r?m Testi',
      108 => '?nbelle?i Temizle'
--- 147,153 ----
      102 => 'Site Etkinlikleri',
      103 => 'Veritaban? Yedekleri',
!     104 => 'ta. G?nderen:',
      105 => 'Kullan?c?lara Mesaj',
!     106 => 'Okunma',
      107 => 'GL S?r?m Testi',
      108 => '?nbelle?i Temizle'
***************
*** 230,234 ****
  	21 => "Hata",
  	22 => "{$_CONF['site_name']} ?ye ol!",
! 	23 => "Bir kullan?c? hesab? yaratman?z size {$_CONF['site_name']} ?yeli?i sa?lar. Bu sayede sitede yorumlar ekleyebilir, kendi i?eri?inizi ekleyebilirsiniz. E?er kullan?c? hesab?n?z yoksa sadece Herhangi birisi olarak i?erik ve yorum g?nderebilirsiniz. Sistemimize verdi?iniz email adresi <b><i>hi? bir zaman</i></b> sitede g?sterilmeyecektir.",
  	24 => "?ifreniz verdi?iniz email adresinize g?nderilecektir.",
  	25 => "?ifrenizi mi unuttunuz?",
--- 231,235 ----
  	21 => "Hata",
  	22 => "{$_CONF['site_name']} ?ye ol!",
! 	23 => "Bir kullan?c? hesab? yaratman?z size {$_CONF['site_name']} ?yeli?i sa?lar. Bu sayede siteye kendinize ait yorumlar?n?z? g?nderebilir ve kendi i?eri?inizi d?zenleyebilirsiniz. E?er kullan?c? hesab?n?z yoksa sadece Herhangi Birisi-?simsiz Kullan?c? olarak i?erik ve yorum g?nderebilirsiniz. Sistemimize verdi?iniz email adresi <b><i>hi? bir zaman</i></b> sitede g?r?nt?lenmeyecektir.",
  	24 => "?ifreniz verdi?iniz email adresinize g?nderilecektir.",
  	25 => "?ifrenizi mi unuttunuz?",
***************
*** 278,282 ****
  	69 => "Sizi sisteme giri? yapt?ktan sonra hat?rlama s?resi",
  	70 => "{$_CONF['site_name']} i?in i?erik ve g?r?n?m ayarlar? d?zenleyin",
! 	71 => "One of the great features of {$_CONF['site_name']} is you can customize the content you get and you can change the overall layout of this site.  In order to take advantage of these great features you must first <a href=\"{$_CONF['site_url']}/users.php?mode=new\">register</a> with {$_CONF['site_name']}.  Are you already a member?  Then use the login form to the left to log in!",
      72 => "Tema",
      73 => "Dil",
--- 279,283 ----
  	69 => "Sizi sisteme giri? yapt?ktan sonra hat?rlama s?resi",
  	70 => "{$_CONF['site_name']} i?in i?erik ve g?r?n?m ayarlar? d?zenleyin",
! 	71 => "{$_CONF['site_name']} nin en b?y?k ?zelli?i, i?eri?inizi ?zelle?tirebilir, bu sitenin t?m g?r?nt?s?n? de?i?tirebilirsiniz.  Bu b?y?k avantajlardan yararlanmak i?in ?ncelikle {$_CONF['site_name']} ne <a href=\"{$_CONF['site_url']}/users.php?mode=new\">kay?t yapmal?s?n?z</a>.  Zaten kay?tl? bir ?yemisiniz?  O zaman sol taraftaki formu kullanarak giri? yap?n?z!",
      72 => "Tema",
      73 => "Dil",
***************
*** 293,297 ****
      84 => 'Yaz?lan yaz?lar?n toplam?:',
      85 => 'Yaz?lan yorumlar?n toplam?:',
!     86 => 'G?nderdi?i t?m mesajlar:'
  );
  
--- 294,317 ----
      84 => 'Yaz?lan yaz?lar?n toplam?:',
      85 => 'Yaz?lan yorumlar?n toplam?:',
!     86 => 'G?nderdi?i t?m mesajlar:',
!     87 => 'Giri? Ad?n?z',
!     88 => 'Birisi (belki siz) ' . $_CONF['site_name'] . ', sitesindeki "%s" hesab?n?z i?in yeni bir ?ifre istedi <' . $_CONF['site_url'] . ">.\n\n?ayet siz ger?ekten bu ?ifreyi almak istiyorsan?z, l?tfen bu linki t?klay?n:\n\n",
!     89 => "?ayet bu ?ifreyi almak istemiyorsan?z, bu mesaj? dikkate almay?n ve bu iste?i ?nemsemeyin (?ifreniz de?i?meyecek ve oldu?u gibi kalacakt?r).\n\n",
!     90 => 'A?a??daki hesab?n?z i?in yeni bir ?ifre girmelisiniz. Not: bu formu g?nderinceye kadar eski ?ifreniz ge?erlidir.',
!     91 => 'Yeni ?ifre Tespit Et',
!     92 => 'Yeni ?ifre Gir',
!     93 => 'Yeni bir ?ifre iste?iniz %d saniye ?nceydi. Bu site ?ifre istekleri aras?nda en az %d saniye olmas?n? aramaktad?r.',
!     94 => '"%s" isimli ?yenin Hesab?n? Sil',
!     95 => 'A?a??daki "hesab? sil" butonuna t?klay?nca hesab?n?z, veritaban?m?zdan kald?r?lacakt?r. Not, bu hesab?n?z alt?nda g?nderdi?iniz yaz?lar ve yorumlar <strong>silinmeyecektir</strong> fakat iletiler "?simsiz Kullan?c?" olarak g?r?nt?lenecektir.',
!     96 => 'hesab? sil',
!     97 => 'Hesap Silme Onay?',
!     98 => 'Hesab?n?z? silmek istedi?inize eminmisiniz? B?ylece yeni bir hesap yarat?ncaya kadar bu siteye kay?tl? kullan?c? olarak giremeyeceksiniz. ?ayet eminseniz a?a??daki formda ki "hesab? sil" butonuna tekrar t?klay?n?z.',
!     99 => 'isimli ?yenin Gizlilik Se?enekleri',
!     100 => 'Y?neticiden Email',
!     101 => 'Site y?neticilerinden email izni',
!     102 => '?yelerden Email',
!     103 => 'Di?er ?yelerden email izni',
!     104 => 'Aktifli?inizin G?r?nt?lenmesi',
!     105 => 'Aktif Kullan?c?lar Blo?unda g?r?nt?lenme'
  );
  
***************
*** 303,307 ****
  	2 => "G?sterilecek hi? haber yaz?s? yok. Bu konu hakk?nda hi? haber olmayabilir, veya belirledi?iniz ayarlar y?z?nden g?sterilemiyor olabilir",
  	3 => " $topic i?in",
! 	4 => "Bug?n?n ?ncelikli Haberi",
  	5 => "Sonraki",
  	6 => "?nceki"
--- 323,327 ----
  	2 => "G?sterilecek hi? haber yaz?s? yok. Bu konu hakk?nda hi? haber olmayabilir, veya belirledi?iniz ayarlar y?z?nden g?sterilemiyor olabilir",
  	3 => " $topic i?in",
! 	4 => "G?n?n Yaz?s?",
  	5 => "Sonraki",
  	6 => "?nceki"
***************
*** 325,329 ****
  	3 => "Oyla",
  	4 => "Anketler",
! 	5 => "Oylar"
  );
  
--- 345,350 ----
  	3 => "Oyla",
  	4 => "Anketler",
! 	5 => "Oy var",
!     6 => "Di?er anketleri g?ster"
  );
  
***************
*** 349,354 ****
  	16 => "Mesaj? G?nder",
  	17 => "Bu Yaz?y? bir Arkada??na G?nder",
! 	18 => "Ad?",
! 	19 => "Email Adresi",
  	20 => "G?nderen Ad?",
  	21 => "G?nderen Emaili",
--- 370,375 ----
  	16 => "Mesaj? G?nder",
  	17 => "Bu Yaz?y? bir Arkada??na G?nder",
! 	18 => "Al?c?n?n Ad?",
! 	19 => "Al?c?n?n Email Adresi",
  	20 => "G?nderen Ad?",
  	21 => "G?nderen Emaili",
***************
*** 365,369 ****
      32 => "Tarih",
      33 => "Yaz?n?n tamam? i?in:",
!     34 => "Mesaj?n Sonu"
  );
  
--- 386,391 ----
      32 => "Tarih",
      33 => "Yaz?n?n tamam? i?in:",
!     34 => "Mesaj?n Sonu",
!     35 => '?zg?n?z, bu kullan?c? hi? mail almamay? tercih etmi?.'
  );
  
***************
*** 397,401 ****
  	24 => "",
  	25 => "kay?t bulundu. Toplam",
! 	26 => "kay?ttan. S?re",
  	27 => "saniye.",
      28 => 'Araman?z sonucunda herhangi bir yaz? veya yorum bulunamad?',
--- 419,423 ----
  	24 => "",
  	25 => "kay?t bulundu. Toplam",
! 	26 => "kay?t var. Arama s?resi",
  	27 => "saniye.",
      28 => 'Araman?z sonucunda herhangi bir yaz? veya yorum bulunamad?',
***************
*** 413,417 ****
      40 => 'Etkinlikler',
      41 => 'Arama yapabilmeniz i?in en az 3 harften olu?an bir arama sorgusu girmeniz gerekmektedir.',
!     42 => 'L?tfen YYYY-AA-GG (Y?l-Ay-G?n) ?eklinde d?zenlenmi? bir tarhi kullan?n?z.'
  );
  
--- 435,454 ----
      40 => 'Etkinlikler',
      41 => 'Arama yapabilmeniz i?in en az 3 harften olu?an bir arama sorgusu girmeniz gerekmektedir.',
!     42 => 'L?tfen YYYY-AA-GG (Y?l-Ay-G?n) ?eklinde d?zenlenmi? bir tarhi kullan?n?z.',
!     43 => 'tam c?mle',
!     44 => 'b?t?n kelimeler',
!     45 => 'herhangi bir kelime',
!     46 => 'Sonraki',
!     47 => '?nceki',
!     48 => 'Yazar',
!     49 => 'Tarih',
!     50 => 'Hit',
!     51 => 'Link',
!     52 => 'Konum',
!     53 => 'Yaz? Sonu?lar?',
!     54 => 'Yorum Sonu?lar?',
!     55 => 'ibare',
!     56 => 'VE',
!     57 => 'YADA'
  );
  
***************
*** 550,554 ****
  	12 => "Normal Blok",
  	13 => "Portal Blok ?zellikleri",
! 	14 => "RDF Adres?",
  	15 => "Son RDF De?i?ikli?i",
  	16 => "Normal Blok ?zellikleri",
--- 587,591 ----
  	12 => "Normal Blok",
  	13 => "Portal Blok ?zellikleri",
! 	14 => "RDF Adresi",
  	15 => "Son RDF De?i?ikli?i",
  	16 => "Normal Blok ?zellikleri",
***************
*** 711,715 ****
      54 => 'Eklenen Resimler Kullan?lmad?',
      55 => 'A?a??daki hatalar yaz?n?z? kaydetmeye ?al???rken olu?tu.  L?tfen listelenen hatalar? kontrol edip d?zeltiniz',
!     56 => 'Sembol? G?ster'
  );
  
--- 748,753 ----
      54 => 'Eklenen Resimler Kullan?lmad?',
      55 => 'A?a??daki hatalar yaz?n?z? kaydetmeye ?al???rken olu?tu.  L?tfen listelenen hatalar? kontrol edip d?zeltiniz',
!     56 => 'Sembol? G?ster',
!     57 => '?l?eksiz resim g?ster'
  );
  
***************
*** 770,774 ****
      19 => 'kaydet',
      20 => 'vazge?',
!     21 => 'sil'
  );
  
--- 808,815 ----
      19 => 'kaydet',
      20 => 'vazge?',
!     21 => 'sil',
!     22 => 'Varsay?lan',
!     23 => 'bildirilen yeni yaz? i?in bunu varsay?lan ba?l?k yap',
!     24 => '(*)'
  );
  
***************
*** 813,817 ****
      32 => 'Ekleme i?lemi tamamland?. $successes kullan?c? eklendi ve $failures hata olu?tu',
      33 => 'g?nder',
!     34 => 'Hata: Y?kleme yapmak i?in bir dosya se?mi? olman?z gerekiyor.'
  );
  
--- 854,860 ----
      32 => 'Ekleme i?lemi tamamland?. $successes kullan?c? eklendi ve $failures hata olu?tu',
      33 => 'g?nder',
!     34 => 'Hata: Y?kleme yapmak i?in bir dosya se?mi? olman?z gerekiyor.',
!     35 => 'Son Giri?',
!     36 => '(asla)'
  );
  
***************
*** 855,862 ****
  	7 => "Cumartesi",
  	8 => "Etkinlik Ekle",
! 	9 => "Geeklog Etkinli?i",
  	10 => "Etkinlikler:",
  	11 => "Genel Takvim",
! 	12 => "Benim Takvimim",
  	13 => "Ocak",
  	14 => "?ubat",
--- 898,905 ----
  	7 => "Cumartesi",
  	8 => "Etkinlik Ekle",
! 	9 => "ScriptEvi Etkinli?i",
  	10 => "Etkinlikler:",
  	11 => "Genel Takvim",
! 	12 => "Takvimim",
  	13 => "Ocak",
  	14 => "?ubat",
***************
*** 972,979 ****
      45 => 'Eklenti ba?ar?yla silindi.',
      46 => "Veri taban? yedekleme program?na eri?imiz yok.  Giri? izni olmayan t?m etkinlikler kay?tlara ge?mektedir.",
!     47 => "Bu ?zellik sadece Linuz, Unix gibi i?letim sistemlerinde ?al???r.  E?er Linux, Unix gibi bir i?letim sistemi kullan?yorsan?z, ?nbelle?iniz ba?ar?yla temizlenmi?tir. E?er Windows kullan?yorsan?z, adodb_*.php  dosyalar?n? arat?n ve silin.",
      48 => $_CONF['site_name'] . ' sitesine ?yelik ba?vurunuz i?in te?ekk?r ederiz. Site y?netimi ba?vurunuzu inceleyecektir. E?er kabul al?rsan?z ?ifreniz belirtti?iniz e?mail adreisne g?nderilecektir.',
      49 => "Grubunuz ba?ar?yla kaydedildi.",
!     50 => "Grup ba?ar?yla silindi."
  );
  
--- 1015,1029 ----
      45 => 'Eklenti ba?ar?yla silindi.',
      46 => "Veri taban? yedekleme program?na eri?imiz yok.  Giri? izni olmayan t?m etkinlikler kay?tlara ge?mektedir.",
!     47 => "Bu ?zellik sadece Linux, Unix gibi i?letim sistemlerinde ?al???r.  E?er Linux, Unix gibi bir i?letim sistemi kullan?yorsan?z, ?nbelle?iniz ba?ar?yla temizlenmi?tir. E?er Windows kullan?yorsan?z, adodb_*.php  dosyalar?n? arat?n ve silin.",
      48 => $_CONF['site_name'] . ' sitesine ?yelik ba?vurunuz i?in te?ekk?r ederiz. Site y?netimi ba?vurunuzu inceleyecektir. E?er kabul al?rsan?z ?ifreniz belirtti?iniz e?mail adreisne g?nderilecektir.',
      49 => "Grubunuz ba?ar?yla kaydedildi.",
!     50 => "Grup ba?ar?yla silindi.",
!     51 => 'Bu kullan?c? ad? zaten kullan?l?yor. L?tfen ba?ka bir tane se?in.',
!     52 => 'Sa?lanan email adresi ge?erli bir email adresi olarak g?z?km?yor.',
!     53 => 'Yeni ?ifreniz kabul edildi. L?tfen a?a??dan yeni ?ifrenizi kullanarak ?imdi giri? yap?n.',
!     54 => 'Yeni bir ?ifre isteme s?resiniz doldu. L?tfen a?a??dan tekrar deneyin.',
!     55 => 'Size bir email g?nderildi ve az ?nce yerine ula?t?. Hesab?n?za yeni bir ?ifre tayin etmek i?in mesajdaki talimatlar? l?tfen takip ediniz.',
!     56 => 'Sa?lanan email adresi zaten ba?ka bir hesap taraf?ndan kullan?l?yor.',
!     57 => 'Hesab?n?z ba?ar?yla silindi.'
  );
  
***************
*** 981,985 ****
  
  $LANG32 = array (
! 	1 => "Sisteme eklenti (plug-in) y?kleyerek Geeklog'un ?al??mas?n? ve belki sisteminizibozabilirsiniz. Sadece <a href=\"http://www.geeklog.net\" target=\"_blank\">Geeklog Ana Sayfas?</a>'ndan y?kledi?iniz eklentileri y?klemeniz tavsiye edilir, ??nk? bize ula?an t?m eklentileri ?e?itli i?letim sistemleriyle ayr?nt?l? testlere sokuyoruz. ?zellikle ???nc? firmalardan y?kledi?iniz eklentilerin y?klenirken sisteminize zarar verebilecek programlar ?al??t?rabilece?ini ve bunlar?n g?venlik a??klar?na neden olabilece?ini anlaman?z ?nemlidir. Bu uyar?ya ra?men, biz bu eklentinin y?klenmesinin ba?ar?yla tamamlanaca??n? garanti etmiyoruz, ve sisteminizde do?acak herhangi bir hasardan dolay? sorumluluk kabul etmiyoruz. Ba?ka bir deyi?le eklentiyi y?klerken do?acak t?m riskler size aittir.  Ayr?nt?lar? ??renmek isteyenler i?in her eklenti paketinde y?klemenin el ile yap?labilmesi i?in ayr?nt?lar ve ad?mlar mevcuttur.",
  	2 => "Eklenti Y?kleme ile ?lgili Y?k?mler",
  	3 => "Eklenti Y?kleme Formu",
--- 1031,1035 ----
  
  $LANG32 = array (
! 	1 => "Sisteme eklenti (plug-in) y?kleyerek Geeklog'un ?al??mas?n? ve belki sisteminizi bozabilirsiniz. Sadece <a href=\"http://www.geeklog.net\" target=\"_blank\">Geeklog Ana Sayfas?</a>'ndan y?kledi?iniz eklentileri y?klemeniz tavsiye edilir, ??nk? bize ula?an t?m eklentileri ?e?itli i?letim sistemleriyle ayr?nt?l? testlere sokuyoruz. ?zellikle ???nc? firmalardan y?kledi?iniz eklentilerin y?klenirken sisteminize zarar verebilecek programlar ?al??t?rabilece?ini ve bunlar?n g?venlik a??klar?na neden olabilece?ini anlaman?z ?nemlidir. Bu uyar?ya ra?men, biz bu eklentinin y?klenmesinin ba?ar?yla tamamlanaca??n? garanti etmiyoruz, ve sisteminizde do?acak herhangi bir hasardan dolay? sorumluluk kabul etmiyoruz. Ba?ka bir deyi?le eklentiyi y?klerken do?acak t?m riskler size aittir.  Ayr?nt?lar? ??renmek isteyenler i?in her eklenti paketinde y?klemenin el ile yap?labilmesi i?in ayr?nt?lar ve ad?mlar mevcuttur.",
  	2 => "Eklenti Y?kleme ile ?lgili Y?k?mler",
  	3 => "Eklenti Y?kleme Formu",
***************
*** 1044,1050 ****
  	lock => "Kilit",
  	members => "?yeler",
! 	anonymous => "Herhangi",
  	permissions => "?zinler",
! 	permissionskey => "O = oku, D = de?i?tir, haklarda de?i?iklik yap",
  	edit => "De?i?tir",
  	none => "Hi?biri",
--- 1094,1100 ----
  	lock => "Kilit",
  	members => "?yeler",
! 	anonymous => "?simsiz Kullan?c?",
  	permissions => "?zinler",
! 	permissionskey => "R = oku, E = d?zenle, haklarda de?i?iklik yap",
  	edit => "De?i?tir",
  	none => "Hi?biri",
***************
*** 1059,1063 ****
  	cancel => 'vazge?',
  	delete => 'sil',
! 	canteditroot => 'Root grubu de?i?tirmeye ?al??t?n?z, fakat root grubun bir ?yesi de?ilsiniz. Bu nedenden eri?iminiz engellendi. E?er bunun bir hata oldu?unu d???n?yorsan?z sistem y?neticinize dan???n.'	
  );
  
--- 1109,1116 ----
  	cancel => 'vazge?',
  	delete => 'sil',
! 	canteditroot => 'Root grubu de?i?tirmeye ?al??t?n?z, fakat root grubun bir ?yesi de?ilsiniz. Bu nedenden eri?iminiz engellendi. E?er bunun bir hata oldu?unu d???n?yorsan?z sistem y?neticinize dan???n.',
!     listusers => '?ye Listesi',
!     listthem => 'liste',
!     usersingroup => '?ye grubu %s'	
  );
  
***************
*** 1077,1082 ****
      do_backup => 'Yedekleme Yap',
      backup_successful => 'Veritaban? yedeklemesi ba?ar?yla sonu?land?.',
!     no_backups => 'Sisteminizde hi? veritaban? yede?i yok',
!     db_explanation => 'Geeklog sisteminin yeni bir yede?ini almak i?in, a?a??daki d??meye bas?n',
      not_found => "Hatal? adres veya mysqldump program? ?al??t?r?l?nam?yor.<br>config.php dosyan?zdaki <strong>\$_DB_mysqldump_path</strong> de?i?kenini kontrol edin.<br>De?i?ken ?u anki de?eri: <var>{$_DB_mysqldump_path}</var>",
      zero_size => 'Yedekleme ba?ar?s?z: Dosya boyutu 0 bayt idi.',
--- 1130,1135 ----
      do_backup => 'Yedekleme Yap',
      backup_successful => 'Veritaban? yedeklemesi ba?ar?yla sonu?land?.',
!     no_backups => 'Sisteminizde hi? veritaban? yede?i yok.',
!     db_explanation => 'Geeklog sisteminin yeni bir yede?ini almak i?in, a?a??daki butona bas?n.',
      not_found => "Hatal? adres veya mysqldump program? ?al??t?r?l?nam?yor.<br>config.php dosyan?zdaki <strong>\$_DB_mysqldump_path</strong> de?i?kenini kontrol edin.<br>De?i?ken ?u anki de?eri: <var>{$_DB_mysqldump_path}</var>",
      zero_size => 'Yedekleme ba?ar?s?z: Dosya boyutu 0 bayt idi.',
***************
*** 1085,1089 ****
      backup_file => 'Yedek dosyas?',
      size => 'Boyut',
!     bytes => 'Bayt'
  );
  
--- 1138,1143 ----
      backup_file => 'Yedek dosyas?',
      size => 'Boyut',
!     bytes => 'Bayt',
!     total_number => 'Toplam backup say?s?: %d'
  );
  




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:04 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:04 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1,1.2
Message-ID: <200308170938.h7H9c4P32451@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/Yahoo/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/comment/startcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startcomment.thtml	27 Mar 2003 09:37:35 -0000	1.1
--- startcomment.thtml	17 Aug 2003 09:38:02 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:03 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:03 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.121,1.122
Message-ID: <200308170938.h7H9c3P32435@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv32401/docs

Modified Files:
	history 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** history	12 Aug 2003 21:10:04 -0000	1.121
--- history	17 Aug 2003 09:38:01 -0000	1.122
***************
*** 1,4 ****
--- 1,8 ----
  GeekLog History/Changes:
  
+ - Integrated Vincent Furia's new comment code to use templates for comments
+   (instead of hard-coded HTML).
+   New template files: comment/comment.thtml, comment/thread.thtml.
+   Updated: comment/startcomment.thtml
  - New Admin interface for content syndication (RSS feeds etc.). This lets you
    create feeds for all the stories and per topic. Plugins can also provide




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:04 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:04 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/gameserver/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1.1.1,1.2
Message-ID: <200308170938.h7H9c4P32457@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/gameserver/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/comment/startcomment.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** startcomment.thtml	30 Apr 2003 20:53:28 -0000	1.1.1.1
--- startcomment.thtml	17 Aug 2003 09:38:02 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:04 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:04 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1,1.2
Message-ID: <200308170938.h7H9c4P32445@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/Smooth_Blue/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/comment/startcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startcomment.thtml	27 Mar 2003 09:37:35 -0000	1.1
--- startcomment.thtml	17 Aug 2003 09:38:01 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:03 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:03 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1,1.2
Message-ID: <200308170938.h7H9c3P32439@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/Classic/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/comment/startcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startcomment.thtml	27 Mar 2003 09:37:35 -0000	1.1
--- startcomment.thtml	17 Aug 2003 09:38:01 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:03 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:03 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html comment.php,1.44,1.45 lib-common.php,1.244,1.245
Message-ID: <200308170938.h7H9c3P32437@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv32401/public_html

Modified Files:
	comment.php lib-common.php 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


Index: comment.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** comment.php	25 Jun 2003 08:39:02 -0000	1.44
--- comment.php	17 Aug 2003 09:38:01 -0000	1.45
***************
*** 140,152 ****
              if ($mode == $LANG03[14] && !empty($title) && !empty($comment) ) {
                  $start = new Template( $_CONF['path_layout'] . 'comment' );
!                 $start->set_file( array( 'startcomment' => 'startcomment.thtml' ));
                  $start->set_var( 'site_url', $_CONF['site_url'] );
                  $start->set_var( 'layout_url', $_CONF['layout_url'] );
  
!                 $thecomments = COM_comment ($HTTP_POST_VARS, 1, $type, 0,
!                                             'flat', true);
  
                  $start->set_var( 'comments', $thecomments );
!                 $retval .= $start->finish( $start->parse( 'output', 'startcomment' ));
              } else if ($mode == $LANG03[14]) {
                  $retval .= COM_startBlock ($LANG03[17], '',
--- 140,154 ----
              if ($mode == $LANG03[14] && !empty($title) && !empty($comment) ) {
                  $start = new Template( $_CONF['path_layout'] . 'comment' );
!                 $start->set_file( array( 'comment' => 'startcomment.thtml' ));
                  $start->set_var( 'site_url', $_CONF['site_url'] );
                  $start->set_var( 'layout_url', $_CONF['layout_url'] );
  
!                 $thecomments = COM_getComment ($HTTP_POST_VARS, 'flat', $type,
!                                                'ASC', true );
  
                  $start->set_var( 'comments', $thecomments );
!                 $retval .= COM_startBlock ($LANG03[14])
!                         . $start->finish( $start->parse( 'output', 'comment' ))
!                         . COM_endBlock ();
              } else if ($mode == $LANG03[14]) {
                  $retval .= COM_startBlock ($LANG03[17], '',

Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.244
retrieving revision 1.245
diff -C2 -d -r1.244 -r1.245
*** lib-common.php	12 Aug 2003 21:10:04 -0000	1.244
--- lib-common.php	17 Aug 2003 09:38:01 -0000	1.245
***************
*** 1113,1117 ****
          if( $A[0] == $selected )
          {
!             $retval .= ' selected';
          }
  
--- 1113,1117 ----
          if( $A[0] == $selected )
          {
!             $retval .= ' selected="selected"';
          }
  
***************
*** 2472,2649 ****
  
  /**
! * This function displays the comments in a high level format.
! *
! * Begins displaying user comments for an item
! *
! * @param        string      $sid        ID for item to show comments for
! * @param        string      $title      Title of item
! * @param        string      $type       Type of item (article,photo,link,etc.)
! * @param        string      $order      How to order the comments 'ASC' or 'DESC'
! * @param        string      $mode       comment mode (nested, flat, etc.)
! * @param        int         $pid        Parent ID
! * @see function COM_commentBar
! * @see function COM_commentChildren
! * @return     string  HTML Formated Comments
  *
  */
! function COM_userComments( $sid, $title, $type='article', $order='', $mode='', $pid=0 )
  {
!     global $_TABLES, $_CONF, $LANG01, $_USER;
  
!     if( !empty( $_USER['uid'] ) && empty( $order ) && empty( $mode ))
      {
!         $result = DB_query( "SELECT commentorder,commentmode,commentlimit FROM {$_TABLES['usercomment']} WHERE uid = '{$_USER['uid']}'" );
!         $U = DB_fetchArray( $result );
!         $order = $U['commentorder'];
!         $mode = $U['commentmode'];
!         $limit = $U['commentlimit'];
      }
  
!     if( empty( $order ))
      {
!         $order = 'ASC';
!     }
  
!     if( empty( $mode ))
      {
!         $mode = $_CONF['comment_mode'];
      }
! 
!     if( empty( $limit ))
      {
!         $limit = $_CONF['comment_limit'];
      }
! 
!     if( $mode == 'nocomments' )
      {
!         $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
      }
      else
      {
!         $comment = new Template( $_CONF['path_layout'] . 'comment' );
!         $comment->set_file( array( 'startcomment' => 'startcomment.thtml' ));
!         $comment->set_var( 'site_url', $_CONF['site_url'] );
!         $comment->set_var( 'layout_url', $_CONF['layout_url'] );
! 
!         $thecomments = '';
!         switch( $mode )
!         {
!             case 'nested':
!             {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = 0 AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
! 
!                 if( $nrows > 0 )
!                 {
!                     for( $i = 0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0, $type, 0, $mode );
!                         $thecomments .= COM_commentChildren( $sid, $A['cid'], $order, $mode, $type );
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
!             }
!             break;
! 
!             case 'flat':
!             {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!                 if( $nrows > 0 )
!                 {
!                     for( $i =0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0 ,$type, 0, $mode );
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
!             }
!             break;
  
!             case 'threaded':
!             {
!                 $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = $pid AND type = '$type' ORDER BY date $order LIMIT $limit" );
!                 $nrows = DB_numRows( $result );
!                 $retval .= COM_commentBar( $sid, $title, $type, $order, $mode );
  
!                 if( $nrows > 0 )
!                 {
!                     for( $i = 0; $i < $nrows; $i++ )
!                     {
!                         $A = DB_fetchArray( $result );
!                         $thecomments .= COM_comment( $A, 0, $type, 0, $mode)
!                             . '<tr><td>'
!                             . COM_commentChildren( $sid, $A['cid'], $order, $mode, $type )
!                             . '</td></tr>';
!                     }
!                 }
!                 else
!                 {
!                     $thecomments .= '<tr><td class="commenttitle" align="center">' . $LANG01[29] . '</td></tr>';
!                 }
!             }
!             break;
          }
- 
-         $comment->set_var( 'comments', $thecomments );
-         $retval .= $comment->finish( $comment->parse( 'output', 'startcomment' ));
      }
  
!     return $retval;
! }
! 
! /**
! * Prints the next level of children for a given comment
! *
! * This is called recursivley to display all the comments for a given
! * comment
! *
! * @param        string      $sid        ID for item comments belong to
! * @param        string      $pid        Parent ID
! * @param        string      $order      Order to show comments in 'ASC' or 'DESC'
! * @param        string      $mode       Mode (e.g. nested, flat, etc)
! * @param        string      $type       Type of item (article, photo, link, etc.)
! * @param        int         $level      How deep in comment thread we are
! * @see COM_commentBar
! * @see COM_userComments
! *
! */
! 
! function COM_commentChildren( $sid, $pid, $order, $mode, $type, $level=0 )
! {
!     global $_TABLES, $_CONF;
! 
!     $result = DB_query( "SELECT *,unix_timestamp(date) AS nice_date FROM {$_TABLES['comments']} WHERE sid = '$sid' AND pid = $pid ORDER BY date $order" );
!     $nrows = DB_numRows( $result );
  
!     if( $nrows > 0 )
      {
!         if( $mode == 'threaded' )
!         {
!             $retval .= '<ul>';
!         }
  
!         for( $i = 0; $i < $nrows; $i++ )
!         {
!             $A = DB_fetchArray( $result );
!             $retval .= COM_comment( $A, 0, $type, $level + 1, $mode)
!                 . COM_commentChildren( $sid, $A['cid'], $order, $mode, $type, $level + 1 );
!         }
  
!         if( $mode == 'threaded' )
          {
!             $retval .= '</ul>';
          }
      }
  
--- 2472,2609 ----
  
  /**
! * This function prints $A (an individual comment) in comment format
! * 
! * @param     array      $A         Associative array based on comment record
! * @param     string     $mode      'flat', 'threaded', etc
! * @param     string     $type      Type of item (article, poll, etc.)
! * @param     string     $order     How to order the comments 'ASC' or 'DESC'
! * @param     boolean    $preview   Preview display (for edit) or not
! * @return    string     HTML       Formated Comment 
  *
  */
! function COM_getComment( $A, $mode, $type, $order, $preview = false )
  {
!     global $_CONF, $_TABLES, $LANG01, $query;
  
!     static $template;
!     static $indent = 0;
! 
!     if( !isset( $_CONF['comment_indent'] ))
      {
!         $_CONF['comment_indent'] = 25;
      }
  
!     if( !isset( $template ))
      {
!         $template = new Template( $_CONF['path_layout'] . 'comment' );
!         $template->set_file( array( 'comment' => 'comment.thtml',
!                                     'thread'  => 'thread.thtml'  ));
  
!         // general variables
!         $template->set_var( 'site_url', $_CONF['site_url'] );
!         $template->set_var( 'layout_url', $_CONF['layout_url'] );
! 
!         $template->set_var( 'lang_replytothis', $LANG01[43] );
!         $template->set_var( 'lang_reply', $LANG01[25] );
!         $template->set_var( 'lang_authoredby', $LANG01[42] );
!         $template->set_var( 'lang_on', $LANG01[36] );
!     }
!     
!     // comment variables
!     $template->set_var( 'indent', $indent );
!     $template->set_var( 'pid', $A['cid'] );
!     $template->set_var( 'author', $A['username'] );
!     $template->set_var( 'author_id', $A['uid'] );
!     if( $A['uid'] > 1 )
      {
!         $template->set_var( 'start_author_anchortag', '<a href="'
!                 . $_CONF['site_url'] . '/users.php?mode?profile&amp;uid='
!                 . $A['uid'] . '">' );
!         $template->set_var( 'end_author_anchortag', '</a>' );
      }
!     else
      {
!         $template->set_var( 'start_author_anchortag', '' );
!         $template->set_var( 'end_author_anchortag', '' );
      }
!     if( $preview )
      {
!         $template->set_var( 'hide_if_preview', 'style="display:none"' );
      }
      else
      {
!         $template->set_var( 'hide_if_preview', '' );
!     }
!     if( empty( $A['nice_date'] ))
!     {
!         $A['nice_date'] = time ();
!     }
!     $template->set_var( 'date', strftime( $_CONF['date'], $A['nice_date'] ));
!     $template->set_var( 'sid', $A['sid'] );
!     $template->set_var( 'type', $A['type'] );
  
!     if( $preview )
!     {
!         $template->set_var( 'delete_option', '' );
!     }
!     // NOTE: the following check is nonsense (but fully 1.3.8 compatible ;-)
!     else if( SEC_hasAccess( $A['owner_id'], $A['group_id'], $A['perm_owner'],
!             $A['perm_group'], $A['perm_members'], $A['perm_anon'] ) == 3 )
!     {
!         $template->set_var( 'delete_option', '| <a href="' . $_CONF['site_url']
!                 . '/comment.php?mode=' . $LANG01[28] . '&amp;cid=' . $A['cid']
!                 . '&amp;sid=' . $A['sid'] . '&amp;type=' . $type . '">'
!                 . $LANG01[28] . '</a> ' );
!     }
  
!     $A['title'] = stripslashes( $A['title'] );
!     $A['title'] = str_replace( '$', '&#36;', $A['title'] );
  
!     // and finally: format the actual text of the comment
!     $A['comment'] = stripslashes( $A['comment'] );
!     if( preg_match( '/<.*>/', $A['comment'] ) == 0 )
!     {
!         $A['comment'] = nl2br( $A['comment'] );
!     }
!     if( !empty( $query ))
!     {
!         $mywords = explode( ' ', $query );
!         foreach( $mywords as $searchword )
!         {
!             $A['comment'] = preg_replace( "/(\>(((?>[^><]+)|(?R))*)\<)/ie", "preg_replace('/(?>$searchword+)/i','<span class=\"highlight\">$searchword</span>','\\0')", "<x>" . $A['comment'] . "<x>" );
          }
      }
+     $A['comment'] = str_replace( '$', '&#36;', $A['comment'] );
+     $A['comment'] = str_replace( '{', '&#123;', $A['comment'] );
+     $A['comment'] = str_replace( '}', '&#125;', $A['comment'] );
  
!     $template->set_var( 'title', $A['title'] );
!     $template->set_var( 'comments', $A['comment'] );
  
!     if( $mode == 'threaded' && $indent > 0 )
      {
!         $retval = $template->parse( 'output', 'thread' );	
!     }
!     else
!     {
!         $retval = $template->parse( 'output', 'comment' ); 
!     }
  
!     if( !$preview && ( $mode == 'nested' || $mode == 'threaded' ))
!     {
!     	$indent += $_CONF['comment_indent'];
  
!         // get children
!         $q = "SELECT c.*,u.username,unix_timestamp(c.date) AS nice_date "
!            . "FROM {$_TABLES['comments']} AS c, {$_TABLES['users']} AS u "
!            . "WHERE c.uid = u.uid AND sid = '{$A['sid']}' AND pid = {$A['cid']} "
!            . "ORDER BY date $order";
!         $result = DB_query( $q );
!         while( $A = DB_fetchArray( $result ))
          {
!             $retval .= COM_getComment( $A, $mode, $type, $order );
          }
+     
+     	$indent -= $_CONF['comment_indent'];
      }
  
***************
*** 2652,2779 ****
  
  /**
! * This function prints $A (an individual comment) in comment format
  *
! * @param        array       $A          Associative array based on comment record from DB
! * @param        string      $mode       'flat', 'threaded', etc
! * @param        int         $level      how deep in comment thread
! * @param        string      $mode       WTF?  This can't be used twice!?!
! * @param        boolean     $ispreview  Preview display (for edit) or not
! * @return     string      HTML Formated Comment
  *
  */
! 
! function COM_comment( $A, $mode=0, $type, $level=0, $mode='flat', $ispreview=false )
  {
!     global $_TABLES, $_CONF, $LANG01, $_USER, $order, $query;
! 
!     $level = $level * 25;
  
!     // if no date, make it now!
!     if( empty( $A['nice_date'] ))
      {
!         $A['nice_date'] = time();
      }
  
!     $A['title'] = stripslashes( $A['title'] );
! 
!     if( $mode == 'threaded' && $level > 0 )
      {
!         $retval .= '<li><b><a href="' . $_CONF['site_url'] . '/comment.php?mode=display&amp;sid=' . $A['sid']
!             . '&amp;title=' . urlencode( $A['title'] ) . '&amp;type=' . $type . '&amp;order=' . $order . '&amp;pid=' . $A['pid'].'">'
!             . $A['title'] . '</a></b> - ' . $LANG01[42] . ' ';
! 
!         if( $A['uid'] == 1 )
!         {
!             $retval .= $LANG01[24];
!         }
!         else
!         {
!             $retval .= '<a href="' . $_CONF['site_url'] . '/users.php?mode=profile&amp;uid=' . $A['uid'] . '">'
!                 . DB_getItem( $_TABLES['users'], 'username', "uid = '{$A['uid']}'" ) . '</a>';
!         }
! 
!         $A['nice_date'] = strftime( $_CONF['date'], $A['nice_date'] );
!         $retval .= ' ' . $LANG01[36] . ' ' . $A['nice_date'] . LB;
      }
-     else
-     {
-         if( $level > 0 )
-         {
-             $retval .= '<tr><td><table border="0" cellpadding="0" cellspacing="0" width="100%">' . LB
-                 . '<tr><td rowspan="3" width="' . $level . '"><img src="' . $_CONF['site_url']
-                 . '/images/speck.gif" width="' . $level . '" height="100%" alt=""></td>' . LB;
-         }
-         else
-         {
-             $retval .= '<tr>';
-         }
  
!         if( !empty( $query ))
!         {
!             $mywords = explode( ' ', $query );
!             foreach( $mywords as $searchword )
!             {
!                 $A['comment'] = preg_replace( "/(\>(((?>[^><]+)|(?R))*)\<)/ie", "preg_replace('/(?>$searchword+)/i','<span class=\"highlight\">$searchword</span>','\\0')", "<x>" . $A['comment'] . "<x>" );
!             }
!         }
  
!         $A['title'] = str_replace( '$', '&#36;', $A['title'] );
!         $A['comment'] = str_replace( '$', '&#36;', $A['comment'] );
!         $A['comment'] = str_replace( '{', '&#123;', $A['comment'] );
!         $A['comment'] = str_replace( '}', '&#125;', $A['comment'] );
  
!         $retval .= '<td class="commenttitle">' . stripslashes( $A['title'] ) . '</td></tr>' . LB
!             . '<tr><td>' . $LANG01[42] . ' ';
  
!         if( $A['uid'] == 1 )
!         {
!             $retval .= $LANG01[24];
!         }
!         else
          {
!             $retval .= '<a href="' . $_CONF['site_url'] . '/users.php?mode=profile&amp;uid=' . $A['uid'] . '">'
!                 . DB_getItem( $_TABLES['users'], 'username', "uid = '{$A['uid']}'" ) .'</a>';
!         }
  
!         $A['nice_date'] = strftime( $_CONF['date'], $A['nice_date'] );
!         $comment = stripslashes( $A['comment'] );
!         if( preg_match( '/<.*>/', $comment ) == 0 )
!         {
!             $comment = nl2br( $comment );
          }
-         $retval .= ' ' . $LANG01[36] . ' ' . $A['nice_date'] . '</td></tr>' . LB
-                 . '<tr><td valign="top">' . $comment;
  
!         if( $mode == 0 && $ispreview == false )
          {
!             $retval .= '<p>[ <a href="' . $_CONF['site_url'] . '/comment.php?sid=' . $A['sid'] . '&amp;pid='
!                 . $A['cid'] . '&amp;title=' . rawurlencode( $A['title'] ) . '&amp;type=' . $type . '">' . $LANG01[43]
!             . '</a> ';
! 
!             // Until I find a better way to parent, we're stuck with this...
!             if( $mode == 'threaded' && $A['pid'] != 0 )
!             {
!                 $result = DB_query( "SELECT title,pid from {$_TABLES['comments']} where cid = '{$A['pid']}'" );
!                 $P = DB_fetchArray( $result );
!                 $retval .= '| <a href="' . $_CONF['site_url'] . '/comment.php?mode=display&amp;sid=' . $A['sid']
!                     . '&amp;title=' . rawurlencode( $P['title'] ) . '&amp;type=' . $type . '&amp;order=' . $order . '&amp;pid='
!                     . $P['pid'] . '">' . $LANG01[44] . '</a> ';
!             }
! 
!             if( SEC_hasAccess( $A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon'] ) == 3 )
!             {
!                 $retval .= '| <a href="' . $_CONF['site_url'] . '/comment.php?mode=' . $LANG01[28] . '&amp;cid='
!                     . $A['cid'] . '&amp;sid=' . $A['sid'] . '&amp;type=' . $type . '">'  . $LANG01[28] . '</a> ';
!             }
! 
!             $retval .= ']<br>';
          }
  
!         $retval .= '</td></tr>' . LB;
! 
!         if( $level > 0 )
!         {
!             $retval .= '</table></td></tr>' . LB;
!         }
      }
  
--- 2612,2696 ----
  
  /**
! * This function displays the comments in a high level format.
  *
! * Begins displaying user comments for an item
! *
! * @param        string      $sid       ID for item to show comments for
! * @param        string      $title     Title of item
! * @param        string      $type      Type of item (article, poll, etc.)
! * @param        string      $order     How to order the comments 'ASC' or 'DESC'
! * @param        string      $mode      comment mode (nested, flat, etc.)
! * @param        int         $pid       Parent ID
! * @see function COM_commentBar
! * @see function COM_commentChildren
! * @return     string  HTML Formated Comments
  *
  */
! function COM_userComments( $sid, $title, $type='article', $order='', $mode='', $pid=0 )
  {
!     global $_CONF, $_TABLES, $_USER, $LANG01;
  
!     if( !empty( $_USER['uid'] ) && empty( $order ) && empty( $mode ))
      {
!         $result = DB_query( "SELECT commentorder,commentmode,commentlimit FROM {$_TABLES['usercomment']} WHERE uid = '{$_USER['uid']}'" );
!         $U = DB_fetchArray( $result );
!         $order = $U['commentorder'];
!         $mode = $U['commentmode'];
!         $limit = $U['commentlimit'];
      }
  
!     if( empty( $order ))
      {
!         $order = 'ASC';
      }
  
!     if( empty( $mode ))
!     {
!         $mode = $_CONF['comment_mode'];
!     }
  
!     if( empty( $limit ))
!     {
!         $limit = $_CONF['comment_limit'];
!     }
  
!     $template = new Template( $_CONF['path_layout'] . 'comment' );
!     $template->set_file( array( 'commentarea' => 'startcomment.thtml' ));
!     $template->set_var( 'site_url', $_CONF['site_url'] );
!     $template->set_var( 'layout_url', $_CONF['layout_url'] );
!     $template->set_var( 'commentbar',
!                          COM_commentBar( $sid, $title, $type, $order, $mode ));
  
!     if ( $mode == 'nested' or $mode == 'threaded' or $mode == 'flat' )
!     {
!         // build query
!         switch( $mode )
          {
!             case 'flat':
!             	$q = "SELECT c.*,u.username,unix_timestamp(date) AS nice_date "
!                    . "FROM {$_TABLES['comments']} as c, {$_TABLES['users']} as u "
!                    . "WHERE c.uid = u.uid AND sid = '$sid' AND type = '$type' "
!                    . "ORDER BY date $order LIMIT $limit";
!                 break;
  
!             case 'nested':
!             case 'threaded':
!             default:
!                 $q = "SELECT c.*,u.username,unix_timestamp(date) AS nice_date "
!                    . "FROM {$_TABLES['comments']} as c, {$_TABLES['users']} as u "
!                    . "WHERE c.uid = u.uid AND sid = '$sid' AND pid = 0 AND type = '$type' "
!                    . "ORDER BY date $order LIMIT $limit";
!                 break;
          }
  
!         $thecomments = '';
!         $result = DB_query( $q );
!         while ($A = DB_fetchArray( $result ))
          {
!             $thecomments .= COM_getComment( $A, $mode, $type, $order );
          }
  
!         $template->set_var( 'comments', $thecomments );
!         $retval = $template->parse( 'output', 'commentarea' );
      }
  
***************
*** 4880,4884 ****
          // add a link to "search by author"
          if( $_CONF["contributedbyline"] == 1 )
!     {
              $author = DB_getItem( $_TABLES['users'], 'username', "uid = $uid" );
              $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;author=$uid\">{$LANG24[37]} $author</a>";
--- 4797,4801 ----
          // add a link to "search by author"
          if( $_CONF["contributedbyline"] == 1 )
!         {
              $author = DB_getItem( $_TABLES['users'], 'username', "uid = $uid" );
              $rel[] = "<a href=\"{$_CONF['site_url']}/search.php?mode=search&amp;type=stories&amp;author=$uid\">{$LANG24[37]} $author</a>";




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:04 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:04 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1,1.2
Message-ID: <200308170938.h7H9c4P32448@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/XSilver/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/comment/startcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startcomment.thtml	27 Mar 2003 09:37:35 -0000	1.1
--- startcomment.thtml	17 Aug 2003 09:38:02 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:03 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:03 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1,1.2
Message-ID: <200308170938.h7H9c3P32442@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/Digital_Monochrome/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/comment/startcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startcomment.thtml	27 Mar 2003 09:37:35 -0000	1.1
--- startcomment.thtml	17 Aug 2003 09:38:01 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 05:38:04 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 04:38:04 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/clean/comment comment.thtml,NONE,1.1 thread.thtml,NONE,1.1 startcomment.thtml,1.1.1.1,1.2
Message-ID: <200308170938.h7H9c4P32454@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/comment
In directory geeklog_prod:/tmp/cvs-serv32401/public_html/layout/clean/comment

Modified Files:
	startcomment.thtml 
Added Files:
	comment.thtml thread.thtml 
Log Message:
Integrated Vincent Furia's new comment code to use templates for comments.


--- NEW FILE: comment.thtml ---
<table width="100%" cellspacing="0" style="margin-left: {indent}">
  <tr><td class="commenttitle">{title}</td></tr>
  <tr><td>{lang_authoredby} {start_author_anchortag}{author}{end_author_anchortag} {lang_on} {date}</td></tr>
  <tr><td valign="top">{comments}</td></tr>
  <tr><td><span {hide_if_preview}>[ <a href="{site_url}/comment.php?sid={sid}&amp;pid={pid}&amp;title={title}&amp;type={type}">{lang_replytothis}</a> {delete_option}]</span></td></tr>
</table>

--- NEW FILE: thread.thtml ---
<div style="margin-left: {indent}">
  <li>
    <a href="{site_url}/comment.php?mode=display&amp;sid={sid}&amp;title={title}&amp;type={type}&amp;order={order}&amp;pid={pid}">{title}</a>
    - Authored by: <a href="{site_url}/users.php?mode=profile&amp;uid={author_id}">{author}</a> on {date}
  </li>
</div>
Index: startcomment.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/comment/startcomment.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** startcomment.thtml	30 Apr 2003 20:41:35 -0000	1.1.1.1
--- startcomment.thtml	17 Aug 2003 09:38:02 -0000	1.2
***************
*** 1,9 ****
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr>
!     <td>
!       <table width="100%" border="0" cellspacing="0" cellpadding="3">
!       {comments}
!       </table>
!     </td>
!   </tr>
! </table>
--- 1,4 ----
! <div id="commentarea">
! {commentbar}
! {comments}
! </div>




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 14:48:27 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 13:48:27 -0500
Subject: [geeklog-cvs] geeklog-1.3/language french_canada.php,1.1,1.2
Message-ID: <200308171848.h7HImRP04211@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv4193

Modified Files:
	french_canada.php 
Log Message:
Fixed parse errors (mixing single and double quotes).


Index: french_canada.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/french_canada.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** french_canada.php	4 Aug 2003 09:55:23 -0000	1.1
--- french_canada.php	17 Aug 2003 18:48:24 -0000	1.2
***************
*** 953,960 ****
   	15 => 'Erreur lors de l\'envoi d\'un message &agrave;: ',
  	16 => 'Message envoy&eacute; avec succ&egrave;s &agrave;: ',
! 	17 => "<a href=' . $_CONF['site_admin_url'] . '/mail.php>Envoyer un autre message</a>",
      18 => '&agrave;',
      19 => 'Remarque: si vous voulez envoyer un message &agrave; tous les membres, utilisez le groupe Logged-in dans le champ A.',
!     20 => "<successcount> messages ont &eacute;t&eacute; envoy&eacute;s avec succ&egrave;s et <failcount> n'ont pas pu ?tre envoy&eacute;s.  Vous trouverez le d&eacute;tail de chaque tentative ci-dessous.  Vous pouvez &eacute;galement <a href=\'' . $_CONF['site_admin_url'] . '/mail.php\'>envoyer un autre message</a> ou <a href=\'' . $_CONF['site_admin_url'] . '/moderation.php\'>revenir &agrave; la page d'administration</a>.",
      21 => '&eacute;checs',
      22 => 'Succ&egrave;s',
--- 953,960 ----
   	15 => 'Erreur lors de l\'envoi d\'un message &agrave;: ',
  	16 => 'Message envoy&eacute; avec succ&egrave;s &agrave;: ',
! 	17 => '<a href="' . $_CONF['site_admin_url'] . '/mail.php">Envoyer un autre message</a>',
      18 => '&agrave;',
      19 => 'Remarque: si vous voulez envoyer un message &agrave; tous les membres, utilisez le groupe Logged-in dans le champ A.',
!     20 => '<successcount> messages ont &eacute;t&eacute; envoy&eacute;s avec succ&egrave;s et <failcount> n\'ont pas pu ?tre envoy&eacute;s.  Vous trouverez le d&eacute;tail de chaque tentative ci-dessous.  Vous pouvez &eacute;galement <a href="' . $_CONF['site_admin_url'] . '/mail.php">envoyer un autre message</a> ou <a href="' . $_CONF['site_admin_url'] . '/moderation.php">revenir &agrave; la page d\'administration</a>.',
      21 => '&eacute;checs',
      22 => 'Succ&egrave;s',
***************
*** 1017,1021 ****
      46 => 'Vous n\'avez pas acc&egrave;s &agrave; l\'utilitaire de sauvegarde de la base de donn&eacute;es. Toutes les tentatives d\'acc&egrave;s &agrave; des parties non autoris&eacute;es sont enregistr&eacute;es.',
      47 => 'Cet option ne fonctionne que sur *nix. Si vous utilisez *nix alors votre cache a &eacute;t&eacute; vid&eacute;e avec succ&egrave;s. Si vous utilisez Windows, vous devez chercher les fichiers adodb_*.php et les supprimer &agrave; la main.',
!     48 => "Merci d'avoir demand&eacute; un compte membre sur ' . $_CONF['site_name'] . '. La demande a &eacute;t&eacute; envoy&eacute;e &agrave; notre &eacute;quipe qui en disposera. Lorsque la demande sera accept&eacute;e, votre mot de passe vous sera envoy&eacute; par courriel &agrave; l'adresse que vous avez fournie.",
      49 => 'Votre groupe a &eacute;t&eacute; enregistr&eacute; avec succ&egrave;s.',
      50 => 'Le groupe a &eacute;t&eacute; supprim&eacute; avec succ&egrave;s.',
--- 1017,1021 ----
      46 => 'Vous n\'avez pas acc&egrave;s &agrave; l\'utilitaire de sauvegarde de la base de donn&eacute;es. Toutes les tentatives d\'acc&egrave;s &agrave; des parties non autoris&eacute;es sont enregistr&eacute;es.',
      47 => 'Cet option ne fonctionne que sur *nix. Si vous utilisez *nix alors votre cache a &eacute;t&eacute; vid&eacute;e avec succ&egrave;s. Si vous utilisez Windows, vous devez chercher les fichiers adodb_*.php et les supprimer &agrave; la main.',
!     48 => 'Merci d\'avoir demand&eacute; un compte membre sur ' . $_CONF['site_name'] . '. La demande a &eacute;t&eacute; envoy&eacute;e &agrave; notre &eacute;quipe qui en disposera. Lorsque la demande sera accept&eacute;e, votre mot de passe vous sera envoy&eacute; par courriel &agrave; l\'adresse que vous avez fournie.',
      49 => 'Votre groupe a &eacute;t&eacute; enregistr&eacute; avec succ&egrave;s.',
      50 => 'Le groupe a &eacute;t&eacute; supprim&eacute; avec succ&egrave;s.',




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 14:49:29 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 13:49:29 -0500
Subject: [geeklog-cvs] geeklog-1.3/language english.php,1.99,1.100
Message-ID: <200308171849.h7HInTP04247@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv4230

Modified Files:
	english.php 
Log Message:
Missing word


Index: english.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/english.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** english.php	12 Aug 2003 21:10:04 -0000	1.99
--- english.php	17 Aug 2003 18:49:27 -0000	1.100
***************
*** 840,844 ****
      23 => 'Batch Add',
      24 => 'Batch Import of Users',
!     25 => 'You can import a batch of users into Geeklog.  The import file must a tab-delimited text file and must have the fields in the following order: full name, username, email address.  Each user you import will be emailed with a random password.  You must have one user entered per line.  Failure to follow these instructions will cause problems that may require manual work so double check your entries!',
      26 => 'Search',
      27 => 'Limit Results',
--- 840,844 ----
      23 => 'Batch Add',
      24 => 'Batch Import of Users',
!     25 => 'You can import a batch of users into Geeklog.  The import file must be a tab-delimited text file and must have the fields in the following order: full name, username, email address.  Each user you import will be emailed with a random password.  You must have one user entered per line.  Failure to follow these instructions will cause problems that may require manual work so double check your entries!',
      26 => 'Search',
      27 => 'Limit Results',




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 14:50:26 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 13:50:26 -0500
Subject: [geeklog-cvs] geeklog-1.3/language german_formal.php,1.5,1.6
Message-ID: <200308171850.h7HIoQP04293@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/language
In directory geeklog_prod:/tmp/cvs-serv4273

Modified Files:
	german_formal.php 
Log Message:
Added "Content Syndication" entry for the Admin menu


Index: german_formal.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/language/german_formal.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** german_formal.php	13 Aug 2003 18:33:18 -0000	1.5
--- german_formal.php	17 Aug 2003 18:50:24 -0000	1.6
***************
*** 86,90 ****
  	36 => "am",
  	37 => "Keine Artikel.",
! 	38 => "",
  	39 => "Neuladen",
  	40 => "",
--- 86,90 ----
  	36 => "am",
  	37 => "Keine Artikel.",
! 	38 => 'Content Syndication',
  	39 => "Neuladen",
  	40 => "",




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 17 15:39:43 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 17 Aug 2003 14:39:43 -0500
Subject: [geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.12,1.13
Message-ID: <200308171939.h7HJdhP04824@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv4769

Modified Files:
	search.class.php 
Log Message:
Fixed links to search results in comments to polls (bug #51). Also added proper highlighting of search results in comments.


Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** search.class.php	2 Aug 2003 22:07:42 -0000	1.12
--- search.class.php	17 Aug 2003 19:39:41 -0000	1.13
***************
*** 355,359 ****
              $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
      
!             $sql = "SELECT {$_TABLES['stories']}.sid,{$_TABLES['comments']}.title,comment,pid,{$_TABLES['comments']}.uid,type as comment_type,UNIX_TIMESTAMP({$_TABLES['comments']}.date) as day,'comment' as type FROM {$_TABLES['comments']} ";
              $sql .= "LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid)" . $stsql . ") ";
              $sql .= "LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid)" . $posql . ") ";
--- 355,359 ----
              $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
      
!             $sql = "SELECT {$_TABLES['stories']}.sid,{$_TABLES['comments']}.title,comment,pid,{$_TABLES['comments']}.uid,{$_TABLES['comments']}.sid AS qid,type as comment_type,UNIX_TIMESTAMP({$_TABLES['comments']}.date) as day,'comment' as type FROM {$_TABLES['comments']} ";
              $sql .= "LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid)" . $stsql . ") ";
              $sql .= "LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid)" . $posql . ") ";
***************
*** 391,398 ****
              while ($A = DB_fetchArray($result_comments)) {
                  $A['title'] = str_replace('$','&#36;',$A['title']);
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="article.php?story=' . $A['sid'] . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="pollbooth.php?qid=' . $A['sid'] . '&amp;aid=-1#comments">' . stripslashes($A['title']) . '</a>';
                  }
                  
--- 391,403 ----
              while ($A = DB_fetchArray($result_comments)) {
                  $A['title'] = str_replace('$','&#36;',$A['title']);
+                 if (!empty ($this->_query)) {
+                     $querystring = '&amp;query=' . $this->_query;
+                 } else {
+                     $querystring = '';
+                 }
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="article.php?story=' . $A['sid'] . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="pollbooth.php?qid=' . $A['qid'] . '&amp;aid=-1' . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  }
                  




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 04:36:59 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 03:36:59 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.122,1.123
Message-ID: <200308180836.h7I8axP11618@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv11602/docs

Modified Files:
	history 
Log Message:
Fixed stripping of HTML tags from What's Related block.


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** history	17 Aug 2003 09:38:01 -0000	1.122
--- history	18 Aug 2003 08:36:57 -0000	1.123
***************
*** 1,4 ****
--- 1,9 ----
  GeekLog History/Changes:
  
+ - What's Related applied COM_checkHTML() on the entire block instead of on the
+   individual items, thus stripping out HTML from the template file (bug #52).
+ - Words from a search query are now properly hightlighted in comments when the
+   words occured only in the comments (but not in the story).
+ - Fixed parse errors in the french_canada.php language file (bug #53).
  - Integrated Vincent Furia's new comment code to use templates for comments
    (instead of hard-coded HTML).




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 04:36:59 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 03:36:59 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.245,1.246
Message-ID: <200308180836.h7I8axP11621@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv11602/public_html

Modified Files:
	lib-common.php 
Log Message:
Fixed stripping of HTML tags from What's Related block.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.245
retrieving revision 1.246
diff -C2 -d -r1.245 -r1.246
*** lib-common.php	17 Aug 2003 09:38:01 -0000	1.245
--- lib-common.php	18 Aug 2003 08:36:57 -0000	1.246
***************
*** 4732,4741 ****
  
          // this gets what is between <a href=...> and </a>
!         preg_match( "/<a href=([^\]]+)>([^\]]+)<\/a>/", stripslashes( $reg[0] ),
!                 $url_text);
          if( empty( $url_text[1] ))
          {
!             preg_match( "/<A HREF=([^\]]+)>([^\]]+)<\/A>/",
!                     stripslashes( $reg[0] ), $url_text );
          }
  
--- 4732,4739 ----
  
          // this gets what is between <a href=...> and </a>
!         preg_match( "/<a href=([^\]]+)>([^\]]+)<\/a>/", $reg[0], $url_text);
          if( empty( $url_text[1] ))
          {
!             preg_match( "/<A HREF=([^\]]+)>([^\]]+)<\/A>/", $reg[0], $url_text );
          }
  
***************
*** 4766,4770 ****
              if( !( stristr( $reg[0], "<img " )))
              {
!                 $rel[] = stripslashes( $reg[0] );
              }
          }
--- 4764,4768 ----
              if( !( stristr( $reg[0], "<img " )))
              {
!                 $rel[] = COM_checkHTML( $reg[0] );
              }
          }
***************
*** 4810,4814 ****
      if( sizeof( $rel ) > 0 )
      {
!         $related = COM_checkHTML( COM_checkWords( COM_makeList( $rel )));
      }
  
--- 4808,4812 ----
      if( sizeof( $rel ) > 0 )
      {
!         $related = COM_checkWords( COM_makeList( $rel ));
      }
  




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/gameserver/links linkdetails.thtml,1.1.1.1,1.2
Message-ID: <200308180953.h7I9rdP12344@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/gameserver/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/links/linkdetails.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** linkdetails.thtml	30 Apr 2003 20:53:33 -0000	1.1.1.1
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.2
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/links linkdetails.thtml,1.2,1.3
Message-ID: <200308180953.h7I9rdP12332@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/Smooth_Blue/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/links/linkdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdetails.thtml	13 Aug 2002 21:35:47 -0000	1.2
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.3
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html links.php,1.26,1.27
Message-ID: <200308180953.h7I9rdP12323@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv12286/public_html

Modified Files:
	links.php 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: links.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/links.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** links.php	25 Jun 2003 08:39:02 -0000	1.26
--- links.php	18 Aug 2003 09:53:37 -0000	1.27
***************
*** 140,143 ****
--- 140,151 ----
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
+                 if (SEC_hasRights ('link.edit')) {
+                     $linklist->set_var ('link_edit', '<a href="'
+                             . $_CONF['site_admin_url']
+                             . '/link.php?mode=edit&amp;lid=' . $A['lid'] . '">'
+                             . $LANG01[4] . '</a>');
+                 } else {
+                     $linklist->set_var ('link_edit', '');
+                 }
                  $linklist->parse('link_details', 'link', true);
              }
***************
*** 181,184 ****
--- 189,200 ----
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
+                 if (SEC_hasRights ('link.edit')) {
+                     $linklist->set_var ('link_edit', '<a href="'
+                             . $_CONF['site_admin_url']
+                             . '/link.php?mode=edit&amp;lid=' . $A['lid'] . '">'
+                             . $LANG01[4] . '</a>');
+                 } else {
+                     $linklist->set_var ('link_edit', '');
+                 }
                  $linklist->parse('link_details', 'link', true);
              }




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/clean/links linkdetails.thtml,1.1.1.1,1.2
Message-ID: <200308180953.h7I9rdP12341@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/clean/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/links/linkdetails.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** linkdetails.thtml	30 Apr 2003 20:41:38 -0000	1.1.1.1
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.2
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.123,1.124
Message-ID: <200308180953.h7I9rdP12321@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv12286/docs

Modified Files:
	history 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** history	18 Aug 2003 08:36:57 -0000	1.123
--- history	18 Aug 2003 09:53:37 -0000	1.124
***************
*** 1,4 ****
--- 1,6 ----
  GeekLog History/Changes:
  
+ - Added an 'edit' link to links/linkdetails.thtml, so that (Link) Admins can
+   edit links easily (contributed by Euan McKay).
  - What's Related applied COM_checkHTML() on the entire block instead of on the
    individual items, thus stripping out HTML from the template file (bug #52).




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/links linkdetails.thtml,1.2,1.3
Message-ID: <200308180953.h7I9rdP12326@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/Classic/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/links/linkdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdetails.thtml	13 Aug 2002 21:35:47 -0000	1.2
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.3
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/links linkdetails.thtml,1.2,1.3
Message-ID: <200308180953.h7I9rdP12338@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/Yahoo/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/links/linkdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdetails.thtml	13 Aug 2002 21:35:47 -0000	1.2
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.3
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/links linkdetails.thtml,1.2,1.3
Message-ID: <200308180953.h7I9rdP12329@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/Digital_Monochrome/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/links/linkdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdetails.thtml	13 Aug 2002 21:35:47 -0000	1.2
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.3
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 05:53:39 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 04:53:39 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/links linkdetails.thtml,1.2,1.3
Message-ID: <200308180953.h7I9rdP12335@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/links
In directory geeklog_prod:/tmp/cvs-serv12286/public_html/layout/XSilver/links

Modified Files:
	linkdetails.thtml 
Log Message:
Added an 'edit' link to  the link details, so that (Link) Admins can edit links easily (contributed by Euan McKay).


Index: linkdetails.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/links/linkdetails.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdetails.thtml	13 Aug 2002 21:35:47 -0000	1.2
--- linkdetails.thtml	18 Aug 2003 09:53:37 -0000	1.3
***************
*** 1,4 ****
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits})<br>
    {link_description}
  </li>
--- 1,4 ----
  <li>
!   <strong><a href="{link_url}">{link_name}</a></strong> ({link_hits}) {link_edit}<br>
    {link_description}
  </li>




From geeklog-cvs-admin at lists.geeklog.net  Mon Aug 18 10:34:34 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Mon, 18 Aug 2003 09:34:34 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.246,1.247
Message-ID: <200308181434.h7IEYYP14231@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv14217

Modified Files:
	lib-common.php 
Log Message:
An attempt to speed up COM_emailUserTopics().


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.246
retrieving revision 1.247
diff -C2 -d -r1.246 -r1.247
*** lib-common.php	18 Aug 2003 08:36:57 -0000	1.246
--- lib-common.php	18 Aug 2003 14:34:31 -0000	1.247
***************
*** 3642,3645 ****
--- 3642,3665 ----
      global $_TABLES, $LANG08, $LANG24, $_CONF, $LANG_CHARSET;
  
+     // prepare email header - it's always the same for all users
+     $charset = $LANG_CHARSET;
+     if( empty( $charset ))
+     {
+         $charset = $_CONF['default_charset'];
+         if( empty( $charset ))
+         {
+             $charset = "iso-8859-1";
+         }
+     }
+ 
+     $mailfrom = "From: {$_CONF['site_name']} <{$_CONF['site_mail']}>\r\n"
+               . "Return-Path: <{$_CONF['site_mail']}>\r\n"
+               . "X-Mailer: GeekLog " . VERSION . "\r\n"
+               . "Content-Type: text/plain; charset={$charset}";
+ 
+     $subject = strip_tags( $_CONF['site_name'] . $LANG08[30] . strftime( '%Y-%m-%d', time() ));
+ 
+     $authors = array();
+ 
      // Get users who want stories emailed to them
      $usersql = "SELECT username,email,etids,{$_TABLES['users']}.uid AS uuid "
***************
*** 3657,3662 ****
          $U = DB_fetchArray( $users );
  
-         $cur_day = strftime( "%D", time() );
- 
          $storysql = "SELECT sid,uid,date AS day,title,introtext,bodytext "
              . "FROM {$_TABLES['stories']} "
--- 3677,3680 ----
***************
*** 3665,3682 ****
          if( !empty( $U['etids'] ))
          {
-             $storysql .= " AND (";
              $ETIDS = explode( ' ', $U['etids'] );
! 
!             for( $i = 0; $i < sizeof( $ETIDS ); $i++ )
!             {
!                 if( $i == (sizeof( $ETIDS ) - 1 ))
!                 {
!                     $storysql .= "tid = '$ETIDS[$i]')";
!                 }
!                 else
!                 {
!                     $storysql .= "tid = '$ETIDS[$i]' OR ";
!                 }
!             }
          }
          else // get all topics this user has access to
--- 3683,3688 ----
          if( !empty( $U['etids'] ))
          {
              $ETIDS = explode( ' ', $U['etids'] );
!             $storysql .= " AND (tid='" . implode( "' OR tid='", $ETIDS ) . "')";
          }
          else // get all topics this user has access to
***************
*** 3716,3720 ****
          $mailtext = $LANG08[29] . strftime( $_CONF['shortdate'], time() ) . "\n";
  
!         for( $y=0; $y < $nsrows; $y++ )
          {
              // Loop through stories building the requested email message
--- 3722,3726 ----
          $mailtext = $LANG08[29] . strftime( $_CONF['shortdate'], time() ) . "\n";
  
!         for( $y = 0; $y < $nsrows; $y++ )
          {
              // Loop through stories building the requested email message
***************
*** 3726,3730 ****
              if( $_CONF['contributedbyline'] == 1 )
              {
!                 $storyauthor = DB_getItem( $_TABLES['users'], 'username', "uid = '{$S['uid']}'" );
                  $mailtext .= "$LANG24[7]: " . $storyauthor . "\n";
              }
--- 3732,3740 ----
              if( $_CONF['contributedbyline'] == 1 )
              {
!                 if( empty( $authors[$S['uid']] ))
!                 {
!                     $storyauthor = DB_getItem( $_TABLES['users'], 'username', "uid = '{$S['uid']}'" );
!                     $authors[$S['uid']] = $storyauthor;
!                 }
                  $mailtext .= "$LANG24[7]: " . $storyauthor . "\n";
              }
***************
*** 3757,3783 ****
          $mailto = "{$U['username']} <{$toemail}>";
  
-         $charset = $LANG_CHARSET;
-         if( empty( $charset ))
-         {
-             $charset = $_CONF['default_charset'];
-             if( empty( $charset ))
-             {
-                 $charset = "iso-8859-1";
-             }
-         }
- 
-         $mailfrom = "From: {$_CONF['site_name']} <{$_CONF['site_mail']}>\r\n"
-                   . "Return-Path: <{$_CONF['site_mail']}>\r\n"
-                   . "Content-Type: text/plain; charset={$charset}\r\n"
-                   . "X-Mailer: GeekLog " . VERSION;
- 
-         $subject = strip_tags( stripslashes( $_CONF['site_name'] . $LANG08[30] . strftime( '%Y-%m-%d', time() )));
- 
          @mail( $toemail, $subject, $mailtext, $mailfrom );
      }
  
!     $tmpdate = date( "Y-m-d H:i:s", time() );
! 
!     DB_query( "UPDATE {$_TABLES['vars']} SET value = '$tmpdate' WHERE name = 'lastemailedstories'" );
  }
  
--- 3767,3774 ----
          $mailto = "{$U['username']} <{$toemail}>";
  
          @mail( $toemail, $subject, $mailtext, $mailfrom );
      }
  
!     DB_query( "UPDATE {$_TABLES['vars']} SET value = NOW() WHERE name = 'lastemailedstories'" );
  }
  




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 21 05:29:13 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 21 Aug 2003 04:29:13 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin user.php,1.59,1.60
Message-ID: <200308210929.h7L9TDP26305@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv26291

Modified Files:
	user.php 
Log Message:
Batch added didn't use the $_CONF['emailstoriesperdefault'] setting, so that any new (batch-added) users were automatically subscribed to the Daily Digest (bug #55).


Index: user.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** user.php	4 Aug 2003 19:42:06 -0000	1.59
--- user.php	21 Aug 2003 09:29:10 -0000	1.60
***************
*** 468,472 ****
                  DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id,ug_uid) values ($all_grp, $uid)");
                  DB_query("INSERT INTO {$_TABLES['userprefs']} (uid) VALUES ($uid)");
!                 DB_query("INSERT INTO {$_TABLES['userindex']} (uid) VALUES ($uid)");
                  DB_query("INSERT INTO {$_TABLES['usercomment']} (uid) VALUES ($uid)");
                  DB_query("INSERT INTO {$_TABLES['userinfo']} (uid) VALUES ($uid)");
--- 468,476 ----
                  DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id,ug_uid) values ($all_grp, $uid)");
                  DB_query("INSERT INTO {$_TABLES['userprefs']} (uid) VALUES ($uid)");
!                 if ($_CONF['emailstoriesperdefault'] == 1) {
!                     DB_query("INSERT INTO {$_TABLES['userindex']} (uid) VALUES ($uid)");
!                 } else {
!                     DB_query("INSERT INTO {$_TABLES['userindex']} (uid,etids) VALUES ($uid, '-')");
!                 }
                  DB_query("INSERT INTO {$_TABLES['usercomment']} (uid) VALUES ($uid)");
                  DB_query("INSERT INTO {$_TABLES['userinfo']} (uid) VALUES ($uid)");




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 21 15:10:21 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 21 Aug 2003 14:10:21 -0500
Subject: [geeklog-cvs] journal/public_html index.php,1.3,1.4
Message-ID: <200308211910.h7LJALP31865@internal.geeklog.net>

Update of /usr/cvs/geeklog/journal/public_html
In directory geeklog_prod:/tmp/cvs-serv31827/public_html

Modified Files:
	index.php 
Log Message:
Allow for shorter URLs to display the Journal entries.
Some more HTML cleanup.


Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/journal/public_html/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	31 Jul 2003 17:58:40 -0000	1.3
--- index.php	21 Aug 2003 19:10:19 -0000	1.4
***************
*** 133,138 ****
          break;	
      default:
!         $display .= shownavigation($mode,$cur_journal);
!         $display .= listjournals($uid);
          break;
  }
--- 133,145 ----
          break;	
      default:
!         if (!empty ($je_id)) {
!             $jrn_id = DB_getItem ($_TABLES['journal_entry'], 'je_jrn_id',
!                                   "je_id = '$je_id'");
!             $display .= shownavigation($mode,$jrn_id);
!             $display .= printjournalentry($je_id);
!         } else {
!             $display .= shownavigation($mode,$cur_journal);
!             $display .= listjournals($uid);
!         }
          break;
  }




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 21 15:10:21 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 21 Aug 2003 14:10:21 -0500
Subject: [geeklog-cvs] journal functions.inc,1.7,1.8
Message-ID: <200308211910.h7LJALP31864@internal.geeklog.net>

Update of /usr/cvs/geeklog/journal
In directory geeklog_prod:/tmp/cvs-serv31827

Modified Files:
	functions.inc 
Log Message:
Allow for shorter URLs to display the Journal entries.
Some more HTML cleanup.


Index: functions.inc
===================================================================
RCS file: /usr/cvs/geeklog/journal/functions.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** functions.inc	6 Aug 2003 20:10:32 -0000	1.7
--- functions.inc	21 Aug 2003 19:10:19 -0000	1.8
***************
*** 623,628 ****
  }
  
! function showjournalentries($jrn_id,$offset,$mode) {
! 	global $_CONF,$_TABLES, $LANG_JOURNAL,$_USER,$JOURNAL_PREFS;
  
  	if (empty($jrn_id)) return;
--- 623,629 ----
  }
  
! function showjournalentries($jrn_id,$offset,$mode)
! {
!     global $_CONF, $_TABLES, $_USER, $LANG_JOURNAL, $JOURNAL_PREFS;
  
  	if (empty($jrn_id)) return;
***************
*** 665,677 ****
  	}
  
! 	$nrows = DB_numRows($result);
! 	$retval .= "<table cellpadding=0 cellspacing=0 width=100%><tr><th width=5%>{$LANG_JOURNAL['mood']}</th><th align=left width=30%>{$LANG_JOURNAL['summary']}</th><th align=left width=15%>{$LANG_JOURNAL['date']}</th><th width=5%>{$LANG_JOURNAL['public']}</th><th width=5%>{$LANG_JOURNAL['hits']}</th></tr>";
  	for ($i = 1; $i <= $nrows; $i++) {
  		$A = DB_fetchArray($result);
! 		$curtime = COM_getUserDateTimeFormat($A["je_date"]);
  		if (($i % 2) > 0) {
  			$retval .= '<tr bgcolor="#DDDDDD">';
  		} else {
! 			$retval .= "<tr>";
  		}
          if (empty ($A['je_mood'])) {
--- 666,678 ----
  	}
  
!     $nrows = DB_numRows($result);
!     $retval .= '<table cellpadding="0" cellspacing="0" width="100%"><tr><th width="5%">' . $LANG_JOURNAL['mood'] . '</th><th align="left" width="30%">' . $LANG_JOURNAL['summary'] . '</th><th align="left" width="15%">' . $LANG_JOURNAL['date'] . '</th><th width="5%">' . $LANG_JOURNAL['public'] . '</th><th width="5%">' . $LANG_JOURNAL['hits'] . '</th></tr>';
  	for ($i = 1; $i <= $nrows; $i++) {
  		$A = DB_fetchArray($result);
! 		$curtime = COM_getUserDateTimeFormat($A['je_date']);
  		if (($i % 2) > 0) {
  			$retval .= '<tr bgcolor="#DDDDDD">';
  		} else {
! 			$retval .= '<tr>';
  		}
          if (empty ($A['je_mood'])) {
***************
*** 686,715 ****
          $retval .= '<td width="5%" align="center"><img src=' . $image
                  . '></td><td width="30%"><a href="' . $_CONF['site_url']
!                 . '/journal/index.php?mode=read&amp;type=entry&amp;je_id='
                  . $A['je_id'] . '">' . stripslashes ($A['je_summary']) . '</a>';
  		if ($isadmin) {
! 			$retval .= "&nbsp;&nbsp;[<a href={$_CONF["site_url"]}/journal/index.php?mode=edit&type=entry&je_id={$A["je_id"]}>{$LANG_JOURNAL['edit']}</a>]</td>";
  		} else {
! 			$retval .= "</td>";
  		}
! 		$retval .= "<td width=15%>$curtime[0]</td>";
! 		if ($A["je_public"] == 1) {
! 			$A["je_public"] = $LANG_JOURNAL['yes'];
  		} else {
! 			$A["je_public"] = $LANG_JOURNAL['no'];
  		}
! 		$retval .= "<td align=center width=5%>{$A["je_public"]}</td>";
! 		$retval .= "<td align=center width=5%>{$A["je_hits"]}</td></tr>";
  	}
  	if ($nrows == 0) {
! 		$retval .= "<tr><td colspan=4 align=left>{$LANG_JOURNAL["noentriesmsg"]}</td></tr>";
  	}
  
! 	$retval .= "<tr><td align=center colspan=4>&nbsp;<br>";
  
  	# next we need to do the links to other results
      if ($offset > 0) { # bypass PREV link if offset is 0
          $prevoffset = $offset - 20;
!         $retval .= "<a href=\"$PHP_SELF?mode=user&offset=$prevoffset\">{$LANG_JOURNAL['previous']}</a> &nbsp; \n";
      } else {
          $retval .= $LANG_JOURNAL['previous'] . " &nbsp; \n";
--- 687,719 ----
          $retval .= '<td width="5%" align="center"><img src=' . $image
                  . '></td><td width="30%"><a href="' . $_CONF['site_url']
!                 . '/journal/index.php?je_id='
                  . $A['je_id'] . '">' . stripslashes ($A['je_summary']) . '</a>';
  		if ($isadmin) {
! 			$retval .= '&nbsp;&nbsp;[<a href="' . $_CONF['site_url']
!                     . '/journal/index.php?mode=edit&amp;type=entry&amp;je_id='
!                     . $A['je_id'] . '">' . $LANG_JOURNAL['edit'] . '</a>]</td>';
  		} else {
! 			$retval .= '</td>';
  		}
! 		$retval .= '<td width="15%">' . $curtime[0] . '</td>';
! 		if ($A['je_public'] == 1) {
! 			$A['je_public'] = $LANG_JOURNAL['yes'];
  		} else {
! 			$A['je_public'] = $LANG_JOURNAL['no'];
  		}
! 		$retval .= '<td align="center" width="5%">' . $A['je_public'] . '</td>';
! 		$retval .= '<td align="center" width="5%">' . $A['je_hits'] . '</td></tr>';
  	}
  	if ($nrows == 0) {
! 		$retval .= '<tr><td colspan="4" align="left">'
!                 . $LANG_JOURNAL['noentriesmsg'] . '</td></tr>';
  	}
  
! 	$retval .= '<tr><td align="center" colspan="4">&nbsp;<br>';
  
  	# next we need to do the links to other results
      if ($offset > 0) { # bypass PREV link if offset is 0
          $prevoffset = $offset - 20;
!         $retval .= "<a href=\"$PHP_SELF?mode=user&amp;offset=$prevoffset\">{$LANG_JOURNAL['previous']}</a> &nbsp; \n";
      } else {
          $retval .= $LANG_JOURNAL['previous'] . " &nbsp; \n";
***************
*** 717,733 ****
  
  	# calculate number of pages needing links
!     $pages= intval($totalrows / $limit);
  
      # $pages now contains int of pages needed unless there is a remainder from division
!     if ($numrows%$limit) {
          #has remainder so add one page
          $pages++;
      }
  
!     for ($i=1;$i<=$pages;$i++) { // loop thru
!         $newoffset = $limit * ($i-1);
  		# only $retval .= link if we aren't on page $i
! 		if ($i <> ($offset+1)) {
!             $retval .= "<a href=\"$PHP_SELF?mode=user&offset=$newoffset\">$i</a> &nbsp; \n";
  			$lastpage = false;
  		} else {
--- 721,737 ----
  
  	# calculate number of pages needing links
!     $pages = intval($totalrows / $limit);
  
      # $pages now contains int of pages needed unless there is a remainder from division
!     if ($numrows % $limit) {
          #has remainder so add one page
          $pages++;
      }
  
!     for ($i = 1; $i <= $pages; $i++) { // loop thru
!         $newoffset = $limit * ($i - 1);
  		# only $retval .= link if we aren't on page $i
! 		if ($i <> ($offset + 1)) {
!             $retval .= "<a href=\"$PHP_SELF?mode=user&amp;offset=$newoffset\">$i</a> &nbsp; \n";
  			$lastpage = false;
  		} else {
***************
*** 741,759 ****
          # not last page so give NEXT link
          $newoffset= $offset + $limit;
!         $retval .= "<a href=\"$PHP_SELF?offset=$newoffset\">{$LANG_JOURNAL['next']}</a><p>\n";
      } else {
!         $retval .= "{$LANG_JOURNAL['next']}<p>\n";
  	}
  
! 	$retval .= "</td></tr></table>";
  
  	$retval .= COM_endBlock();
  
  	return $retval;
! }	
  
  function getprevnextentries($je_id,$jrn_id,$date) {
      global $_TABLES;
!     
      $result = DB_query("SELECT je_id FROM {$_TABLES['journal_entry']} WHERE je_date > '" . $date . "' AND je_jrn_id = $jrn_id ORDER BY je_date");
         
--- 745,763 ----
          # not last page so give NEXT link
          $newoffset= $offset + $limit;
!         $retval .= "<a href=\"$PHP_SELF?offset=$newoffset\">{$LANG_JOURNAL['next']}</a>" . LB;
      } else {
!         $retval .= $LANG_JOURNAL['next'] . LB;
  	}
  
! 	$retval .= '</td></tr></table>';
  
  	$retval .= COM_endBlock();
  
  	return $retval;
! }
  
  function getprevnextentries($je_id,$jrn_id,$date) {
      global $_TABLES;
! 
      $result = DB_query("SELECT je_id FROM {$_TABLES['journal_entry']} WHERE je_date > '" . $date . "' AND je_jrn_id = $jrn_id ORDER BY je_date");
         




From geeklog-cvs-admin at lists.geeklog.net  Thu Aug 21 17:19:49 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Thu, 21 Aug 2003 16:19:49 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.247,1.248
Message-ID: <200308212119.h7LLJnP01352@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv1339

Modified Files:
	lib-common.php 
Log Message:
Changes to enable highlighting of current menu selection on IIS.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.247
retrieving revision 1.248
diff -C2 -d -r1.247 -r1.248
*** lib-common.php	18 Aug 2003 14:34:31 -0000	1.247
--- lib-common.php	21 Aug 2003 21:19:46 -0000	1.248
***************
*** 1900,1908 ****
          if( empty( $thisUrl ))
          {
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
              else
--- 1900,1918 ----
          if( empty( $thisUrl ))
          {
+             $requestUri = $HTTP_SERVER_VARS['REQUEST_URI'];
+             if( empty( $HTTP_SERVER_VARS['REQUEST_URI'] ))
+             {
+                 $requestUri = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+                 if( !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
+                 {
+                     $requestUri .= '?' . $HTTP_SERVER_VARS['QUERY_STRING'];     
+                 }
+             }
+ 
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $requestUri;
              }
              else
***************
*** 1910,1915 ****
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos )
!                          . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
          }
--- 1920,1924 ----
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos ) . $requestUri;
              }
          }
***************
*** 2061,2069 ****
          if( empty( $thisUrl ))
          {
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
              else
--- 2070,2088 ----
          if( empty( $thisUrl ))
          {
+             $requestUri = $HTTP_SERVER_VARS['REQUEST_URI'];
+             if( empty( $HTTP_SERVER_VARS['REQUEST_URI'] ))
+             {
+                 $requestUri = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+                 if( !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
+                 {
+                     $requestUri .= '?' . $HTTP_SERVER_VARS['QUERY_STRING'];     
+                 }
+             }
+ 
              $firstslash = strpos( $_CONF['site_url'], '/' );
              if( $firstslash + 1 == strrpos( $_CONF['site_url'], '/' ))
              {
                  // site is in the document root
!                 $thisUrl = $_CONF['site_url'] . $requestUri;
              }
              else
***************
*** 2071,2076 ****
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos )
!                          . $HTTP_SERVER_VARS['REQUEST_URI'];
              }
          }
--- 2090,2094 ----
                  // extract server name first
                  $pos = strpos( $_CONF['site_url'], '/', $firstslash + 2 );
!                 $thisUrl = substr( $_CONF['site_url'], 0, $pos ) . $requestUri;
              }
          }




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug 22 16:48:28 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 22 Aug 2003 15:48:28 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html users.php,1.67,1.68
Message-ID: <200308222048.h7MKmSP14719@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv14692

Modified Files:
	users.php 
Log Message:
Make sure new users enter a username when registering with the site (bug #56).
When displaying the error message for this (or an invalid email address), make sure we're checking for (and calling) the custom registration form, if it exists.


Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** users.php	25 Jul 2003 08:11:28 -0000	1.67
--- users.php	22 Aug 2003 20:48:26 -0000	1.68
***************
*** 456,464 ****
  function createuser($username,$email) 
  {
!     global $_TABLES, $LANG04, $_CONF;
  
!     if (COM_isEmail($email)) {
  
!         $username = trim ($username);
  
          $ucount = DB_count($_TABLES['users'],'username',$username);
--- 456,464 ----
  function createuser($username,$email) 
  {
!     global $_CONF, $_TABLES, $LANG01, $LANG04;
  
!     $username = trim ($username);
  
!     if (COM_isEmail ($email) && !empty ($username)) {
  
          $ucount = DB_count($_TABLES['users'],'username',$username);
***************
*** 534,540 ****
          }
      } else {
!         $retval .= COM_siteHeader ('Menu')
!                 . newuserform ($LANG04[18])
!                 . COM_siteFooter();
      }
  
--- 534,549 ----
          }
      } else {
!         if (empty ($username)) {
!             $msg = $LANG01[32]; // invalid username
!         } else {
!             $msg = $LANG04[18]; // invalid email address
!         }
!         $retval .= COM_siteHeader ('menu');
!         if ($_CONF['custom_registration'] && function_exists(custom_userform)) {
!             $retval .= custom_userform ('new', '', $msg);
!         } else {
!             $retval .= newuserform ($msg);
!         }
!         $retval .= COM_siteFooter();
      }
  




From geeklog-cvs-admin at lists.geeklog.net  Fri Aug 22 17:17:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Fri, 22 Aug 2003 16:17:25 -0500
Subject: [geeklog-cvs] geeklog-1.3/docs history,1.124,1.125
Message-ID: <200308222117.h7MLHPP15154@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/docs
In directory geeklog_prod:/tmp/cvs-serv15142

Modified Files:
	history 
Log Message:
Updated list of changes


Index: history
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/docs/history,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** history	18 Aug 2003 09:53:37 -0000	1.124
--- history	22 Aug 2003 21:17:23 -0000	1.125
***************
*** 1,9 ****
  GeekLog History/Changes:
  
  - Added an 'edit' link to links/linkdetails.thtml, so that (Link) Admins can
    edit links easily (contributed by Euan McKay).
  - What's Related applied COM_checkHTML() on the entire block instead of on the
    individual items, thus stripping out HTML from the template file (bug #52).
! - Words from a search query are now properly hightlighted in comments when the
    words occured only in the comments (but not in the story).
  - Fixed parse errors in the french_canada.php language file (bug #53).
--- 1,15 ----
  GeekLog History/Changes:
  
+ - When users try to register with an empty username or invalid email address,
+   make sure we're displaying a custom registration form (if one exists) when
+   displaying the error message (part 1 of bug #57).
+ - Prevent users from registering with an empty username (bug #56).
+ - Use $_CONF['emailstoriesperdefault'] when batch-adding users. Until now,
+   new users were subscribed to the Daily Digest automatically (bug #55).
  - Added an 'edit' link to links/linkdetails.thtml, so that (Link) Admins can
    edit links easily (contributed by Euan McKay).
  - What's Related applied COM_checkHTML() on the entire block instead of on the
    individual items, thus stripping out HTML from the template file (bug #52).
! - Words from a search query are now properly highlighted in comments when the
    words occured only in the comments (but not in the story).
  - Fixed parse errors in the french_canada.php language file (bug #53).




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 27 21:31:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 27 Aug 2003 20:31:25 -0500
Subject: [geeklog-cvs] MVCnPHP/contactmanager Validate.class.php,1.1.1.1,1.2 config.php,1.2,1.3 index.php,1.2,1.3 mvcconfig.php,1.2,1.3
Message-ID: <200308280131.h7S1VPP25675@internal.geeklog.net>

Update of /usr/cvs/geeklog/MVCnPHP/contactmanager
In directory geeklog_prod:/tmp/cvs-serv25633/contactmanager

Modified Files:
	Validate.class.php config.php index.php mvcconfig.php 
Log Message:
Massive Updates as result of progress at work

Index: Validate.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/Validate.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: mvcconfig.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/mvcconfig.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 27 21:31:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 27 Aug 2003 20:31:25 -0500
Subject: [geeklog-cvs] MVCnPHP/quickform index.php,1.3,1.4
Message-ID: <200308280131.h7S1VPP25674@internal.geeklog.net>

Update of /usr/cvs/geeklog/MVCnPHP/quickform
In directory geeklog_prod:/tmp/cvs-serv25633/quickform

Modified Files:
	index.php 
Log Message:
Massive Updates as result of progress at work

Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/quickform/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 27 21:31:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 27 Aug 2003 20:31:25 -0500
Subject: [geeklog-cvs] MVCnPHP/contactmanager/views EditContact.class.php,1.2,1.3 ShowContacts.class.php,1.2,1.3
Message-ID: <200308280131.h7S1VPP25666@internal.geeklog.net>

Update of /usr/cvs/geeklog/MVCnPHP/contactmanager/views
In directory geeklog_prod:/tmp/cvs-serv25633/contactmanager/views

Modified Files:
	EditContact.class.php ShowContacts.class.php 
Log Message:
Massive Updates as result of progress at work

Index: EditContact.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/views/EditContact.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: ShowContacts.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/views/ShowContacts.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 27 21:31:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 27 Aug 2003 20:31:25 -0500
Subject: [geeklog-cvs] MVCnPHP/contactmanager/commands DeleteContact.class.php,1.2,1.3 SaveContact.class.php,1.2,1.3 SearchContacts.class.php,1.2,1.3 ValidateContact.class.php,1.2,1.3
Message-ID: <200308280131.h7S1VPP25672@internal.geeklog.net>

Update of /usr/cvs/geeklog/MVCnPHP/contactmanager/commands
In directory geeklog_prod:/tmp/cvs-serv25633/contactmanager/commands

Modified Files:
	DeleteContact.class.php SaveContact.class.php 
	SearchContacts.class.php ValidateContact.class.php 
Log Message:
Massive Updates as result of progress at work

Index: DeleteContact.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/commands/DeleteContact.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: SaveContact.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/commands/SaveContact.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: SearchContacts.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/commands/SearchContacts.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: ValidateContact.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/contactmanager/commands/ValidateContact.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3




From geeklog-cvs-admin at lists.geeklog.net  Wed Aug 27 21:31:25 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Wed, 27 Aug 2003 20:31:25 -0500
Subject: [geeklog-cvs] MVCnPHP ArrayLoader.class.php,1.1.1.1,1.2 BaseCommand.class.php,1.1.1.1,1.2 BaseLoader.class.php,1.2,1.3 BaseView.class.php,1.1.1.1,1.2 CHANGELOG,1.3,1.4 CommandFactory.class.php,1.1.1.1,1.2 Constants.php,1.2,1.3 Controller.class.php,1.4,1.5 Form.class.php,1.2,1.3 LoaderFactory.class.php,1.2,1.3 MVC_Base.class.php,1.1.1.1,1.2 MVC_XMLParser.class.php,1.2,1.3 Mapping.class.php,1.1.1.1,1.2 QF_View.class.php,1.3,1.4 README.txt,1.4,1.5 Validator.class.php,1.2,1.3 ViewFactory.class.php,1.1.1.1,1.2 XMLLoader.class.php,1.3,1.4
Message-ID: <200308280131.h7S1VPP25689@internal.geeklog.net>

Update of /usr/cvs/geeklog/MVCnPHP
In directory geeklog_prod:/tmp/cvs-serv25633

Modified Files:
	ArrayLoader.class.php BaseCommand.class.php 
	BaseLoader.class.php BaseView.class.php CHANGELOG 
	CommandFactory.class.php Constants.php Controller.class.php 
	Form.class.php LoaderFactory.class.php MVC_Base.class.php 
	MVC_XMLParser.class.php Mapping.class.php QF_View.class.php 
	README.txt Validator.class.php ViewFactory.class.php 
	XMLLoader.class.php 
Log Message:
Massive Updates as result of progress at work

Index: ArrayLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/ArrayLoader.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: BaseCommand.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseCommand.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: BaseLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseLoader.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseLoader.class.php	14 Jul 2003 16:39:27 -0000	1.2
--- BaseLoader.class.php	28 Aug 2003 01:31:22 -0000	1.3
***************
*** 74,78 ****
          }
          $mapping->setBaseURL($baseURL);
!         $mapping->setForwards($this->_getForwards($name));
          
          return $mapping;
--- 74,78 ----
          }
          $mapping->setBaseURL($baseURL);
!         $mapping->setForwards($this->_getForwards($name, $mapping->getType()));
          
          return $mapping;
***************
*** 105,114 ****
      * @access private
      * @param string $name Name of model to get forwards for
      * @return array Forwards for given model
      *
      */
!     function _getForwards($name)
      {
!         return $this->_arrayData[MVC_MODELS][$name][MVC_FORWARDS];
      }
      
--- 105,119 ----
      * @access private
      * @param string $name Name of model to get forwards for
+     * @param string $type Type of object (command or view)
      * @return array Forwards for given model
      *
      */
!     function _getForwards($name, $type)
      {
!         if ($type == 'view') {
!             return $this->_arrayData[MVC_VIEWS][$name][MVC_FORWARDS];
!         } else {
!             return $this->_arrayData[MVC_COMMANDS][$name][MVC_FORWARDS];
!         }
      }
      

Index: BaseView.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/BaseView.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: CHANGELOG
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/CHANGELOG,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CHANGELOG	14 Jul 2003 17:03:32 -0000	1.3
--- CHANGELOG	28 Aug 2003 01:31:22 -0000	1.4
***************
*** 10,13 ****
  - Fixed bug with QuickForm example that was caused because the Controller::ProcessRequest() method expects
    all commands. (02 May 2003)
! - Now assume that MVCnPHP folder is in PHP's include_path. Also changed some terminology in config files 
!   (XML and .php) to avoid confusion (15 June 2003)
--- 10,12 ----
  - Fixed bug with QuickForm example that was caused because the Controller::ProcessRequest() method expects
    all commands. (02 May 2003)
! - Now assume that MVCnPHP folder is in PHP's include_path. Also changed some terminology in config files (XML and .php) to avoid confusion (15 June 2003)

Index: CommandFactory.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/CommandFactory.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: Constants.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Constants.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Constants.php	14 Jul 2003 16:39:57 -0000	1.2
--- Constants.php	28 Aug 2003 01:31:22 -0000	1.3
***************
*** 46,50 ****
  define('MVC_TARGET', 'target');
  define('MVC_TYPE', 'type');
! define('MVC_MESSAGE', 'mvc_message');
  define('MVC_ERRORS', 'mvc_errors');
  define('MVC_PRINT', 1);
--- 46,50 ----
  define('MVC_TARGET', 'target');
  define('MVC_TYPE', 'type');
! define('MVC_MESSAGES', 'mvc_messages');
  define('MVC_ERRORS', 'mvc_errors');
  define('MVC_PRINT', 1);

Index: Controller.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Controller.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Controller.class.php	14 Jul 2003 16:40:14 -0000	1.4
--- Controller.class.php	28 Aug 2003 01:31:22 -0000	1.5
***************
*** 233,236 ****
--- 233,242 ----
      * Process a request (or forward)
      *
+     * NOTE this now supports the concept of a global forward for
+     * descendants of the validator class.  A global forward is a
+     * slick way for validators to return control to the calling
+     * command or view without having define a bunch of them in
+     * the configuration file.
+     *
      * @author Tony Bibbs <tony at geeklog.net>
      * @access public
***************
*** 253,256 ****
--- 259,268 ----
                  $this->_forwardControl($retval);
              }
+             $tmpArray = explode(':', $retval);
+             
+             if ($tmpArray[0] = 'doForward') {
+                 $this->_mapping = &$this->_mapLoader->getMapping($tmpArray[1], $this->_viewDir, $this->_commandDir, $this->_baseURL);
+                 $this->processRequest();
+             }
              if (!$view->printView()) {
                  return $retval;
***************
*** 261,266 ****
--- 273,291 ----
              $strForward = $tmp->execute();
              // This IF is required to avoid errors using quickform
+             
              if ($this->_isForward($strForward)) {
                  $this->_forwardControl($strForward);
+             }
+ 
+             $tmpArray = explode(':', $strForward);
+             
+             if ($tmpArray[0] = 'doForward') {
+                 $this->_mapping = &$this->_mapLoader->getMapping($tmpArray[1], $this->_viewDir, $this->_commandDir, $this->_baseURL);
+                 $this->processRequest();
+             }
+             
+             // OK if we got here then we got an undefined forward of some kind
+             if (!empty($strForward)) {
+                 return PEAR::raiseError('Unexpected return from MVC command or MVC view.  Got ' . $strForward);
              }
          }

Index: Form.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Form.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: LoaderFactory.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/LoaderFactory.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: MVC_Base.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/MVC_Base.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: MVC_XMLParser.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/MVC_XMLParser.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MVC_XMLParser.class.php	14 Jul 2003 16:40:54 -0000	1.2
--- MVC_XMLParser.class.php	28 Aug 2003 01:31:22 -0000	1.3
***************
*** 102,106 ****
          
          // Lets expat know this class will handle the parsing
!         xml_set_object($this->_parser, &$this);
          xml_set_element_handler($this->_parser, '_handleStartElement', '_handleEndElement');
          xml_set_character_data_handler($this->_parser, '_handleData');
--- 102,106 ----
          
          // Lets expat know this class will handle the parsing
!         xml_set_object($this->_parser, $this);
          xml_set_element_handler($this->_parser, '_handleStartElement', '_handleEndElement');
          xml_set_character_data_handler($this->_parser, '_handleData');
***************
*** 138,141 ****
--- 138,143 ----
              $attributes['PARENT'] = $this->_level;
          }
+         $this->_numSiblings = $this->_getNumSiblings($attributes['PARENT']);
+         //$attributes['NUMSIBLINGS'] = $this->_numSiblings;
          $this->_level++;
          $this->_elements[] = $name;
***************
*** 158,162 ****
      {
          $this->_level--;
!         $this->_curElement--;
      }
      
--- 160,164 ----
      {
          $this->_level--;
!         $this->_curElement = $this->_curElement - ($this->_numSiblings + 1);
      }
      
***************
*** 177,180 ****
--- 179,194 ----
          if (empty($this->_curElement) OR !trim($data)) return;
          $this->_values[$this->_curElement] = $data;
+     }
+     
+     function _getNumSiblings($parent)
+     {
+         if ($parent == 1) return 0;
+         $numSiblings = 0;
+         foreach ($this->_attributes as $curAtt) {
+             if ($curAtt['PARENT'] == $parent) {
+                 $numSiblings++;
+             }
+         }
+         return $numSiblings;
      }
      

Index: Mapping.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Mapping.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: QF_View.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/QF_View.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4

Index: README.txt
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README.txt	14 Jul 2003 17:02:55 -0000	1.4
--- README.txt	28 Aug 2003 01:31:22 -0000	1.5
***************
*** 45,49 ****
  you are a Java purist and insist on a 100% Struts compatible version you may
  feel welcome to rework what I have here OR check out the Phrame project at
! http://phrame.itsd.ttu.edu/.  
  
  MVC FEATURES
--- 45,49 ----
  you are a Java purist and insist on a 100% Struts compatible version you may
  feel welcome to rework what I have here OR check out the Phrame project at
! http://phrame.itsd.ttu.edu/ 
  
  MVC FEATURES
***************
*** 133,138 ****
  can be easily extended to use other packages for the creation of views.  Furthermore, 
  MVCnPHP includes QF_View.class.php as part of the base distribution so that you could begin
! using HTML QuickForm right out-of-the-box.  To use the example, edit the index.php file and
! change $mvcBase to point to where you installed MVCnPHP.
  
  INSTALLATION FOR GENERAL USE
--- 133,137 ----
  can be easily extended to use other packages for the creation of views.  Furthermore, 
  MVCnPHP includes QF_View.class.php as part of the base distribution so that you could begin
! using HTML QuickForm right out-of-the-box.  
  
  INSTALLATION FOR GENERAL USE
***************
*** 148,156 ****
     application one for each functional area of your application.  Each 
     controller will require it's own configuration settings.
! 3) If you plan to use MVCnPHP in a number of applications, you should consider adding the
!    folder location to your php.ini's include_path.  The sample applications assume this is the 
!    case but, to get around the fact some of you may not be able to edit php.ini we change the 
!    value of include_path at runtime through code.  If you want to do something similar in your
!    code, feel free to borrow those code snippets.
  
  TODO
--- 147,151 ----
     application one for each functional area of your application.  Each 
     controller will require it's own configuration settings.
! 3) ...coming soon
  
  TODO
***************
*** 159,163 ****
  2) Remove dependence on $_SESSION superglobal since not all application may
     use it.
- 3) Branch and port to PHP5
  
  KNOWN BUGS
--- 154,157 ----
***************
*** 170,174 ****
  -------
  
! This package is considered a final release and is supported.  Send any bugs, comments or
  questions to Tony Bibbs, tony at geeklog.net.
  
--- 164,169 ----
  -------
  
! This package is considered a release condidate and is unsupported.  Once it is deemed stable
! we will release a supported package.  Until that time, send any bugs, comments or
  questions to Tony Bibbs, tony at geeklog.net.
  
***************
*** 180,185 ****
  project and a special shout-out to Jason Sweat who is a regular contributor to Phrame.
  
! At one point we had considered combining our efforts but their Phrame project is GPL'd which
! doesn't lend itself for use in proprietary PHP systems. MVCnPHP uses the PHP License which gets
! around this.  For those looking for an MVC implementation be willing to consider both and 
! understand the main differences as it will be an important decision.
--- 175,181 ----
  project and a special shout-out to Jason Sweat who is a regular contributor to Phrame.
  
! At the time of this writing no decision on the future of this project and Phrame has been
! decided.  I am in constant communication with the Phrame developers hoping we can combine 
! what I have built here into some of the Phrame principles that were omitted in this package. 
! By doing so I hope to end up with *the* definitive PHP-MVC package and, at that time, we would
! look at submitting this framework to PEAR.

Index: Validator.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/Validator.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3

Index: ViewFactory.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/ViewFactory.class.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2

Index: XMLLoader.class.php
===================================================================
RCS file: /usr/cvs/geeklog/MVCnPHP/XMLLoader.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLLoader.class.php	14 Jul 2003 16:41:26 -0000	1.3
--- XMLLoader.class.php	28 Aug 2003 01:31:22 -0000	1.4
***************
*** 106,111 ****
                      } else {
                          if ($parentTag == 'COMMAND') {
!                             $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TARGET] = $parser->getValue($curIndex);
!                             $configData[MVC_MODELS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');
                          } else {
                              trigger_error('Hit unexpected XML tag in XMLLoader::_XMLToArray');
--- 106,111 ----
                      } else {
                          if ($parentTag == 'COMMAND') {
!                             $configData[MVC_COMMANDS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TARGET] = $parser->getValue($curIndex);
!                             $configData[MVC_COMMANDS][$parentIDAttr][MVC_FORWARDS][$name][MVC_TYPE] = $parser->getAttribute($curIndex, 'type');
                          } else {
                              trigger_error('Hit unexpected XML tag in XMLLoader::_XMLToArray');




From geeklog-cvs-admin at lists.geeklog.net  Sat Aug 30 12:39:16 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sat, 30 Aug 2003 11:39:16 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.25,1.26
Message-ID: <200308301639.h7UGdFP28464@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv28450

Modified Files:
	calendar_event.php 
Log Message:
A few more declarations of {layout_url} can't hurt ...


Index: calendar_event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** calendar_event.php	16 Jun 2003 09:11:22 -0000	1.25
--- calendar_event.php	30 Aug 2003 16:39:13 -0000	1.26
***************
*** 60,63 ****
--- 60,64 ----
          $cal_template->set_file(array('addevent'=>'addevent.thtml'));
          $cal_template->set_var('site_url', $_CONF['site_url']);
+         $cal_template->set_var('layout_url', $_CONF['layout_url']);
          $cal_template->set_var('intro_msg', $LANG02[8]);
          $cal_template->set_var('lang_event', $LANG02[12]);
***************
*** 153,156 ****
--- 154,158 ----
      $cal_templates->set_file('form','editpersonalevent.thtml');
      $cal_templates->set_var('site_url', $_CONF['site_url']);
+     $cal_templates->set_var('layout_url', $_CONF['layout_url']);
      $cal_templates->set_var('lang_title', $LANG12[10]);
      $cal_templates->set_var('event_title', stripslashes ($A['title']));
***************
*** 438,441 ****
--- 440,444 ----
          $cal_templates->set_var('event_details','');
          $cal_templates->set_var('site_url', $_CONF['site_url']);
+         $cal_templates->set_var('layout_url', $_CONF['layout_url']);
          $cal_templates->parse('output','events');
          $display .= $cal_templates->finish($cal_templates->get_var('output'));
***************
*** 457,460 ****
--- 460,464 ----
                  $cal_templates->set_var('event_title', stripslashes($A['title']));
                  $cal_templates->set_var('site_url', $_CONF['site_url']);
+                 $cal_templates->set_var('layout_url', $_CONF['layout_url']);
                  if (!empty($A['url'])) {
                      $cal_templates->set_var('event_begin_anchortag', '<a href="'.$A['url'].'">');




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 04:18:03 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 03:18:03 -0500
Subject: [geeklog-cvs] geeklog-1.3 config.php,1.95,1.96
Message-ID: <200308310818.h7V8I3P01932@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3
In directory geeklog_prod:/tmp/cvs-serv1918

Modified Files:
	config.php 
Log Message:
Fixed comments referring to the "Sections" block (which is now called "Topics").


Index: config.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/config.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** config.php	9 Aug 2003 11:47:40 -0000	1.95
--- config.php	31 Aug 2003 08:18:01 -0000	1.96
***************
*** 304,308 ****
  
  // Topics can be assigned a sort number so that you can control what order they
! // appear in the 'Sections' block on the homepage.  If you prefer you can also
  // have this sort alphabetically by changing the value to 'alpha' (default is
  // by 'sortnum'
--- 304,308 ----
  
  // Topics can be assigned a sort number so that you can control what order they
! // appear in the 'Topics' block on the homepage.  If you prefer you can also
  // have this sort alphabetically by changing the value to 'alpha' (default is
  // by 'sortnum'
***************
*** 310,320 ****
  $_CONF['sortmethod'] = 'sortnum'; // or 'alpha'
  
! // Show the number of stories in a topic in Section Block
  $_CONF['showstorycount'] = 1;
  
! // Show the number of story submissions for a topic in Section Block
  $_CONF['showsubmissioncount'] = 1;
  
! // Hide 'Home' link from Sections block (if set to 1)
  $_CONF['hide_home_link'] = 0;
  
--- 310,320 ----
  $_CONF['sortmethod'] = 'sortnum'; // or 'alpha'
  
! // Show the number of stories in a topic in Topics Block
  $_CONF['showstorycount'] = 1;
  
! // Show the number of story submissions for a topic in Topics Block
  $_CONF['showsubmissioncount'] = 1;
  
! // Hide 'Home' link from Topics block (if set to 1)
  $_CONF['hide_home_link'] = 0;
  




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 13:20:35 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 12:20:35 -0500
Subject: [geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.13,1.14
Message-ID: <200308311720.h7VHKZP14271@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv14259/system/classes

Modified Files:
	search.class.php 
Log Message:
The link for Story Search result now uses $_CONF['site_url'] instead of a relative link to provide the full URL. Created a problem for any plugins sub components that called this class.

Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** search.class.php	17 Aug 2003 19:39:41 -0000	1.13
--- search.class.php	31 Aug 2003 17:20:33 -0000	1.14
***************
*** 297,301 ****
                          $articleUrl .= '&amp;query=' . $urlQuery;
                      }
!                     $row = array('<a href="' . $articleUrl . '">' . stripslashes($A['title']) . '</a>',$thetime[0], DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;
--- 297,301 ----
                          $articleUrl .= '&amp;query=' . $urlQuery;
                      }
!                     $row = array('<a href="' .$_CONF['site_url'] .'/'. $articleUrl . '">' . stripslashes($A['title']) . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 13:26:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 12:26:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.14,1.15
Message-ID: <200308311726.h7VHQvP14356@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv14344/system/classes

Modified Files:
	search.class.php 
Log Message:
Fixed Additional locations where $_CONF['site_url'] was not being used. Poll search and comment search results

Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** search.class.php	31 Aug 2003 17:20:33 -0000	1.14
--- search.class.php	31 Aug 2003 17:26:55 -0000	1.15
***************
*** 293,301 ****
                      $A['title'] = str_replace('$','&#36;',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     $articleUrl = 'article.php?story=' . $A['sid'];
                      if (!empty ($urlQuery)) {
                          $articleUrl .= '&amp;query=' . $urlQuery;
                      }
!                     $row = array('<a href="' .$_CONF['site_url'] .'/'. $articleUrl . '">' . stripslashes($A['title']) . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;
--- 293,301 ----
                      $A['title'] = str_replace('$','&#36;',$A['title']);
                      $thetime = COM_getUserDateTimeFormat($A['day']);
!                     $articleUrl = '/article.php?story=' . $A['sid'];
                      if (!empty ($urlQuery)) {
                          $articleUrl .= '&amp;query=' . $urlQuery;
                      }
!                     $row = array('<a href="' .$_CONF['site_url'] . $articleUrl . '">' . stripslashes($A['title']) . DB_getItem($_TABLES['users'],'username',"uid = '{$A['uid']}'"), $A['hits']);
                      $story_results->addSearchResult($row);
                      $story_results->num_searchresults++;
***************
*** 397,403 ****
                  }
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="article.php?story=' . $A['sid'] . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="pollbooth.php?qid=' . $A['qid'] . '&amp;aid=-1' . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  }
                  
--- 397,403 ----
                  }
                  if ($A['comment_type'] == 'article') {
!                     $A['title'] = '<a href="' .$_CONF['site_url'] .'/article.php?story=' . $A['sid'] . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  } else {
!                     $A['title'] = '<a href="' .$_CONF['site_url'] .'/pollbooth.php?qid=' . $A['qid'] . '&amp;aid=-1' . $querystring . '#comments">' . stripslashes($A['title']) . '</a>';
                  }
                  




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:56 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:56 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Classic/admin/story liststories.thtml,1.5,1.6
Message-ID: <200308311858.h7VIwuP15229@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/Classic/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Classic/admin/story/liststories.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** liststories.thtml	10 Apr 2003 14:32:39 -0000	1.5
--- liststories.thtml	31 Aug 2003 18:58:54 -0000	1.6
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
!                                     <td rowspan="2"><img src="{site_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
!                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
!                                     <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Digital_Monochrome/admin/story liststories.thtml,1.4,1.5
Message-ID: <200308311858.h7VIwuP15232@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/Digital_Monochrome/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Digital_Monochrome/admin/story/liststories.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** liststories.thtml	10 Apr 2003 14:32:39 -0000	1.4
--- liststories.thtml	31 Aug 2003 18:58:54 -0000	1.5
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
!                                     <td rowspan="2"><img src="{site_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
!                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
!                                     <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/XSilver/admin/story liststories.thtml,1.2,1.3
Message-ID: <200308311858.h7VIwvP15237@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/XSilver/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/XSilver/admin/story/liststories.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** liststories.thtml	10 Apr 2003 14:32:39 -0000	1.2
--- liststories.thtml	31 Aug 2003 18:58:55 -0000	1.3
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
+                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/gameserver/admin/story liststories.thtml,1.1.1.1,1.2
Message-ID: <200308311858.h7VIwvP15249@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/gameserver/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/gameserver/admin/story/liststories.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** liststories.thtml	30 Apr 2003 20:53:24 -0000	1.1.1.1
--- liststories.thtml	31 Aug 2003 18:58:55 -0000	1.2
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
+                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Yahoo/admin/story liststories.thtml,1.5,1.6
Message-ID: <200308311858.h7VIwvP15241@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/Yahoo/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Yahoo/admin/story/liststories.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** liststories.thtml	10 Apr 2003 14:32:39 -0000	1.5
--- liststories.thtml	31 Aug 2003 18:58:55 -0000	1.6
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
+                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/clean/admin/story liststories.thtml,1.1.1.1,1.2
Message-ID: <200308311858.h7VIwvP15244@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/clean/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/clean/admin/story/liststories.thtml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** liststories.thtml	30 Apr 2003 20:41:28 -0000	1.1.1.1
--- liststories.thtml	31 Aug 2003 18:58:55 -0000	1.2
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
+                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:57 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:57 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/layout/Smooth_Blue/admin/story liststories.thtml,1.2,1.3
Message-ID: <200308311858.h7VIwvP15238@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/story
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/layout/Smooth_Blue/admin/story

Modified Files:
	liststories.thtml 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: liststories.thtml
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/layout/Smooth_Blue/admin/story/liststories.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** liststories.thtml	10 Apr 2003 14:32:39 -0000	1.2
--- liststories.thtml	31 Aug 2003 18:58:54 -0000	1.3
***************
*** 1,12 ****
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
                                  </tr>
                                  <tr>
!                                     <td>{lang_instructions}</td>
                                  </tr>
                              </table>
!                             <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
--- 1,17 ----
                              <table border="0" cellspacing="0" cellpadding=2 width="100%">
                                  <tr>
+                                     <FORM ACTION="{site_admin_url}/story.php" METHOD="POST">
                                      <td rowspan="2"><img src="{layout_url}/images/icons/story.gif" alt=""></td>
                                      <td>[ <a href="{site_admin_url}/story.php?mode=edit">{lang_newstory}</a> | <a href="{site_admin_url}">{lang_adminhome}</a> ]</td>
+                                     <td align="center" valign="middle">{lang_topic}:&nbsp;</td>
+                                     <td align="left" valign="middle">{topic_selection}&nbsp;</td>
+                                 </td>
                                  </tr>
+                                 </FORM>
                                  <tr>
!                                     <td colspan="3">{lang_instructions}</td>
                                  </tr>
                              </table>
!                                 <table cellpadding="0" cellspacing="3" border="0" width="100%">
                                  <tr>
                                      <th align="left">#</th>
***************
*** 23,26 ****
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
! 
--- 28,30 ----
                                      <td colspan="8">{google_paging}</td>
                                  </tr>
!                             </table>
\ No newline at end of file




From geeklog-cvs-admin at lists.geeklog.net  Sun Aug 31 14:58:56 2003
From: geeklog-cvs-admin at lists.geeklog.net (geeklog-cvs-admin at lists.geeklog.net)
Date: Sun, 31 Aug 2003 13:58:56 -0500
Subject: [geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.100,1.101
Message-ID: <200308311858.h7VIwuP15226@internal.geeklog.net>

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory geeklog_prod:/tmp/cvs-serv15200/public_html/admin

Modified Files:
	story.php 
Log Message:
Added the ability to filter topics and only show stories for a single topic from a listbox.

Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** story.php	12 Aug 2003 21:10:05 -0000	1.100
--- story.php	31 Aug 2003 18:58:54 -0000	1.101
***************
*** 413,417 ****
  function liststories($page = 1) 
  {
!     global $_TABLES, $LANG24, $_CONF, $LANG_ACCESS, $_USER, $_GROUPS;
  
      $display = '';
--- 413,417 ----
  function liststories($page = 1) 
  {
!     global $_TABLES, $LANG24, $_CONF, $LANG_ACCESS, $_USER, $_GROUPS,$HTTP_POST_VARS,$HTTP_GET_VARS;
  
      $display = '';
***************
*** 437,459 ****
      $story_templates->set_var('lang_featured', $LANG24[32]); 
  
      if (empty($page)) {
          $page = 1;
      }
  
!     $excludetopics = '';
!     $topicsql = "SELECT tid FROM {$_TABLES['topics']}" . COM_getPermSQL ();
!     $tresult = DB_query ($topicsql);
!     $trows = DB_numRows ($tresult);     
!     if ($trows > 0) {
!         $tids = array ();
!         for ($i = 0; $i < $trows; $i++) {
!             $T = DB_fetchArray ($tresult);
!             $tids[] = $T['tid'];
!         }
!         if (sizeof ($tids) > 0) {
!             $excludetopics = " WHERE (tid IN ('" . implode ("','", $tids) . "'))";
!         }
      }
  
      $limit = (50 * $page) - 50;
      $result = DB_query("SELECT *,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} " . $excludetopics . "ORDER BY date DESC LIMIT $limit,50");
--- 437,487 ----
      $story_templates->set_var('lang_featured', $LANG24[32]); 
  
+     $current_topic = $topic;
+     if (!empty ($HTTP_GET_VARS['tid'])) {
+         $current_topic = $HTTP_GET_VARS['tid'];
+     } elseif (!empty ($HTTP_POST_VARS['tid'])) {
+         $current_topic = $HTTP_POST_VARS['tid'];
+     } else {
+         $current_topic = 'all';
+     }
      if (empty($page)) {
          $page = 1;
      }
  
!     if ($current_topic == 'all') {
!         $excludetopics = '';
!         $topicsql = "SELECT tid FROM {$_TABLES['topics']}" . COM_getPermSQL ();
!         $tresult = DB_query( $topicsql );
!         $trows = DB_numRows( $tresult );     
!         if( $trows > 0 )
!         {
!             $excludetopics .= " WHERE (";
!             for( $i = 1; $i <= $trows; $i++ )  {
!                 $T = DB_fetchArray ($tresult);
!                 if ($i > 1)  {
!                     $excludetopics .= " OR ";
!                 }
!                 $excludetopics .= "tid = '{$T['tid']}'";
!                 $seltopics .= '<option value="' .$T['tid']. '"';
!                 if ($current_topic == "{$T['tid']}") {
!                     $seltopics .= ' selected="selected"';
!                 }
!                 $seltopics .= '>' . $T['tid'] . '</option>' . LB;
!             }
!             $excludetopics .= ") ";
!         } 
! 
!     } else {
!         $excludetopics = " WHERE tid = '$current_topic' ";
!         $seltopics = COM_topicList ('tid,topic', $current_topic);
      }
  
+     $alltopics = '<option value="all"';
+     if ($current_topic == 'all') {
+         $alltopics .= ' selected="selected"';
+     }
+     $alltopics .= '>' . "All" . '</option>' . LB;
+     $story_templates->set_var ('topic_selection', '<select name="tid" style="width: 125px" onchange="this.form.submit()">' . $alltopics . $seltopics . '</select>');
+ 
      $limit = (50 * $page) - 50;
      $result = DB_query("SELECT *,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['stories']} " . $excludetopics . "ORDER BY date DESC LIMIT $limit,50");
***************
*** 485,489 ****
              }
              $story_templates->set_var('story_author', DB_getItem($_TABLES['users'],'username',"uid = {$A['uid']}"));
!             $story_templates->set_var('story_date', $curtime[0]);
              $story_templates->set_var('story_topic', $A['tid']);
              if ($A['featured'] == 1) {
--- 513,517 ----
              }
              $story_templates->set_var('story_author', DB_getItem($_TABLES['users'],'username',"uid = {$A['uid']}"));
!             $story_templates->set_var('story_date', strftime($_CONF['shortdate'], $curtime[1]));
              $story_templates->set_var('story_topic', $A['tid']);
              if ($A['featured'] == 1) {
***************
*** 519,523 ****
  	        $story_templates->set_var('nextpage_link','');
              }
!             $baseurl = $_CONF['site_admin_url'] . '/story.php?mode=list';
              $numpages = ceil ($numstories / 50);
              $story_templates->set_var ('google_paging',
--- 547,551 ----
  	        $story_templates->set_var('nextpage_link','');
              }
!             $baseurl = $_CONF['site_admin_url'] . '/story.php?mode=list&tid=' .$current_topic;
              $numpages = ceil ($numstories / 50);
              $story_templates->set_var ('google_paging',