Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-27 361156e8395d3837a4cd0ff7a417d3ca8dc16a40

 server/plugins-available/nginx_plugin.inc.php

@@ -479,7 +479,9 @@
         //* Change the log mount
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind';
         $app->system->removeLine('/etc/fstab', $fstab_line);
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait    0 0';
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['old']['domain'].' '.$data['old']['document_root'].'/'.$log_folder.'    none    bind,nobootwait';
         $app->system->removeLine('/etc/fstab', $fstab_line);
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';
         $app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);

      }
@@ -529,7 +531,7 @@
         $app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);
         exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/'.$log_folder));
         //* add mountpoint to fstab
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait    0 0';
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nobootwait,_netdev    0 0';
         $app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
      }

@@ -2041,9 +2043,7 @@

      //* Create the folder path, if it does not exist
      if(!is_dir($folder_path)) {
         $app->system->mkdirpath($folder_path);
         $app->system->chown($folder_path, $website['system_user']);
         $app->system->chgrp($folder_path, $website['system_group']);
         $app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);
      }

      //* Create empty .htpasswd file, if it does not exist
@@ -2378,7 +2378,7 @@
               if(substr($ini_setting, 0, 1) == ';') continue;
               if(substr($ini_setting, 0, 1) == '#') continue;
               if(substr($ini_setting, 0, 2) == '//') continue;
               list($key, $value) = explode('=', $ini_setting);
               list($key, $value) = explode('=', $ini_setting, 2);
               if($value){
                  $value = trim($value);
                  $key = trim($key);