[phpws-comm-commits] modules/article index.php,1.8,1.9

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

Update of /cvsroot/phpwebsite-comm/modules/article
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156

Modified Files:
	index.php 
Log Message:
2.5 Release Files

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	18 Jun 2004 23:31:10 -0000	1.8
--- index.php	21 Aug 2004 17:02:13 -0000	1.9
***************
*** 63,67 ****
  }
  /* Start processing module operation requests */
! if (isset($_REQUEST['edit']))
  { 
    switch($_REQUEST['edit'])
--- 63,92 ----
  }
  /* Start processing module operation requests */
! if (isset($_REQUEST['viewhistory']))
! { 
!   $temp = new PHPWS_Article($_REQUEST['viewhistory']);
! 	$temp->view_history();
! }
! elseif (isset($_REQUEST['viewarchive']))
! { 
!   $sql = 'SELECT * FROM mod_article_oldversions WHERE article_id='.$_REQUEST['viewarchive'].' AND version='.$_REQUEST['version'];
!   /* Retrieve the older article version */
!   $result = $GLOBALS['core']->query($sql, 1);
!   if ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) {
!     $old_object = unserialize(stripslashes($row['article']));
!     $old_object->view();
!   }
! }
! elseif (isset($_REQUEST['viewdiff']) && isset($_REQUEST['that'])
!   && isset($_REQUEST['this']) && is_numeric($_REQUEST['this']))
! {
!   $temp = new PHPWS_Article((int)$_REQUEST['viewdiff']);
!   if ($_REQUEST['that']=='current')
!     $_REQUEST['that'] = $temp->version;
!   elseif ($_REQUEST['that']=='previous')
!     $_REQUEST['that'] = $_REQUEST['this'] - 1;
! 	$temp->view_diff(min($_REQUEST['this'], $_REQUEST['that']), max($_REQUEST['this'], $_REQUEST['that']));
! }
! elseif (isset($_REQUEST['edit']))
  { 
    switch($_REQUEST['edit'])
***************
*** 131,135 ****
    	default:
    		$_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['edit']);
! 	    if ($user->can('edit', $_SESSION['SES_ART_article']->created_username)) 
    	        $_SESSION['SES_ART_article']->edit_article();
    	break;
--- 156,160 ----
    	default:
    		$_SESSION['SES_ART_article'] = new PHPWS_Article($_REQUEST['edit']);
! 	    if ($user->can('edit', $_SESSION['SES_ART_article']->created_username, $_SESSION['SES_ART_article']->mainarticle)) 
    	        $_SESSION['SES_ART_article']->edit_article();
    	break;