X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_identities.php;h=51eebb73c1400a4d4b5ba1435d38be124bbfff0c;hp=92152a29ff22f7e4811e2d5e78922c0a1be5fe3e;hb=e38807da7cc331846514027ebc62b9c0456b1ada;hpb=e7db48afbf9565737173583af6962520d2491acc

diff --git a/src/options_identities.php b/src/options_identities.php
index 92152a29..51eebb73 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -1,14 +1,34 @@
 <?php
-   /**
-    **  options_identities.php
-    **
-    **  $Id$
-    **/
 
-   include('../src/validate.php');
-   include('../functions/page_header.php');
-   include('../functions/display_messages.php');
-   include('../src/load_prefs.php');
+/**
+ * options_identities.php
+ *
+ * Copyright (c) 1999-2001 The SquirrelMail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Display Identities Options
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
+require_once('../functions/display_messages.php');
 
    if (isset($return)) {
       SaveUpdateFunction();
@@ -73,7 +93,7 @@
 
    ShowTableInfo('', '', '', $num);
 ?>
-</table>   
+</table>
 </form>
 
     </td></tr>
@@ -85,255 +105,226 @@
 
 <?PHP
 
-function SaveUpdateFunction()
-{
-   global $username, $data_dir, $full_name, $email_address, $reply_to;
-    
-   $i = 1;
-   $fakeI = 1;
-   $name = 'form_for_' . $i;
-   global $$name;
-   while (isset($$name))
-   {
-      $name = 'delete_' . $i;
-      global $$name;
-      if (isset($$name)) {
-         $fakeI --;
-      } else {
-         do_hook('options_identities_renumber', $i, $fakeI);
-         $filled = 0;
-	 
-         $name = 'full_name' . $i;
-         global $$name;
-	 if ($$name != '') 
-	    $filled ++;
-         setPref($data_dir, $username, 'full_name' . $fakeI, $$name);
-	 
-         $name = 'email_address' . $i;
-         global $$name;
-	 if ($$name != '') 
-	    $filled ++;
-         setPref($data_dir, $username, 'email_address' . $fakeI, $$name);
-	 
-         $name = 'reply_to' . $i;
-         global $$name;
-	 if ($$name != '') 
-	    $filled ++;
-         setPref($data_dir, $username, 'reply_to' . $fakeI, $$name);
-	 
-	 if ($filled == 0) 
-	    $fakeI --;
-      }
-      
-      $fakeI ++;
-      $i ++;
-      $name = 'form_for_' . $i;
-      global $$name;
-   }
-   
-   setPref($data_dir, $username, 'identities', $fakeI);
-   
-   while ($fakeI != $i)
-   {
-      removePref($data_dir, $username, 'full_name' . $fakeI);
-      removePref($data_dir, $username, 'email_address' . $fakeI);
-      removePref($data_dir, $username, 'reply_to' . $fakeI);
-      $fakeI ++;
-   }
+    function SaveUpdateFunction() {
+        global $username, $data_dir, $full_name, $email_address, $reply_to;
 
-   setPref($data_dir, $username, 'full_name', $full_name);
-   setPref($data_dir, $username, 'email_address', $email_address);
-   setPref($data_dir, $username, 'reply_to', $reply_to);
-}
+        $i = 1;
+        $fakeI = 1;
+        $name = 'form_for_' . $i;
+        global $$name;
+        while (isset($$name))
+        {
+            $name = 'delete_' . $i;
+            global $$name;
+            if (isset($$name)) {
+                $fakeI --;
+            } else {
+                do_hook('options_identities_renumber', $i, $fakeI);
+                $filled = 0;
 
-function CheckAndDoDefault()
-{
-   global $username, $data_dir, $full_name, $email_address, $reply_to;
-    
-   $i = 1;
-   $name = 'form_for_' . $i;
-   global $$name;
-   while (isset($$name))
-   {
-      $name = 'make_default_' . $i;
-      global $$name;
-      if (isset($$name)) {
-          do_hook('options_identities_renumber', $i, 'default');
-          global $full_name, $email_address, $reply_to;
-	  
-          $name = 'full_name' . $i;
-          global $$name;
-          $temp = $full_name;
-          $full_name = $$name;
-          $$name = $temp;
-          
-          $name = 'email_address' . $i;
-          global $$name;
-          $temp = $email_address;
-          $email_address = $$name;
-          $$name = $temp;
-          
-          $name = 'reply_to' . $i;
-          global $$name;
-          $temp = $reply_to;
-          $reply_to = $$name;
-          $$name = $temp;
-          
-          return true;
-      }
-      
-      $i ++;
-      $name = 'form_for_' . $i;
-      global $$name;
-   }
-   return false;
-}
+                $name = 'full_name' . $i;
+                global $$name;
+            if ($$name != '')
+                $filled ++;
+                setPref($data_dir, $username, 'full_name' . $fakeI, $$name);
 
-function CheckForDelete()
-{
-   global $username, $data_dir, $full_name, $email_address, $reply_to;
-    
-   $i = 1;
-   $name = 'form_for_' . $i;
-   global $$name;
-   while (isset($$name))
-   {
-      $name = 'delete_' . $i;
-      global $$name;
-      if (isset($$name)) {
-          return true;
-      }
-      
-      $i ++;
-      $name = 'form_for_' . $i;
-      global $$name;
-   }
-   return false;
-}
+                $name = 'email_address' . $i;
+                global $$name;
+            if ($$name != '')
+                $filled ++;
+                setPref($data_dir, $username, 'email_address' . $fakeI, $$name);
 
-function CheckAndDoPromote()
-{
-   global $username, $data_dir, $full_name, $email_address, $reply_to;
-    
-   $i = 1;
-   $name = 'form_for_' . $i;
-   global $$name;
-   while (isset($$name))
-   {
-      $name = 'promote_' . $i;
-      global $$name;
-      if (isset($$name) && $i > 1) {
-          do_hook('options_identities_renumber', $i, $i - 1);
-	  
-	  $nameA = 'full_name' . $i;
-	  $nameB = 'full_name' . ($i - 1);
-	  global $$nameA, $$nameB;
-	  $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;
-	  $temp = $$nameA;
-	  $$nameA = $$nameB;
-	  $$nameB = $temp;
-	  
-	  return true;
-      }
-
-      $i ++;
-      $name = 'form_for_' . $i;
-      global $$name;
-   }
-   return false;
-}
+                $name = 'reply_to' . $i;
+                global $$name;
+            if ($$name != '')
+                $filled ++;
+                setPref($data_dir, $username, 'reply_to' . $fakeI, $$name);
+
+            if ($filled == 0)
+                $fakeI --;
+            }
+
+            $fakeI ++;
+            $i ++;
+            $name = 'form_for_' . $i;
+            global $$name;
+        }
+
+        setPref($data_dir, $username, 'identities', $fakeI);
+
+        while ($fakeI != $i)
+        {
+            removePref($data_dir, $username, 'full_name' . $fakeI);
+            removePref($data_dir, $username, 'email_address' . $fakeI);
+            removePref($data_dir, $username, 'reply_to' . $fakeI);
+            $fakeI ++;
+        }
+
+        setPref($data_dir, $username, 'full_name', $full_name);
+        setPref($data_dir, $username, 'email_address', $email_address);
+        setPref($data_dir, $username, 'reply_to', $reply_to);
+    }
+
+    function CheckAndDoDefault() {
+        global $username, $data_dir, $full_name, $email_address, $reply_to;
+
+        $i = 1;
+        $name = 'form_for_' . $i;
+        global $$name;
+        while (isset($$name))
+        {
+            $name = 'make_default_' . $i;
+            global $$name;
+            if (isset($$name)) {
+                do_hook('options_identities_renumber', $i, 'default');
+                global $full_name, $email_address, $reply_to;
+
+                $name = 'full_name' . $i;
+                global $$name;
+                $temp = $full_name;
+                $full_name = $$name;
+                $$name = $temp;
+
+                $name = 'email_address' . $i;
+                global $$name;
+                $temp = $email_address;
+                $email_address = $$name;
+                $$name = $temp;
+
+                $name = 'reply_to' . $i;
+                global $$name;
+                $temp = $reply_to;
+                $reply_to = $$name;
+                $$name = $temp;
+
+                return true;
+            }
+
+            $i ++;
+            $name = 'form_for_' . $i;
+            global $$name;
+        }
+        return FALSE;
+    }
 
-function LoadInfo(&$n, &$e, &$r, $post)
-{
-   global $username, $data_dir;
+    function CheckForDelete() {
+        global $username, $data_dir, $full_name, $email_address, $reply_to;
 
-   $n = getPref($data_dir, $username, 'full_name' . $post);
-   $e = getPref($data_dir, $username, 'email_address' . $post);
-   $r = getPref($data_dir, $username, 'reply_to' . $post);
+        $i = 1;
+        $name = 'form_for_' . $i;
+        global $$name;
+        while (isset($$name))
+        {
+            $name = 'delete_' . $i;
+            global $$name;
+            if (isset($$name)) {
+                return true;
+            }
+
+            $i ++;
+            $name = 'form_for_' . $i;
+            global $$name;
+        }
+        return false;
+    }
+
+    function CheckAndDoPromote() {
+        global $username, $data_dir, $full_name, $email_address, $reply_to;
+
+        $i = 1;
+        $name = 'form_for_' . $i;
+        global $$name;
+        while (isset($$name)) {
+            $name = 'promote_' . $i;
+            global $$name;
+            if (isset($$name) && $i > 1) {
+                do_hook('options_identities_renumber', $i, $i - 1);
+
+            $nameA = 'full_name' . $i;
+            $nameB = 'full_name' . ($i - 1);
+            global $$nameA, $$nameB;
+            $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;
+            $temp = $$nameA;
+            $$nameA = $$nameB;
+            $$nameB = $temp;
+
+            return true;
+            }
+
+            $i ++;
+            $name = 'form_for_' . $i;
+            global $$name;
+        }
+        return false;
+    }
+
+    function LoadInfo(&$n, &$e, &$r, $post) {
+        global $username, $data_dir;
+
+        $n = getPref($data_dir, $username, 'full_name' . $post);
+        $e = getPref($data_dir, $username, 'email_address' . $post);
+        $r = getPref($data_dir, $username, 'reply_to' . $post);
+
+        if ($n != '' || $e != '' || $r != '')
+            return true;
+    }
+
+function sti_input( $title, $hd, $data, $post, $bg ) {
+
+    echo "<tr$bg><td align=right nowrap>$title:".
+         '</td><td>'.
+         '<input size=50 type=text value="' . htmlspecialchars($data) .
+         "\" name=\"$hd$post\"></td></tr>";
 
-   if ($n != '' || $e != '' || $r != '')
-      return true;
 }
 
-function ShowTableInfo($full_name, $email_address, $reply_to, $post)
-{
-   global $color;
-   
-   $OtherBG = ' bgcolor="' . $color[0] . '"';
-   if ($full_name == '' && $email_address == '' && $reply_to == '')
-   	  $OtherBG = '';
+function ShowTableInfo($full_name, $email_address, $reply_to, $post) {
+    global $color;
 
-   if ($full_name == '' && $email_address == '' && $reply_to == '')
-      $isEmptySection = true;
-   else
-      $isEmptySection = false;
+    $OtherBG = ' bgcolor="' . $color[0] . '"';
+    if ($full_name == '' && $email_address == '' && $reply_to == '')
+        $OtherBG = '';
 
-?>
-  <tr<?PHP echo $OtherBG ?>>
-    <td align=right nowrap>
-      <?php echo _("Full Name"); ?>:
-    </td>
-    <td>
-      <input size=50 type=text value="<?php echo htmlspecialchars($full_name)
-      ?>" name="full_name<?PHP echo $post ?>"> 
-    </td>
-  </tr>
-  <tr<?PHP echo $OtherBG ?>>
-    <td align=right nowrap>
-      <?php echo _("E-Mail Address"); ?>:
-    </td>
-    <td>
-      <input size=50 type=text value="<?php echo htmlspecialchars($email_address)
-      ?>" name="email_address<?PHP echo $post ?>"> 
-    </td>
-  </tr>
-  <tr<?PHP echo $OtherBG ?>>
-    <td align=right nowrap>
-      <?php echo _("Reply To"); ?>:
-    </td>
-    <td>
-      <input size=50 type=text value="<?php echo htmlspecialchars($reply_to)
-      ?>" name="reply_to<?PHP echo $post ?>"> 
-    </td>
-  </tr>
-<?PHP do_hook('options_identities_table', $OtherBG, $isEmptySection, $post); ?>
-  <tr<?PHP echo $OtherBG ?>>
-    <td>&nbsp;</td><td>
-      <input type=hidden name="form_for_<?PHP echo $post ?>" value="1">
-      <input type=submit name="update" value="<?PHP echo _("Save / Update") ?>">
-<?PHP 
-   if (! $isEmptySection && $post != '') {
-?>
-      <input type=submit name="make_default_<?PHP echo $post ?>" value="<?PHP
-         echo _("Make Default") ?>">
-      <input type=submit name="delete_<?PHP echo $post ?>" value="<?PHP echo _("Delete") ?>">
-<?PHP
-   }
-   if (! $isEmptySection && $post != '' && $post > 1) {
-?>
-      <input type=submit name="promote_<?PHP echo $post ?>" value="<?PHP
-         echo _("Move Up") ?>">
-<?PHP
-   }
-   do_hook('options_identities_buttons', $isEmptySection, $post);
-?>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-<?PHP
+    if ($full_name == '' && $email_address == '' && $reply_to == '')
+        $isEmptySection = true;
+    else
+        $isEmptySection = false;
+
+    sti_input( _("Full Name"), 'full_name', $full_name, $post, $OtherBG );
+    sti_input( _("E-Mail Address"), 'email_address', $email_address, $post, $OtherBG );
+    sti_input( _("Reply To"), 'reply_to', $reply_to, $post, $OtherBG );
+
+    do_hook('options_identities_table', $OtherBG, $isEmptySection, $post);
+    echo "<tr$OtherBG>".
+         '<td>&nbsp;</td><td>'.
+         "<input type=hidden name=\"form_for_$post\" value=\"1\">".
+         '<input type=submit name="update" value="'.
+         _("Save / Update") . '">';
+    if (! $isEmptySection && $post != '') {
+        echo "<input type=submit name=\"make_default_$post\" value=\"".
+             _("Make Default") . '">'.
+             "<input type=submit name=\"delete_$post\" value=\"".
+             _("Delete") . '">';
+    }
+    if (! $isEmptySection && $post != '' && $post > 1) {
+        echo '<input type=submit name="promote_' . $post . '" value="'.
+             _("Move Up") . '">';
+    }
+    do_hook('options_identities_buttons', $isEmptySection, $post);
+    echo '</td></tr>'.
+         '<tr><td colspan="2">&nbsp;</td></tr>';
 }
+?>