[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.124,1.125

[blaine at iowaoutdoors.org]

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

Modified Files:
	story.php 
Log Message:
Added support for new DEFINES in config.php to be used for the Story Status field to indicate ArchiveStoryOnExpiry or DeleteStoryOnExpiry. Also corrected logic in index.php to find and handle expired stories.

Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** story.php	14 Aug 2004 15:52:18 -0000	1.124
--- story.php	15 Aug 2004 19:57:48 -0000	1.125
***************
*** 377,384 ****
      $story_templates->set_var('expire_date_explanation', $LANG24[46]);
      $story_templates->set_var('story_unixstamp', $A['expiredate']); 
!     if ($A['statuscode'] == 10) {
          $story_templates->set_var('is_checked2', 'checked="checked"');
          $story_templates->set_var('is_checked3', 'checked="checked"');
!     } elseif ($A['statuscode'] == 11) {
          $story_templates->set_var('is_checked2', 'checked="checked"');
          $story_templates->set_var('is_checked4', 'checked="checked"');
--- 377,384 ----
      $story_templates->set_var('expire_date_explanation', $LANG24[46]);
      $story_templates->set_var('story_unixstamp', $A['expiredate']); 
!     if ($A['statuscode'] == STORY_ARCHIVE_ON_EXPIRE) {
          $story_templates->set_var('is_checked2', 'checked="checked"');
          $story_templates->set_var('is_checked3', 'checked="checked"');
!     } elseif ($A['statuscode'] == STORY_DELETE_ON_EXPIRE) {
          $story_templates->set_var('is_checked2', 'checked="checked"');
          $story_templates->set_var('is_checked4', 'checked="checked"');
***************
*** 1216,1221 ****
      $publish_month = COM_applyFilter ($HTTP_POST_VARS['publish_month'], true);
      $publish_day = COM_applyFilter ($HTTP_POST_VARS['publish_day'], true);
      $unixdate = strtotime("$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");
!     if ($archiveflag != 1) {
          $statuscode = 0;
      }
--- 1216,1223 ----
      $publish_month = COM_applyFilter ($HTTP_POST_VARS['publish_month'], true);
      $publish_day = COM_applyFilter ($HTTP_POST_VARS['publish_day'], true);
+     $archiveflag = COM_applyFilter ($HTTP_POST_VARS['archiveflag'], true);
+ 
      $unixdate = strtotime("$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");
!     if ($archiveflag =!= 1) {
          $statuscode = 0;
      }