From 1e1b56cc8b7c4d256a829385eacc715ab516ba38 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Thu, 29 Mar 2001 11:02:14 +0000 Subject: [PATCH] More POST fixes --- addressbook/export.php | 17 ++++++++------ addressbook/import.php | 19 +++++++++------- addressbook/templates/default/export.tpl | 14 +++++++++++- addressbook/templates/default/import.tpl | 28 +++++++++++++++++------- 4 files changed, 54 insertions(+), 24 deletions(-) diff --git a/addressbook/export.php b/addressbook/export.php index 0787f59dc2..20d02fd346 100644 --- a/addressbook/export.php +++ b/addressbook/export.php @@ -52,19 +52,22 @@ $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", - "sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")); + $t->set_var("cat_link",cat_option($cat_id,'ncat_id',True)); + $t->set_var("cancel_url",$phpgw->link("/addressbook/index.php")); $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", - "sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")); + $t->set_var("action_url",$phpgw->link("/addressbook/export.php")); $t->set_var("filename",lang("Export file name")); $t->set_var("conv",$conv); $t->set_var("debug",lang("")); $t->set_var("download",lang("Submit")); - + $t->set_var("start",$start); + $t->set_var("sort",$sort); + $t->set_var("order",$order); + $t->set_var("filter",$filter); + $t->set_var("query",$query); + $t->set_var("cat_id",$cat_id); $t->pparse("out","export"); $phpgw->common->phpgw_footer(); @@ -119,7 +122,7 @@ echo $buffer; echo "\n\n"; echo ''.lang("OK").''; $phpgw->common->phpgw_footer(); } diff --git a/addressbook/import.php b/addressbook/import.php index fb4a05ec5d..37fed2f0f3 100644 --- a/addressbook/import.php +++ b/addressbook/import.php @@ -53,14 +53,12 @@ $t->set_var("lang_cancel",lang("Cancel")); $t->set_var("lang_cat",lang("Select Category")); - $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("cancel_url",$phpgw->link("/addressbook/index.php")); $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", - "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("action_url",$phpgw->link("/addressbook/import.php")); + $t->set_var("cat_link",cat_option($cat_id)); $t->set_var("tsvfilename",""); $t->set_var("conv",$conv); $t->set_var("debug",lang("Debug output in browser")); @@ -68,7 +66,12 @@ $t->set_var("basedn",$basedn); $t->set_var("context",$context); $t->set_var("download",lang("Submit")); - + $t->set_var("start",$start); + $t->set_var("sort",$sort); + $t->set_var("order",$order); + $t->set_var("filter",$filter); + $t->set_var("query",$query); + $t->set_var("cat_id",$cat_id); $t->pparse("out","import"); $phpgw->common->phpgw_footer(); } else { @@ -171,14 +174,14 @@ } else { echo "
$buffer
"; echo ''.lang("OK").''; $phpgw->common->phpgw_footer(); } } else { echo "
$buffer
"; echo ''.lang("OK").''; $phpgw->common->phpgw_footer(); } diff --git a/addressbook/templates/default/export.tpl b/addressbook/templates/default/export.tpl index 001d43be1a..dccc6f7ec4 100644 --- a/addressbook/templates/default/export.tpl +++ b/addressbook/templates/default/export.tpl @@ -15,16 +15,28 @@ {conv}

  • {filename}:
    • -
  • {lang_cat}:{cat_id}
    • +
  • {lang_cat}:{cat_link}
  • Download export file (Uncheck to debug output in browser)
    • + + + + + +
    + + + + + +
    diff --git a/addressbook/templates/default/import.tpl b/addressbook/templates/default/import.tpl index 175502ce2e..6b55a5a894 100644 --- a/addressbook/templates/default/import.tpl +++ b/addressbook/templates/default/import.tpl @@ -13,12 +13,12 @@
    1. In Netscape, open the Addressbook and select Export from the File menu. - The file exported will be in LDIF format. + The file exported will be in LDIF format.

      Or, in Outlook, select your Contacts folder, select Import - and Export... from the File - menu and export your contacts into a comma separated text (CSV) file. -

      Or, in Palm Desktop 4.0 or greater, visit your addressbook and select Export from the File menu. - The file exported will be in VCard format.

      + and Export... from the File + menu and export your contacts into a comma separated text (CSV) file. +

      Or, in Palm Desktop 4.0 or greater, visit your addressbook and select Export from the File menu. + The file exported will be in VCard format.

    2. Enter the path to the exported file here:

      3. @@ -27,11 +27,17 @@ {conv}

      -

    3. {lang_cat}:{cat_id}
      4. +
    4. {lang_cat}:{cat_link}
    5. Mark records as private
    6. Debug output in browser
    + + + + + +
    @@ -41,8 +47,14 @@
    - -
    + + + + + + + +