X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_identities.php;h=310f06079af83abcd0b58d37172a60eed2e040d3;hb=34a6b7c2cede50f12a9ce43fef49e28ce324d3b6;hp=aff95a75c31fe7aa32ff05548d3cae94ca663fc9;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git
diff --git a/src/options_identities.php b/src/options_identities.php
index aff95a75..310f0607 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -11,48 +11,34 @@
* $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();
- header('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();
-
- LoadInfo($full_name, $email_address, $reply_to, '');
+ if (isset($return)) {
+ SaveUpdateFunction();
+ header('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();
+ }
+
+ LoadInfo($full_name, $email_address, $reply_to, $signature, '');
?>
-
@@ -60,38 +46,37 @@ require_once('../functions/display_messages.php');
|