kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve feedback to users when protecting folder with htaccess 

The current behaviour of protecting a folder only modifies adds the
relevant .htaccess configuration lines if the file doesn't already
exist. In the case that it exists, no change is made and it appears to
"not work" for users.

This commit improves the feedbackup to users about what is happening,
and gives them the necessary information to modify their custom
.htaccess file with the appropriate configuration lines.
This commit is contained in:
Kienan Stewart 2021-08-20 10:50:08 -04:00 committed by Camille Lafitte
parent da50b32d61
commit 8b64c144b2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bureau/admin/hta_doadd.php
View File

@ -37,7 +37,6 @@ if(empty($dir)) {
$is_include=true; $is_include=true;
include("hta_add.php"); include("hta_add.php");
} else { } else {
$msg->raise("INFO", "hta", _("Folder %s is protected"), $dir);
include("hta_list.php"); include("hta_list.php");
} }
?> ?>

11
bureau/class/m_hta.php
View File

@ -71,6 +71,7 @@ class m_hta {
$msg->raise("ERROR", "hta", _("The folder '%s' does not exist"), $dir); $msg->raise("ERROR", "hta", _("The folder '%s' does not exist"), $dir);
return false; return false;
} }
$param = "AuthUserFile \"$absolute/.htpasswd\"\nAuthName \"" . _("Restricted area") . "\"\nAuthType Basic\nrequire valid-user\n";
if (!file_exists("$absolute/.htaccess")) { if (!file_exists("$absolute/.htaccess")) {
$file = @fopen("$absolute/.htaccess", "w+"); $file = @fopen("$absolute/.htaccess", "w+");
if (!$file) { if (!$file) {
@ -78,15 +79,23 @@ class m_hta {
return false; return false;
} }
fseek($file, 0); fseek($file, 0);
$param = "AuthUserFile \"$absolute/.htpasswd\"\nAuthName \"" . _("Restricted area") . "\"\nAuthType Basic\nrequire valid-user\n";
fwrite($file, $param); fwrite($file, $param);
fclose($file); fclose($file);
$msg->raise("INFO", "hta", _("Added .htaccess file to restrict '%s' to valid users"), array($dir));
}
else {
# The .htaccess file already exists, and we don't try to overwrite the existing
# contents, therefore we inform that they need to make the modifications to
# the htaccess file manually.
$msg->raise("ALERT", "hta", _("The .htaccess file already existed in '%s', you must add the following lines manually to '%s'\n"), array($dir, $dir . "/.htaccess"));
$msg->raise("ALERT", "hta", $param);
} }
if (!file_exists("$absolute/.htpasswd")) { if (!file_exists("$absolute/.htpasswd")) {
if (!@touch("$absolute/.htpasswd")) { if (!@touch("$absolute/.htpasswd")) {
$msg->raise("ERROR", "hta", _("Error creating .htpasswd file: ") . error_get_last()['message']); $msg->raise("ERROR", "hta", _("Error creating .htpasswd file: ") . error_get_last()['message']);
return false; return false;
} }
$msg->raise("INFO", "hta", _("Added .htpasswd to Folder '%s', you may now add users who will be able to access it."), $dir);
return true; return true;
} }
return true; return true;