Fix in maildrop plugin.

tbrehm

2009-10-28 c2f53e76fde1ab534e67a9227d4f0adcde05dfa4

 install/lib/installer_base.lib.php

@@ -979,6 +979,7 @@
      
      $apps_vhost_user = $conf['web']['apps_vhost_user'];
      $apps_vhost_group = $conf['web']['apps_vhost_group'];
      $install_dir = $conf['web']['website_basedir'].'/apps';
      
      $command = 'groupadd '.$apps_vhost_user;
      if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -989,23 +990,25 @@
      
      $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
				
		
      exec('mkdir -p '.escapeshellcmd($conf['web']['website_basedir'].'/apps'));
		
      //* Copy the apps vhost file
        $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
        $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
        $apps_vhost_servername = ($conf['apache']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['apache']['apps_vhost_servername'];
        $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername'];
        
        // Dont just copy over the virtualhost template but add some custom settings
        $content = rf("tpl/apache_apps.vhost.master");
      
      $content = str_replace('{apps_vhost_ip}', $conf['apache']['apps_vhost_ip'], $content);
      $content = str_replace('{apps_vhost_port}', $conf['apache']['apps_vhost_port'], $content);
      $content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content);
      $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
      $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
      $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
      
      
      // comment out the listen directive if port is 80 or 443
      if($conf['apache']['apps_vhost_ip'] == 80 or $conf['apache']['apps_vhost_ip'] == 443) {
      if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['apps_vhost_ip'] == 443) {
         $content = str_replace('{vhost_port_listen}', '#', $content);
      } else {
         $content = str_replace('{vhost_port_listen}', '', $content);
@@ -1015,7 +1018,7 @@
      
      //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
      //* and create the symlink
      if($this->install_ispconfig_interface == true && $this->is_update == false) {
      if($this->install_ispconfig_interface == true) {
         if(@is_link("$vhost_conf_enabled_dir/apps.vhost")) unlink("$vhost_conf_enabled_dir/apps.vhost");
         if(!@is_link("$vhost_conf_enabled_dir/000-apps.vhost")) {
            exec("ln -s $vhost_conf_dir/apps.vhost $vhost_conf_enabled_dir/000-apps.vhost");
@@ -1025,7 +1028,6 @@
         exec('mkdir -p '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
         exec('cp tpl/apache_apps_fcgi_starter.master '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
         exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
         exec('ln -s /usr/local/apps/interface/web '.$conf['web']['website_basedir'].'/apps');
         exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
         
      }