From e38ebf4da7991895f6e82611f2b42b88f788607a Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Mon, 17 Dec 2001 13:05:19 +0000 Subject: [PATCH] Preferences bugfix git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1863 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/translate/options.php | 92 +++++++++++++++++++++++------------ plugins/translate/setup.php | 45 ----------------- 2 files changed, 60 insertions(+), 77 deletions(-) diff --git a/plugins/translate/options.php b/plugins/translate/options.php index de3f5923..c3a6389a 100644 --- a/plugins/translate/options.php +++ b/plugins/translate/options.php @@ -9,35 +9,61 @@ chdir('..'); session_start(); - - if (!isset($config_php)) - include_once('../config/config.php'); - if (!isset($strings_php)) - include_once('../functions/strings.php'); - if (!isset($page_header_php)) - include_once('../functions/page_header.php'); - if (!isset($display_messages_php)) - include_once('../functions/display_messages.php'); - if (!isset($imap_php)) - include_once('../functions/imap.php'); - if (!isset($array_php)) - include_once('../functions/array.php'); - if (!isset($i18n_php)) - include_once('../functions/i18n.php'); - - + + require_once('../config/config.php'); + require_once('../functions/strings.php'); + require_once('../functions/page_header.php'); + require_once('../functions/display_messages.php'); + require_once('../functions/imap.php'); + require_once('../functions/array.php'); + require_once('../functions/i18n.php'); require_once('../src/load_prefs.php'); displayPageHeader($color, 'None'); - $translate_server = getPref($data_dir, $username, 'translate_server'); - if ($translate_server == '') + if ($submit_translate) { + if (isset($translate_translate_server)) { + setPref($data_dir, $username, 'translate_server', $translate_translate_server); + } else { + setPref($data_dir, $username, 'translate_server', 'babelfish'); + } + + if (isset($translate_translate_location)) { + setPref($data_dir, $username, 'translate_location', $translate_translate_location); + } else { + setPref($data_dir, $username, 'translate_location', 'center'); + } + + if (isset($translate_translate_show_read)) { + setPref($data_dir, $username, 'translate_show_read', '1'); + } else { + setPref($data_dir, $username, 'translate_show_read', ''); + } + + if (isset($translate_translate_show_send)) { + setPref($data_dir, $username, 'translate_show_send', '1'); + } else { + setPref($data_dir, $username, 'translate_show_send', ''); + } + + if (isset($translate_translate_same_window)) { + setPref($data_dir, $username, 'translate_same_window', '1'); + } else { + setPref($data_dir, $username, 'translate_same_window', ''); + } + } + + $translate_server = getPref($data_dir, $username, 'translate_server'); + if ($translate_server == '') { $translate_server = 'babelfish'; - $translate_location = getPref($data_dir, $username, 'translate_location'); - if ($translate_location == '') + } + $translate_location = getPref($data_dir, $username, 'translate_location'); + if ($translate_location == '') { $translate_location = 'center'; - $translate_show_read = getPref($data_dir, $username, 'translate_show_read'); - $translate_show_send = getPref($data_dir, $username, 'translate_show_send'); - $translate_same_window = getPref($data_dir, $username, 'translate_same_window'); + } + $translate_show_read = getPref($data_dir, $username, 'translate_show_read'); + $translate_show_send = getPref($data_dir, $username, 'translate_show_send'); + $translate_same_window = getPref($data_dir, $username, 'translate_same_window'); + function ShowOption($Var, $value, $Desc) { @@ -90,14 +116,14 @@

- -
- - -
'. + ''. + '
' . + _("Select your translator:") . + '
'. ''. "\n"; + +?> \ No newline at end of file diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php index 0a79c351..202edcde 100644 --- a/plugins/translate/setup.php +++ b/plugins/translate/setup.php @@ -28,7 +28,6 @@ function squirrelmail_plugin_init_translate() { $squirrelmail_plugin_hooks['read_body_bottom']['translate'] = 'translate_read_form'; $squirrelmail_plugin_hooks['optpage_register_block']['translate'] = 'translate_optpage_register_block'; - $squirrelmail_plugin_hooks['options_save']['translate'] = 'translate_sav'; $squirrelmail_plugin_hooks['loading_prefs']['translate'] = 'translate_pref'; $squirrelmail_plugin_hooks['compose_button_row']['translate'] = 'translate_button'; } @@ -100,50 +99,6 @@ function translate_optpage_register_block() { ); } -function translate_sav() { - global $username,$data_dir; - global $submit_translate, $translate_translate_server; - global $translate_translate_location; - global $translate_translate_show_read; - global $translate_translate_show_send; - global $translate_translate_same_window; - - if ($submit_translate) { - if (isset($translate_translate_server)) { - setPref($data_dir, $username, 'translate_server', $translate_translate_server); - } else { - setPref($data_dir, $username, 'translate_server', 'babelfish'); - } - - if (isset($translate_translate_location)) { - setPref($data_dir, $username, 'translate_location', $translate_translate_location); - } else { - setPref($data_dir, $username, 'translate_location', 'center'); - } - - if (isset($translate_translate_show_read)) { - setPref($data_dir, $username, 'translate_show_read', '1'); - } else { - setPref($data_dir, $username, 'translate_show_read', ''); - } - - if (isset($translate_translate_show_send)) { - setPref($data_dir, $username, 'translate_show_send', '1'); - } else { - setPref($data_dir, $username, 'translate_show_send', ''); - } - - if (isset($translate_translate_same_window)) { - setPref($data_dir, $username, 'translate_same_window', '1'); - } else { - setPref($data_dir, $username, 'translate_same_window', ''); - } - - echo '
Translation options saved.
'; - } -} - - function translate_pref() { global $username, $data_dir; global $translate_server, $translate_location; -- 2.25.1