Improved ttUser::markUserDeleted by marking user custom fields as deleted also.

[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 16e2d2d1650c7231533305c7127019868fd8b0ec..6db627884cd71996fdb41d660e8ebcfcf5e98048 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -55,7 +55,6 @@ class ttUser {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.

-  var $show_holidays = 0;       // Whether to show holidays in calendar.

   var $tracking_mode = 0;       // Tracking mode.
   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 $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.


@@ -148,7 +147,6 @@ class ttUser {
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.

-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');

       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');


@@ -205,6 +203,11 @@ class ttUser {
     return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
   }
 
     return ($this->behalfGroup ? $this->behalfGroup->time_format : $this->time_format);
   }
 

+  // getWeekStart returns week start day for active group.
+  function getWeekStart() {
+    return ($this->behalfGroup ? $this->behalfGroup->week_start : $this->week_start);
+  }
+

   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);
   // getTrackingMode returns tracking mode for active group.
   function getTrackingMode() {
     return ($this->behalfGroup ? $this->behalfGroup->tracking_mode : $this->tracking_mode);


@@ -245,6 +248,11 @@ class ttUser {
     return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
   }
 
     return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
   }
 

+  // getConfigHelper returns ttConfigHelper instance for active group.
+  function getConfigHelper() {
+    return ($this->behalfGroup ? $this->behalfGroup->configHelper : $this->configHelper);
+  }
+

   // getConfigOption returns true if an option is defined for group.
   // This helps us keeping a set of user attributes smaller.
   // We determine whether the option is set only on pages that need to know.
   // getConfigOption returns true if an option is defined for group.
   // This helps us keeping a set of user attributes smaller.
   // We determine whether the option is set only on pages that need to know.


@@ -502,54 +510,36 @@ class ttUser {
     return $user_list;
   }
 
     return $user_list;
   }
 

-  // getGroupsForDropdown obtains an array of groups to populate "Group" dropdown.
-  // It consists of:
-  //   - User home group.
-  //   - The entire stack of groups all the way down to current on behalf group.
-  //   - All immediate children of the current on behalf group.
-  // This allows user to navigate easily to home group, anything in between, and 1 level below.
+  // getGroupsForDropdown obtains an array of groups to populate the "Group" dropdown.
+  // It consists of the entire tree starting from user home group.
+  // Group name is prefixed with additional characters to indicate subgroups level.

   function getGroupsForDropdown() {
   function getGroupsForDropdown() {

-    $mdb2 = getConnection();
+    global $user;

 
 

-    // Start with subgroups.
+    // Start with user home group.

     $groups = array();
     $groups = array();

-    $group_id = $this->getGroup();
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $groups[] = $val;
-      }
-    }
+    $subgroup_level = 0;
+    $group_id = $user->group_id;

 
 

-    // Add current on behalf group to the beginning of array.
-    $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
-    $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
-    array_unshift($groups,  array('id'=>$selected_group_id,'name'=>$selected_group_name));
+    $this->addGroupToDropdown($groups, $group_id, $subgroup_level);
+    return $groups;
+  }

 
 

-    // Iterate all the way to the home group, starting with selected ("on behalf") group.
-    $current_group_id = $selected_group_id;
-    while ($current_group_id != $this->group_id) {
-      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $current_group_id and status = 1";
-      $res = $mdb2->query($sql);
-      if (is_a($res, 'PEAR_Error')) return false;
+  // addGroupToDropdown is a recursive function to populate a tree of groups, used with getGroupsForDropdown().
+  function addGroupToDropdown(&$groups, $group_id, $subgroup_level) {
+    // Add indentation markup to indicate subdirectory level.
+    for ($i = 0; $i < $subgroup_level; $i++) {
+      $name .= '🛑'; // Unicode stop sign.
+    }
+    if ($subgroup_level) $name .= ' '; // Add an extra space.
+    $name .= ttGroupHelper::getGroupName($group_id);

 
 

-      $val = $res->fetchRow();
-      $parent_id = $val['parent_id'];
-      if ($parent_id) {
-        // Get parent group name.
-        $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
-        $res = $mdb2->query($sql);
-        if (is_a($res, 'PEAR_Error')) return false;
-        $val = $res->fetchRow();
-        if (!$val) return false;
-        array_unshift($groups, array('id'=>$parent_id,'name'=>$val['name']));
-        $current_group_id = $parent_id;
-      } else {
-        return false;
-      }
+    $groups[] = array('id'=>$group_id, 'name'=>$name);
+
+    $subgroups = $this->getSubgroups($group_id);
+    foreach($subgroups as $subgroup) {
+      $this->addGroupToDropdown($groups, $subgroup['id'], $subgroup_level+1);

     }
     }

-    return $groups;

   }
 
   // getSubgroups obtains a list of immediate subgroups.
   }
 
   // getSubgroups obtains a list of immediate subgroups.


@@ -718,14 +708,26 @@ class ttUser {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     if (is_a($affected, 'PEAR_Error'))
       return false;
 

-    // Mark user as deleted.
+    // Mark user custom fields as deleted,
+    require_once('plugins/CustomFields.class.php');
+    $entity_type = CustomFields::ENTITY_USER;

     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);
     $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($this->id);

+    $sql = "update tt_entity_custom_fields set status = null $modified_part".
+      " where entity_type = $entity_type and entity_id = $user_id".
+      " and group_id = $group_id and org_id = $org_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error'))
+      return false;
+
+    // Mark user as deleted.

     $sql = "update tt_users set status = null $modified_part where id = $user_id".
       " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
     $sql = "update tt_users set status = null $modified_part where id = $user_id".
       " and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
 

+
+

     return true;
   }
 
     return true;
   }