mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 06:00:28 +01:00
htaccess warning now not preventing login
This commit is contained in:
parent
3ea5c0e478
commit
a731d0f5df
@ -574,18 +574,19 @@ class Acl
|
|||||||
include dirname(__DIR__).'/../version.php';
|
include dirname(__DIR__).'/../version.php';
|
||||||
$this->app->Tpl->Set('XENTRALVERSION',"V.".$version_revision);
|
$this->app->Tpl->Set('XENTRALVERSION',"V.".$version_revision);
|
||||||
|
|
||||||
|
$this->app->Tpl->Set('LOGINWARNING_VISIBLE', 'hidden');
|
||||||
|
|
||||||
$result = $this->CheckHtaccess();
|
$result = $this->CheckHtaccess();
|
||||||
if ($result !== true) {
|
if ($result !== true) {
|
||||||
|
$this->app->Tpl->Set('LOGINWARNING_VISIBLE', '');
|
||||||
$this->app->Tpl->Set('LOGINWARNING_TEXT', "Achtung: Zugriffskonfiguration (htaccess) fehlerhaft. Bitte wenden Sie sich an Ihren an Ihren Administrator. <br>($result)");
|
$this->app->Tpl->Set('LOGINWARNING_TEXT', "Achtung: Zugriffskonfiguration (htaccess) fehlerhaft. Bitte wenden Sie sich an Ihren an Ihren Administrator. <br>($result)");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->IsInLoginLockMode() === true)
|
if($this->IsInLoginLockMode() === true)
|
||||||
{
|
{
|
||||||
|
$this->app->Tpl->Set('LOGINWARNING_VISIBLE', '');
|
||||||
$this->app->Tpl->Set('LOGINWARNING_TEXT', 'Achtung: Es werden gerade Wartungsarbeiten in Ihrem System (z.B. Update oder Backup) durch Ihre IT-Abteilung durchgeführt. Das System sollte in wenigen Minuten wieder erreichbar sein. Für Rückfragen wenden Sie sich bitte an Ihren Administrator.');
|
$this->app->Tpl->Set('LOGINWARNING_TEXT', 'Achtung: Es werden gerade Wartungsarbeiten in Ihrem System (z.B. Update oder Backup) durch Ihre IT-Abteilung durchgeführt. Das System sollte in wenigen Minuten wieder erreichbar sein. Für Rückfragen wenden Sie sich bitte an Ihren Administrator.');
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
$this->app->Tpl->Set('LOGINWARNING_VISIBLE', 'hidden');
|
|
||||||
|
|
||||||
$multidbs = $this->app->getDbs();
|
$multidbs = $this->app->getDbs();
|
||||||
if(count($multidbs) > 1)
|
if(count($multidbs) > 1)
|
||||||
@ -1268,21 +1269,27 @@ Allow from all
|
|||||||
dirname($script_file_name)."/.htaccess"); // www
|
dirname($script_file_name)."/.htaccess"); // www
|
||||||
|
|
||||||
for ($count = 0;$count < 2;$count++) {
|
for ($count = 0;$count < 2;$count++) {
|
||||||
$htaccess = trim(file_get_contents($htaccess_path[$count]));
|
$htaccess = file_get_contents($htaccess_path[$count]);
|
||||||
$htaccess_nominal = trim($nominal[$count]);
|
|
||||||
|
|
||||||
|
if ($htaccess === false) {
|
||||||
|
$missing = true;
|
||||||
|
} else {
|
||||||
|
$htaccess = trim($htaccess);
|
||||||
|
}
|
||||||
|
$htaccess_nominal = trim($nominal[$count]);
|
||||||
$result = strcmp($htaccess,$htaccess_nominal);
|
$result = strcmp($htaccess,$htaccess_nominal);
|
||||||
|
|
||||||
if ($result !== 0) {
|
|
||||||
return("FATAL: ".$htaccess_path[$count]." fehlerhaft.");
|
|
||||||
}
|
|
||||||
if ($htaccess === false) {
|
if ($htaccess === false) {
|
||||||
return("FATAL: ".$htaccess_path[$count]." nicht vorhanden.");
|
return($htaccess_path[$count]." nicht vorhanden.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($result !== 0) {
|
||||||
|
return($htaccess_path[$count]." fehlerhaft.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($_SERVER['OPENXE_HTACCESS'])) {
|
if (!isset($_SERVER['OPENXE_HTACCESS'])) {
|
||||||
return("FATAL: htaccess nicht aktiv.");
|
return("htaccess nicht aktiv.");
|
||||||
}
|
}
|
||||||
|
|
||||||
return(true);
|
return(true);
|
||||||
|
Loading…
Reference in New Issue
Block a user