X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttAdmin.class.php;h=f9b12c86306643a022360dd82ca8482339c906c3;hb=167e70e68597a70269edea5c5af9b186c489d57f;hp=fbcabd476547fc68bbcbed42e77638f577b761e8;hpb=75b65e92b21d45e2b09fb12daef169fb214a7acd;p=timetracker.git

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index fbcabd47..f9b12c86 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -47,7 +47,7 @@ class ttAdmin {
   // getUsers obtains user ids in a group.
   function getUsers($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_users where team_id = $group_id";
+    $sql = "select id from tt_users where group_id = $group_id";
     $res = $mdb2->query($sql);
     $users = array();
     if (!is_a($res, 'PEAR_Error')) {
@@ -85,7 +85,7 @@ class ttAdmin {
   // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group.
   function markTasksDeleted($group_id) {
     $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where team_id = $group_id";
+    $sql = "select id from tt_tasks where group_id = $group_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
 
@@ -120,7 +120,7 @@ class ttAdmin {
     // Now that we are done with subgroups, handle this group.
     $users = $this->getUsers($group_id);
 
-    // Iterate through team users and mark them as deleted.
+    // Iterate through group users and mark them as deleted.
     foreach ($users as $one_user) {
       if (!$this->markUserDeleted($one_user['id']))
           return false;
@@ -132,32 +132,32 @@ class ttAdmin {
     $mdb2 = getConnection();
 
     // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where team_id = $group_id";
+    $sql = "update tt_roles set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where team_id = $group_id";
+    $sql = "update tt_projects set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where team_id = $group_id";
+    $sql = "update tt_clients set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark invoices deleted.
-    $sql = "update tt_invoices set status = NULL where team_id = $group_id";
+    $sql = "update tt_invoices set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark custom fields deleted.
-    $sql = "update tt_custom_fields set status = NULL where team_id = $group_id";
+    $sql = "update tt_custom_fields set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Mark notifications deleted.
-    $sql = "update tt_cron set status = NULL where team_id = $group_id";
+    $sql = "update tt_cron set status = NULL where group_id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -174,7 +174,7 @@ class ttAdmin {
     // Mark group deleted.
     global $user;
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-    $sql = "update tt_teams set status = NULL $modified_part where id = $group_id";
+    $sql = "update tt_groups set status = NULL $modified_part where id = $group_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -189,7 +189,7 @@ class ttAdmin {
     $result = true;
 
     if (!ttValidString($fields['group_name'], true)) {
-      $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+      $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
       $result = false;
     }
     if (!ttValidString($fields['user_name'])) {
@@ -232,7 +232,7 @@ class ttAdmin {
   }
 
   // updateGroup validates user input and updates the group with new information.
-  function updateGroup($team_id, $fields) {
+  function updateGroup($group_id, $fields) {
     if (!$this->validateGroupInfo($fields)) return false; // Can't continue as user input is invalid.
 
     global $user;
@@ -242,7 +242,7 @@ class ttAdmin {
     if ($fields['old_group_name'] != $fields['new_group_name']) {
       $name_part = 'name = '.$mdb2->quote($fields['new_group_name']);
       $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
-      $sql = 'update tt_teams set '.$name_part.$modified_part.' where id = '.$team_id;
+      $sql = 'update tt_groups set '.$name_part.$modified_part.' where id = '.$group_id;
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error')) return false;
     }