[phpws-comm-commits] modules/article index.php,1.1,1.2

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

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

Modified Files:
	index.php 
Log Message:
Decreased reliance on sessions

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	9 Jul 2003 20:24:26 -0000	1.1
--- index.php	14 Jul 2003 20:38:34 -0000	1.2
***************
*** 40,43 ****
--- 40,48 ----
  if (isset($_REQUEST['view']))
  {
+   if ($_REQUEST['view']=='news')
+   {
+     	$_SESSION['SES_ART_master']->view_news();
+     	return;
+   }
    $temp = new PHPWS_Article($_REQUEST['view']);
  	$temp->view();
***************
*** 74,80 ****
      	$_SESSION['SES_ART_master']->list_articles();
    	break;
-   	case 'news':
-     	$_SESSION['SES_ART_master']->list_news();
-   	break;
    }
  }
--- 79,82 ----
***************
*** 108,135 ****
    		$_SESSION['SES_ART_master']->list_articles();
    	break;
!   
    	case 'delete':
!   		$_SESSION['SES_ART_master']->main_menu();
!   		$_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['ARTICLE_id']);
! 	    if ($user->can('delete',$_SESSION['SES_ART_article']->author)) 
! 		    $_SESSION['SES_ART_article']->delete_article();
!   		$_SESSION['SES_ART_article']=null;
!       	$_SESSION['SES_ART_master']->list_articles();
    	break;
!   
    	case 'expire':
!   		$_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['ARTICLE_id']);
  	    if ($_SESSION['OBJ_user']->allow_access('article', 'change_dates'))
!     		$_SESSION['SES_ART_article']->expire();
!   		$_SESSION['SES_ART_article']=null;
    		$_SESSION['SES_ART_master']->main_menu();
    		$_SESSION['SES_ART_master']->list_articles();
    	break;
!   
    	case 'publish':
!   		$_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['ARTICLE_id']);
  	    if ($_SESSION['OBJ_user']->allow_access('article', 'change_dates'))
!     		$_SESSION['SES_ART_article']->publish();
!   		$_SESSION['SES_ART_article']=null;
    		$_SESSION['SES_ART_master']->main_menu();
    		$_SESSION['SES_ART_master']->list_articles();
--- 110,141 ----
    		$_SESSION['SES_ART_master']->list_articles();
    	break;
! 
    	case 'delete':
! 	    if ($user->can('delete',$temp->author)) 
! 	    {
!     		$temp = new PHPWS_Article($_REQUEST['ARTICLE_id']);
! 		    $temp->delete_article();
! 		    if (isset($_POST['yes']))
! 		    {
!       		$_SESSION['SES_ART_master']->main_menu();
!          	$_SESSION['SES_ART_master']->list_articles();
!         }
! 		    elseif (isset($_POST['no']))
!         	$temp->view();
!       }
    	break;
! 
    	case 'expire':
!   		$temp = new PHPWS_Article($_REQUEST['ARTICLE_id']);
  	    if ($_SESSION['OBJ_user']->allow_access('article', 'change_dates'))
!     		$temp->expire();
    		$_SESSION['SES_ART_master']->main_menu();
    		$_SESSION['SES_ART_master']->list_articles();
    	break;
! 
    	case 'publish':
!   		$temp = new PHPWS_Article($_REQUEST['ARTICLE_id']);
  	    if ($_SESSION['OBJ_user']->allow_access('article', 'change_dates'))
!     		$temp->publish();
    		$_SESSION['SES_ART_master']->main_menu();
    		$_SESSION['SES_ART_master']->list_articles();
***************
*** 139,143 ****
  	    if ($_SESSION['OBJ_user']->allow_access('article', 'set_mainarticle'))
      		$_SESSION['SES_ART_master']->set_main_article();
-   		$_SESSION['SES_ART_article']=null;
    		$_SESSION['SES_ART_master']->main_menu();
    		$_SESSION['SES_ART_master']->list_articles();
--- 145,148 ----