Fixed: FS#940 - Interface is squished in Google Chrome

tbrehm

2010-01-21 812f6e9a1500de5ed933e1c6a2fa124b4a68fd15

 server/plugins-available/apache2_plugin.inc.php

@@ -83,7 +83,7 @@
      
      if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
      $ssl_dir = $data["new"]["document_root"]."/ssl";
      $domain = $data["new"]["domain"];
      $domain = $data["new"]["ssl_domain"];
      $key_file = $ssl_dir.'/'.$domain.".key.org";
        $key_file2 = $ssl_dir.'/'.$domain.".key";
        $csr_file = $ssl_dir.'/'.$domain.".csr";
@@ -106,7 +106,7 @@
         $ssl_cnf = "        RANDFILE               = $rand_file

        [ req ]
        default_bits           = 1024
        default_bits           = 2048
        default_keyfile        = keyfile.pem
        distinguished_name     = req_distinguished_name
        attributes             = req_attributes
@@ -137,7 +137,7 @@
         $crt_file = escapeshellcmd($crt_file);

           if(is_file($ssl_cnf_file)){
                exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 1024 && openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file && openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file && openssl rsa -passin pass:$ssl_password -in $key_file -out $key_file2");
                exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 2048 && openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file && openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file && openssl rsa -passin pass:$ssl_password -in $key_file -out $key_file2");
            $app->log("Creating SSL Cert for: $domain",LOGLEVEL_DEBUG);
           }

@@ -554,6 +554,7 @@
      $vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
      $vhost_data["web_basedir"] = $web_config["website_basedir"];
      $vhost_data["security_level"] = $web_config["security_level"];
      $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
      
      // Check if a SSL cert exists
      $ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -812,7 +813,7 @@
         if(!is_dir($data["new"]["document_root"].'/web/stats')) mkdir($data["new"]["document_root"].'/web/stats');
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\nrequire valid-user";
         file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);
         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0664);
         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0755);
         unset($ht_file);
      }
      
@@ -820,7 +821,7 @@
         if(trim($data["new"]["stats_password"]) != '') {
            $htp_file = 'admin:'.trim($data["new"]["stats_password"]);
            file_put_contents($data["new"]["document_root"].'/.htpasswd_stats',$htp_file);
            chmod($data["new"]["document_root"].'/.htpasswd_stats',0664);
            chmod($data["new"]["document_root"].'/.htpasswd_stats',0755);
            unset($htp_file);
         }
      }