[Phpgroupware-cvs] phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php, 1.1.2.2

[nomail]

Update of /phpgroupware/ipc_test_suite/sources/api
Modified Files:
        Branch: Version-0_9_16-branch
          class.vcard.inc.php

date: 2004/04/15 13:45:32;  author: mkaemmerer;  state: Exp;  lines: +18 -6

Log Message:
- updated from ds
=====================================================================
No syntax errors detected in -
=====================================================================
Index: phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php
diff -u phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php:1.1.2.1 
phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php:1.1.2.2
--- phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php:1.1.2.1 Sun Apr 
11 13:08:13 2004
+++ phpgroupware/ipc_test_suite/sources/api/class.vcard.inc.php Thu Apr 15 
13:45:32 2004
@@ -685,13 +685,19 @@
                                }
                        }
 
-                       if (isset($org_name) && ($org_name!=''))
+                       if(isset($org_name) && ($org_name!=''))
                        {
                                $org = $org_name;
                                if (isset($org_unit) && ($org_unit!=''))
                                        $org .= $org_unit;
                                $entries .= 'ORG;ENCODING=QUOTED-PRINTABLE:' . 
$org . "\r\n";
                        }
+                       else
+                       {
+                               if(isset($org_unit) && ($org_unit!=''))
+                                       $entries .= 
'ORG;ENCODING=QUOTED-PRINTABLE:' . $org_unit . "\r\n";
+                       }
+                       
 
                        if(isset($workaddr) && is_array($workaddr))
                        {
@@ -708,7 +714,7 @@
                                if (strlen($workaddr) > 6) 
                                  $work = 'A.ADR;' . $workattr . 
';ENCODING=QUOTED-PRINTABLE:' . $workaddr . "\r\n";
                                else
-                                 $work;
+                                 $work = '';
                                $wlabel = 
'LABEL;TYPE=WORK;ENCODING=QUOTED-PRINTABLE:' . $wlabel . "\r\n";
                        }
 
@@ -727,12 +733,13 @@
                                if (strlen($homeaddr) > 6) 
                                  $home = 'B.ADR;' . $homeattr . 
';ENCODING=QUOTED-PRINTABLE:' . $homeaddr . "\r\n";
                                else
-                                 $home;
+                                 $home = '';
                                $hlabel = 
'LABEL;TYPE=HOME;ENCODING=QUOTED-PRINTABLE:' . $hlabel . "\r\n";
                        }
 
                        $entries = ereg_replace('PUBKEY','KEY',$entries);
                        $entries .= $work . $home . $wlabel . $hlabel . 
'END:VCARD' . "\r\n";
+                       $entries .= "\r\n";
 
                        $buffer = $entries;
                        return $buffer;
@@ -934,13 +941,18 @@
                                }
                        }
 
-                       if (isset($org_name) && ($org_name!=''))
+                       if(isset($org_name) && ($org_name!=''))
                        {
                                $org = $org_name;
                                if (isset($org_unit) && ($org_unit!=''))
                                        $org .= $org_unit;
                                $entries .= 'ORG:' . $this->vCard_encode($org, 
false, 'UTF-8') . "\r\n";
                        }
+                       else
+                       {
+                               if(isset($org_unit) && ($org_unit!=''))
+                                       $entries .= 'ORG:' . 
$this->vCard_encode($org_unit, false, 'UTF-8') . "\r\n";
+                       }
 
                        if(isset($workaddr) && is_array($workaddr))
                        {
@@ -957,7 +969,7 @@
                                if (strlen($workaddr) > 6) 
                                  $work = 'ADR;' . $workattr . ':' . $workaddr 
. "\r\n";
                                else
-                                 $work = "";
+                                 $work = '';
                    }
                        
                        if(isset($homeaddr) && is_array($homeaddr))
@@ -975,7 +987,7 @@
                                if (strlen($homeaddr) > 6) 
                                  $home = 'ADR;' . $homeattr . ':' . $homeaddr 
. "\r\n";
                                else
-                                 $home = "";
+                                 $home = '';
                                
                        }