- Implemented: FS#1339 - Add "disablesieve" to mail_user table - Added fiel...

tbrehm

2011-09-09 40c436b6e2724e98efb51582d1ad8fad6dcf4a1c

 server/plugins-available/apps_vhost_plugin.inc.php

@@ -70,26 +70,26 @@
   // The purpose of this plugin is to rewrite the main.cf file
   function update($event_name,$data) {
      global $app, $conf;
		
      if(   $data['old']['apps_vhost_ip'] != $data['new']['apps_vhost_ip'] or
         $data['old']['apps_vhost_port'] != $data['new']['apps_vhost_port'] or
         $data['old']['apps_vhost_servername'] != $data['new']['apps_vhost_servername'] ) {
		
				
      // get the config
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
            
      // Dont just copy over the virtualhost template but add some custom settings
        $content = rf("conf/apache_apps.vhost.master");
        $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master");
      
      $vhost_conf_dir = $web_config['vhost_conf_dir'];
        $vhost_conf_enabled_dir = $web_config['vhost_conf_enabled_dir'];
      $apps_vhost_servername = ($web_config['apps_vhost_servername'] == '')?'':'ServerName '.$web_config['apps_vhost_servername'];
      
      $web_config['apps_vhost_port'] = (empty($web_config['apps_vhost_port']))?8081:$web_config['apps_vhost_port'];
      $web_config['apps_vhost_ip'] = (empty($web_config['apps_vhost_ip']))?'_default_':$web_config['apps_vhost_ip'];
		
      $content = str_replace('{apps_vhost_ip}', $web_config['apps_vhost_ip'], $content);
      $content = str_replace('{apps_vhost_port}', $web_config['apps_vhost_port'], $content);
      $content = str_replace('{apps_vhost_dir}', $web_config['website_basedir'].'/apps', $content);
      $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
      $content = str_replace('{apps_vhost_basedir}', $web_config['website_basedir'], $content);
      
      
      // comment out the listen directive if port is 80 or 443
@@ -99,8 +99,9 @@
         $content = str_replace('{vhost_port_listen}', '', $content);
      }
      
      wf("$vhost_conf_dir/apps.vhost", $content);
      }
      file_put_contents("$vhost_conf_dir/apps.vhost", $content);
		
      $app->services->restartServiceDelayed('httpd','restart');
      
      
   }