Removing legacy lock interval in days - replaced by Locking plugin.

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 4a607fbf5ba9b97e5268b99f1be27d82621f09f5..912ac38a704fd6e63c830ed708d492ab67bdb1a5 100644 (file)
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -61,7 +61,7 @@ class ttExportHelper {
     fwrite($file, "<pack>\n");
 
     // Write team info.
     fwrite($file, "<pack>\n");
 
     // Write team info.

-    fwrite($file, "<team currency=\"".$user->currency."\" lock_spec=\"".$user->lock_spec."\" lock_interval=\"".$user->lock_interval."\" lang=\"".$user->lang."\" decimal_mark=\"".$user->decimal_mark."\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
+    fwrite($file, "<team currency=\"".$user->currency."\" lock_spec=\"".$user->lock_spec."\" lang=\"".$user->lang."\" decimal_mark=\"".$user->decimal_mark."\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.

       "\" plugins=\"".$user->plugins."\" tracking_mode=\"".$user->tracking_mode."\" record_type=\"".$user->record_type."\">\n");
     fwrite($file, "  <name><![CDATA[".$user->team."]]></name>\n");
     fwrite($file, "  <address><![CDATA[".$user->address."]]></address>\n");
       "\" plugins=\"".$user->plugins."\" tracking_mode=\"".$user->tracking_mode."\" record_type=\"".$user->record_type."\">\n");
     fwrite($file, "  <name><![CDATA[".$user->team."]]></name>\n");
     fwrite($file, "  <address><![CDATA[".$user->address."]]></address>\n");

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index 67d60dff235b902d6f4427ad3b3ff4868ddf9020..29c537f360289f849dba960f49220e53a044aa95 100644 (file)
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -118,7 +118,6 @@ class ttImportHelper {
           'address' => $this->teamData['ADDRESS'],
           'currency' => $this->teamData['CURRENCY'],
           'lock_spec' => $this->teamData['LOCK_SPEC'],
           'address' => $this->teamData['ADDRESS'],
           'currency' => $this->teamData['CURRENCY'],
           'lock_spec' => $this->teamData['LOCK_SPEC'],

-          'lock_interval' => $this->teamData['LOCK_INTERVAL'],

           'lang' => $this->teamData['LANG'],
           'decimal_mark' => $this->teamData['DECIMAL_MARK'],
           'date_format' => $this->teamData['DATE_FORMAT'],
           'lang' => $this->teamData['LANG'],
           'decimal_mark' => $this->teamData['DECIMAL_MARK'],
           'date_format' => $this->teamData['DATE_FORMAT'],

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 6633795c2634c17a0d0844fc7f77ab7a8c58481d..9fa205c0c1789b3b5de1af0adbb4b5b2253358ba 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -606,14 +606,6 @@ class ttTeamHelper {
       $lockspec_v = '';
     }
 
       $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;
     $lang = $fields['lang'];
     if (!$lang) {
       global $i18n;


@@ -692,10 +684,10 @@ class ttTeamHelper {
       $record_type_v = '';
     }
 
       $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'])).
       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);
 
       "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v)";
     $affected = $mdb2->exec($sql);
 


@@ -717,7 +709,6 @@ class ttTeamHelper {
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
     $addr_part = '';
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
     $addr_part = '';

-    $locktime_part = '';

     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';
     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';


@@ -730,7 +721,6 @@ class ttTeamHelper {
 
     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['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']);
     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']);


@@ -741,7 +731,7 @@ class ttTeamHelper {
     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['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
+    $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";
     $affected = $mdb2->exec($sql);
       $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);

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c9dee41c3a026a9f5fd2542fad2e25e0e31ed859..53ddb48474f6155b8943fcefb0199b10c9723da7 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -48,7 +48,6 @@ class ttUser {
   var $team = null;         // Team name.
   var $custom_logo = 0;     // Whether to use a custom logo for team.
   var $address = null;      // Address for invoices.
   var $team = null;         // Team name.
   var $custom_logo = 0;     // Whether to use a custom logo for team.
   var $address = null;      // Address for invoices.

-  var $lock_interval = 0;   // Lock interval in days for time records.

   var $lock_spec = null;    // Cron specification for record locking.
   var $rights = 0;          // A mask of user rights.
 
   var $lock_spec = null;    // Cron specification for record locking.
   var $rights = 0;          // A mask of user rights.
 


@@ -62,7 +61,7 @@ class ttUser {
     $mdb2 = getConnection();
 
     $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, 
     $mdb2 = getConnection();
 
     $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, 

-      t.address, t.currency, t.locktime, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
+      t.address, t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,

       t.tracking_mode, t.record_type, t.plugins, t.lock_spec, t.custom_logo
       FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
     if ($id)
       t.tracking_mode, t.record_type, t.plugins, t.lock_spec, t.custom_logo
       FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
     if ($id)


@@ -98,7 +97,6 @@ class ttUser {
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
       $this->custom_logo = $val['custom_logo'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
       $this->custom_logo = $val['custom_logo'];

-      $this->lock_interval = $val['locktime'];

 
       // Set "on behalf" id and name.
       if (isset($_SESSION['behalf_id'])) {
 
       // Set "on behalf" id and name.
       if (isset($_SESSION['behalf_id'])) {


@@ -180,20 +178,6 @@ class ttUser {
   function isDateLocked($date)
   {
     if ($this->isPluginEnabled('lk') && $this->lock_spec) {
   function isDateLocked($date)
   {
     if ($this->isPluginEnabled('lk') && $this->lock_spec) {

-      // This is legacy code...
-      /*
-      // Determine lock date. Entries earlier than lock date cannot be created or modified.
-      $lockdate = 0;
-      if ($this->lock_interval > 0) {
-        $lockdate = new DateAndTime();
-        $lockdate->decDay($this->lock_interval);
-      }
-      if($lockdate && $date->before($lockdate))
-        return true;
-      */
-
-      // New code with cron specification.
-

       // Override for managers.
       if ($this->canManageTeam()) return false;
 
       // Override for managers.
       if ($this->canManageTeam()) return false;
 

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index b2cb3eadb31976af90bc32089f57e7d17e665b04..b3b37fd4775620f315f4b8be3820db10eada3651 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -167,7 +167,6 @@ $i18n_key_words = array(
 'label.language' => 'Sprache',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.language' => 'Sprache',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'Blockierter Zeitraum in Tagen',

 'label.date_format' => 'Datumsformat',
 'label.time_format' => 'Zeitformat',
 'label.week_start' => 'Erster Wochentag',
 'label.date_format' => 'Datumsformat',
 'label.time_format' => 'Zeitformat',
 'label.week_start' => 'Erster Wochentag',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 53eb46837aa7dc15d7487ea3e902308f11d70c31..8a4fe503815a88bdfb6a55119fc5600183df4332 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -165,7 +165,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Language',
 'label.decimal_mark' => 'Decimal mark',
 'label.id' => 'ID',
 'label.language' => 'Language',
 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'Lock interval in days',

 'label.date_format' => 'Date format',
 'label.time_format' => 'Time format',
 'label.week_start' => 'First day of week',
 'label.date_format' => 'Date format',
 'label.time_format' => 'Time format',
 'label.week_start' => 'First day of week',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index cdac38043df1dc9c66e768deb770d77d1eefcb8d..153df4715a06fe527267b9905f7422880fef7d8d 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -193,8 +193,6 @@ $i18n_key_words = array(
 // TODO: translate the following strings.
 // 'label.language' => 'Language',
 // 'label.decimal_mark' => 'Decimal mark',
 // TODO: translate the following strings.
 // 'label.language' => 'Language',
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'Intervalo de cierre en días',
-// TODO: translate the following strings.

 // 'label.date_format' => 'Date format',
 // 'label.time_format' => 'Time format',
 // 'label.week_start' => 'First day of week',
 // 'label.date_format' => 'Date format',
 // 'label.time_format' => 'Time format',
 // 'label.week_start' => 'First day of week',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 53485d222ce8e33aaf919dfd4cbca4aee77304a3..22b04cb47956a127ed158954cd1857d997e34caa 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -175,7 +175,6 @@ $i18n_key_words = array(
 'label.language' => 'زبان',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.language' => 'زبان',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'قفل کردن  فرصت بازه زمانی',

 'label.date_format' => 'قالب تاریخ',
 'label.time_format' => 'قالب زمان',
 'label.week_start' => 'روز اول هفته',
 'label.date_format' => 'قالب تاریخ',
 'label.time_format' => 'قالب زمان',
 'label.week_start' => 'روز اول هفته',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 3f6900883202526fc672f3519f5ccae3ac8402da..88f08e13f15e306a916866ee45d08a385b887253 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -168,7 +168,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Kieli',
 'label.decimal_mark' => 'Desimaalierotin',
 'label.id' => 'ID',
 'label.language' => 'Kieli',
 'label.decimal_mark' => 'Desimaalierotin',

-'label.lock_interval' => 'Lukitusväli päivinä',

 'label.date_format' => 'Päiväyksen muoto',
 'label.time_format' => 'Kellonajan muoto',
 'label.week_start' => 'Viikon 1. päivä',
 'label.date_format' => 'Päiväyksen muoto',
 'label.time_format' => 'Kellonajan muoto',
 'label.week_start' => 'Viikon 1. päivä',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a961f5517daf8a984b1e80066ef2416f1affac95..52b17db5dce20f744f3d83aa88d09f3de0f3b467 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -179,7 +179,6 @@ $i18n_key_words = array(
 'label.language' => 'Langage',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.language' => 'Langage',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'Intervalle de verrouillage en jours',

 'label.date_format' => 'Format date',
 'label.time_format' => 'Format heure',
 'label.week_start' => '1er jour de la semaine',
 'label.date_format' => 'Format date',
 'label.time_format' => 'Format heure',
 'label.week_start' => '1er jour de la semaine',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 704acf4a8d427efacf5fc6e8203b51b33f052e0b..698a92bbc2e22312813582fb8ccbbbb26eafe080 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -180,7 +180,6 @@ $i18n_key_words = array(
 'label.language' => 'שפה',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.language' => 'שפה',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'טווח זמן לנעילה',

 'label.date_format' => 'תבנית של תאריך',
 'label.time_format' => 'תבנית של שעה',
 'label.week_start' => 'היום הראשון בשבוע',
 'label.date_format' => 'תבנית של תאריך',
 'label.time_format' => 'תבנית של שעה',
 'label.week_start' => 'היום הראשון בשבוע',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index ca87180f3b1be5ce58e0604c96467d44225ea0c1..187bc8139a7f1678a20aaf23efe2d10c2b07279e 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -165,7 +165,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Taal',
 'label.decimal_mark' => 'Decimaal teken',
 'label.id' => 'ID',
 'label.language' => 'Taal',
 'label.decimal_mark' => 'Decimaal teken',

-'label.lock_interval' => 'Uitsluit interval in dagen',

 'label.date_format' => 'Datum formaat',
 'label.time_format' => 'Tijdsaanduiding',
 'label.week_start' => 'Eerste dag van de week',
 'label.date_format' => 'Datum formaat',
 'label.time_format' => 'Tijdsaanduiding',
 'label.week_start' => 'Eerste dag van de week',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 4fc4038591d562b7ea3dc6a342d161d6b4392079..b2abad4e0e4d4f715603e8ae3b0e686092c37d5b 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -168,7 +168,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Język',
 'label.decimal_mark' => 'Znak dziesiętny',
 'label.id' => 'ID',
 'label.language' => 'Język',
 'label.decimal_mark' => 'Znak dziesiętny',

-'label.lock_interval' => 'Blokada edycji po okresie (dni)',

 'label.date_format' => 'Format daty',
 'label.time_format' => 'Format godziny',
 'label.week_start' => 'Początek tygodnia',
 'label.date_format' => 'Format daty',
 'label.time_format' => 'Format godziny',
 'label.week_start' => 'Początek tygodnia',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index d338c452a427b24a45dd54e663b75128bf4acbb5..cef0ba4b5a48b9e974917fbfbb29c85066c7c96b 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -165,7 +165,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Язык',
 'label.decimal_mark' => 'Десятичный знак',
 'label.id' => 'ID',
 'label.language' => 'Язык',
 'label.decimal_mark' => 'Десятичный знак',

-'label.lock_interval' => 'Интервал блокировки в днях',

 'label.date_format' => 'Формат даты',
 'label.time_format' => 'Формат времени',
 'label.week_start' => 'День начала недели',
 'label.date_format' => 'Формат даты',
 'label.time_format' => 'Формат времени',
 'label.week_start' => 'День начала недели',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 3b647d87cd5a30180a95efd027afc9607dd59a28..bd3abd815c4f2b5f5cbb5677c3697510aa7f32ff 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -177,7 +177,6 @@ $i18n_key_words = array(
 'label.language' => 'Jazyk',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',
 'label.language' => 'Jazyk',
 // TODO: translate the following string.
 // 'label.decimal_mark' => 'Decimal mark',

-'label.lock_interval' => 'Interval uzamknutia záznamov v dňoch',

 'label.date_format' => 'Formát dátumu',
 'label.time_format' => 'Formát času',
 'label.week_start' => 'Prvý deň v týždni',
 'label.date_format' => 'Formát dátumu',
 'label.time_format' => 'Formát času',
 'label.week_start' => 'Prvý deň v týždni',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 7837bc6d116cbc95de5a422d2e58521df8d95d6a..8e42f96f5ddf80c0f6cf18425c349706b154454c 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -165,7 +165,6 @@ $i18n_key_words = array(
 'label.id' => 'ID',
 'label.language' => 'Jezik',
 'label.decimal_mark' => 'Decimala',
 'label.id' => 'ID',
 'label.language' => 'Jezik',
 'label.decimal_mark' => 'Decimala',

-'label.lock_interval' => 'Blokiraj intervale u danima',

 'label.date_format' => 'Format datuma',
 'label.time_format' => 'Format vremena',
 'label.week_start' => 'Prvi dan u nedelji',
 'label.date_format' => 'Format datuma',
 'label.time_format' => 'Format vremena',
 'label.week_start' => 'Prvi dan u nedelji',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b9de17f4ca84d0e97357f3e49addd39e9ca83a7d..931390e60beaa00ec2bd55db2d5efaf0565c259a 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.9.22.3477 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.22.3478 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/mysql.sql b/mysql.sql
index 5e669305d4232154b97f8d5e6f7ef9809c2ea477..f566df7b085472a2da3eb9c1215bb31abfad6edc 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -19,7 +19,6 @@ CREATE TABLE `tt_teams` (
   `address` varchar(255) default NULL,                   # team address, used in invoices
   `currency` varchar(7) default NULL,                    # team currency symbol
   `decimal_mark` char(1) NOT NULL default '.',           # separator in decimals
   `address` varchar(255) default NULL,                   # team address, used in invoices
   `currency` varchar(7) default NULL,                    # team currency symbol
   `decimal_mark` char(1) NOT NULL default '.',           # separator in decimals

-  `locktime` int(4) default '0',                         # lock interval in days

   `lang` varchar(10) NOT NULL default 'en',              # language
   `date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
   `time_format` varchar(20) NOT NULL default '%H:%M',    # time format
   `lang` varchar(10) NOT NULL default 'en',              # language
   `date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
   `time_format` varchar(20) NOT NULL default '%H:%M',    # time format

diff --git a/profile_edit.php b/profile_edit.php
index d4465745fea32f69fa66b37be27aa96dd4e9fb9a..5ccccf5461454deb060a29229e289bae07c79804 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -200,14 +200,10 @@ if ($request->isPost()) {
     if (!ttValidString($cl_team, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
     if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.address'));
     if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));
     if (!ttValidString($cl_team, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
     if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.address'));
     if (!ttValidString($cl_currency, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.currency'));

-    if (!ttValidInteger($cl_lock_interval, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.lock_interval'));

   }
   // Finished validating user input.
 
   if ($err->no()) {
   }
   // Finished validating user input.
 
   if ($err->no()) {

-    if ($cl_lock_interval == null || trim($cl_lock_interval) == '')
-      $cl_lock_interval = 0;
-

     $update_result = true;
     if ($user->canManageTeam()) {
 
     $update_result = true;
     if ($user->canManageTeam()) {