Introduced site admin and top manager roles in tt_roles with team_id 0.

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

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 60d0872..815eff7 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -46,7 +46,7 @@ class ttUser {
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
-  var $punch_in_mode = 0;       // Whether punch in mode is enabled for user.
+  var $punch_mode = 0;          // Whether punch mode is enabled for user.
   var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $future_entries = 0;      // Whether to allow creating future entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
@@ -117,7 +117,7 @@ class ttUser {
 
       // Set user config options.
       $this->show_holidays = in_array('show_holidays', $config_array);
-      $this->punch_in_mode = in_array('punch_in_mode', $config_array);
+      $this->punch_mode = in_array('punch_mode', $config_array);
       $this->allow_overlap = in_array('allow_overlap', $config_array);
       $this->future_entries = in_array('future_entries', $config_array);
       $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array);
@@ -132,18 +132,27 @@ class ttUser {
       if ($this->role == ROLE_USER) {
         $this->rights = right_data_entry|right_view_charts|right_view_reports;
         // TODO: get customized rights from the database instead.
-        $this->rights_array[] = "data_entry";       // Right to enter time and expense records into Time Tracker.
-        $this->rights_array[] = "view_own_reports"; // Right to view own reports (for a specific user).
-        $this->rights_array[] = "view_own_charts";  // Right to view own charts (for a specific user).
+        // $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.
       } elseif ($this->role == ROLE_CLIENT) {
         $this->rights = right_view_reports|right_view_invoices; // TODO: how about right_view_charts, too?
-        $this->rights_array[] = "view_client_reports";  // Right to view reports for a specific client.
-        $this->rights_array[] = "view_client_charts";   // Right to view charts for a specific client.
-        $this->rights_array[] = "view_client_invoices"; // Right to view invoices for a specific client.
+        // $this->rights_array[] = "view_own_data";       // View own reports, charts, and invoices.
+        // $this->rights_array[] = "manage_own_settings"; // Edit own settings.
       } elseif ($this->role == ROLE_COMANAGER) {
         $this->rights = 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.
+        // TODO: get rights from the database instead.
       } elseif ($this->role == ROLE_MANAGER) {
         $this->rights = 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.
       } elseif ($this->role == ROLE_SITE_ADMIN) {
         $this->rights = right_administer_site;
       }
@@ -173,9 +182,6 @@ define('ROLE_COMANAGER', 68);    // Team co-manager. Can do many things but not
 define('ROLE_MANAGER', 324);     // Team manager. Can do everything for a team.
 define('ROLE_SITE_ADMIN', 1024); // Site administrator.
 */
-
-      // Adjust punch_in_mode for managers as they are allowed to overwrite start and end times.
-      if ($this->canManageTeam()) $this->punch_in_mode = 0;
     }
   }