Fixed export and import for locking specification.

[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 024ce0ba938a37d5adf6405d2e7a5aec1f1fe4e4..5b25174bc5855f251757f90d57349f8ffb42844f 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -602,6 +602,15 @@ 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 = '';
+    }
+
     if ($fields['lock_interval'] !== null) {
       $locktime_f = ', locktime';
       $locktime_v = ", " . (int)$fields['lock_interval'];
@@ -615,11 +624,11 @@ class ttTeamHelper {
       global $i18n;
       $lang = $i18n->lang;
     }
-    
+
     $decimal_mark = $fields['decimal_mark'];
     if ($decimal_mark !== null) {
       $decimal_mark_f = ', decimal_mark';
-      $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark);            
+      $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark);
     } else {
       $decimal_mark_f = '';
       $decimal_mark_v = '';            
@@ -629,7 +638,7 @@ class ttTeamHelper {
     if ($date_format !== null) {
       $date_format_f = ', date_format';
       $date_format_v = ', ' . $mdb2->quote($date_format);      
-    } else if (defined('DATE_FORMAT_DEFAULT')) {
+    } elseif (defined('DATE_FORMAT_DEFAULT')) {
       $date_format_f = ', date_format';
       $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT);
     } else {
@@ -641,7 +650,7 @@ class ttTeamHelper {
     if ($time_format !== null) {
       $time_format_f = ', time_format';
       $time_format_v = ', ' . $mdb2->quote($time_format);
-    } else if (defined('TIME_FORMAT_DEFAULT')) {
+    } elseif (defined('TIME_FORMAT_DEFAULT')) {
       $time_format_f = ', time_format';
       $time_format_v = ', ' . $mdb2->quote(TIME_FORMAT_DEFAULT);
     } else {
@@ -653,7 +662,7 @@ class ttTeamHelper {
     if ($week_start !== null) {
       $week_start_f = ', week_start';
       $week_start_v = ', ' . (int)$week_start;
-    } else if (defined('WEEK_START_DEFAULT')) {
+    } elseif (defined('WEEK_START_DEFAULT')) {
       $week_start_f = ', week_start';
       $week_start_v = ', ' . (int)WEEK_START_DEFAULT;          
     } else {
@@ -688,11 +697,11 @@ class ttTeamHelper {
       $record_type_v = '';     
     }
     
-    $sql = "insert into tt_teams (name, address, currency $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 $locktime_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']))." $locktime_v, ".$mdb2->quote($lang).
+      ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v $locktime_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);
 
@@ -707,11 +716,11 @@ class ttTeamHelper {
   // The update function updates team information.
   static function update($team_id, $fields)    
   {
-       // We'll require team name to be always set.
-       if (!isset($fields['name'])) return false;
+    // We'll require team name to be always set.
+    if (!isset($fields['name'])) return false;
 
-       $mdb2 = getConnection();
-       $name_part = 'name = '.$mdb2->quote($fields['name']);
+    $mdb2 = getConnection();
+    $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
     $addr_part = '';
     $locktime_part = '';
@@ -723,6 +732,7 @@ class ttTeamHelper {
     $tracking_mode_part = '';
     $record_type_part = '';
     $plugins_part = '';
+    $lock_spec_part = '';
     
     if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
@@ -735,9 +745,11 @@ class ttTeamHelper {
     if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
     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']);
 
     $sql = "update tt_teams set $name_part $addr_part $currency_part $locktime_part $lang_part $decimal_mark_part
-      $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part $plugins_part where id = $team_id";
+      $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
+      $plugins_part $lock_spec_part where id = $team_id";
     $affected = $mdb2->exec($sql);
     
     if (is_a($affected, 'PEAR_Error')) {