[Phpgroupware-cvs] addressbook/inc class.boaddressbook.inc.php, 1.21.2.2.2.12, 1.21.2.2.2.13 class.uivcard.inc.php, 1.5.2.1.2.1, 1.5.2.1.2.2

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv1405

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaddressbook.inc.php class.uivcard.inc.php 
Log Message:
php4.1 compliance

Index: class.uivcard.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uivcard.inc.php,v
retrieving revision 1.5.2.1.2.1
retrieving revision 1.5.2.1.2.2
diff -C2 -d -r1.5.2.1.2.1 -r1.5.2.1.2.2
*** class.uivcard.inc.php       8 Sep 2003 13:26:37 -0000       1.5.2.1.2.1
--- class.uivcard.inc.php       8 Oct 2003 08:47:25 -0000       1.5.2.1.2.2
***************
*** 44,48 ****
                function in()
                {
!                       $action = $GLOBALS['HTTP_POST_VARS']['action'] ? 
$GLOBALS['HTTP_POST_VARS']['action'] : $GLOBALS['HTTP_GET_VARS']['action'];
  
                        $GLOBALS['phpgw']->common->phpgw_header();
--- 44,48 ----
                function in()
                {
!                       $action = $_POST['action'] ? $_POST['action'] : 
$_GET['action'];
  
                        $GLOBALS['phpgw']->common->phpgw_header();

Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2.2.12
retrieving revision 1.21.2.2.2.13
diff -C2 -d -r1.21.2.2.2.12 -r1.21.2.2.2.13
*** class.boaddressbook.inc.php 26 Sep 2003 19:34:22 -0000      1.21.2.2.2.12
--- class.boaddressbook.inc.php 8 Oct 2003 08:47:24 -0000       1.21.2.2.2.13
***************
*** 291,297 ****
                function add_vcard()
                {
!                       global $uploadedfile;
! 
!                       if($uploadedfile == 'none' || $uploadedfile == '')
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in&action=GetFile'));
--- 291,295 ----
                function add_vcard()
                {
!                       if(!is_array($_FILES['uploadedfile']))
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in&action=GetFile'));
***************
*** 299,312 ****
                        else
                        {
                                $uploaddir = 
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
  
                                srand((double)microtime()*1000000);
                                $random_number = rand(100000000,999999999);
!                               $newfilename = md5("$uploadedfile, 
$uploadedfile_name, "
!                                       . time() . getenv("REMOTE_ADDR") . 
$random_number );
  
!                               copy($uploadedfile, $uploaddir . $newfilename);
                                $ftp = fopen($uploaddir . $newfilename . 
'.info','w');
!                               
fputs($ftp,"$uploadedfile_type\n$uploadedfile_name\n");
                                fclose($ftp);
  
--- 297,311 ----
                        else
                        {
+                               $uploadedfile = 
$_FILES['uploadedfile']['tmp_name'];
                                $uploaddir = 
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
  
                                srand((double)microtime()*1000000);
                                $random_number = rand(100000000,999999999);
!                               $newfilename = md5($_FILES['uploadedfile'] . 
$_FILES['uploadedfile']['name'] .
!                                       . time() . $_SERVER['REMOTE_ADDR'] . 
$random_number );
  
!                               move_uploaded_file($uploadedfile, $uploaddir . 
$newfilename);
                                $ftp = fopen($uploaddir . $newfilename . 
'.info','w');
!                               fputs($ftp,$_FILES['uploadedfile']['type'] . 
"\n" . $_FILES['uploadedfile']['name']."\n");
                                fclose($ftp);