tbrehm
2012-11-06 791e991764cfa14bf4481bfc2e939d7d8074ef85
Fixed issue that .htpasswd_stats could not be written to the web root dwhen webfolder protection is on.
1 files modified
8 ■■■■ changed files
server/plugins-available/apache2_plugin.inc.php 8 ●●●● patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php
@@ -1343,19 +1343,19 @@
        //* Create .htaccess and .htpasswd file for website statistics
        if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
            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']."/.htpasswd_stats\nrequire valid-user";
            $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',0755);
            unset($ht_file);
        }
        if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
        if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
            if(trim($data['new']['stats_password']) != '') {
                $htp_file = 'admin:'.trim($data['new']['stats_password']);
                $app->system->web_folder_protection($data['new']['document_root'],false);
                $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
                $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'].'/.htpasswd_stats',0750);
                $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
                unset($htp_file);
            }
        }