Merge branch '825-La-pantalla-de-login-con-mysql-parado-no-configurado-no-se-ve-correctamente-2' into 'develop'
Fix logout bad permission with myslq service stopped dialog - #825 See merge request !490
This commit is contained in:
commit
da314c7ed7
|
@ -33,6 +33,8 @@ if ($develop_bypass != 1) {
|
||||||
$config['homeurl'] = $_SERVER['REQUEST_URI'];
|
$config['homeurl'] = $_SERVER['REQUEST_URI'];
|
||||||
$config['homeurl_static'] = $_SERVER['REQUEST_URI'];
|
$config['homeurl_static'] = $_SERVER['REQUEST_URI'];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require('general/error_screen.php');
|
require('general/error_screen.php');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
@ -66,11 +68,11 @@ if ($develop_bypass != 1) {
|
||||||
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0660") &&
|
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0660") &&
|
||||||
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0640")) {
|
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0640")) {
|
||||||
$ownDir = dirname(__FILE__) . DIRECTORY_SEPARATOR;
|
$ownDir = dirname(__FILE__) . DIRECTORY_SEPARATOR;
|
||||||
|
$url = explode('/', $_SERVER['REQUEST_URI']);
|
||||||
$config['homedir'] = $ownDir;
|
$config['homedir'] = $ownDir;
|
||||||
$config['homeurl'] = $_SERVER['REQUEST_URI'];
|
$config['homeurl'] = "/" . $url[1];
|
||||||
$config['homeurl_static'] = $_SERVER['REQUEST_URI'];
|
$config['homeurl_static'] = "/" . $url[1];
|
||||||
$login_screen = 'error_perms';
|
$login_screen = 'error_perms';
|
||||||
|
|
||||||
require('general/error_screen.php');
|
require('general/error_screen.php');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue