Changeset 601

Show
Ignore:
Timestamp:
05/24/07 23:54:19 (1 year ago)
Author:
raphael
Message:

Fixed #287: choosing DIR not working when adding a new ftp-user
Fixed #308: variable declaration during the setup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r598 r601  
    1010|               * gui: disable stats-alias in client menu         | 
    1111\_________________________________________________________________/ 
     12 
     132007-05-24 Raphael Geissert 
     14        - GUI 
     15                * Fixed #287: choosing DIR not working when adding a new ftp-user 
     16        - SETUP 
     17                * Fixed #308: variable declaration during the setup 
    1218 
    13192007-05-20 Benedikt Heintel 
  • trunk/engine/setup/ispcp-setup

    r600 r601  
    14101410        push_el(\@main::el, 'setup_resolver()', 'Starting...'); 
    14111411 
    1412         my $data = "nameserver 127.0.0.1\n"; 
     1412        $data = "nameserver 127.0.0.1\n"; 
    14131413 
    14141414        if ($main::cfg{'SECONDARY_DNS'} ne '') { 
  • trunk/gui/include/vfs.php

    r474 r601  
    113113                $this->_domain =  $domain; 
    114114                $this->_db     =& $db; 
     115                putenv("TMPDIR=" . VFS_TMP_DIR); 
    115116        } 
    116117 
     
    198199        function open() { 
    199200                // Check if we're already open 
    200                 if ( $this->_handle ) { 
     201                if ( is_resource($this->_handle) ) { 
    201202                        return true; 
    202203                } 
     
    217218                // $this->_domain would work on all situations 
    218219                $this->_handle = @ftp_connect('localhost'); 
    219                 if ( !$this->_handle ) { 
     220                if ( !is_resource($this->_handle) ) { 
    220221                        $this->close(); 
    221222                }