phpwebsite-comm-cvs-commits

[<ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory sc8-pr-cvs1:/tmp/cvs-serv8358/class

Modified Files:
	Article.php 
Log Message:
-Fixed problem with pages needing approval not saving.

Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Article.php	31 Aug 2003 22:59:02 -0000	1.11
--- Article.php	6 Sep 2003 22:37:01 -0000	1.12
***************
*** 89,93 ****
        . $GLOBALS['core']->moduleLink($_SESSION['translate']->it('Main Menu'), 'article'
          ,array('disp'=>'main_menu')).'</center>';
- //    '<center><a href="index.php?module=article&disp=main_menu">'.$_SESSION['translate']->it('Main Menu').'</a></center>';
      $this->sectionID = 'a';
      $this->editmode = FALSE;
--- 89,92 ----
***************
*** 163,169 ****
  			$this->pages = 1;
  			$this->template = $_SESSION['SES_ART_master']->val['default_article_template'];
! 			$this->approved = $_SESSION['OBJ_user']->allow_access('article', "create_articles") 
! 	                    || !$_SESSION['SES_ART_master']->val['need_approval'];
! 			$this->version = -1;
  			$this->announce = 1;
  		}
--- 162,168 ----
  			$this->pages = 1;
  			$this->template = $_SESSION['SES_ART_master']->val['default_article_template'];
! 			$this->approved = ($_SESSION['OBJ_user']->allow_access('article', 'create_articles') 
! 	                    || !$_SESSION['SES_ART_master']->val['need_approval']) ?1:0; 
!  			$this->version = -1;
  			$this->announce = 1;
  		}
***************
*** 193,207 ****
  		$now = date('Y-m-d H:i:s');
  		if (!($this->mainarticle 
! 	        || ($this->approved 
  				    && $this->publication_date <= $now 
  				    && ($this->expiration_date > $now || $this->expiration_date==NULL))
  			    || $_SESSION['SES_ART_master']->can('edit',$this->created_username))) 
  		{
! 		  if ($Fullpage)
! 		  {
!   			$_SESSION['SES_ART_master']->error['article'][] = 
!   			    $_SESSION['translate']->it('The article you requested has expired.');
!   			$_SESSION['SES_ART_master']->get_error('article');
!   		}
        PHPWS_Fatcat::deactivate($this->id, 'article');
  			return;
--- 192,202 ----
  		$now = date('Y-m-d H:i:s');
  		if (!($this->mainarticle 
! 	        || (($this->approved || $GLOBALS['module']=='approval')
  				    && $this->publication_date <= $now 
  				    && ($this->expiration_date > $now || $this->expiration_date==NULL))
  			    || $_SESSION['SES_ART_master']->can('edit',$this->created_username))) 
  		{
! 			$GLOBALS['CNT_article']['content'] =  
! 			    $_SESSION['translate']->it('The article you requested has expired.');
        PHPWS_Fatcat::deactivate($this->id, 'article');
  			return;