extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust link() calls

Browse Source
This commit is contained in:
Miles Lott 2001-03-08 13:31:05 +00:00
parent ffadfe324e
commit 8eb384e4ee
7 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/acl_preferences.php
View File

@ -194,7 +194,7 @@
$var = Array( $var = Array(
'errors' => '', 'errors' => '',
'title' => '<p><b>'.lang($phpgw_info['flags']['currentapp'].' preferences').' - '.lang('acl').':</b><hr><p>', 'title' => '<p><b>'.lang($phpgw_info['flags']['currentapp'].' preferences').' - '.lang('acl').':</b><hr><p>',
'action_url' => $phpgw->link(''), 'action_url' => $phpgw->link('/addressbook/acl_preferences.php'),
'bg_color' => $phpgw_info['theme']['th_bg'], 'bg_color' => $phpgw_info['theme']['th_bg'],
'submit_lang' => lang('submit'), 'submit_lang' => lang('submit'),
'common_hidden_vars_form' => $common_hidden_vars 'common_hidden_vars_form' => $common_hidden_vars

4
addressbook/add.php
View File

@ -85,14 +85,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("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("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");

8
addressbook/delete.php
View File

@ -24,7 +24,7 @@
include("../header.inc.php"); include("../header.inc.php");
if (! $ab_id) { if (! $ab_id) {
@Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/")); @Header("Location: " . $phpgw->link("/addressbook/"));
} }
$this = CreateObject("phpgwapi.contacts"); $this = CreateObject("phpgwapi.contacts");
@ -36,9 +36,9 @@
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("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("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"));
$t->pparse("out","delete"); $t->pparse("out","delete");
@ -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($phpgw_info["server"]["webserver_url"]. "/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query")); @Header("Location: " . $phpgw->link("/addressbook/","cd=16&order=$order&sort=$sort&filter=$filter&start=$start&query=$query"));
} }
?> ?>

6
addressbook/edit.php
View File

@ -92,7 +92,7 @@
//} //}
addressbook_update_entry($ab_id,$userid,$fields); addressbook_update_entry($ab_id,$userid,$fields);
Header("Location: " . $phpgw->link("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();
} }
@ -106,8 +106,8 @@
$t->set_var("lang_cancel",lang("cancel")); $t->set_var("lang_cancel",lang("cancel"));
$t->set_var("lang_delete",lang("delete")); $t->set_var("lang_delete",lang("delete"));
$t->set_var("lang_submit",lang("submit")); $t->set_var("lang_submit",lang("submit"));
$t->set_var("cancel_link",'<form action="'.$phpgw->link("index.php","sort=$sort&order=$order&filter=$filter&start=$start") . '">'); $t->set_var("cancel_link",'<form action="'.$phpgw->link("/addressbook/index.php","sort=$sort&order=$order&filter=$filter&start=$start") . '">');
$t->set_var("delete_link",'<form action="'.$phpgw->link("delete.php","ab_id=$ab_id") . '">'); $t->set_var("delete_link",'<form action="'.$phpgw->link("/addressbook/delete.php","ab_id=$ab_id") . '">');
$t->parse("out","edit"); $t->parse("out","edit");
$t->pparse("out","edit"); $t->pparse("out","edit");

6
addressbook/vcardin.php
View File

@ -37,7 +37,7 @@
if ($action == "Load Vcard") { if ($action == "Load Vcard") {
if($uploadedfile == "none" || $uploadedfile == "") { if($uploadedfile == "none" || $uploadedfile == "") {
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/vcardin.php","action=GetFile")); Header("Location: " . $phpgw->link("/addressbook/vcardin.php","action=GetFile"));
} else { } else {
srand((double)microtime()*1000000); srand((double)microtime()*1000000);
$random_number = rand(100000000,999999999); $random_number = rand(100000000,999999999);
@ -61,7 +61,7 @@
// Delete the temp file. // Delete the temp file.
unlink($filename); unlink($filename);
unlink($filename . ".info"); unlink($filename . ".info");
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/addressbook/", "cd=14")); Header("Location: " . $phpgw->link("/addressbook/", "cd=14"));
} }
} }
@ -79,7 +79,7 @@
$vcard_header = "<p>&nbsp;<b>" . lang("Address book - VCard in") . "</b><hr><p>"; $vcard_header = "<p>&nbsp;<b>" . lang("Address book - VCard in") . "</b><hr><p>";
$t->set_var(vcard_header,$vcard_header); $t->set_var(vcard_header,$vcard_header);
$t->set_var(action_url,$phpgw->link("vcardin.php")); $t->set_var(action_url,$phpgw->link("/addressbook/vcardin.php"));
$t->set_var(lang_access,lang("Access")); $t->set_var(lang_access,lang("Access"));
$t->set_var(lang_groups,lang("Which groups")); $t->set_var(lang_groups,lang("Which groups"));

10
addressbook/vcardout.php
View File

@ -29,7 +29,7 @@
include("../header.inc.php"); include("../header.inc.php");
if (! $ab_id) { if (! $ab_id) {
Header("Location: " . $phpgw->link("index.php")); Header("Location: " . $phpgw->link("/addressbook/index.php"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
@ -72,10 +72,10 @@
/* First name and last must be in the vcard. */ /* First name and last must be in the vcard. */
if($lastname == "") { if($lastname == "") {
/* Run away here. */ /* 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")); Header("Location: " . $phpgw->link("/addressbook/vcardout.php","nolname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
} }
if($firstname == "" ) { 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("Location: " . $phpgw->link("/addressbook/vcardout.php","nofname=1&ab_id=$ab_id&start=$start&order=$order&filter=" . "$filter&query=$query&sort=$sort"));
} }
header("Content-type: text/X-VCARD"); header("Content-type: text/X-VCARD");
@ -133,7 +133,7 @@
echo "<BR><BR><CENTER>"; echo "<BR><BR><CENTER>";
echo lang("This person's first name was not in the address book.") ."<BR>"; echo lang("This person's first name was not in the address book.") ."<BR>";
echo lang("Vcards require a first name entry.") . "<BR><BR>"; echo lang("Vcards require a first name entry.") . "<BR><BR>";
echo "<a href=" . $phpgw->link("index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort") . ">OK</a>"; echo "<a href=" . $phpgw->link("/addressbook/index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort") . ">OK</a>";
echo "</CENTER>"; echo "</CENTER>";
} }
@ -141,7 +141,7 @@
echo "<BR><BR><CENTER>"; echo "<BR><BR><CENTER>";
echo lang("This person's last name was not in the address book.") . "<BR>"; echo lang("This person's last name was not in the address book.") . "<BR>";
echo lang("Vcards require a last name entry.") . "<BR><BR>"; echo lang("Vcards require a last name entry.") . "<BR><BR>";
echo "<a href=" . $phpgw->link("index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort") . ">OK</a>"; echo "<a href=" . $phpgw->link("/addressbook/index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort") . ">OK</a>";
echo "</CENTER>"; echo "</CENTER>";
} }

11
addressbook/view.php
View File

@ -32,7 +32,7 @@
$this = CreateObject("phpgwapi.contacts"); $this = CreateObject("phpgwapi.contacts");
if (! $ab_id) { if (! $ab_id) {
Header("Location: " . $phpgw->link("index.php")); Header("Location: " . $phpgw->link("/addressbook/index.php"));
} }
while ($column = each($this->stock_contact_fields)) { while ($column = each($this->stock_contact_fields)) {
@ -67,8 +67,7 @@
$data=$coldata.'</a>'; $data=$coldata.'</a>';
} elseif ($column[0] == "email") { } elseif ($column[0] == "email") {
if ($phpgw_info["user"]["apps"]["email"]) { if ($phpgw_info["user"]["apps"]["email"]) {
$ref='<a href="'.$phpgw->link($phpgw_info["server"]["webserver_url"] $ref='<a href="'.$phpgw->link("/email/compose.php","to=" . urlencode($coldata)).'" target="_new">';
. "/email/compose.php","to=" . urlencode($coldata)).'" target="_new">';
} else { } else {
$ref='<a href="mailto:'.$coldata.'">'; $ref='<a href="mailto:'.$coldata.'">';
} }
@ -93,9 +92,9 @@
. $phpgw->common->grab_owner_name($record_owner) . '</td><td><b>' . $phpgw->common->grab_owner_name($record_owner) . '</td><td><b>'
. $access_link . '</b></td><td></table>'; . $access_link . '</b></td><td></table>';
$editlink = $phpgw->common->check_owner($record_owner,"edit.php",lang("edit"),"ab_id=" . $ab_id . "&start=".$start."&sort=".$sort."&order=".$order); $editlink = $phpgw->common->check_owner($record_owner,"/addressbook/edit.php",lang("edit"),"ab_id=" . $ab_id . "&start=".$start."&sort=".$sort."&order=".$order);
$vcardlink = '<form action="'.$phpgw->link("vcardout.php","ab_id=$ab_id&order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">'; $vcardlink = '<form action="'.$phpgw->link("/addressbook/vcardout.php","ab_id=$ab_id&order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';
$donelink = '<form action="'.$phpgw->link("index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">'; $donelink = '<form action="'.$phpgw->link("/addressbook/index.php","order=$order&start=$start&filter=$filter&query=$query&sort=$sort").'">';
$t->set_var("access_link",$access_link); $t->set_var("access_link",$access_link);
$t->set_var("ab_id",$ab_id); $t->set_var("ab_id",$ab_id);