- Fixed several bugs in the installer. - Changed mbox regex in dns manager.

tbrehm

2008-08-18 b7332908d8ed550bf727df95a344b59ab1216e7c

- Fixed several bugs in the installer.
- Changed mbox regex in dns manager.

 install/dist/conf/debian40.conf.php

@@ -25,7 +25,7 @@
$conf['mysql']['admin_user'] = 'root';
$conf['mysql']['admin_password'] = '';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = '5sDrewBhk';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));

//* Apache
$conf['apache']['user'] = 'www-data';

 install/lib/install.lib.php

@@ -438,6 +438,38 @@
    return $content;
}

function is_user($user){
  global $mod;
  $user_datei = '/etc/passwd';
  $users = no_comments($user_datei);
  $lines = explode("\n", $users);
  if(is_array($lines)){
    foreach($lines as $line){
      if(trim($line) != ""){
        list($f1, $f2, $f3, $f4, $f5, $f6, $f7) = explode(":", $line);
        if($f1 == $user) return true;
      }
    }
  }
  return false;
}

function is_group($group){
  global $mod;
  $group_datei = '/etc/group';
  $groups = no_comments($group_datei);
  $lines = explode("\n", $groups);
  if(is_array($lines)){
    foreach($lines as $line){
      if(trim($line) != ""){
        list($f1, $f2, $f3, $f4) = explode(":", $line);
        if($f1 == $group) return true;
      }
    }
  }
  return false;
}



?>

 install/lib/installer_base.lib.php

@@ -664,10 +664,10 @@
        
        //* Create a ISPConfig user and group
        $command = 'groupadd ispconfig';
        caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        if(!is_group('vacp')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        
        $command = "useradd -g ispconfig -d $install_dir ispconfig";
        caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        if(!is_user('vacp')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        
        //* copy the ISPConfig interface part
        $command = "cp -rf ../interface $install_dir";

 interface/web/dns/form/dns_soa.tform.php

@@ -108,7 +108,7 @@
            'validators'    => array (     0 => array (    'type'    => 'NOTEMPTY',
                                                        'errmsg'=> 'mbox_error_empty'),
                                        1 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{0,64}\.$/',
                                                        'regex' => '/^[[a-zA-Z0-9\.\-]{0,64}\.$/',
                                                        'errmsg'=> 'mbox_error_regex'),
                                    ),
            'default'    => '',