Changeset 680

Timestamp:

Jan 8, 2005, 12:23:52 PM (19 years ago)

Author:

plg

Message:

• deletion of calculated permissions when deleting a user

• taking into account locked categories during permissions calculation

Location:

trunk

Files:

• admin/include/functions.php (modified) (2 diffs)
• include/functions_user.inc.php (modified) (2 diffs)
• include/user.inc.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -322 +322 @@
 //     - all the favorites linked to this user
 //     - all sessions linked to this user
-//     - all categories informations linked to this user
+//     - calculated permissions linked to the user
 function delete_user($user_id)
 {
@@ -349 +349 @@
   $query = '
 DELETE FROM '.SESSIONS_TABLE.'
+  WHERE user_id = '.$user_id.'
+;';
+  pwg_query($query);
+
+  // deletion of calculated permissions linked to the user
+  $query = '
+DELETE FROM '.USER_FORBIDDEN_TABLE.'
   WHERE user_id = '.$user_id.'
 ;';

trunk/include/functions_user.inc.php

@@ -268 +268 @@
  *
  * @param int user_id
+ * @param string user_status
  * @return string forbidden_categories
  */
-function calculate_permissions($user_id)
+function calculate_permissions($user_id, $user_status)
 {
   $private_array = array();
@@ -284 +285 @@
   {
     array_push($private_array, $row['id']);
+  }
+
+  // if user is not an admin, locked categories can be considered as private$
+  if ($user_status != 'admin')
+  {
+    $query = '
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE visible = \'false\'
+;';
+    $result = pwg_query($query);
+    while ($row = mysql_fetch_array($result))
+    {
+      array_push($private_array, $row['id']);
+    }
+
+    $private_array = array_unique($private_array);
   }
   

trunk/include/user.inc.php

@@ -129 +129 @@
       or $user['need_update'] == true)
   {
-    $user['forbidden_categories'] = calculate_permissions($user['id']);
+    $user['forbidden_categories'] = calculate_permissions($user['id'],
+                                                          $user['status']);
   }
 }