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

[Dirk Haun]

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

Modified Files:
      Tag: geeklog_1_5_0_1
	story.class.php 
Log Message:
Ported story submission / permission fixes over from the Trunk


Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -d -r1.27.2.1 -r1.27.2.2
*** story.class.php	20 Jun 2008 19:10:38 -0000	1.27.2.1
--- story.class.php	20 Jul 2008 10:32:57 -0000	1.27.2.2
***************
*** 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 {
***************
*** 794,797 ****
--- 796,800 ----
          // Use what we have:
          $this->_tid = $topic;
+         $this->_date = time();
      }
  
***************
*** 802,805 ****
--- 805,812 ----
      {
          $array = $_POST;
+         
+         $this->_expire = time();
+         $this->_date = time();
+         $this->_expiredate = 0;
  
          // Handle Magic GPC Garbage:
***************
*** 814,817 ****
--- 821,828 ----
          $this->_unixdate = COM_applyFilter($array['date'], true);
  
+         if (!isset($array['bodytext'])) {
+             $array['bodytext'] = '';
+         }
+ 
          /* Then load the title, intro and body */
          if (($array['postmode'] == 'html') || ($array['postmode'] == 'adveditor')) {
***************
*** 907,913 ****
--- 918,927 ----
              $this->_oldsid = $this->_sid;
              $this->_date = mktime();
+             $this->_featured = 0;
              $this->_commentcode = $_CONF['comment_code'];
              $this->_trackbackcode = $_CONF['trackback_code'];
+             $this->_statuscode = 0;
              $this->_show_topic_icon = $_CONF['show_topic_icon'];
+             $this->_owner_id = $_USER['uid'];
              $this->_group_id = $T['group_id'];
              $this->_perm_owner = $T['perm_owner'];