- Fixed FS#2318 - Starting nginx nginx: [emerg] duplicate listen options fo...

ftimme

2012-09-05 f2ded16c1b28b471a5864aa7cfb96f68c44118f8

 server/plugins-available/apache2_plugin.inc.php

@@ -1463,15 +1463,16 @@
      
      //* Remove the mounts
      $log_folder = 'log';
        $web_folder = '';
        if($data['old']['type'] == 'vhostsubdomain') {
            $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
            $tmp = $app->db->queryOneRecord('SELECT `domain`,`document_root` FROM web_domain WHERE domain_id = '.intval($data['old']['parent_domain_id']));
            $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $data['old']['domain']);
            if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
            $web_folder = $data['old']['web_folder'];
            $log_folder .= '/' . $subdomain_host;
            unset($tmp);
        }
		
      }
        
      exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
      
      //* remove mountpoint from fstab
@@ -1512,9 +1513,12 @@
         $app->system->unlink($vhost_file);
         $app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
            
            if($data['old']['type'] == 'vhost') {
            if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') {
                $docroot = escapeshellcmd($data['old']['document_root']);
                if($docroot != '' && !stristr($docroot,'..')) exec('rm -rf '.$docroot);
                if($docroot != '' && !stristr($docroot,'..')) {
                    if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);
                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);
                }
         
                //remove the php fastgi starter script if available
                if ($data['old']['php'] == 'fast-cgi') {
@@ -1575,8 +1579,6 @@
                    }
                }
                // end removing symlinks
            } else {
                // vhost subdomain
            }

            // Delete the log file directory
@@ -1598,6 +1600,10 @@
                $this->awstats_delete($data,$web_config);
            }
         
         if($data['old']['type'] == 'vhostsubdomain') {
            $app->system->web_folder_protection($parent_web_document_root,true);
         }
			
         if($apache_chrooted) {
            $app->services->restartServiceDelayed('httpd','restart');
         } else {
@@ -1606,6 +1612,7 @@
         }

      }
        if($data['old']['type'] != 'vhost') $app->system->web_folder_protection($data['old']['document_root'],true);
   }

   //* This function is called when a IP on the server is inserted, updated or deleted
@@ -1737,12 +1744,26 @@
      
      //* Create the .htaccess file
      //if(!is_file($folder_path.'.htaccess')) {
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user";
         $app->system->file_put_contents($folder_path.'.htaccess',$ht_file);
         $begin_marker = '### ISPConfig folder protection begin ###';
            $end_marker = "### ISPConfig folder protection end ###\n\n";
            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user\n".$end_marker;
			
            if(file_exists($folder_path.'.htaccess')) {
                $old_content = $app->system->file_get_contents($folder_path.'.htaccess');
                
                if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $old_content, $matches)) {
                    $ht_file = str_replace($matches[0], $ht_file, $old_content);
                } else {
                    $ht_file .= $old_content;
                }
            }
            unset($old_content);
            
            $app->system->file_put_contents($folder_path.'.htaccess',$ht_file);
         $app->system->chmod($folder_path.'.htaccess',0755);
         $app->system->chown($folder_path.'.htaccess',$website['system_user']);
         $app->system->chgrp($folder_path.'.htaccess',$website['system_group']);
         $app->log('Created file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
         $app->log('Created/modified file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
      //}
      
   }
@@ -1784,8 +1805,24 @@
      
      //* Remove .htaccess file
      if(is_file($folder_path.'.htaccess')) {
         $app->system->unlink($folder_path.'.htaccess');
         $app->log('Removed file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
            $begin_marker = '### ISPConfig folder protection begin ###';
            $end_marker = "### ISPConfig folder protection end ###\n\n";
            
            $ht_file = $app->system->file_get_contents($folder_path.'.htaccess');
            
            if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                $ht_file = str_replace($matches[0], '', $ht_file);
            } else {
                $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
            }
            
            if(trim($ht_file) == '') {
                $app->system->unlink($folder_path.'.htaccess');
                $app->log('Removed file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
            } else {
                $app->system->file_put_contents($folder_path.'.htaccess', $ht_file);
                $app->log('Removed protection content from file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
            }
      }
   }
   
@@ -1837,6 +1874,9 @@
      //* Create the folder path, if it does not exist
      if(!is_dir($new_folder_path)) $app->system->mkdirpath($new_folder_path);
      
        $begin_marker = '### ISPConfig folder protection begin ###';
        $end_marker = "### ISPConfig folder protection end ###\n\n";
        
      if($data['old']['path'] != $data['new']['path']) {

      
@@ -1848,26 +1888,63 @@
         
         //* delete old .htaccess file
         if(is_file($old_folder_path.'.htaccess')) {
            $app->system->unlink($old_folder_path.'.htaccess');
            $app->log('Deleted file '.$old_folder_path.'.htaccess',LOGLEVEL_DEBUG);
                $ht_file = $app->system->file_get_contents($old_folder_path.'.htaccess');
                
                if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                    $ht_file = str_replace($matches[0], '', $ht_file);
                } else {
                    $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$old_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
                }
                
                if(trim($ht_file) == '') {
                    $app->system->unlink($old_folder_path.'.htaccess');
                    $app->log('Removed file '.$old_folder_path.'.htaccess',LOGLEVEL_DEBUG);
                } else {
                    $app->system->file_put_contents($old_folder_path.'.htaccess', $ht_file);
                    $app->log('Removed protection content from file '.$old_folder_path.'.htaccess',LOGLEVEL_DEBUG);
                }
         }
      
      }
      
      //* Create the .htaccess file
      if($data['new']['active'] == 'y') {
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user";
         $app->system->file_put_contents($new_folder_path.'.htaccess',$ht_file);
         $app->system->chmod($new_folder_path.'.htpasswd',0755);
         $app->system->chown($folder_path.'.htpasswd',$website['system_user']);
         $app->system->chgrp($folder_path.'.htpasswd',$website['system_group']);
         $app->log('Created file '.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
            $ht_file = $begin_marker."\nAuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user\n".$end_marker;
			
            if(file_exists($new_folder_path.'.htaccess')) {
                $old_content = $app->system->file_get_contents($new_folder_path.'.htaccess');
                
                if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $old_content, $matches)) {
                    $ht_file = str_replace($matches[0], $ht_file, $old_content);
                } else {
                    $ht_file .= $old_content;
                }
            }
            
            $app->system->file_put_contents($new_folder_path.'.htaccess',$ht_file);
         $app->system->chmod($new_folder_path.'.htaccess',0755);
         $app->system->chown($new_folder_path.'.htaccess',$website['system_user']);
         $app->system->chgrp($new_folder_path.'.htaccess',$website['system_group']);
         $app->log('Created/modified file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
      }
      
      //* Remove .htaccess file
      if($data['new']['active'] == 'n' && is_file($new_folder_path.'.htaccess')) {
         $app->system->unlink($new_folder_path.'.htaccess');
         $app->log('Removed file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
            $ht_file = $app->system->file_get_contents($new_folder_path.'.htaccess');
            
            if(preg_match('/' . preg_quote($begin_marker, '/') . '(.*?)' . preg_quote($end_marker, '/') . '/s', $ht_file, $matches)) {
                $ht_file = str_replace($matches[0], '', $ht_file);
            } else {
                $ht_file = str_replace("AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$new_folder_path.".htpasswd\nrequire valid-user", '', $ht_file);
            }
            
            if(trim($ht_file) == '') {
                $app->system->unlink($new_folder_path.'.htaccess');
                $app->log('Removed file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
            } else {
                $app->system->file_put_contents($new_folder_path.'.htaccess', $ht_file);
                $app->log('Removed protection content from file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
            }
      }
      
      
@@ -2292,8 +2369,8 @@
            foreach($ini_settings as $ini_setting){
                  list($key, $value) = explode('=', $ini_setting);
                  if($value){
                     $value = escapeshellcmd(trim($value));
                     $key = escapeshellcmd(trim($key));
                     $value = trim($value);
                     $key = trim($key);
                     switch (strtolower($value)) {
                        case '0':
                           // PHP-FPM might complain about invalid boolean value if you use 0