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

More POST fixes

Browse Source
This commit is contained in:
Miles Lott 2001-03-29 11:02:14 +00:00
parent 36d417cbaa
commit 1e1b56cc8b
4 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/export.php
View File

@ -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</pre>\n";
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&ncat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}

19
addressbook/import.php
View File

@ -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 "<pre>$buffer</pre>";
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&ncat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}
} else {
echo "<pre>$buffer</pre>";
echo '<a href="'.$phpgw->link("/addressbook/index.php",
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&ncat_id=$cat_id")
. '">'.lang("OK").'</a>';
$phpgw->common->phpgw_footer();
}

14
addressbook/templates/default/export.tpl
View File

@ -15,16 +15,28 @@
<OPTION VALUE="none">&lt;none&gt;</OPTION>
{conv} </SELECT><P></LI>
<LI>{filename}:<INPUT NAME="tsvfilename" VALUE="export.txt"></LI>
<LI>{lang_cat}:{cat_id}</LI>
<LI>{lang_cat}:{cat_link}</LI>
<LI><INPUT NAME="download" TYPE="checkbox" checked>Download export file (Uncheck to debug output in browser)</LI>
<LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
</OL>
<input type="hidden" name="sort" value="{sort}">
<input type="hidden" name="order" value="{order}">
<input type="hidden" name="filter" value="{filter}">
<input type="hidden" name="query" value="{query}">
<input type="hidden" name="start" value="{start}">
<input type="hidden" name="cat_id" value="{cat_id}">
</FORM>
</TD>
</TR>
<TR>
<TD>
<FORM action="{cancel_url}" method="post">
<input type="hidden" name="sort" value="{sort}">
<input type="hidden" name="order" value="{order}">
<input type="hidden" name="filter" value="{filter}">
<input type="hidden" name="query" value="{query}">
<input type="hidden" name="start" value="{start}">
<input type="hidden" name="ncat_id" value="{cat_id}">
<INPUT type="submit" name="Cancel" value="{lang_cancel}">
</FORM>
</TD>

28
addressbook/templates/default/import.tpl
View File

@ -13,12 +13,12 @@
<TD><FORM ENCTYPE="multipart/form-data" action="{action_url}" method="post">
<OL>
<LI>In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.
The file exported will be in LDIF format.
The file exported will be in LDIF format.
<P>Or, in Outlook, select your Contacts folder, select <b>Import
and Export...</b> from the <b>File</b>
menu and export your contacts into a comma separated text (CSV) file.
<P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu.
The file exported will be in VCard format.<P>
and Export...</b> from the <b>File</b>
menu and export your contacts into a comma separated text (CSV) file.
<P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu.
The file exported will be in VCard format.<P>
</LI>
<LI>Enter the path to the exported file here:
<INPUT NAME="tsvfile" SIZE=48 TYPE="file" VALUE="{tsvfilename}"><P></LI>
@ -27,11 +27,17 @@
<OPTION VALUE="none">&lt;none&gt;</OPTION>
{conv}
</SELECT><P></LI>
<LI>{lang_cat}:{cat_id}</LI>
<LI>{lang_cat}:{cat_link}</LI>
<LI><INPUT NAME="private" TYPE="checkbox" VALUE="private" CHECKED>Mark records as private</LI>
<LI><INPUT NAME="download" TYPE="checkbox" VALUE="{debug}" CHECKED>Debug output in browser</LI>
<LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
</OL>
<input type="hidden" name="sort" value="{sort}">
<input type="hidden" name="order" value="{order}">
<input type="hidden" name="filter" value="{filter}">
<input type="hidden" name="query" value="{query}">
<input type="hidden" name="start" value="{start}">
<input type="hidden" name="cat_id" value="{cat_id}">
</FORM></TD>
</TR>
</TABLE>
@ -41,8 +47,14 @@
<td width="8%">
<div align="left">
<form action="{cancel_url}" method="post">
<input type="submit" name="Cancel" value="{lang_cancel}">
</form>
<input type="hidden" name="sort" value="{sort}">
<input type="hidden" name="order" value="{order}">
<input type="hidden" name="filter" value="{filter}">
<input type="hidden" name="query" value="{query}">
<input type="hidden" name="start" value="{start}">
<input type="hidden" name="ncat_id" value="{cat_id}">
<input type="submit" name="Cancel" value="{lang_cancel}">
</form>
</div>
</td>
<td width="64%">&nbsp;</td>