[geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.29, 1.30

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv32100/system/classes

Modified Files:
	story.class.php 
Log Message:
Bug 678 - Draft and future publish dates not respected. Plus, no submission queue caused crash bug when users submitted stories.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** story.class.php	22 Jun 2008 20:23:07 -0000	1.29
--- story.class.php	3 Jul 2008 19:44:31 -0000	1.30
***************
*** 496,499 ****
--- 496,501 ----
                  } elseif ($this->_access == 2 && $mode != 'view') {
                      return STORY_EDIT_DENIED;
+                 } elseif ((($this->_access == 2) && ($mode == 'view')) && (($this->_draft_flag == 1) || ($this->_date > time()))) {
+                         return STORY_INVALID_SID;
                  }
              } else {
***************
*** 802,805 ****
--- 804,810 ----
      {
          $array = $_POST;
+         
+         $this->_expire = time();
+         $this->_expiredate = 0;
  
          // Handle Magic GPC Garbage: