From aeb8e74bdcba6bcb57aae4dd736d423749497b9a Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 22 Mar 2017 15:54:53 +0100 Subject: [PATCH] delete help in visual setup --- .../godmode/setup/setup_visuals.php | 6 +++--- pandora_console/include/config_process.php | 20 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 2bb9758820..cb4958306e 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -222,7 +222,7 @@ $row++; //Splash login if(enterprise_installed()) { - $table_styles->data[$row][0] = __('Custom Splash (login)') . ui_print_help_icon("custom_logo_login", true); + $table_styles->data[$row][0] = __('Custom Splash (login)'); $table_styles->data[$row][1] = html_print_select( list_files('enterprise/images/custom_splash_login', "png", 1, 0), 'custom_splash_login', @@ -235,14 +235,14 @@ if(enterprise_installed()) { //login title1 if(enterprise_installed()) { - $table_styles->data[$row][0] = __('Title 1 (login)') . ui_print_help_icon("custom_logo_login", true); + $table_styles->data[$row][0] = __('Title 1 (login)'); $table_styles->data[$row][1] = html_print_input_text ('custom_title1_login', $config["custom_title1_login"], '', 50, 50, true); $row++; } //login text2 if(enterprise_installed()) { - $table_styles->data[$row][0] = __('Title 2 (login)') . ui_print_help_icon("custom_logo_login", true); + $table_styles->data[$row][0] = __('Title 2 (login)'); $table_styles->data[$row][1] = html_print_input_text ('custom_title2_login', $config["custom_title2_login"], '', 50, 50, true); $row++; } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6ebbe44779..95a4961fcc 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -133,17 +133,15 @@ if (!defined('METACONSOLE')) { $config["error"] = "homeurl_bad_defined"; return; } - //else{ - //$url = preg_match('/(\/.+)\/.*\/*/', $_SERVER['REQUEST_URI'], $match); - //html_debug_print($config["homeurl"], true); - //html_debug_print($match[1], true); - //if($config["homeurl"] != $match[1]){ - // $config["homeurl"] = $match[1]; - // $config["homeurl_static"] = $match[1]; - // $config["error"] = "homeurl_bad_defined"; - // return; - //} - //} + else{ + $url = explode('/', $_SERVER['REQUEST_URI']); + if($config["homeurl"] != '/'.$url[1]){ + $config["homeurl"] = '/'.$url[1]; + $config["homeurl_static"] = '/'.$url[1]; + $config["error"] = "homeurl_bad_defined"; + return; + } + } } if (!isset($config["homeurl_static"])) { $config["homeurl_static"] = $config["homeurl"];