utf-8 is already converted by ja_JP extra functions.

[squirrelmail.git] / src / options_identities.php

diff --git a/src/options_identities.php b/src/options_identities.php
index 875cddfffa7012f9d7cc4e1d1429be4ca40be685..d2dfd035924558a7fd5d61bfa78c8991d3439b16 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -3,7 +3,7 @@
 /**
  * options_identities.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Display Identities Options
@@ -16,12 +16,14 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/html.php');
 
 /* POST data var names are dynamic because 
    of the possible multiple idents so lets get
    them all
+   FIXME! This circumvents the benefits of rg=0
 */
 if (!empty($_POST)) {
     extract($_POST);
@@ -30,7 +32,7 @@ if (!empty($_POST)) {
 
     if (isset($return)) {
        SaveUpdateFunction();
-       header('Location: options_personal.php');
+       header('Location: '.get_location().'/options_personal.php');
        exit();
     }
     
@@ -326,7 +328,7 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
     $return_val .= sti_input( _("Reply To"), 'reply_to', $reply_to, $post, $OtherBG );
     $return_val .= sti_textarea( _("Signature"), 'signature', $signature, $post, $OtherBG );
 
-    do_hook('options_identities_table', $OtherBG, $isEmptySection, $post);
+    $return_val .= concat_hook_function('options_identities_table', array($OtherBG, $isEmptySection, $post));
     $return_val .= html_tag( 'tr', '', '', $OtherBG);
     $return_val .= html_tag( 'td', ' ', 'left' );
     $return_val .= html_tag( 'td', '', 'left' );
@@ -344,7 +346,7 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
         $return_val .= '<input type=submit name="promote_' . $post . '" value="'.
              _("Move Up") . '">';
     }
-    do_hook('options_identities_buttons', $isEmptySection, $post);
+    $return_val .= concat_hook_function('options_identities_buttons', array($isEmptySection, $post));
     $return_val .=  '</td></tr>'.
          html_tag( 'tr', html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' ));