More refactoring.

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index 8e9cf20..1218f7f 100644 (file)
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -42,11 +42,10 @@ define('DSN', 'mysqli://root:no@localhost/dbname?charset=utf8');
 // and now you see some corrupted characters. See http://dev.mysql.com/doc/refman/5.0/en/charset-mysql.html
 
 
-// MULTITEAM_MODE option defines whether users can create their own teams.
+// MULTITEAM_MODE option defines whether users can create their own top groups (organizations).
+// When false, a Time Tracker server is managed by admin, who creates top groups (one or many).
 //
 // Available values are true or false.
-// If true users can create their own teams.
-// If false only admin can create teams.
 //
 define('MULTITEAM_MODE', true);
 
@@ -208,7 +207,3 @@ define('AUTH_MODULE', 'db');
 
 // Height in pixels for the note input field in time.php. Defaults to 40.
 // define('NOTE_INPUT_HEIGHT', 100);
-
-// define('MANAGER_ONLY_TEAM_SETTINGS', true); // Note: temporary define, to be removed after introduction of role edits.
-                                               // Currently checked for "defined" only in profile_edit.tpl, meaning that false
-                                               // value here means the same thing.
\ No newline at end of file

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index 50bffb6..30c78f9 100644 (file)
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -168,7 +168,7 @@ class ttAdmin {
     // If we mark all of them deleted here, we can't recover nicely
     // as we'll lose track of what was deleted by user.
     //
-    // 2) DB maintenance script (Clean up DB from inactive teams) should
+    // 2) DB maintenance script (Clean up DB from inactive groups) should
     // get rid of these items permanently eventually.
 
     // Mark group deleted.

diff --git a/WEB-INF/lib/ttClientHelper.class.php b/WEB-INF/lib/ttClientHelper.class.php
index f11edc9..afa7afb 100644 (file)
--- a/WEB-INF/lib/ttClientHelper.class.php
+++ b/WEB-INF/lib/ttClientHelper.class.php
@@ -51,7 +51,7 @@ class ttClientHelper {
     return false;
   }
 
-  // getClients - returns an array of active and inactive clients in a team.
+  // getClients - returns an array of active and inactive clients in a group.
   static function getClients()
   {
     global $user;
@@ -241,7 +241,7 @@ class ttClientHelper {
     return (!is_a($affected, 'PEAR_Error'));
   }
 
-  // The setMappedClient function is used during team import to change client_id value for tt_users to a mapped value.
+  // The setMappedClient function is used during group import to change client_id value for tt_users to a mapped value.
   static function setMappedClient($group_id, $imported_id, $mapped_id)
   {
     $mdb2 = getConnection();

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index c26937e..243ed3e 100644 (file)
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -29,7 +29,7 @@
 import('ttTeamHelper');
 import('ttTimeHelper');
 
-// ttExportHelper - this class is used to export team data to a file.
+// ttExportHelper - this class is used to export group data to a file.
 class ttExportHelper {
   var $fileName    = null;    // Name of the file with data.
 
@@ -45,7 +45,7 @@ class ttExportHelper {
   var $customFieldOptionMap = array(); // Custop field option ids.
   var $logMap      = array(); // Time log ids.
 
-  // createDataFile creates a file with all data for a given team.
+  // createDataFile creates a file with all data for a given group.
   function createDataFile($compress = false) {
     global $user;
 
@@ -61,7 +61,7 @@ class ttExportHelper {
     fwrite($file, "<?xml version=\"1.0\"?>\n");
     fwrite($file, "<pack>\n");
 
-    // Write team info.
+    // Write group info.
     fwrite($file, "<group currency=\"".$user->currency."\" decimal_mark=\"".$user->decimal_mark."\" lang=\"".$user->lang.
       "\" date_format=\"".$user->date_format."\" time_format=\"".$user->time_format."\" week_start=\"".$user->week_start.
       "\" tracking_mode=\"".$user->tracking_mode."\" project_required=\"".$user->project_required."\" task_required=\"".$user->task_required.
@@ -69,7 +69,7 @@ class ttExportHelper {
       "\" plugins=\"".$user->plugins."\" lock_spec=\"".$user->lock_spec."\" workday_minutes=\"".$user->workday_minutes.
       "\" config=\"".$user->config.
       "\">\n");
-    fwrite($file, "  <name><![CDATA[".$user->team."]]></name>\n");
+    fwrite($file, "  <name><![CDATA[".$user->group."]]></name>\n");
     fwrite($file, "</group>\n");
 
     // Prepare role map.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 5091c1f..6920ab3 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1100,7 +1100,7 @@ class ttTeamHelper {
 
     $plugins = implode(',', $plugin_array);
     if ($plugins != $user->plugins) {
-      if (!ttTeamHelper::update($user->group_id, array('name' => $user->team,'plugins' => $plugins)))
+      if (!ttTeamHelper::update($user->group_id, array('name' => $user->group,'plugins' => $plugins)))
         return false;
       $user->plugins = $plugins;
     }

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e3de5b4..dfcd1a6 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -57,7 +57,7 @@ class ttUser {
   var $currency = null;         // Currency.
   var $plugins = null;          // Comma-separated list of enabled plugins.
   var $config = null;           // Comma-separated list of miscellaneous config options.
-  var $team = null;             // Team name.
+  var $group = null;            // Group name.
   var $custom_logo = 0;         // Whether to use a custom logo for team.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
@@ -113,7 +113,7 @@ class ttUser {
       $this->record_type = $val['record_type'];
       $this->bcc_email = $val['bcc_email'];
       $this->allow_ip = $val['allow_ip'];
-      $this->team = $val['group_name'];
+      $this->group = $val['group_name'];
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3634919..0487798 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.87.4236 | 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.87.4237 | 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/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 2752dc4..aa59d3f 100644 (file)
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -158,7 +158,7 @@
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
   {if $user->name}
-        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>
+        <tr><td>{$user->name|escape} - {$user->role_name|escape}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->group}, {$user->group|escape}{/if}</td></tr>
   {else}
         <tr><td>&nbsp;</td></tr>
   {/if}

diff --git a/group_edit.php b/group_edit.php
index 6ec572e..b5deee8 100644 (file)
--- a/group_edit.php
+++ b/group_edit.php
@@ -76,7 +76,7 @@ if ($request->isPost()) {
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
 } else {
-  $cl_team = $user->team;
+  $cl_team = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
   $cl_lang = $user->lang;
   $cl_decimal_mark = $user->decimal_mark;

diff --git a/invoice_send.php b/invoice_send.php
index 20c3c18..ca76f34 100644 (file)
--- a/invoice_send.php
+++ b/invoice_send.php
@@ -58,7 +58,7 @@ if ($request->isPost()) {
 } else {
   $cl_receiver = $sc->getValue(SYSC_LAST_INVOICE_EMAIL);
   $cl_cc = $sc->getValue(SYSC_LAST_INVOICE_CC);
-  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->team;
+  $cl_subject = $i18n->get('title.invoice').' '.$invoice['name'].', '.$user->group;
 }
 
 $form = new Form('mailForm');

diff --git a/locking.php b/locking.php
index 99e79a2..2de307e 100644 (file)
--- a/locking.php
+++ b/locking.php
@@ -52,7 +52,7 @@ if ($request->isPost()) {
 
   if ($err->no()) {
     if (ttTeamHelper::update($user->group_id, array(
-      'name' => $user->team,
+      'name' => $user->group,
       'lock_spec' => $cl_lock_spec))) {
       header('Location: profile_edit.php');
       exit();

diff --git a/quotas.php b/quotas.php
index 8e6f59c..a453099 100644 (file)
--- a/quotas.php
+++ b/quotas.php
@@ -90,7 +90,7 @@ if ($request->isPost()){
     // Handle workday hours.
     $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'));
     if ($workday_minutes != $user->workday_minutes) {
-      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->team,'workday_minutes'=>$workday_minutes)))
+      if (!ttTeamHelper::update($user->group_id, array('name'=>$user->group,'workday_minutes'=>$workday_minutes)))
         $err->add($i18n->get('error.db'));
     }