Moved enablePlugin to ttUser class.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b22e8b5f9311fd3ac4f4ccf74d20b5901886c79e..3bb71656385a00793164e123476ce60643adb780 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -1033,31 +1033,4 @@ class ttTeamHelper {
 
     return true;
   }
 
     return true;
   }

-
-  // enablePlugin either enables or disables a specific plugin for team.
-  static function enablePlugin($plugin, $enable = true)
-  {
-    global $user;
-    if (!$user->can('manage_features'))
-      return false;
-
-    $plugin_array = explode(',', $user->plugins);
-    if ($enable && !in_array($plugin, $plugin_array))
-      $plugin_array[] = $plugin; // Add plugin to array.
-
-    if (!$enable && in_array($plugin, $plugin_array)) {
-      $key = array_search($plugin, $plugin_array);
-      if ($key !== false)
-        unset($plugin_array[$key]); // Remove plugin from array.
-    }
-
-    $plugins = implode(',', $plugin_array);
-    if ($plugins != $user->plugins) {
-      if (!$user->updateGroup(array('plugins' => $plugins)))
-        return false;
-      $user->plugins = $plugins;
-    }
-
-    return true;
-  }

 }
 }

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index ae197c6983351b3213f54e0dda7f939efcf1bd7a..cbfd62d1a262a4054e411441ed7c8d8955c1dc9d 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -416,6 +416,9 @@ class ttUser {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {
 
   // updateGroup updates group information with new data.
   function updateGroup($fields) {

+    if (!($this->can('manage_basic_settings') ||
+      $this->can('manage_advanced_settings') ||
+      $this->can('manage_features'))) return false;

 
     $mdb2 = getConnection();
 
 
     $mdb2 = getConnection();
 


@@ -450,4 +453,32 @@ class ttUser {
 
     return true;
   }
 
     return true;
   }

+
+  // enablePlugin either enables or disables a specific plugin for group.
+  function enablePlugin($plugin, $enable = true)
+  {
+    if (!$this->can('manage_advanced_settings'))
+      return false; // Note: enablePlugin is currently only used on week_view.php.
+                    // So, it's not really a plugin we are enabling, but rather week view display options.
+                    // Therefore, a check for manage_advanced_settings, not manage_features.
+
+    $plugin_array = explode(',', $this->plugins);
+    if ($enable && !in_array($plugin, $plugin_array))
+      $plugin_array[] = $plugin; // Add plugin to array.
+
+    if (!$enable && in_array($plugin, $plugin_array)) {
+      $key = array_search($plugin, $plugin_array);
+      if ($key !== false)
+        unset($plugin_array[$key]); // Remove plugin from array.
+    }
+
+    $plugins = implode(',', $plugin_array);
+    if ($plugins != $this->plugins) {
+      if (!$this->updateGroup(array('plugins' => $plugins)))
+        return false;
+      $this->plugins = $plugins;
+    }
+
+    return true;
+  }

 }
 }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ac4aadba25b1d177649dfebd784d4dba0beaaece..1ce30a99abeff5cfd609bb8652b2c948284df98a 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4241 | 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.4242 | 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>
             <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/week_view.php b/week_view.php
index e5ec147960ac898ad25b2b5fc71960f2e3281578..38b753a15554aa03eebf78d54a2930b7522b13df 100644 (file)
--- a/week_view.php
+++ b/week_view.php
@@ -59,9 +59,9 @@ $form->addInput(array('type'=>'checkbox','name'=>'notes','value'=>$cl_notes));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()){

-  if (!ttTeamHelper::enablePlugin('wvn', $cl_week_note) ||
-      !ttTeamHelper::enablePlugin('wvl', $cl_week_list) ||
-      !ttTeamHelper::enablePlugin('wvns', $cl_notes)) {
+  if (!$user->enablePlugin('wvn', $cl_week_note) ||
+      !$user->enablePlugin('wvl', $cl_week_list) ||
+      !$user->enablePlugin('wvns', $cl_notes)) {

     $err->add($i18n->get('error.db'));
   }
 }
     $err->add($i18n->get('error.db'));
   }
 }