[geeklog-cvs] geeklog-1.3/public_html article.php,1.45,1.46

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv20989/public_html

Modified Files:
	article.php 
Log Message:
Added filtering for the $order parameter,
Added {article_url} variable for article/printable.thtml so that we can print the proper URL to the article if URL rewriting is on


Index: article.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/article.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** article.php	30 May 2004 16:33:02 -0000	1.45
--- article.php	17 Jun 2004 19:34:32 -0000	1.46
***************
*** 64,67 ****
--- 64,71 ----
      exit();
  }
+ $order = COM_applyFilter ($order);
+ if ((strcasecmp ($order, 'ASC') != 0) && (strcasecmp ($order, 'DESC') != 0)) {
+     $order = '';
+ }
  
  // First see if we have a plugin that may be trying to use the Geeklog comment engine
***************
*** 136,139 ****
--- 140,146 ----
              $story_template->set_var('story_comments', DB_count($_TABLES['comments'],'sid',$A['sid']));
              $story_template->set_var('lang_comments', $LANG01[3]);
+             $articleUrl = COM_buildUrl ($_CONF['site_url']
+                                         . '/article.php?story=' . $A['sid']);
+             $story_template->set_var ('article_url', $articleUrl);
              $story_template->parse('output','article');
              $display = $story_template->finish($story_template->get_var('output'));