Fixed a database error when inserting entries - recently introduced bug.

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

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6f716f5..6127123 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -636,21 +636,6 @@ class ttTeamHelper {
 
     $mdb2 = getConnection();
 
-    $lock_spec = $fields['lock_spec'];
-    if ($lock_spec !== null) {
-      $lockspec_f = ', lock_spec';
-      $lockspec_v = ', ' . $mdb2->quote($lock_spec);
-    } else {
-      $lockspec_f = '';
-      $lockspec_v = '';
-    }
-
-    $lang = $fields['lang'];
-    if (!$lang) {
-      global $i18n;
-      $lang = $i18n->lang;
-    }
-
     $decimal_mark = $fields['decimal_mark'];
     if ($decimal_mark !== null) {
       $decimal_mark_f = ', decimal_mark';
@@ -660,6 +645,12 @@ class ttTeamHelper {
       $decimal_mark_v = '';
     }
 
+    $lang = $fields['lang'];
+    if (!$lang) {
+      global $i18n;
+      $lang = $i18n->lang;
+    }
+
     $date_format = $fields['date_format'];
     if ($date_format !== null) {
       $date_format_f = ', date_format';
@@ -696,15 +687,6 @@ class ttTeamHelper {
       $week_start_v = '';
     }
 
-    $plugins = $fields['plugins'];
-    if ($plugins !== null) {
-      $plugins_f = ', plugins';
-      $plugins_v = ', ' . $mdb2->quote($plugins);
-    } else {
-      $plugins_f = '';
-      $plugins_v = '';
-    }
-
     $tracking_mode = $fields['tracking_mode'];
     if ($tracking_mode !== null) {
       $tracking_mode_f = ', tracking_mode';
@@ -714,6 +696,15 @@ class ttTeamHelper {
       $tracking_mode_v = '';
     }
 
+    $project_required = $fields['project_required'];
+    if ($project_required !== null) {
+      $project_required_f = ', project_required';
+      $project_required_v = ', ' . (int)$project_required;
+    } else {
+      $project_required_f = '';
+      $project_required_v = '';
+    }
+
     $task_required = $fields['task_required'];
     if ($task_required !== null) {
       $task_required_f = ', task_required';
@@ -741,6 +732,33 @@ class ttTeamHelper {
       $uncompleted_indicators_v = '';
     }
 
+    $bcc_email = $fields['bcc_email'];
+    if ($bcc_email !== null) {
+      $bcc_email_f = ', bcc_email';
+      $bcc_email_v = ', ' . $mdb2->quote($bcc_email);
+    } else {
+      $bcc_email_f = '';
+      $bcc_email_v = '';
+    }
+
+    $plugins = $fields['plugins'];
+    if ($plugins !== null) {
+      $plugins_f = ', plugins';
+      $plugins_v = ', ' . $mdb2->quote($plugins);
+    } else {
+      $plugins_f = '';
+      $plugins_v = '';
+    }
+
+    $lock_spec = $fields['lock_spec'];
+    if ($lock_spec !== null) {
+      $lockspec_f = ', lock_spec';
+      $lockspec_v = ', ' . $mdb2->quote($lock_spec);
+    } else {
+      $lockspec_f = '';
+      $lockspec_v = '';
+    }
+
     $workday_hours = $fields['workday_hours'];
     if ($workday_hours !== null) {
       $workday_hours_f = ', workday_hours';
@@ -750,11 +768,10 @@ class ttTeamHelper {
       $workday_hours_v = '';
     }
 
-    $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 $task_required_f $record_type_f $uncompleted_indicators_f $workday_hours_f)
+    $sql = "insert into tt_teams (name, currency $decimal_mark_f, lang $date_format_f $time_format_f $week_start_f $tracking_mode_f $project_required_f $task_required_f $record_type_f $uncompleted_indicators_f $bcc_email_f $plugins_f $lockspec_f $workday_hours_f)
       values(".$mdb2->quote(trim($fields['name'])).
-      ", ".$mdb2->quote(trim($fields['address'])).
-      ", ".$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 $task_required_v $record_type_v $uncompleted_indicators_v $workday_hours_v)";
+      ", ".$mdb2->quote(trim($fields['currency']))." $decimal_mark_v, ".$mdb2->quote($lang).
+      "$date_format_v $time_format_v $week_start_v $tracking_mode_v $project_required_v $task_required_v $record_type_v $uncompleted_indicators_v $bcc_email_v $plugins_v $lockspec_v $workday_hours_v)";
     $affected = $mdb2->exec($sql);
 
     if (!is_a($affected, 'PEAR_Error')) {
@@ -771,7 +788,6 @@ class ttTeamHelper {
     $mdb2 = getConnection();
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
-    $addr_part = '';
     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';
@@ -786,7 +802,6 @@ class ttTeamHelper {
     $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['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
     if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
@@ -801,7 +816,7 @@ class ttTeamHelper {
     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 $lang_part $decimal_mark_part
+    $sql = "update tt_teams set $name_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
       $uncompleted_indicators_part $bcc_email_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";
     $affected = $mdb2->exec($sql);
@@ -810,7 +825,7 @@ class ttTeamHelper {
     return true;
   }
 
-  // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 50).
+  // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100).
   static function getInactiveTeams() {
     $inactive_teams = array();
     $mdb2 = getConnection();
@@ -829,7 +844,7 @@ class ttTeamHelper {
           $count++;
           $inactive_teams[] = $team_id;
           // Limit the array size for perfomance by allowing this operation on small chunks only.
-          if ($count >= 50) break;
+          if ($count >= 100) break;
         }
       }
       return $inactive_teams;