Updated to the new link()

This commit is contained in:
jengo 2001-03-08 23:55:58 +00:00
parent 25fe742367
commit ee94089549
4 changed files with 9 additions and 10 deletions

View File

@ -29,8 +29,7 @@
$this = CreateObject("phpgwapi.contacts"); $this = CreateObject("phpgwapi.contacts");
if ($AddVcard){ if ($AddVcard){
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . Header("Location: " . $phpgw->link("/addressbook/vcardin.php"));
"/addressbook/vcardin.php"));
} else if ($add_email) { } else if ($add_email) {
list($fields["firstname"],$fields["lastname"]) = explode(" ", $name); list($fields["firstname"],$fields["lastname"]) = explode(" ", $name);
$fields["email"] = $add_email; $fields["email"] = $add_email;
@ -85,14 +84,14 @@
addressbook_add_entry($phpgw_info["user"]["account_id"],$fields); addressbook_add_entry($phpgw_info["user"]["account_id"],$fields);
$ab_id = addressbook_get_lastid(); $ab_id = addressbook_get_lastid();
Header("Location: " . $phpgw->link("/addressbook/view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start")); Header("Location: " . $phpgw->link("/addressbook/view.php","ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
$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("cancel_url",$phpgw->link("/addressbook/index.php?sort=$sort&order=$order&filter=$filter&start=$start")); $t->set_var("cancel_url",$phpgw->link("/addressbook/index.php","sort=$sort&order=$order&filter=$filter&start=$start"));
$t->parse("out","add"); $t->parse("out","add");
$t->pparse("out","add"); $t->pparse("out","add");

View File

@ -24,7 +24,7 @@
include("../header.inc.php"); include("../header.inc.php");
if (! $ab_id) { if (! $ab_id) {
@Header("Location: " . $phpgw->link("/addressbook/")); @Header("Location: " . $phpgw->link("/addressbook/index.php"));
} }
$this = CreateObject("phpgwapi.contacts"); $this = CreateObject("phpgwapi.contacts");
@ -36,7 +36,7 @@
if ($confirm != "true") { if ($confirm != "true") {
$t->set_var(lang_sure,lang("Are you sure you want to delete this entry ?")); $t->set_var(lang_sure,lang("Are you sure you want to delete this entry ?"));
$t->set_var(no_link,$phpgw->link("/addressbook/view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query")); $t->set_var(no_link,$phpgw->link("/addressbook/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(lang_no,lang("NO"));
$t->set_var(yes_link,$phpgw->link("/addressbook/delete.php","ab_id=$ab_id&confirm=true&order=$order&sort=$sort&filter=$filter&start=$start&query=$query")); $t->set_var(yes_link,$phpgw->link("/addressbook/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->set_var(lang_yes,lang("YES"));
@ -46,6 +46,6 @@
} else { } else {
$this->account_id=$phpgw_info["user"]["account_id"]; $this->account_id=$phpgw_info["user"]["account_id"];
$this->delete($ab_id); $this->delete($ab_id);
@Header("Location: " . $phpgw->link("/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query")); @Header("Location: " . $phpgw->link("/addressbook/index.php","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
} }
?> ?>

View File

@ -27,7 +27,7 @@
$t->set_file(array( "edit" => "edit.tpl")); $t->set_file(array( "edit" => "edit.tpl"));
if (! $ab_id) { if (! $ab_id) {
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]. "/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query")); Header("Location: " . $phpgw->link('/addressbook/index.php',"cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
@ -92,7 +92,7 @@
//} //}
addressbook_update_entry($ab_id,$userid,$fields); addressbook_update_entry($ab_id,$userid,$fields);
Header("Location: " . $phpgw->link("/addressbook/view.php","&ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start")); Header("Location: " . $phpgw->link("/addressbook/view.php","ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }

View File

@ -290,7 +290,7 @@
} }
if ($action) { if ($action) {
echo "<FORM action=\"".$phpgw->link($action)."\" method=\"post\">\n"; echo "<FORM action=\"".$phpgw->link('/addressbook/' . $action)."\" method=\"post\">\n";
} }
// test: // test: