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 243ed3e1dfc21f9fc8037e35f01497ef4c948919..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,9 @@ 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");
 
     // Prepare role map.
@@ -118,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");
@@ -301,7 +304,10 @@ class ttExportHelper {
         " show_end=\"".$fav_report['show_end']."\"".
         " show_note=\"".$fav_report['show_note']."\"".
         " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
-        " group_by=\"".$fav_report['group_by']."\"".
+        " 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");
@@ -316,7 +322,7 @@ class ttExportHelper {
     $this->projectMap = array();
     $this->taskMap = array();
 
-    fwrite($file, "</pack>\n");
+    fwrite($file, "</org>\n");
     fclose($file);
 
     if ($compress) {
@@ -375,7 +381,7 @@ class ttExportHelper {
    * and we don't want to over-complicate things.
    */
 
-  // getRoles - obtains all roles defined for team.
+  // getRoles - obtains all roles defined for group.
   function getRoles() {
     global $user;
     $mdb2 = getConnection();
@@ -393,7 +399,7 @@ class ttExportHelper {
     return false;
   }
 
-  // The getUsers obtains all users in team for the purpose of export.
+  // The getUsers obtains all users in group for the purpose of export.
   function getUsers() {
     global $user;
     $mdb2 = getConnection();