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

More query string handling

Browse Source
This commit is contained in:
Miles Lott 2001-03-28 01:59:08 +00:00
parent d58fc5bfcd
commit 561670a24d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/export.php
View File

@ -53,11 +53,13 @@
$t->set_var("lang_cancel",lang("Cancel"));
$t->set_var("lang_cat",lang("Select Category"));
$t->set_var("cat_id",cat_option($cat_id,'ncat_id',True));
$t->set_var("cancel_url",$phpgw->link("/addressbook/index.php"));
$t->set_var("cancel_url",$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
$t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
$t->set_var("navbar_text",$phpgw_info["theme"]["navbar_text"]);
$t->set_var("export_text",lang("Export from Addressbook"));
$t->set_var("action_url",$phpgw->link("/addressbook/export.php"));
$t->set_var("action_url",$phpgw->link("/addressbook/export.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
$t->set_var("filename",lang("Export file name"));
$t->set_var("conv",$conv);
$t->set_var("debug",lang(""));
@ -116,7 +118,9 @@
echo "<pre>\n";
echo $buffer;
echo "\n</pre>\n";
echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}
}

11
addressbook/import.php
View File

@ -58,7 +58,8 @@
$t->set_var("navbar_bg",$phpgw_info["theme"]["navbar_bg"]);
$t->set_var("navbar_text",$phpgw_info["theme"]["navbar_text"]);
$t->set_var("import_text",lang("Import from LDIF, CSV, or VCard"));
$t->set_var("action_url",$phpgw->link("/addressbook/import.php"));
$t->set_var("action_url",$phpgw->link("/addressbook/import.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
$t->set_var("cat_id",cat_option($cat_id,True));
$t->set_var("tsvfilename","");
$t->set_var("conv",$conv);
@ -169,12 +170,16 @@
echo $buffer;
} else {
echo "<pre>$buffer</pre>";
echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}
} else {
echo "<pre>$buffer</pre>";
echo '<a href="'.$phpgw->link("/addressbook/index.php").'">'.lang("OK").'</a>';
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}
}