Fixed import and export of role descriptions.

[timetracker.git] / WEB-INF / lib / ttExportHelper.class.php

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 0c30b2f7667b25a6aa70ef5398b9ae917bd6382d..310af91374cb867514a484bc409455f5181363a5 100644 (file)
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -59,7 +59,7 @@ class ttExportHelper {
 
     // Write XML to the file.
     fwrite($file, "<?xml version=\"1.0\"?>\n");
-    fwrite($file, "<pack>\n");
+    fwrite($file, "<org>\n");
 
     // Write group info.
     fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
@@ -69,7 +69,7 @@ class ttExportHelper {
       "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
       "\" config=\"".$user->config.
       "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->group."]]></name>\n");
+    fwrite($file, "  <name><![CDATA[".$user->group_name."]]></name>\n");
     fwrite($file, "  <allow_ip><![CDATA[".$user->allow_ip."]]></allow_ip>\n");
     fwrite($file, "  <password_complexity><![CDATA[".$user->password_complexity."]]></password_complexity>\n");
     fwrite($file, "</group>\n");
@@ -120,6 +120,7 @@ class ttExportHelper {
       fwrite($file, "  <role id=\"".$this->roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
         " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
       fwrite($file, "    <name><![CDATA[".$role['name']."]]></name>\n");
+      fwrite($file, "    <description><![CDATA[".$role['description']."]]></description>\n");
       fwrite($file, "  </role>\n");
     }
     fwrite($file, "</roles>\n");
@@ -305,6 +306,8 @@ class ttExportHelper {
         " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
         " show_work_units=\"".$fav_report['show_work_units']."\"".
         " group_by1=\"".$fav_report['group_by1']."\"".
+        " group_by2=\"".$fav_report['group_by2']."\"".
+        " group_by3=\"".$fav_report['group_by3']."\"".
         " show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
       fwrite($file, "    <name><![CDATA[".$fav_report["name"]."]]></name>\n");
       fwrite($file, "  </fav_report>\n");
@@ -319,7 +322,7 @@ class ttExportHelper {
     $this->projectMap = array();
     $this->taskMap = array();
 
-    fwrite($file, "</pack>\n");
+    fwrite($file, "</org>\n");
     fclose($file);
 
     if ($compress) {