X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttGroupExportHelper.class.php;h=9490f075743065158caf124e4993c274c6bc7600;hb=d82f2da8a4df2190f26f1ce8a44fe35c42bba1da;hp=a520e7fbe37a541e4897148c25da7f9ab772a960;hpb=80d8ba7ca7444b575edc4930ee45e46dca66144b;p=timetracker.git

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index a520e7fb..9490f075 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -82,6 +82,23 @@ class ttGroupExportHelper {
     return $val;
   }
 
+  // The getUsers obtains all users in group for the purpose of export.
+  private function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id)".
+      " where u.group_id = $this->group_id and u.org_id = $user->org_id order by upper(u.name)"; // Note: deleted users are included.
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+      return $result;
+    }
+    return false;
+  }
+
   // getRecordsFromTable - obtains all fields from a given table for a group.
   function getRecordsFromTable($table_name) {
     global $user;
@@ -106,6 +123,7 @@ class ttGroupExportHelper {
     // Write group info.
     $group = $this->getGroupAttrs();
     $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
+    $group_part .= " description=\"".htmlspecialchars($group['description'])."\"";
     $group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
     $group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
     $group_part .= " lang=\"".$group['lang']."\"";
@@ -132,7 +150,7 @@ class ttGroupExportHelper {
     unset($group_part);
 
     // Prepare user map.
-    $users = $this->getRecordsFromTable('tt_users');
+    $users = $this->getUsers();
     foreach ($users as $key=>$user_item)
       $this->userMap[$user_item['id']] = $key + 1;