X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ftranslate%2Foptions.php;h=f20dd5c5dee9edbe41050398725ba4d98beca071;hp=711238b3b788042d3a5a0e1e6c7a2f64689cb107;hb=e7d5ff29db69101e42cd491d2fa42d4f83cd35a4;hpb=bb3ecba2a91cf935225f6732c54db41faf0891a7

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 711238b3..f20dd5c5 100644
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -1,84 +1,32 @@
 <?php
+
 /**
  * options.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Pick your translator to translate the body of incoming mail messages
  *
+ * @copyright 1999-2017 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage translate
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../../');
+require('../../include/init.php');
 
-/* SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/display_messages.php');
-include_once(SM_PATH . 'functions/imap.php');
+/** Plugin functions */
 include_once(SM_PATH . 'plugins/translate/functions.php');
 
-displayPageHeader($color, 'None');
-
-// Save preferences
-if (sqgetGlobalVar('submit_translate',$tmp,SQ_POST)) {
-    if (sqgetGlobalVar('translate_translate_server',$translate_translate_server,SQ_POST)) {
-        setPref($data_dir, $username, 'translate_server', $translate_translate_server);
-    } else {
-        setPref($data_dir, $username, 'translate_server', $translate_default_engine);
-    }
-
-    if (sqgetGlobalVar('translate_translate_location',$translate_translate_location,SQ_POST)) {
-        setPref($data_dir, $username, 'translate_location', $translate_translate_location);
-    } else {
-        setPref($data_dir, $username, 'translate_location', 'center');
-    }
-
-    if (sqgetGlobalVar('translate_translate_show_read',$tmp,SQ_POST)) {
-        setPref($data_dir, $username, 'translate_show_read', '1');
-    } else {
-        setPref($data_dir, $username, 'translate_show_read', '');
-    }
-
-    if (sqgetGlobalVar('translate_translate_show_send',$tmp,SQ_POST)) {
-        setPref($data_dir, $username, 'translate_show_send', '1');
-    } else {
-        setPref($data_dir, $username, 'translate_show_send', '');
-    }
-
-    if (sqgetGlobalVar('translate_translate_same_window',$tmp,SQ_POST)) {
-       setPref($data_dir, $username, 'translate_same_window', '1');
-    } else {
-        setPref($data_dir, $username, 'translate_same_window', '');
-    }
-}
-
-// Move these calls to separate function
-$translate_server = getPref($data_dir, $username, 'translate_server',$translate_default_engine);
-
-$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');
+displayPageHeader($color);
 
 ?>
    <table width="95%" align="center" border="0" cellpadding="1" cellspacing="0"><tr><td bgcolor="<?php echo $color[0]; ?>">
-      <center><b><?php echo _("Options") . ' - '. _("Translator"); ?></b></center>
+      <div style="text-align: center;"><b><?php echo _("Options") . ' - '. _("Translator"); ?></b></div>
    </td></tr></table>
 
-    <?php if (sqgetGlobalVar('submit_translate',$tmp,SQ_POST)) {
-        print '<center><h4>'._("Saved Translation Options")."</h4></center>\n";
-    }?>
-
    <p><?php echo _("Your server options are as follows:"); ?></p>
 
    <ul>
@@ -89,16 +37,18 @@ $translate_same_window = getPref($data_dir, $username, 'translate_same_window');
    <p>
 <?php
    echo _("You also decide if you want the translation box displayed, and where it will be located.") .
-        '<form action="'.$PHP_SELF.'" method="post">'.
+        '<form action="'.sqm_baseuri().'src/options.php" method="post">'.
+        '<input type="hidden" name="optmode" value="submit" />' .
+        '<input type="hidden" name="optpage" value="translate" />' .
         '<table border="0" cellpadding="0" cellspacing="2">'.
-            '<tr><td align="right" nowrap="nowrap">' .
+            '<tr><td align="right" style="white-space: nowrap;">' .
              _("Select your translator:") .
              '</td>'.
             '<td><select name="translate_translate_server">';
    translate_showoption();
    echo '</select>' .
        '</td></tr>' .
-       '<tr>'.html_tag('td',_("When reading:"),'right','','nowrap').
+       '<tr>'.html_tag('td',_("When reading:"),'right','','style="white-space: nowrap;"').
        '<td><input type="checkbox" name="translate_translate_show_read"';
    if ($translate_show_read)
        echo ' checked="checked"';
@@ -115,7 +65,7 @@ $translate_same_window = getPref($data_dir, $username, 'translate_same_window');
        "</td></tr>\n";
 
 if (!$disable_compose_translate) {
-   echo '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
+   echo '<tr>'.html_tag('td',_("When composing:"),'right','','style="white-space: nowrap;"').
          '<td><input type="checkbox" name="translate_translate_show_send"';
    if ($translate_show_send)
       echo ' checked="checked"';
@@ -128,4 +78,4 @@ if (!$disable_compose_translate) {
 </td></tr>
 </table>
 </form>
-</body></html>
\ No newline at end of file
+</body></html>