Add login_background_image_enabled default false

This commit is contained in:
FusionPBX
2025-09-01 13:42:33 -06:00
committed by GitHub
parent f4378bea98
commit 38a38d36b3
2 changed files with 22 additions and 16 deletions

View File

@@ -358,46 +358,46 @@ if (!empty($_SESSION['theme'])) {
$background_images_enabled = false;
if (!empty($_SESSION['username'])) {
//logged in - use standard background images
if ($settings->get('theme', 'background_image_enabled', false) && is_array($settings->get('theme', 'background_image', ''))) {
if ($settings->get('theme', 'background_image_enabled', false) && !empty($settings->get('theme', 'background_image', ''))) {
$background_images_enabled = true;
$background_images = $settings->get('theme', 'background_image', '');
$background_images = $settings->get('theme', 'background_image', array());
}
//logged in - use standard background colors
if ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
if ($settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
$background_colors[0] = $settings->get('theme', 'background_color')[0];
$background_colors[1] = $settings->get('theme', 'background_color')[1];
}
elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0])) {
elseif ($settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0])) {
$background_colors[0] = $settings->get('theme', 'background_color')[0];
}
}
else {
//not logged in - try using login background images
if ($settings->get('theme', 'login_background_image_enabled', false) && is_array($settings->get('theme', 'login_background_image', ''))) {
if ($settings->get('theme', 'login_background_image_enabled', false) && !empty($settings->get('theme', 'login_background_image', ''))) {
$background_images_enabled = true;
$background_images = $settings->get('theme', 'login_background_image', '');
$background_images = $settings->get('theme', 'login_background_image', array());
}
//otherwise, use standard background images
if ($settings->get('theme', 'background_image_enabled', true) && is_array($settings->get('theme', 'background_image', ''))) {
if ($settings->get('theme', 'background_image_enabled', false) && !empty($settings->get('theme', 'background_image', ''))) {
$background_images_enabled = true;
$background_images = $settings->get('theme', 'background_image', '');
$background_images = $settings->get('theme', 'background_image', array());
}
//use standard background colors
if (!empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0]) && !empty($settings->get('theme', 'login_background_color')[1])) {
if ($settings->get('theme', 'login_background_color_enabled', false) && !empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0]) && !empty($settings->get('theme', 'login_background_color')[1])) {
$background_colors[0] = $settings->get('theme', 'login_background_color')[0];
$background_colors[1] = $settings->get('theme', 'login_background_color')[1];
}
elseif (!empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0])) {
elseif ($settings->get('theme', 'login_background_color_enabled', false) && !empty($settings->get('theme', 'login_background_color', '')) && !empty($settings->get('theme', 'login_background_color')[0])) {
$background_colors[0] = $settings->get('theme', 'login_background_color')[0];
}
elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
elseif (!$settings->get('theme', 'login_background_image_enabled', false) && $settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0]) && !empty($settings->get('theme', 'background_color')[1])) {
$background_colors[0] = $settings->get('theme', 'background_color')[0];
$background_colors[1] = $settings->get('theme', 'background_color')[1];
}
elseif ($settings->get('theme', 'background_color_enabled', true) && !empty($settings->get('theme', 'background_color')[0])) {
elseif (!$settings->get('theme', 'login_background_image_enabled', false) && $settings->get('theme', 'background_color_enabled', false) && !empty($settings->get('theme', 'background_color')[0])) {
$background_colors[0] = $settings->get('theme', 'background_color')[0];
}
}
@@ -407,7 +407,7 @@ if ($background_images_enabled) {
//background image is enabled
$image_extensions = array('jpg','jpeg','png','gif');
if (count($background_images) > 0) {
if (is_array($background_images) && count($background_images) > 0) {
if ((!isset($_SESSION['background_image'])) or empty($_SESSION['background_image'])) {
$_SESSION['background_image'] = $background_images[array_rand($background_images)];
@@ -500,8 +500,6 @@ else { //default: white
$background_color = "";
}
?>
html {