mostly working now

Author: benkeen

code/Module.class.php

@@ -155,7 +155,7 @@ public function displayExportOptions($template_name, $params)
         $smarty->assign("is_admin", $is_admin);
         $smarty->assign("page_vars", $page_vars);
         $smarty->assign("L", $L);
-        $smarty->assign("SESSION", Settings::get("export_manager"));
+        $smarty->assign("SESSION", Sessions::get("export_manager"));
         $smarty->assign("LANG", $params["LANG"]);
         $smarty->assign("export_icon_folder", "$root_url/modules/export_manager/images/icons");
 
@@ -389,10 +389,11 @@ private function addXmlExportGroup ()
             "visibility" => "hide",
             "icon" => "xml.jpg",
             "action_button_text" => $L["word_generate"],
-            "smarty_template" => "<?xml version=\"1.0\" encoding=\"utf - 8\" ?>\r\n\r\n{\$export_type_smarty_template}"
+            "smarty_template" => "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n\r\n{\$export_type_smarty_template}"
         ), $L);
 
         $xml_smarty_template =<<< END
+{strip}
 <export>
     <export_datetime>{\$datetime}</export_datetime>
     <export_unixtime>{\$U}</export_unixtime>
@@ -420,6 +421,7 @@ private function addXmlExportGroup ()
         {/foreach}
     </submissions>
 </export>
+{/strip}
 END;
 
         ExportTypes::addExportType(array(
@@ -441,12 +443,38 @@ private function addCsvExportGroup()
             "visibility" => "hide",
             "icon" => "csv.gif",
             "action_button_text" => $L["word_generate"],
-            "headers" => "Content-type: application/xml; charset=\"octet - stream\"\r\nContent-Disposition: attachment; filename={\$filename}",
-            "smarty_template" => "<?xml version=\"1.0\" encoding=\"utf - 8\" ?>\r\n\r\n{\$export_type_smarty_template}"
+            "headers" => "Content-type: text/csv; charset=\"octet-stream\"\r\nContent-Disposition: attachment; filename={\$filename}",
+            "smarty_template" => "{\$export_type_smarty_template}"
         ), $L);
 
         $csv_smarty_template =<<< END
-{strip}\r\n  {foreach from=\$display_fields item=column name=row}\r\n    {* workaround for an absurd Microsoft Excel problem, in which the first\r\n       two characters of a file cannot be ID; see:\r\n       http://support.microsoft.com /kb/323626 *}\r\n    {if \$smarty.foreach.row.first && \$column.field_title == \"ID\"}\r\n      .ID\r\n    {else}\r\n      {\$column.field_title|escape:''csv''}\r\n    {/if}\r\n    {if !\$smarty.foreach.row.last},{/if}\r\n  {/foreach}\r\n{/strip}\r\n{foreach from=\$submissions item=submission name=row}{strip}\r\n  {foreach from=\$display_fields item=field_info name=col_row}\r\n    {assign var=col_name value=\$field_info.col_name}\r\n    {assign var=value value=\$submission.\$col_name}\r\n    {smart_display_field form_id=\$form_id view_id=\$view_id\r\n      submission_id=\$submission.submission_id field_info=\$field_info\r\n      field_types=\$field_types settings=\$settings value=\$value\r\n      escape=\"csv\"}\r\n    {* if this wasn''t the last row, output a comma *}\r\n    {if !\$smarty.foreach.col_row.last},{/if}\r\n  {/foreach}\r\n{/strip}\r\n{if !\$smarty.foreach.row.last}\r\n{/if}\r\n{/foreach}
+{strip}
+{foreach from=\$display_fields item=column name=row}
+  {* workaround for an absurd Microsoft Excel problem, in which the first
+     two characters of a file cannot be ID; see:
+     http://support.microsoft.com/kb/323626 *}
+  {if \$smarty.foreach.row.first && \$column.field_title == "ID"}
+    'ID
+  {else}
+    {\$column.field_title|escape:'csv'}
+  {/if}
+  {if !\$smarty.foreach.row.last},{/if}
+{/foreach}
+{/strip}
+{foreach from=\$submissions item=submission name=row}{strip}
+  {foreach from=\$display_fields item=field_info name=col_row}
+    {assign var=col_name value=\$field_info.col_name}
+    {assign var=value value=\$submission.\$col_name}
+    {smart_display_field form_id=\$form_id view_id=\$view_id 
+      submission_id=\$submission.submission_id field_info=\$field_info
+      field_types=\$field_types settings=\$settings value=\$value
+      escape="csv"}
+    {* if this wasn't the last row, output a comma *}
+    {if !\$smarty.foreach.col_row.last},{/if}
+  {/foreach}{/strip}
+{if !\$smarty.foreach.row.last}
+{/if}
+{/foreach}
 END;
 
         ExportTypes::addExportType(array(

export.php

@@ -103,7 +103,8 @@
 $placeholders["settings"]  = Settings::get();
 
 $export_group_info = ExportGroups::getExportGroup($export_group_id);
-$export_types      = ExportTypes::getExportType($export_group_id);
+$export_types      = ExportTypes::getExportTypes($export_group_id);
+
 
 // if the export type ID isn't available, the export group only contains a single (visible) export type
 $export_type_info = array();
@@ -126,7 +127,7 @@
 $template = $export_type_info["export_type_smarty_template"];
 $placeholders["export_type_name"] = $export_type_info["export_type_name"];
 
-$plugin_dirs = array("$root_dir/modules/export_manager/smarty");
+$plugin_dirs = array("$root_dir/modules/export_manager/smarty_plugins");
 $export_type_smarty_template = CoreGeneral::evalSmartyString($template, $placeholders, "", $plugin_dirs);
 
 
@@ -135,10 +136,15 @@
 $placeholders["export_group_name"] = CoreGeneral::evalSmartyString($export_group_info["group_name"]);
 $placeholders["export_types"] = $export_types;
 $placeholders["export_type_smarty_template"] = $export_type_smarty_template;
+
+//print_r($placeholders);
+//exit;
+
 $page = CoreGeneral::evalSmartyString($template, $placeholders);
 
 
 if ($export_group_info["action"] == "new_window" || $export_group_info["action"] == "popup") {
+
     // if required, send the HTTP headers
     if (!empty($export_group_info["headers"])) {
         $headers = preg_replace("/\r\n|\r/", "\n", $export_group_info["headers"]);

smarty_plugins/function.smart_display_field.php

@@ -21,7 +21,7 @@ function smarty_function_smart_display_field($params, &$smarty)
     if (isset($params["escape"])) {
         if ($params["escape"] == "csv") {
             $value = preg_replace("/\"/", "\"\"", $value);
-            if (strstr($value, ",")) {
+            if (strstr($value, ",") || strstr($value, "\n")) {
                 $value = "\"$value\"";
             }
         }

templates/export_options_html.tpl

@@ -33,10 +33,10 @@
           <td class="target_content">
             {assign var=var_name value="export_group_`$export_group_id`_results"}
             <input type="radio" name="export_group_{$export_group_id}_results" id="export_group_{$export_group_id}_results_1" value="all"
-              {if $SESSION.$var_name == "all" || !isset($SESSION.$var_name)}checked{/if} />
+              {if !isset($SESSION.$var_name) || $SESSION.$var_name == "all"}checked{/if} />
               <label for="export_group_{$export_group_id}_results_1"">{$LANG.word_all}</label>
             <input type="radio" name="export_group_{$export_group_id}_results" id="export_group_{$export_group_id}_results_2" value="selected"
-              {if $SESSION.$var_name == "selected"}checked{/if} />
+              {if isset($SESSION.$var_name) && $SESSION.$var_name == "selected"}checked{/if} />
               <label for="export_group_{$export_group_id}_results_2"">{$LANG.word_selected}</label>
           </td>
           <td>