projects / timetracker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7ea057a)
Some more renaming.
authorNik Okuntseff <support@anuko.com>
Mon, 12 Mar 2018 13:56:42 +0000 (13:56 +0000)
committerNik Okuntseff <support@anuko.com>
Mon, 12 Mar 2018 13:56:42 +0000 (13:56 +0000)
WEB-INF/lib/ttUser.class.php patch | blob | history
WEB-INF/templates/footer.tpl patch | blob | history
mobile/time.php patch | blob | history
mobile/time_edit.php patch | blob | history
role_edit.php patch | blob | history
time.php patch | blob | history
time_edit.php patch | blob | history

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0d31cb7..9c3e4c5 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -61,7 +61,7 @@ class ttUser {
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
   var $rights_mask = 0;         // A mask of user rights. TODO: remove after roles revamp.
-  var $rights_array = array();  // An array of user rights, planned replacement of $rights_mask.
+  var $rights = array();        // An array of user rights, planned replacement of $rights_mask.
 
   // Constructor.
   function __construct($login, $id = null) {
@@ -142,27 +142,27 @@ class ttUser {
       if ($this->role == ROLE_USER) {
         $this->rights_mask = right_data_entry|right_view_charts|right_view_reports;
         // TODO: get customized rights from the database instead.
-        // $this->rights_array[] = "data_entry";          // Enter time and expense records into Time Tracker.
-        // $this->rights_array[] = "view_own_data";       // View own reports and charts.
-        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
-        // $this->rights_array[] = "view_users";          // View user names and roles in a group.
+        // $this->rights[] = "data_entry";          // Enter time and expense records into Time Tracker.
+        // $this->rights[] = "view_own_data";       // View own reports and charts.
+        // $this->rights[] = "manage_own_settings"; // Edit own settings.
+        // $this->rights[] = "view_users";          // View user names and roles in a group.
       } elseif ($this->role == ROLE_CLIENT) {
         $this->rights_mask = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too?
-        // $this->rights_array[] = "view_own_data";       // View own reports, charts, and invoices.
-        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
+        // $this->rights[] = "view_own_data";       // View own reports, charts, and invoices.
+        // $this->rights[] = "manage_own_settings"; // Edit own settings.
       } elseif ($this->role == ROLE_COMANAGER) {
         $this->rights_mask = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team;
-        // $this->rights_array[] = "data_entry";          // Enter time and expense records into Time Tracker.
-        // $this->rights_array[] = "view_own_data";       // View own reports and charts.
-        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
-        // $this->rights_array[] = "view_users";          // View user names and roles in a group.
-        // $this->rights_array[] = "on_behalf_data_entry";// Can enter data on behalf of lower roles.
-        // $this->rights_array[] = "view_data";           // Can view data for lower roles.
-        $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
+        // $this->rights[] = "data_entry";          // Enter time and expense records into Time Tracker.
+        // $this->rights[] = "view_own_data";       // View own reports and charts.
+        // $this->rights[] = "manage_own_settings"; // Edit own settings.
+        // $this->rights[] = "view_users";          // View user names and roles in a group.
+        // $this->rights[] = "on_behalf_data_entry";// Can enter data on behalf of lower roles.
+        // $this->rights[] = "view_data";           // Can view data for lower roles.
+        $this->rights[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
         // TODO: get rights from the database instead.
       } elseif ($this->role == ROLE_MANAGER) {
         $this->rights_mask = right_data_entry|right_view_charts|right_view_reports|right_view_invoices|right_manage_team|right_assign_roles|right_export_team;
-        $this->rights_array[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
+        $this->rights[] = "override_punch_mode"; // Can input any start and finish times for self and lower roles.
       } elseif ($this->role == ROLE_SITE_ADMIN) {
         $this->rights_mask = right_administer_site;
       }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d14cee7..cc7c135 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.38.4057 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.38.4058 | 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>
diff --git a/mobile/time.php b/mobile/time.php
index 666f4c2..aff2137 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -155,7 +155,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights_array)) {
+  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights)) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index e374008..73496ca 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -175,7 +175,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights_array)) {
+  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights)) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
diff --git a/role_edit.php b/role_edit.php
index b665e6d..99fbbc4 100644 (file)
--- a/role_edit.php
+++ b/role_edit.php
@@ -44,7 +44,7 @@ if (!$role) {
   exit();
 }
 $assigned_rights = explode(',', $role['rights']);
-$available_rights = array_diff($user->rights_array, $assigned_rights);
+$available_rights = array_diff($user->rights, $assigned_rights);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -124,7 +124,7 @@ if ($request->isPost()) {
        $rights = str_replace($right_to_add, '', $rights);
        $rights = str_replace(',,',',', $rights);
        // Add the right only if we have it ourselves.
-       if (in_array($right_to_add, $user->rights_array))
+       if (in_array($right_to_add, $user->rights))
          $rights .= ','.$right_to_add;
      }
      $rights = trim($rights, ',');
diff --git a/time.php b/time.php
index b6bb000..381634f 100644 (file)
--- a/time.php
+++ b/time.php
@@ -187,7 +187,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights_array)) {
+  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights)) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
diff --git a/time_edit.php b/time_edit.php
index 2ceb4b3..58d963f 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -178,7 +178,7 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights_array)) {
+  if ($user->punch_mode && !in_array('override_punch_mode', $user->rights)) {
     // Make the start and finish fields read-only.
     $form->getElement('start')->setEnabled(false);
     $form->getElement('finish')->setEnabled(false);
Unnamed repository; edit this file 'description' to name the repository.