[phpws-comm-commits] modules/article/inc importANN.php,1.1,1.2 importPM.php,1.2,1.3

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

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

Modified Files:
	importANN.php importPM.php 
Log Message:
-Changed how publication & expiration dates are calculated in the importation script.
Publication date is now the same as creation date and expiration date = now if not specified by the imported data.


Index: importANN.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importANN.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** importANN.php	9 Jul 2003 20:24:26 -0000	1.1
--- importANN.php	31 Aug 2003 22:50:15 -0000	1.2
***************
*** 45,49 ****
  	$_SESSION['SES_ART_article']->hits = $old_ann->_hits;
  	$_SESSION['SES_ART_article']->expiration_date = $old_ann->_expiration;
! 	$_SESSION['SES_ART_article']->publication_date = ($old_ann->_active)?$old_ann->_dateCreated :$old_ann->_expiration;
  	$_SESSION['SES_ART_article']->approved = $old_ann->_approved;
  
--- 45,49 ----
  	$_SESSION['SES_ART_article']->hits = $old_ann->_hits;
  	$_SESSION['SES_ART_article']->expiration_date = $old_ann->_expiration;
! 	$_SESSION['SES_ART_article']->publication_date = $old_ann->_dateCreated;
  	$_SESSION['SES_ART_article']->approved = $old_ann->_approved;
  

Index: importPM.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importPM.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** importPM.php	6 Aug 2003 02:26:33 -0000	1.2
--- importPM.php	31 Aug 2003 22:50:15 -0000	1.3
***************
*** 35,42 ****
  	$_SESSION['SES_ART_article']->created_date = $old_page->created_date;
  	$_SESSION['SES_ART_article']->updated_date = $old_page->updated_date;
! 	if ($old_page->active)
!     $_SESSION['SES_ART_article']->publication_date = $old_page->created_date;
!   else
!     $_SESSION['SES_ART_article']->publication_date = $_SESSION['SES_ART_article']->expiration_date;
    $_SESSION['SES_ART_article']->approved = $old_page->approved;
  
--- 35,41 ----
  	$_SESSION['SES_ART_article']->created_date = $old_page->created_date;
  	$_SESSION['SES_ART_article']->updated_date = $old_page->updated_date;
!   $_SESSION['SES_ART_article']->publication_date = $old_page->created_date;
! 	if (!$old_page->active)
!     $_SESSION['SES_ART_article']->expiration_date = date('Y-m-d H:i:s');
    $_SESSION['SES_ART_article']->approved = $old_page->approved;