[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.13,1.14 ziplib.php,1.9,1.10

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26030/lib

Modified Files:
	loadsave.php ziplib.php 
Log Message:
Delete ctime() and rfc1123date() from lib/ziplib.php in favor of
CTime() and Rfc2822DateTime() in lib/stdlib.php.


Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** loadsave.php	2001/11/26 22:00:26	1.13
--- loadsave.php	2001/12/11 18:21:38	1.14
***************
*** 34,41 ****
     $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
    
!    $head = "From $from  " . ctime(time()) . "\r\n";
     $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
     $head .= "From: $from (PhpWiki)\r\n";
!    $head .= "Date: " . rfc1123date($current->get('mtime')) . "\r\n";
     $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION);
  
--- 34,41 ----
     $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
    
!    $head = "From $from  " . CTime(time()) . "\r\n";
     $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
     $head .= "From: $from (PhpWiki)\r\n";
!    $head .= "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";
     $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION);
  

Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ziplib.php	2001/09/19 02:58:00	1.9
--- ziplib.php	2001/12/11 18:21:38	1.10
***************
*** 427,451 ****
   * Routines for Mime mailification of pages.
   */
! //FIXME: these should go elsewhere (stdlib.php).
! function ctime ($unix_time)
! {
!   return date("D M j H:i:s Y", $unix_time);
! }
! 
! function rfc1123date ($unix_time)
! {
!   $zone = ' +';
!   
!   $zonesecs = date("Z", $unix_time);
!   if ($zonesecs < 0)
!       $zone = ' -';
! 
!   $zonemins = (int)((abs($zonesecs) + 30) / 60);
!   $zonehrs = (int)(($zonemins + 30) / 60);
!   $zonemins -= $zonehrs * 60;
!   $zone .= sprintf("%02d%02d", $zonehrs, $zonemins);
! 
!   return date("D, j M Y H:i:s", $unix_time) . $zone;
! }
  
  /**
--- 427,431 ----
   * Routines for Mime mailification of pages.
   */
! //FIXME: these should go elsewhere (libmime?).
  
  /**