Till Brehm
2014-08-08 746bf0f5cd4a3a650a0bfa1c1149d4e1331774a0
server/plugins-available/apache2_plugin.inc.php
@@ -344,8 +344,9 @@
         if($data['new']['type'] == 'vhost' || $data['new']['type'] == 'vhostsubdomain') $app->log('document_root not set', LOGLEVEL_WARN);
         return 0;
      }
      if($data['new']['system_user'] == 'root' or $data['new']['system_group'] == 'root') {
         $app->log('Websites cannot be owned by the root user or group.', LOGLEVEL_WARN);
      if($app->system->is_allowed_user($data['new']['system_user'], $app->system->is_user($data['new']['system_user']), true) == false
         || $app->system->is_allowed_group($data['new']['system_group'], $app->system->is_group($data['new']['system_group']), true) == false) {
         $app->log('Websites cannot be owned by the root user or group. User: '.$data['new']['system_user'].' Group: '.$data['new']['system_group'], LOGLEVEL_WARN);
         return 0;
      }
      if(trim($data['new']['domain']) == '') {
@@ -1474,7 +1475,7 @@
      if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
      $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
      $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', $ht_file);
      $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', 0751);
      $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', 0755);
      unset($ht_file);
      //}
@@ -1484,7 +1485,7 @@
            $app->system->web_folder_protection($data['new']['document_root'], false);
            $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats', $htp_file);
            $app->system->web_folder_protection($data['new']['document_root'], true);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats', 0751);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats', 0755);
            unset($htp_file);
         }
      }
@@ -2951,8 +2952,6 @@
         $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
         $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
      }
      $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
      return $seo_redirects;
   }