Fixed a problem with apache rewrite rules wen noflag is selected.

tbrehm

2009-10-15 ee64f07277d08aa4e81d29cc201b3f58cadf3d0f

Fixed a problem with apache rewrite rules wen noflag is selected.

 server/plugins-available/apache2_plugin.inc.php

@@ -579,6 +579,10 @@
        $rewrite_rules = array();
        if($data["new"]["redirect_type"] != '') {
            if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
            if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
                $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
            }
			
            $rewrite_rules[] = array(    'rewrite_domain'     => $data["new"]["domain"],
                                        'rewrite_type'         => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                                        'rewrite_target'     => $data["new"]["redirect_path"]);
@@ -626,6 +630,9 @@
                // Rewriting
                if($alias["redirect_type"] != '') {
                    if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
                    if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
                        $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
                    }
                    $rewrite_rules[] = array(    'rewrite_domain'     => $alias["domain"],
                                                'rewrite_type'         => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                                'rewrite_target'     => $alias["redirect_path"]);
@@ -803,7 +810,7 @@
        //* Create .htaccess and .htpasswd file for website statistics
        if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess') or $data["old"]["document_root"] != $data["new"]["document_root"]) {
            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\n<limit GET PUT POST>\nrequire valid-user\n</limit>";
            $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);
            unset($ht_file);