diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9f56ecc599..3920033fc9 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2009-07-24 Miguel de Dios + + * index.php: fix mistake, add lost lines between my "dirty installation" and + "clean project". + Fixes: 2826478 + 2009-07-23 Miguel de Dios * godmode/modules/manage_network_components_form.php: add comments for diff --git a/pandora_console/index.php b/pandora_console/index.php index 5941fd47a3..0081de3cfa 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -111,6 +111,15 @@ $page = $sec2; //Reference variable for old time sake $sec = get_parameter_get ('sec'); $sec = safe_url_extraclean ($sec); +$searchPage = false; +$search = get_parameter_get("head_search_keywords"); +if (strlen($search) > 0) { + $config['search_keywords'] = trim(get_parameter('keywords')); + $config['search_category'] = get_parameter('search_category'); + if (($config['search_keywords'] != 'Enter keywords to search') && (strlen($config['search_keywords']) > 0)) + $searchPage = true; +} + // Hash login process if (! isset ($config['id_user']) && isset ($_GET["loginhash"])) { $loginhash_data = get_parameter("loginhash_data", ""); @@ -199,23 +208,26 @@ if (!is_writable ("attachment")){ } // Page loader / selector -if ($page != "") { - $page .= '.php'; - if (file_exists ($page)) { - if (! is_extension ($page)) { - require ($page); - } else { - if ($sec[0] == 'g') { - extension_call_godmode_function (basename ($page)); - } else { - extension_call_main_function (basename ($page)); +if ($searchPage) { + require ('operation/search_results.php'); +} +else +{ + if ($page != "") { + $page .= '.php'; + if (file_exists ($page)) { + if (! is_extension ($page)) + require ($page); + else { + if ($sec[0] == 'g') + extension_call_godmode_function (basename ($page)); + else + extension_call_main_function (basename ($page)); } - } - } else { - echo '
'.__('Sorry! I can\'t find the page!').''; + } + else echo '
'.__('Sorry! I can\'t find the page!').''; } -} else { - require ("general/logon_ok.php"); + else require ("general/logon_ok.php"); } if ($config["pure"] == 0) {