Sorry, a bug slipped into the CVS.

[squirrelmail.git] / src / options_display.php

diff --git a/src/options_display.php b/src/options_display.php
index 5c862157a3717c1386f196bf604e0cd03d2ecc84..9c98ef14b111639328536604b4f1b1ca0b69b431 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -10,11 +10,11 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
-   include('../functions/plugin.php');
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
    
    displayPageHeader($color, 'None');
    $chosen_language = getPref($data_dir, $username, 'language');  
@@ -110,35 +110,6 @@
 ?>
             </td>
          </tr>
-         <tr>
-            <td align="right" nowrap><?PHP echo _("Reply Citation Style") ?>:</td>
-            <td><select name="new_reply_citation_style">
-                <option value="none"<?PHP
-                    if ($reply_citation_style == 'none') echo ' SELECTED';
-                    ?>>- <?PHP echo _("Not Used"); ?> -</option>
-                <option value="author_said"<?PHP
-                    if ($reply_citation_style == 'author_said') echo ' SELECTED';
-                    ?>><?PHP echo _("AUTHOR Said"); ?></option>
-                <option value="quote_who"<?PHP
-                    if ($reply_citation_style == 'quote_who') echo ' SELECTED';
-                    ?>><?PHP echo _("Quote Who XML"); ?></option>
-                <option value="user-defined"<?PHP
-                    if ($reply_citation_style == 'user-defined') echo ' SELECTED';
-                    ?>><?PHP echo _("User-Defined"); ?></option>
-                </select>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?php echo _("User-Defined Reply Citation"); ?>:</td>
-            <td>
-               <tt><input type="text" size="15" name="new_reply_citation_start" value="<?php
-                  echo $reply_citation_start;
-               ?>"></tt> &lt;<?PHP echo _("Author's Name"); ?>&gt;
-               <tt><input type="text" size="15" name="new_reply_citation_end" value="<?php
-                  echo $reply_citation_end;
-               ?>"></tt>
-            </td>
-         </tr>
          <tr>
             <td align="right" nowrap><?PHP echo _("Location of buttons when composing") ?>:</td>
             <td><select name="button_new_location">
@@ -197,7 +168,7 @@
       $left_refresh = 'None';
    if ($left_refresh > 600)
       $left_refresh = 600;
-   RefreshOption($left_refresh, '', 'None', _("None"));
+   RefreshOption($left_refresh, '', _("Never"));
    RefreshOption($left_refresh, 30);
    RefreshOption($left_refresh, 60);
    RefreshOption($left_refresh, 120);
@@ -294,4 +265,4 @@ echo _("Don't remove me from the CC addresses when I use \"Reply All\"");
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file