holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove acl code

Browse Source
This commit is contained in:
Miles Lott 2001-02-17 10:35:10 +00:00
parent aed86715fe
commit 65005c07fb
2 changed files with 94 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/delete.php
View File

@ -31,10 +31,6 @@
$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"));
@ -48,11 +44,5 @@
$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"));
}
} 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();
}
?>

57
addressbook/vcardout.php
View File

@ -29,37 +29,38 @@
$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. */