Extended the Locking plugin with cron specification fo locks.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 1cf71d86f071b0ab4054a9d32bf6b047860bc156..8cc9660ba5c262739a3ad6262ccf6af6166bf826 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -723,6 +723,7 @@ class ttTeamHelper {
     $tracking_mode_part = '';
     $record_type_part = '';
     $plugins_part = '';
     $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']);
     
     if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);


@@ -735,9 +736,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['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
 
     $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')) {
     $affected = $mdb2->exec($sql);
     
     if (is_a($affected, 'PEAR_Error')) {

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a14f7cddd50c1f264f3389830a9943b96b06bad1..a6731a4eea063ec104d7d416f1d44b19c8f7e6d2 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -49,6 +49,7 @@ class ttUser {
   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 $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.
 
   // Constructor.
   var $rights = 0;          // A mask of user rights.
 
   // Constructor.


@@ -61,7 +62,8 @@ 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.tracking_mode, t.record_type, t.plugins, t.custom_logo
+      t.address, t.currency, t.locktime, 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)
       $sql .= "u.id = $id";
       FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";


@@ -94,6 +96,7 @@ class ttUser {
       $this->address = $val['address'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->address = $val['address'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];

+      $this->lock_spec = $val['lock_spec'];

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


@@ -176,7 +179,9 @@ class ttUser {
   // isDateLocked checks whether a specifc date is locked for modifications.
   function isDateLocked($date)
   {
   // isDateLocked checks whether a specifc date is locked for modifications.
   function isDateLocked($date)
   {

-    if ($this->isPluginEnabled('lk')) {
+    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) {
       // Determine lock date. Entries earlier than lock date cannot be created or modified.
       $lockdate = 0;
       if ($this->lock_interval > 0) {


@@ -185,6 +190,18 @@ class ttUser {
       }
       if($lockdate && $date->before($lockdate))
         return true;
       }
       if($lockdate && $date->before($lockdate))
         return true;

+      */
+
+      // New code with cron specification.
+      require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
+      require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
+
+      // Calculate the last occurrence of a lock.
+      $last = tdCron::getLastOccurrence($this->lock_spec, mktime());
+      $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
+      if ($date->before($lockdate)) {
+        return true;
+      }

     }
     return false;
   }
     }
     return false;
   }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d18884c22bb6034fede33c4bf4106daae2b4d8a2..ab87a978de8cc691efe6280074bfd60faba636df 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.21.3467 | 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.3468 | 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/WEB-INF/templates/locking.tpl b/WEB-INF/templates/locking.tpl
index 94e706a3996f073d203bf024ad990abd5e575c33..177f591886fbc8bfe1c3f09c12b2d7f198e32311 100644 (file)
--- a/WEB-INF/templates/locking.tpl
+++ b/WEB-INF/templates/locking.tpl
@@ -4,8 +4,8 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>

-          <td align="right" nowrap>{$i18n.label.lock_interval}:</td>
-          <td>{$forms.lockingForm.lock_interval.control}</td>
+          <td align="right">{$i18n.label.cron_schedule}:</td>
+          <td>{$forms.lockingForm.lock_spec.control} <a href="https://www.anuko.com/lp/tt_6.htm" target="_blank">{$i18n.label.what_is_it}</a></td>

         </tr>
         <tr>
           <td colspan="2">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2">&nbsp;</td>

diff --git a/dbinstall.php b/dbinstall.php
index b6ddb1ebbbbd6c284a77a316e287a391a41b117d..1429a24f549fbfc43d14803154d5728280a454dc 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -516,6 +516,7 @@ if ($_POST) {
     setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
     setChange("DROP INDEX name_idx on tt_invoices");
     setChange("create unique index name_idx on tt_invoices(team_id, name, status)");
     setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'");
     setChange("DROP INDEX name_idx on tt_invoices");
     setChange("create unique index name_idx on tt_invoices(team_id, name, status)");

+    setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL");

   }
 
   // The update_clients function updates projects field in tt_clients table.
   }
 
   // The update_clients function updates projects field in tt_clients table.

diff --git a/locking.php b/locking.php
index 09a7cf9513f639b60ebf8c38b72b56760e7812ba..2383178f4dedee29716cf54433b8b71b34c11f82 100644 (file)
--- a/locking.php
+++ b/locking.php
@@ -36,22 +36,25 @@ if (!ttAccessCheck(right_manage_team)) {
   exit();
 }
 
   exit();
 }
 

-$cl_lock_interval = $request->isPost() ? $request->getParameter('lock_interval') : $user->lock_interval;
+$cl_lock_spec = $request->isPost() ? $request->getParameter('lock_spec') : $user->lock_spec;

 
 $form = new Form('lockingForm');
 
 $form = new Form('lockingForm');

-$form->addInput(array('type'=>'text','maxlength'=>'10','name'=>'lock_interval','value'=>$cl_lock_interval));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'lock_spec','style'=>'width: 250px;','value'=>$cl_lock_spec));

 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
 
 if ($request->isPost()) {
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
 
 if ($request->isPost()) {

-  if ($cl_lock_interval == null || trim($cl_lock_interval) == '') $cl_lock_interval = 0;
+  // Validate user input.
+  if (!ttValidCronSpec($cl_lock_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));

 
 

-  if (ttTeamHelper::update($user->team_id, array(
-    'name' => $user->team,
-    'locktime' => $cl_lock_interval))) {
-    header('Location: time.php');
-    exit();
-  } else {
-    $err->add($i18n->getKey('error.db'));
+  if ($err->no()) {
+    if (ttTeamHelper::update($user->team_id, array(
+      'name' => $user->team,
+      'lock_spec' => $cl_lock_spec))) {
+      header('Location: time.php');
+      exit();
+    } else {
+      $err->add($i18n->getKey('error.db'));
+    }

   }
 } // isPost
 
   }
 } // isPost
 

diff --git a/mysql.sql b/mysql.sql
index e964ac72056c7981a0c8b4ab84ff7e4588a3d442..5e669305d4232154b97f8d5e6f7ef9809c2ea477 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -27,6 +27,8 @@ CREATE TABLE `tt_teams` (
   `tracking_mode` smallint(2) NOT NULL DEFAULT '1',      # tracking mode ("projects" or "projects and tasks")
   `record_type` smallint(2) NOT NULL DEFAULT '0',        # time record type ("start and finish", "duration", or both)
   `plugins` varchar(255) default NULL,                   # a list of enabled plugins for team
   `tracking_mode` smallint(2) NOT NULL DEFAULT '1',      # tracking mode ("projects" or "projects and tasks")
   `record_type` smallint(2) NOT NULL DEFAULT '0',        # time record type ("start and finish", "duration", or both)
   `plugins` varchar(255) default NULL,                   # a list of enabled plugins for team

+  `lock_spec` varchar(255) default NULL,                 # Cron specification for record locking,
+                                                         # for example: "0 10 * * 1" for "weekly on Mon at 10:00".

   `custom_logo` tinyint(4) default '0',                  # whether to use a custom logo or not
   `status` tinyint(4) default '1',                       # team status
   PRIMARY KEY (`id`)
   `custom_logo` tinyint(4) default '0',                  # whether to use a custom logo or not
   `status` tinyint(4) default '1',                       # team status
   PRIMARY KEY (`id`)