From: Nik Okuntseff <support@anuko.com>
Date: Wed, 14 Mar 2018 16:07:50 +0000 (+0000)
Subject: Some more refactoring.
X-Git-Tag: timetracker_1.19-1~1036
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=813f43a9406fb5adfb8c6e89cd97b06a11da58c9;p=timetracker.git

Some more refactoring.
---

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 38a2d819..684fa63c 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1054,7 +1054,7 @@ class ttTeamHelper {
   static function enablePlugin($plugin, $enable = true)
   {
     global $user;
-    if (!$user->canManageTeam())
+    if (!$user->can('manage_features'))
       return false;
 
     $plugin_array = explode(',', $user->plugins);
diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 7cbf4dda..222bcca4 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -474,7 +474,7 @@ class ttTimeHelper {
       $billable_part = $fields['billable'] ? ', billable = 1' : ', billable = 0';
     }
     $paid_part = '';
-    if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
+    if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
       $paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
     }
 
diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl
index 04908bbd..442f41bb 100644
--- a/WEB-INF/templates/cf_custom_field_add.tpl
+++ b/WEB-INF/templates/cf_custom_field_add.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
diff --git a/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl
index 00ad37ff..fae6d804 100644
--- a/WEB-INF/templates/cf_custom_field_delete.tpl
+++ b/WEB-INF/templates/cf_custom_field_delete.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
           <td colspan="2" align="center"><b>{$field|escape}</b></td>
diff --git a/WEB-INF/templates/cf_custom_field_edit.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl
index 5e4d57c4..beabbe7d 100644
--- a/WEB-INF/templates/cf_custom_field_edit.tpl
+++ b/WEB-INF/templates/cf_custom_field_edit.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 51e83769..7a1b156b 100644
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td width="50%" class="tableHeader">{$i18n.label.thing_name}</td>
diff --git a/WEB-INF/templates/cf_dropdown_option_add.tpl b/WEB-INF/templates/cf_dropdown_option_add.tpl
index 5d892d13..bcc1cee7 100644
--- a/WEB-INF/templates/cf_dropdown_option_add.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_add.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
diff --git a/WEB-INF/templates/cf_dropdown_option_delete.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl
index 6a273db0..bec03cc3 100644
--- a/WEB-INF/templates/cf_dropdown_option_delete.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_delete.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
           <td colspan="2" align="center"><b>{$option|escape}</b></td>
diff --git a/WEB-INF/templates/cf_dropdown_option_edit.tpl b/WEB-INF/templates/cf_dropdown_option_edit.tpl
index 84deaa22..c2b0bae9 100644
--- a/WEB-INF/templates/cf_dropdown_option_edit.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_edit.tpl
@@ -2,7 +2,7 @@
 <table cellspacing="4" cellpadding="7" border="0">
   <tr>
     <td>
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
           <td align="right">{$i18n.label.thing_name} (*):</td>
diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index 2882d92c..ba15a416 100644
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -6,7 +6,7 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->canManageTeam()}
+{if $user->can('manage_custom_fields')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr>
           <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 39198b88..953f78d5 100644
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -150,7 +150,7 @@ function recalculateCost() {
       <td align="right">{$i18n.label.cost}:</td>
       <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>
     </tr>
-{if ($user->canManageTeam() && $user->isPluginEnabled('ps'))}
+{if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
     <tr>
       <td align="right">&nbsp;</td>
       <td><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f7e7f6bf..3807ef1d 100644
--- 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.43.4075 | 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.43.4076 | 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>