Refactoring, finished replacing with ttUser::isPluginEnabled().

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index b4557f145bdebb5c87f800508bb7a556c2fcdee9..ae90374c134a6ba9b716785b9a8b04b082599370 100644 (file)
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -1055,7 +1055,7 @@ class ttReportHelper {
     $totals = ttReportHelper::getTotals($bean);
 
     // Use custom fields plugin if it is enabled.
-    if (in_array('cf', explode(',', $user->plugins)))
+    if ($user->isPluginEnabled('cf'))
       $custom_fields = new CustomFields($user->team_id);
 
     // Define some styles to use in email.
@@ -1313,7 +1313,7 @@ class ttReportHelper {
     $totals = ttReportHelper::getFavTotals($report);
 
     // Use custom fields plugin if it is enabled.
-    if (in_array('cf', explode(',', $user->plugins)))
+    if ($user->isPluginEnabled('cf'))
       $custom_fields = new CustomFields($user->team_id);
 
     // Define some styles to use in email.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index b55bc06ab93df20c3cec3d0fac8884380e886bbb..0c671c4e5a0bf4b6dfe9b80f68fab1e83ee55215 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.9.20.3461 | 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.20.3462 | 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/invoice_view.php b/invoice_view.php
index a40d9b670b14848ca9912cdc9451a8c6c5ee6d00..2bb987637beeec51f3336399df1bb65d31e0baba 100644 (file)
--- a/invoice_view.php
+++ b/invoice_view.php
@@ -52,7 +52,7 @@ $tax = 0;
 foreach($invoice_items as $item)
   $subtotal += $item['cost'];
 if ($tax_percent) {
-  $tax_expenses = in_array('et', explode(',', $user->plugins));
+  $tax_expenses = $user->isPluginEnabled('et');
   foreach($invoice_items as $item) {
     if ($item['type'] == 2 && !$tax_expenses)
       continue;

diff --git a/mobile/time.php b/mobile/time.php
index b7a26b6467628fcdca6f5011b08517c22df79190..8b20cac831fcae5180ae7cdf85cac5d7aef15074 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -54,7 +54,7 @@ $prev_date = date('Y-m-d', strtotime('-1 day', strtotime($cl_date)));
 $next_date = date('Y-m-d', strtotime('+1 day', strtotime($cl_date)));
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index f2083ee46eea1222563ad9c9538a8d6191b707f9..052ec1f18b4f4e5ae0afcb9f1c6e3f8b5fec18f5 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -41,7 +41,7 @@ if (!ttAccessCheck(right_data_entry)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/mobile/timer.php b/mobile/timer.php
index 949d585cfd44eb00b6243eee1fd6ff1193e45f5e..1ccc78934e8f2b9178289ac77d7b11ccf2411fff 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -51,7 +51,7 @@ $_SESSION['date'] = $cl_date;
 // TODO: for time page we may limit the day to today only.
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/report.php b/report.php
index dd4b9be3aedf827ab5ff4646723a9627cd6bb408..a18ff1f1a382bf28c49400b569349070a86fb04b 100644 (file)
--- a/report.php
+++ b/report.php
@@ -39,7 +39,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/reports.php b/reports.php
index 4947e4d968c533a5346c5dfbb74c05ce30fa7a0f..add2b43f326102245776e7fc9fc842e108d49632 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -43,7 +43,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/time_edit.php b/time_edit.php
index 18638b07bf7d09e97445da837f5bb0642a8900e6..a3421a8d21074b24f771a39cfe607a484e1ee57d 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -41,7 +41,7 @@ if (!ttAccessCheck(right_data_entry)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
   $smarty->assign('custom_fields', $custom_fields);

diff --git a/tofile.php b/tofile.php
index 26d1cbaee563216014fb65a6f26d032007b83375..299b4a10452593b2ce95044dadf2557b4b811f3c 100644 (file)
--- a/tofile.php
+++ b/tofile.php
@@ -38,7 +38,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
 }

diff --git a/topdf.php b/topdf.php
index 0126bc616b6a0f45dcf110c36b1d213e08f2d7f5..d017299b7ccb5f424afd6ae3f886576518e688a4 100644 (file)
--- a/topdf.php
+++ b/topdf.php
@@ -49,7 +49,7 @@ if (!ttAccessCheck(right_view_reports)) {
 }
 
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
   $custom_fields = new CustomFields($user->team_id);
 }