ISPConfig3 devel
blame | history | patch | commit | commitdiff | ignore whitespace
vogelor
2010-05-26 24f38b424a3d12c7f4fac1829c83725b200b1e97 
 server/plugins-available/apache2_plugin.inc.php


@@ -157,7 +157,7 @@


      //* Save a SSL certificate to disk


      if($data["new"]["ssl_action"] == 'save') {


         $ssl_dir = $data["new"]["document_root"]."/ssl";


         $domain = $data["new"]["domain"];


         $domain = $data["new"]["ssl_domain"];


           $csr_file = $ssl_dir.'/'.$domain.".csr";


           $crt_file = $ssl_dir.'/'.$domain.".crt";


         $bundle_file = $ssl_dir.'/'.$domain.".bundle";


@@ -174,7 +174,7 @@


      //* Delete a SSL certificate


      if($data["new"]["ssl_action"] == 'del') {


         $ssl_dir = $data["new"]["document_root"]."/ssl";


         $domain = $data["new"]["domain"];


         $domain = $data["new"]["ssl_domain"];


           $csr_file = $ssl_dir.'/'.$domain.".csr";


           $crt_file = $ssl_dir.'/'.$domain.".crt";


         $bundle_file = $ssl_dir.'/'.$domain.".bundle";


@@ -556,10 +556,11 @@


      $vhost_data["security_level"] = $web_config["security_level"];


      $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];


      $vhost_data["php_open_basedir"] = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];


      $vhost_data["ssl_domain"] = $data["new"]["ssl_domain"];


      


      // Check if a SSL cert exists


      $ssl_dir = $data["new"]["document_root"]."/ssl";


      $domain = $data["new"]["domain"];


      $domain = $data["new"]["ssl_domain"];


        $key_file = $ssl_dir.'/'.$domain.".key";


        $crt_file = $ssl_dir.'/'.$domain.".crt";


      $bundle_file = $ssl_dir.'/'.$domain.".bundle";


@@ -715,7 +716,7 @@


         $fcgi_tpl->setVar('security_level',intval($web_config["security_level"]));


         


         $php_open_basedir = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];


         $cgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));


         $fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));


            


         $fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config["fastcgi_starter_script"]);


         file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());