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

tbrehm

2009-10-15 8388ae72ae0b07a1152bdad8b43a345830613e3b

Fixed a problem with apache rewrite rules wen noflag is selected.
Fixed: FS#934 - Webalizer statistics wrong

 server/cron_daily.php

@@ -133,12 +133,15 @@

if(!@is_file($webalizer_conf)) {
    exec("cp $webalizer_conf_main $webalizer_conf");

    setConfigVar($webalizer_conf, 'Incremental', 'yes');
    setConfigVar($webalizer_conf, 'IncrementalName', $logdir.'/webalizer.current');
    setConfigVar($webalizer_conf, 'HistoryName', $logdir.'/webalizer.hist');
}

if(@is_file($webalizer_conf)) {
    setConfigVar($webalizer_conf, 'Incremental', 'yes');
    setConfigVar($webalizer_conf, 'IncrementalName', $statsdir.'/webalizer.current');
    setConfigVar($webalizer_conf, 'HistoryName', $statsdir.'/webalizer.hist');
}


if(!@is_dir($statsdir)) mkdir($statsdir);
    exec("$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -p -o $statsdir $logfile");
}

 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"]);