code clean up. No need to use isset because the vars are properly

initialized

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3811 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/AddressStructure.class.php b/class/mime/AddressStructure.class.php
index ed5d9f21d9fb0cd8a060433bb966c45507b79ef3..f2144c126a8e334fb6fad8012e114ac3d3987b52 100644 (file)
--- a/class/mime/AddressStructure.class.php
+++ b/class/mime/AddressStructure.class.php
@@ -22,17 +22,11 @@ class AddressStructure {
         $result = '';
 
         if (is_object($this)) {
-            if (isset($this->host) && ($this->host != '')) {
-                $email = $this->mailbox.'@'.$this->host;
-            } else {
-                $email = $this->mailbox;
-            }
-            if (trim($this->personal) != '') {
-                if ($email) {
-                    $addr = '"' . $this->personal . '" <' .$email.'>';
-                } else {
-                    $addr = $this->personal;
-                }
+            $email = ($this->host ? $this->mailbox.'@'.$this->host
+                                 : $this->mailbox);
+            if (trim($this->personal)) {
+               $addr = ($email ? '"' . $this->personal . '" <' .$email.'>'
+                               : $this->personal);
                 $best_dpl = $this->personal;
             } else {
                 $addr = $email;