diff --git a/addressbook/delete.php b/addressbook/delete.php
index 414bde2911..9b1fa7408e 100755
--- a/addressbook/delete.php
+++ b/addressbook/delete.php
@@ -31,28 +31,18 @@
$t = new Template($phpgw->common->get_tpl_dir("addressbook"));
$t->set_file(array("delete" => "delete.tpl"));
- $rights = $phpgw->acl->get_rights($owner,$phpgw_info["flags"]["currentapp"]);
- if ( ($rights & PHPGW_ACL_DELETE) || ($owner == $phpgw_info["user"]["account_id"]) ) {
- $phpgw->common->phpgw_header();
- echo parse_navbar();
- if ($confirm != "true") {
- $t->set_var(lang_sure,lang("Are you sure you want to delete this entry ?"));
- $t->set_var(no_link,$phpgw->link("view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
- $t->set_var(lang_no,lang("NO"));
- $t->set_var(yes_link,$phpgw->link("delete.php","ab_id=$ab_id&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
- $t->set_var(lang_yes,lang("YES"));
- $t->pparse("out","delete");
+ if ($confirm != "true") {
+ $t->set_var(lang_sure,lang("Are you sure you want to delete this entry ?"));
+ $t->set_var(no_link,$phpgw->link("view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
+ $t->set_var(lang_no,lang("NO"));
+ $t->set_var(yes_link,$phpgw->link("delete.php","ab_id=$ab_id&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
+ $t->set_var(lang_yes,lang("YES"));
+ $t->pparse("out","delete");
- $phpgw->common->phpgw_footer();
- } else {
- $this->account_id=$phpgw_info["user"]["account_id"];
- $this->delete($ab_id);
- @Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]. "/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
-
- }
+ $phpgw->common->phpgw_footer();
} else {
- $phpgw->redirect($phpgw->session->link($phpgw_info["server"]["webserver_url"]. "/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
- $phpgw->common->phpgw_exit();
+ $this->account_id=$phpgw_info["user"]["account_id"];
+ $this->delete($ab_id);
+ @Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]. "/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
}
-
?>
diff --git a/addressbook/vcardout.php b/addressbook/vcardout.php
index ac03584897..2dd06eaa8f 100644
--- a/addressbook/vcardout.php
+++ b/addressbook/vcardout.php
@@ -29,98 +29,99 @@
$this = CreateObject("phpgwapi.contacts");
- if ($filter != "private")
+ //if ($filter != "private")
//$filtermethod = " or ab_access='public' " . $phpgw->accounts->sql_search("ab_access");
- $fields = addressbook_read_entry($ab_id,$this->stock_contact_fields);
+ $fieldlist = addressbook_read_entry($ab_id,$this->stock_contact_fields);
+ $fields = $fieldlist[0];
- $email = $fields[0]["d_email"];
- $fullname = $fields[0]["fn"];
- $prefix = $fields[0]["n_prefix"];
- $firstname = $fields[0]["n_given"];
- $middle = $fields[0]["n_middle"];
- $lastname = $fields[0]["n_family"];
- $suffix = $fields[0]["n_suffix"];
- $title = $fields[0]["title"];
- $hphone = $fields[0]["a_tel"];
- $wphone = $fields[0]["b_tel"];
- $fax = $fields[0]["c_tel"];
- $pager = $fields[0]["pager"];
- $mphone = $fields[0]["mphone"];
- $ophone = $fields[0]["ophone"];
- $street = $fields[0]["adr_street"];
- $address2 = $fields[0]["address2"];
- $city = $fields[0]["adr_locality"];
- $state = $fields[0]["adr_region"];
- $zip = $fields[0]["adr_postalcode"];
- $country = $fields[0]["adr_countryname"];
- $company = $fields[0]["org_name"];
- $dept = $fields[0]["org_unit"];
- $bday = $fields[0]["bday"];
- $notes = $fields[0]["notes"];
- $access = $fields[0]["access"];
- $url = $fields[0]["url"];
+ $email = $fields["d_email"];
+ $fullname = $fields["fn"];
+ $prefix = $fields["n_prefix"];
+ $firstname = $fields["n_given"];
+ $middle = $fields["n_middle"];
+ $lastname = $fields["n_family"];
+ $suffix = $fields["n_suffix"];
+ $title = $fields["title"];
+ $hphone = $fields["a_tel"];
+ $wphone = $fields["b_tel"];
+ $fax = $fields["c_tel"];
+ $pager = $fields["pager"];
+ $mphone = $fields["mphone"];
+ $ophone = $fields["ophone"];
+ $street = $fields["adr_street"];
+ $address2 = $fields["address2"];
+ $city = $fields["adr_locality"];
+ $state = $fields["adr_region"];
+ $zip = $fields["adr_postalcode"];
+ $country = $fields["adr_countryname"];
+ $company = $fields["org_name"];
+ $dept = $fields["org_unit"];
+ $bday = $fields["bday"];
+ $notes = $fields["notes"];
+ $access = $fields["access"];
+ $url = $fields["url"];
- if(!$nolname && !$nofname) {
- /* First name and last must be in the vcard. */
- if($lastname == "") {
- /* Run away here. */
- Header("Location: " . $phpgw->link("vcardout.php","nolname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
- }
- if($firstname == "" ) {
- Header("Location: " . $phpgw->link("vcardout.php","nofname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
- }
+ if(!$nolname && !$nofname) {
+ /* First name and last must be in the vcard. */
+ if($lastname == "") {
+ /* Run away here. */
+ Header("Location: " . $phpgw->link("vcardout.php","nolname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
+ }
+ if($firstname == "" ) {
+ Header("Location: " . $phpgw->link("vcardout.php","nofname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
+ }
- header("Content-type: text/X-VCARD");
- $fn = explode("@",$email);
- $filename = sprintf("%s.vcf", $fn[0]);
+ header("Content-type: text/X-VCARD");
+ $fn = explode("@",$email);
+ $filename = sprintf("%s.vcf", $fn[0]);
- header("Content-Disposition: attachment; filename=$filename");
+ header("Content-Disposition: attachment; filename=$filename");
- printf("BEGIN:VCARD\r\n");
- printf("N:%s;%s\r\n", $lastname, $firstname);
- if (!$fullname) { printf("FN:%s %s\r\n", $firstname, $lastname); }
- else { printf("FN:%s\r\n", $fullname); }
+ printf("BEGIN:VCARD\r\n");
+ printf("N:%s;%s\r\n", $lastname, $firstname);
+ if (!$fullname) { printf("FN:%s %s\r\n", $firstname, $lastname); }
+ else { printf("FN:%s\r\n", $fullname); }
- /* This stuff is optional. */
- if($title != "") /* Title */
- printf("TITLE:%s\r\n",$title);
- if($email != "") /* E-mail */
- printf("EMAIL;INTERNET:%s\r\n", $email);
- if($hphone != "") /* Home Phone */
- printf("TEL;HOME:%s\r\n", $hphone);
- if($wphone != "") /* Work Phone */
- printf("TEL;WORK:%s\r\n", $wphone);
- if($mphone != "") /* Mobile Phone */
- printf("TEL;CELL:%s\r\n", $mphone);
- if($fax != "") /* Fax Number */
- printf("TEL;FAX:%s\r\n", $fax);
- if($pager != "") /* Pager Number */
- printf("TEL;PAGER:%s\r\n", $pager);
- //if($ophone != "") /* Other Phone */
- //$NOTES .= "Other Phone: " . $ophone;
- /* The address one is pretty icky. Send it if ANY of the fields are present. */
- if($address2 != "" || /* Street Line 1 */
- $street != "" || /* Street Line 2 */
- $city != "" || /* City */
- $state != "" || /* State */
- $zip != "") /* Zip */
- printf("ADR:;%s;%s;%s;%s;%s;%s\r\n", $address2,
- $street,$city,$state,$zip,$country);
+ /* This stuff is optional. */
+ if($title != "") /* Title */
+ printf("TITLE:%s\r\n",$title);
+ if($email != "") /* E-mail */
+ printf("EMAIL;INTERNET:%s\r\n", $email);
+ if($hphone != "") /* Home Phone */
+ printf("TEL;HOME:%s\r\n", $hphone);
+ if($wphone != "") /* Work Phone */
+ printf("TEL;WORK:%s\r\n", $wphone);
+ if($mphone != "") /* Mobile Phone */
+ printf("TEL;CELL:%s\r\n", $mphone);
+ if($fax != "") /* Fax Number */
+ printf("TEL;FAX:%s\r\n", $fax);
+ if($pager != "") /* Pager Number */
+ printf("TEL;PAGER:%s\r\n", $pager);
+ //if($ophone != "") /* Other Phone */
+ //$NOTES .= "Other Phone: " . $ophone;
+ /* The address one is pretty icky. Send it if ANY of the fields are present. */
+ if($address2 != "" || /* Street Line 1 */
+ $street != "" || /* Street Line 2 */
+ $city != "" || /* City */
+ $state != "" || /* State */
+ $zip != "") /* Zip */
+ printf("ADR:;%s;%s;%s;%s;%s;%s\r\n", $address2,
+ $street,$city,$state,$zip,$country);
- if($bday != "" && $bday != "//") /* Birthday */
- printf("BDAY:%s\r\n", $bday); /* This is not the right format. */
- if($company != "") /* Company Name (Really isn't company_name?) */
- printf("ORG:%s %s\r\n", $company, $dept);
- if($notes != "") /* Notes */
- $NOTES .= $notes;
+ if($bday != "" && $bday != "//") /* Birthday */
+ printf("BDAY:%s\r\n", $bday); /* This is not the right format. */
+ if($company != "") /* Company Name (Really isn't company_name?) */
+ printf("ORG:%s %s\r\n", $company, $dept);
+ if($notes != "") /* Notes */
+ $NOTES .= $notes;
- if($NOTES != "") /* All of the notes. */
- printf("NOTE:%s\r\n", $NOTES);
- /* End of Stuff. */
- printf("VERSION:2.1\r\n");
- printf("END:VCARD\r\n");
- } /* !nolname && !nofname */
+ if($NOTES != "") /* All of the notes. */
+ printf("NOTE:%s\r\n", $NOTES);
+ /* End of Stuff. */
+ printf("VERSION:2.1\r\n");
+ printf("END:VCARD\r\n");
+ } /* !nolname && !nofname */
if($nofname) {
echo "
";