X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=f3763c2061030c14099e18ee2cbddd80196fe9f7;hb=1c2cf98a7a062d53e6988f042da2530e1f5d172e;hp=6633795c2634c17a0d0844fc7f77ab7a8c58481d;hpb=4c41dc3fad985fa9b71a81222b6402ebd5041c42;p=timetracker.git

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6633795c..f3763c20 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -606,14 +606,6 @@ class ttTeamHelper {
       $lockspec_v = '';
     }
 
-    if ($fields['lock_interval'] !== null) {
-      $locktime_f = ', locktime';
-      $locktime_v = ", " . (int)$fields['lock_interval'];
-    } else {
-      $locktime_f = '';
-      $locktime_v = '';
-    }
-
     $lang = $fields['lang'];
     if (!$lang) {
       global $i18n;
@@ -692,10 +684,10 @@ class ttTeamHelper {
       $record_type_v = '';
     }
 
-    $sql = "insert into tt_teams (name, address, currency $lockspec_f $locktime_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f)
+    $sql = "insert into tt_teams (name, address, currency $lockspec_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f)
       values(".$mdb2->quote(trim($fields['name'])).
       ", ".$mdb2->quote(trim($fields['address'])).
-      ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v $locktime_v, ".$mdb2->quote($lang).
+      ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v, ".$mdb2->quote($lang).
       "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v)";
     $affected = $mdb2->exec($sql);
 
@@ -711,13 +703,12 @@ class ttTeamHelper {
   static function update($team_id, $fields)
   {
     // We'll require team name to be always set.
-    if (!isset($fields['name'])) return false;
+    if (!isset($fields['name']) || $fields['name'] == "") return false;
 
     $mdb2 = getConnection();
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
     $addr_part = '';
-    $locktime_part = '';
     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';
@@ -727,10 +718,10 @@ class ttTeamHelper {
     $record_type_part = '';
     $plugins_part = '';
     $lock_spec_part = '';
+    $workday_hours_part = '';
 
     if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
-    if (isset($fields['locktime'])) $locktime_part = ', locktime = '.intval($fields['locktime']);
     if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
     if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
     if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']);
@@ -740,10 +731,11 @@ class ttTeamHelper {
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
+    if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);
 
-    $sql = "update tt_teams set $name_part $addr_part $currency_part $locktime_part $lang_part $decimal_mark_part
+    $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
-      $plugins_part $lock_spec_part where id = $team_id";
+      $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
@@ -768,7 +760,7 @@ class ttTeamHelper {
           $count++;
           $inactive_teams[] = $team_id;
           // Limit the array size for perfomance by allowing this operation on small chunks only.
-          if ($count >= 25) break;
+          if ($count >= 100) break;
         }
       }
       return $inactive_teams;
@@ -778,9 +770,9 @@ class ttTeamHelper {
 
   // The isTeamActive determines if a team is using Time Tracker or abandoned it.
   static function isTeamActive($team_id) {
-  	$users = array();
-  
-  	$mdb2 = getConnection();
+    $users = array();
+
+    $mdb2 = getConnection();
     $sql = "select id from tt_users where team_id = $team_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());
@@ -792,8 +784,8 @@ class ttTeamHelper {
       return false; // No users in team.
 
     $count = 0;
-  	$ts = date('Y-m-d', strtotime('-2 years')); 
-    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";  
+    $ts = date('Y-m-d', strtotime('-2 years'));
+    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow()) {
@@ -807,153 +799,141 @@ class ttTeamHelper {
     if ($count <= 5) {
       // We will consider a team inactive if it has 5 or less time entries made more than 1 year ago.
       $count_last_year = 0;
-      $ts = date('Y-m-d', strtotime('-1 year')); 
-      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";  
+      $ts = date('Y-m-d', strtotime('-1 year'));
+      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         if ($val = $res->fetchRow()) {
           $count_last_year = $val['cnt'];
         }
         if ($count_last_year == 0)
-          return false;  // No time entries for the last year and only a few entries before that...
-      } 
+          return false;  // No time entries for the last year and only a few entries before that.
+      }
     }
     return true;
   }
-  
+
   // The delete function permanently deletes all data for a team.
   static function delete($team_id) {
-  	$mdb2 = getConnection();
-  	
-  	// Delete users.
+    $mdb2 = getConnection();
+
+    // Delete users.
     $sql = "select id from tt_users where team_id = $team_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {
       $user_id = $val['id'];
-      if (!ttUserHelper::delete($user_id))
-        return false;
+      if (!ttUserHelper::delete($user_id)) return false;
     }
 
     // Delete tasks.
-    if (!ttTeamHelper::deleteTasks($team_id))
-      return false;
-      
+    if (!ttTeamHelper::deleteTasks($team_id)) return false;
+
     // Delete client to project binds.
     $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where team_id = $team_id)";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete projects.
-  	$sql = "delete from tt_projects where team_id = $team_id";
-  	$affected = $mdb2->exec($sql);
-  	if (is_a($affected, 'PEAR_Error'))
-  	  return false;
-
-  	// Delete clients.
-  	$sql = "delete from tt_clients where team_id = $team_id";
-  	$affected = $mdb2->exec($sql);
-  	if (is_a($affected, 'PEAR_Error'))
-  	  return false;
-  	  
-   	// Delete invoices.
-  	$sql = "delete from tt_invoices where team_id = $team_id";
-  	$affected = $mdb2->exec($sql);
-  	if (is_a($affected, 'PEAR_Error'))
-  	  return false;
-
-  	// Delete custom fields.
-  	if (!ttTeamHelper::deleteCustomFields($team_id))
-  	  return false;
-    
+    $sql = "delete from tt_projects where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete clients.
+    $sql = "delete from tt_clients where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete invoices.
+    $sql = "delete from tt_invoices where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete custom fields.
+    if (!ttTeamHelper::deleteCustomFields($team_id)) return false;
+
     // Delete team.
     $sql = "delete from tt_teams where id = $team_id";
     $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;
 
     return true;
   }
 
   // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team.
   static function markTasksDeleted($team_id) {
-  	$mdb2 = getConnection();
-  	$sql = "select id from tt_tasks where team_id = $team_id";
-  	$res = $mdb2->query($sql);
-  	if (is_a($res, 'PEAR_Error')) return false;
-  	while ($val = $res->fetchRow()) {
-  	  
-  	  // Delete task binds.
-  	  $task_id = $val['id'];
-  	  $sql = "delete from tt_project_task_binds where task_id = $task_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;
-  	  
-  	  // Mark task as deleted.
-  	  $sql = "update tt_tasks set status = NULL where id = $task_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;  	  
-  	}
-  	
-  	return true;
-  }
-  
+    $mdb2 = getConnection();
+    $sql = "select id from tt_tasks where team_id = $team_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+
+      // Delete task binds.
+      $task_id = $val['id'];
+      $sql = "delete from tt_project_task_binds where task_id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Mark task as deleted.
+      $sql = "update tt_tasks set status = NULL where id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    return true;
+  }
+
   // The deleteTasks deletes all tasks and task binds for an inactive team.
   static function deleteTasks($team_id) {
-  	$mdb2 = getConnection();
-  	$sql = "select id from tt_tasks where team_id = $team_id";
-  	$res = $mdb2->query($sql);
-  	if (is_a($res, 'PEAR_Error')) return false;
-  	while ($val = $res->fetchRow()) {
-  	  
-  	  // Delete task binds.
-  	  $task_id = $val['id'];
-  	  $sql = "delete from tt_project_task_binds where task_id = $task_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;
-  	  
-  	  // Delete task.
-  	  $sql = "delete from tt_tasks where id = $task_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;   	  
-  	}
-  	
-  	return true;
-  }
-  
+    $mdb2 = getConnection();
+    $sql = "select id from tt_tasks where team_id = $team_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+
+      // Delete task binds.
+      $task_id = $val['id'];
+      $sql = "delete from tt_project_task_binds where task_id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Delete task.
+      $sql = "delete from tt_tasks where id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    return true;
+  }
+
   // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team.
   static function deleteCustomFields($team_id) {
-  	$mdb2 = getConnection();
-  	$sql = "select id from tt_custom_fields where team_id = $team_id";
-  	$res = $mdb2->query($sql);
-  	if (is_a($res, 'PEAR_Error')) return false;
-  	while ($val = $res->fetchRow()) {
-  	  $field_id = $val['id'];
-  	  
-  	  // Clean up tt_custom_field_log.
- 	  $sql = "delete from tt_custom_field_log where field_id = $field_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;
-  	  
-  	  // Clean up tt_custom_field_options.
-  	  $sql = "delete from tt_custom_field_options where field_id = $field_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false;
-  	  
-  	  // Delete custom field.
-  	  $sql = "delete from tt_custom_fields where id = $field_id";
-  	  $affected = $mdb2->exec($sql);
-  	  if (is_a($affected, 'PEAR_Error'))
-  	    return false; 	  
-  	}
-  	
-  	return true;
+    $mdb2 = getConnection();
+    $sql = "select id from tt_custom_fields where team_id = $team_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+      $field_id = $val['id'];
+
+      // Clean up tt_custom_field_log.
+      $sql = "delete from tt_custom_field_log where field_id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Clean up tt_custom_field_options.
+      $sql = "delete from tt_custom_field_options where field_id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Delete custom field.
+      $sql = "delete from tt_custom_fields where id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    return true;
   }
 }