The copyright message should be consistent.

[squirrelmail.git] / src / options_identities.php

diff --git a/src/options_identities.php b/src/options_identities.php
index 12cf4de78ba64f5b27c57c95aa0cc05b360e31dc..5744561c88901214b0188f1de13b970bafe1e38c 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -3,7 +3,7 @@
 /**
  * options_identities.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Display Identities Options
@@ -24,7 +24,7 @@ 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 
+/* 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
@@ -39,27 +39,27 @@ if (!empty($_POST)) {
        header('Location: '.get_location().'/options_personal.php');
        exit();
     }
-    
+
     displayPageHeader($color, 'None');
- 
+
     $Info = do_hook('options_identities_process', 0);
     if ($Info[1]) {
         SaveUpdateFunction();
     }
-    
+
     if (CheckAndDoDefault() || CheckAndDoPromote()) {
        SaveUpdateFunction();
     }
     if (isset($update) || CheckForDelete()) {
         SaveUpdateFunction();
     }
- 
+
    do_hook('options_identities_top');
    LoadInfo($full_name, $email_address, $reply_to, $signature, '');
    $td_str = '';
    $td_str .= '<form name="f" action="options_identities.php" method="post"><br />';
    $td_str .= ShowTableInfo($full_name, $email_address, $reply_to, $signature, '');
-  
+
    $num = 1;
    while (LoadInfo($full_name, $email_address, $reply_to, $signature, $num)) {
        $td_str .= html_tag( 'tr',
@@ -69,7 +69,7 @@ if (!empty($_POST)) {
        $num ++;
        }
 
-   echo '<br />' . 
+   echo '<br />' .
    html_tag( 'table', "\n" .
        html_tag( 'tr', "\n" .
            html_tag( 'td', "\n" .
@@ -161,7 +161,7 @@ if (!empty($_POST)) {
         setPref($data_dir, $username, 'email_address', $email_address);
         setPref($data_dir, $username, 'reply_to', $reply_to);
         setSig($data_dir, $username, "g", $signature);
-        
+
     }
 
     function CheckAndDoDefault() {
@@ -252,14 +252,14 @@ if (!empty($_POST)) {
                 $temp = $$nameA;
                 $$nameA = $$nameB;
                 $$nameB = $temp;
-    
+
                 $nameA = 'email_address' . $i;
                 $nameB = 'email_address' . ($i - 1);
                 global $$nameA, $$nameB;
                 $temp = $$nameA;
                 $$nameA = $$nameB;
                 $$nameB = $temp;
-    
+
                 $nameA = 'reply_to' . $i;
                 $nameB = 'reply_to' . ($i - 1);
                 global $$nameA, $$nameB;
@@ -300,7 +300,7 @@ if (!empty($_POST)) {
 
 function sti_input( $title, $hd, $data, $post, $bg ) {
     $return_val = html_tag( 'tr',
-                           html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
+                           html_tag( 'td', $title . ':', 'right', '', 'style="white-space: nowrap;"' ) .
                            html_tag( 'td', '<input size="50" type="text" value="' . htmlspecialchars($data) . '" name="' . $hd . $post . '" />' , 'left' ) ,
                        '', $bg );
      return ($return_val);
@@ -308,7 +308,7 @@ function sti_input( $title, $hd, $data, $post, $bg ) {
 
 function sti_textarea( $title, $hd, $data, $post, $bg ) {
     $return_val = html_tag( 'tr',
-                           html_tag( 'td', $title . ':', 'right', '', 'nowrap' ) .
+                           html_tag( 'td', $title . ':', 'right', '', 'style="white-space: nowrap;"' ) .
                            html_tag( 'td', '<textarea cols="50" rows="5" name="' . $hd . $post . '">' . htmlspecialchars($data) . '</textarea>' , 'left' ) ,
                        '', $bg );
      return ($return_val);