Formatting

This commit is contained in:
Miles Lott 2001-05-06 16:24:20 +00:00
parent 38882f39ae
commit b5453e9b73

View File

@ -34,16 +34,17 @@
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
$t = new Template($phpgw->common->get_tpl_dir("addressbook")); $t = new Template($phpgw->common->get_tpl_dir('addressbook'));
$t->set_file(array("edit" => "edit.tpl")); $t->set_file(array('edit' => 'edit.tpl'));
if (! $ab_id) { if (!$ab_id)
{
Header("Location: " Header("Location: "
. $phpgw->link('/addressbook/index.php',"cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id")); . $phpgw->link('/addressbook/index.php',"cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
if (! $submit) if (!$submit)
{ {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
echo parse_navbar(); echo parse_navbar();
@ -51,32 +52,41 @@
// Read in user custom fields, if any // Read in user custom fields, if any
$customfields = array(); $customfields = array();
while (list($col,$descr) = @each($phpgw_info["user"]["preferences"]["addressbook"])) { while (list($col,$descr) = @each($phpgw_info['user']['preferences']['addressbook']))
if ( substr($col,0,6) == 'extra_' ) { {
if ( substr($col,0,6) == 'extra_' )
{
$field = ereg_replace('extra_','',$col); $field = ereg_replace('extra_','',$col);
$field = ereg_replace(' ','_',$field); $field = ereg_replace(' ','_',$field);
$customfields[$field] = ucfirst($field); $customfields[$field] = ucfirst($field);
} }
} }
if (!$submit) { if (!$submit)
{
// merge in extra fields // merge in extra fields
$extrafields = array( $extrafields = array(
"ophone" => "ophone", 'ophone' => 'ophone',
"address2" => "address2", 'address2' => 'address2',
"address3" => "address3" 'address3' => 'address3'
); );
$qfields = $this->stock_contact_fields + $extrafields + $customfields; $qfields = $this->stock_contact_fields + $extrafields + $customfields;
$fields = addressbook_read_entry($ab_id,$qfields); $fields = addressbook_read_entry($ab_id,$qfields);
addressbook_form("edit","edit.php","Edit",$fields[0],$customfields); addressbook_form('edit','edit.php','Edit',$fields[0],$customfields);
} else { }
if ($url == "http://") { else
{
if ($url == "http://")
{
$url = ""; $url = "";
} }
if (! $bday_month && ! $bday_day && ! $bday_year) { if (!$bday_month && !$bday_day && !$bday_year)
{
$bday = ""; $bday = "";
} else { }
else
{
if (strlen ($bday_day) == 1) if (strlen ($bday_day) == 1)
{ {
$bday_day = "0".$bday_day; $bday_day = "0".$bday_day;
@ -84,87 +94,93 @@
$bday = "$bday_month/$bday_day/$bday_year"; $bday = "$bday_month/$bday_day/$bday_year";
} }
$fields["org_name"] = $company; $fields['org_name'] = $company;
$fields["org_unit"] = $department; $fields['org_unit'] = $department;
$fields["n_given"] = $firstname; $fields['n_given'] = $firstname;
$fields["n_family"] = $lastname; $fields['n_family'] = $lastname;
$fields["n_middle"] = $middle; $fields['n_middle'] = $middle;
$fields["n_prefix"] = $prefix; $fields['n_prefix'] = $prefix;
$fields["n_suffix"] = $suffix; $fields['n_suffix'] = $suffix;
if ($prefix) { $pspc = " "; } if ($prefix) { $pspc = ' '; }
if ($middle) { $mspc = " "; } else { $nspc = " "; } if ($middle) { $mspc = ' '; } else { $nspc = ' '; }
if ($suffix) { $sspc = " "; } if ($suffix) { $sspc = ' '; }
$fields["fn"] = $prefix.$pspc.$firstname.$nspc.$mspc.$middle.$mspc.$lastname.$sspc.$suffix; $fields['fn'] = $prefix.$pspc.$firstname.$nspc.$mspc.$middle.$mspc.$lastname.$sspc.$suffix;
$fields["email"] = $email; $fields['email'] = $email;
$fields["email_type"] = $email_type; $fields['email_type'] = $email_type;
$fields["email_home"] = $hemail; $fields['email_home'] = $hemail;
$fields["email_home_type"] = $hemail_type; $fields['email_home_type'] = $hemail_type;
$fields["title"] = $title; $fields['title'] = $title;
$fields["tel_work"] = $wphone; $fields['tel_work'] = $wphone;
$fields["tel_home"] = $hphone; $fields['tel_home'] = $hphone;
$fields["tel_fax"] = $fax; $fields['tel_fax'] = $fax;
$fields["tel_pager"] = $pager; $fields['tel_pager'] = $pager;
$fields["tel_cell"] = $mphone; $fields['tel_cell'] = $mphone;
$fields["tel_msg"] = $msgphone; $fields['tel_msg'] = $msgphone;
$fields["tel_car"] = $carphone; $fields['tel_car'] = $carphone;
$fields["tel_video"] = $vidphone; $fields['tel_video'] = $vidphone;
$fields["tel_isdn"] = $isdnphone; $fields['tel_isdn'] = $isdnphone;
$fields["tel_prefer"] = $tel_prefer; $fields['tel_prefer'] = $tel_prefer;
$fields["adr_one_street"] = $bstreet; $fields['adr_one_street'] = $bstreet;
$fields["adr_one_locality"] = $bcity; $fields['adr_one_locality'] = $bcity;
$fields["adr_one_region"] = $bstate; $fields['adr_one_region'] = $bstate;
$fields["adr_one_postalcode"] = $bzip; $fields['adr_one_postalcode'] = $bzip;
$fields["adr_one_countryname"] = $bcountry; $fields['adr_one_countryname'] = $bcountry;
reset($this->adr_types); reset($this->adr_types);
$typed = ''; $typed = '';
while (list($type,$val) = each($this->adr_types)) { while (list($type,$val) = each($this->adr_types))
{
$ftype = 'one_'.$type; $ftype = 'one_'.$type;
eval("if (\$\$ftype=='on'\) { \$typed \.= \$type\.';'; }"); eval("if (\$\$ftype=='on'\) { \$typed \.= \$type\.';'; }");
} }
$fields["adr_one_type"] = substr($typed,0,-1); $fields['adr_one_type'] = substr($typed,0,-1);
$fields["address2"] = $address2; $fields['address2'] = $address2;
$fields["address3"] = $address3; $fields['address3'] = $address3;
$fields["adr_two_street"] = $hstreet; $fields['adr_two_street'] = $hstreet;
$fields["adr_two_locality"] = $hcity; $fields['adr_two_locality'] = $hcity;
$fields["adr_two_region"] = $hstate; $fields['adr_two_region'] = $hstate;
$fields["adr_two_postalcode"] = $hzip; $fields['adr_two_postalcode'] = $hzip;
$fields["adr_two_countryname"] = $hcountry; $fields['adr_two_countryname'] = $hcountry;
reset($this->adr_types); reset($this->adr_types);
$typed = ''; $typed = '';
while (list($type,$val) = each($this->adr_types)) { while (list($type,$val) = each($this->adr_types))
{
$ftype = 'two_'.$type; $ftype = 'two_'.$type;
eval("if \(\$\$ftype=='on'\) { \$typed \.= \$type\.';'; }"); eval("if \(\$\$ftype=='on'\) { \$typed \.= \$type\.';'; }");
} }
$fields["adr_two_type"] = substr($typed,0,-1); $fields["adr_two_type"] = substr($typed,0,-1);
reset($customfields); reset($customfields);
while (list($name,$val) = each($customfields)) { while (list($name,$val) = each($customfields))
{
$cust = ''; $cust = '';
eval("if (\$name\) { \$cust \.= \$\$name; }"); eval("if (\$name\) { \$cust \.= \$\$name; }");
if ($cust) { $fields[$name] = $cust; } if ($cust) { $fields[$name] = $cust; }
} }
$fields["ophone"] = $ophone; $fields['ophone'] = $ophone;
$fields["tz"] = $timezone; $fields['tz'] = $timezone;
$fields["bday"] = $bday; $fields['bday'] = $bday;
$fields["url"] = $url; $fields['url'] = $url;
$fields["pubkey"] = $pubkey; $fields['pubkey'] = $pubkey;
$fields["note"] = $notes; $fields['note'] = $notes;
$fields["label"] = $label; $fields['label'] = $label;
if ($access == True || $access == "private") { if ($access == True || $access == 'private')
$fields["access"] = 'private'; {
} else { $fields['access'] = 'private';
$fields["access"] = 'public'; }
else
{
$fields['access'] = 'public';
} }
$fields["cat_id"] = $cat_id; $fields['cat_id'] = $cat_id;
if (($this->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) && $check[0]['owner'] != $phpgw_info['user']['account_id']) if (($this->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) && $check[0]['owner'] != $phpgw_info['user']['account_id'])
{ {
@ -172,28 +188,28 @@
} }
else else
{ {
$userid = $phpgw_info["user"]["account_id"]; $userid = $phpgw_info['user']['account_id'];
} }
addressbook_update_entry($ab_id,$userid,$fields,$fields['access'],$fields["cat_id"]); addressbook_update_entry($ab_id,$userid,$fields,$fields['access'],$fields['cat_id']);
$referer = urlencode($referer); $referer = urlencode($referer);
Header("Location: " Header("Location: "
. $phpgw->link("/addressbook/view.php","ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id&referer=$referer")); . $phpgw->link('/addressbook/view.php',"ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id&referer=$referer"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
$t->set_var("ab_id",$ab_id); $t->set_var('ab_id',$ab_id);
$t->set_var("sort",$sort); $t->set_var('sort',$sort);
$t->set_var("order",$order); $t->set_var('order',$order);
$t->set_var("filter",$filter); $t->set_var('filter',$filter);
$t->set_var("query",$query); $t->set_var('query',$query);
$t->set_var("start",$start); $t->set_var('start',$start);
$t->set_var("cat_id",$cat_id); $t->set_var('cat_id',$cat_id);
$t->set_var("lang_ok",lang("ok")); $t->set_var('lang_ok',lang('ok'));
$t->set_var("lang_clear",lang("clear")); $t->set_var('lang_clear',lang('clear'));
$t->set_var("lang_cancel",lang("cancel")); $t->set_var('lang_cancel',lang('cancel'));
$t->set_var("lang_submit",lang("submit")); $t->set_var('lang_submit',lang('submit'));
$t->set_var("cancel_link",'<form method="POST" action="' . $phpgw->link("/addressbook/index.php") . '">'); $t->set_var('cancel_link','<form method="POST" action="' . $phpgw->link("/addressbook/index.php") . '">');
if (($this->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) || $check[0]['owner'] == $phpgw_info['user']['account_id']) if (($this->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) || $check[0]['owner'] == $phpgw_info['user']['account_id'])
{ {
@ -201,7 +217,7 @@
$t->set_var('delete_button','<input type="submit" name="delete" value="' . lang('Delete') . '">'); $t->set_var('delete_button','<input type="submit" name="delete" value="' . lang('Delete') . '">');
} }
$t->pfp("out","edit"); $t->pfp('out','edit');
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();
?> ?>