From 3c4cc38c908e582007c1df656bf04e1ebcb7fcdb Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 30 Sep 2014 11:57:11 +0200 Subject: [PATCH] Removed old deprecated and commented/disabled code --- .../godmode/setup/setup_general.php | 11 ---- .../include/javascript/jquery.pandora.js | 52 ++++--------------- 2 files changed, 10 insertions(+), 53 deletions(-) diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 5cf05f2cf5..8209cefd11 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -212,17 +212,6 @@ $table->data[26][1] = html_print_select($sounds, 'sound_warning', $config['sound $table->data[26][1] .= ' ' . html_print_image("images/control_play_col.png", true, array("id" => "button_sound_warning", "style" => "vertical-align: middle;", "width" => "16", "title" => __('Play sound'))) . ''; $table->data[26][1] .= '
'; -/* -$table->data[27][0] = __('License information'); -$license_info = db_get_value ('value', 'tupdate_settings', '`key`', 'customer_key'); -if ($license_info === false) - $license_info = ''; - -$table->data[27][1] = html_print_input_text ('license_info_key', $license_info, '', 40, 255, true); -$table->data[27][1] .= ' '.html_print_image('images/lock.png', true, array('class' => 'bot', 'title' => __('License info'))).''; -$table->data[27][1] .= ''; -*/ - $table->data[28][0] = __('Public URL'); $table->data[28][0] .= ui_print_help_tip(__('Set this value when your PandoraFMS across inverse proxy or for example with mod_proxy of Apache.'), true); $table->data[28][1] = html_print_input_text ('public_url', $config['public_url'], '', 40, 255, true); diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index 5a8107f3ec..97d8f69b98 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -123,50 +123,18 @@ $(document).ready (function () { } - $("a#dialog_license_info").click (function () { - var ajax_doc = "ajax.php"; - if($('#hidden-metaconsole_activated').val() == 1) { - ajax_doc = "../../" + ajax_doc; - } + if ($('#msg_change_password').length) { - jQuery.get (ajax_doc, - {"page": "extensions/update_manager", - "get_license_info": "1"}, - function (data, status) { - $("#dialog_show_license").hide () - .empty () - .append (data) - .dialog ({ - title: $("a#dialog_license_info").attr ("title"), - resizable: false, - draggable: true, - modal: true, - overlay: { - opacity: 0.5, - background: "black" - }, - width: 500, - height: 250 - }) - .show (); - }, - "html" - ); - return false; - }); - - if ($('#msg_change_password').length) { - $( "#msg_change_password" ).dialog({ - resizable: true, - draggable: true, - modal: true, - height: 260, - width: 590, - overlay: { - opacity: 0.5, - background: "black" - } + resizable: true, + draggable: true, + modal: true, + height: 260, + width: 590, + overlay: { + opacity: 0.5, + background: "black" + } }); }