checkpoint taqua

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index b4347da..e9a2679 100644 (file)
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -448,10 +448,12 @@ as keys (for use with batch_import) and "pretty" format names as values.
 =cut
 
 sub import_formats {
-  'asterisk' => 'Asterisk',
-  'taqua'    => 'Taqua',
-  'unitel'   => 'Unitel/RSLCOM',
-  'simple'   => 'Simple',
+  (
+    'asterisk' => 'Asterisk',
+    'taqua'    => 'Taqua',
+    'unitel'   => 'Unitel/RSLCOM',
+    'simple'   => 'Simple',
+  );
 }
 
 my($tmp_mday, $tmp_mon, $tmp_year);

diff --git a/httemplate/misc/cdr-import.html b/httemplate/misc/cdr-import.html
index 60f619e..a71b25b 100644 (file)
--- a/httemplate/misc/cdr-import.html
+++ b/httemplate/misc/cdr-import.html
@@ -1,11 +1,13 @@
 <% include("/elements/header.html",'Call Detail Record Import') %>
 <FORM ACTION="process/cdr-import.html" METHOD="POST" ENCTYPE="multipart/form-data">
 Import a CSV file containing Call Detail Records (CDRs).<BR><BR>
-CDR Format: <SELECT NAME="format">
-<OPTION VALUE="asterisk">Asterisk</OPTION>
-<OPTION VALUE="unitel">Unitel/RSLCOM</OPTION>
-<OPTION VALUE="simple">Simple</OPTION>
-</SELECT><BR><BR>
+CDR Format:
+<SELECT NAME="format">
+% foreach $format ( keys %formats ) {
+    <OPTION VALUE="<% $format %>"><% $format{$format} %></OPTION>
+% }
+</SELECT>
+<BR><BR>
 
 Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
 
@@ -19,4 +21,6 @@ Filename: <INPUT TYPE="file" NAME="csvfile"><BR><BR>
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
+tie my %formats, FS::cdr->import_formats;
+
 </%init>