Changeset 4276 for extensions/event_cats/include

Timestamp:

Nov 16, 2009, 1:26:06 AM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] Duplication management, add table and begin $_POST analysis

Location:

extensions/event_cats/include

Files:

• evntcats_admin_funcs.inc.php (modified) (6 diffs)
• evntcats_main_funcs.inc.php (modified) (12 diffs)

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -376 +376 @@
   "
     SELECT `id`
-    FROM `".EVNTCATS_TABLE."`
+    FROM `".EVNTCATS_AUTOLOG_TABLE."`
     WHERE `code`    = '".$ec_code."'
       AND `user_id`    ".$ec_user_idp."
@@ -393 +393 @@
       $t1 = mysql_fetch_row(pwg_query("
         SELECT `code`
-        FROM `".EVNTCATS_TABLE."`
+        FROM `".EVNTCATS_AUTOLOG_TABLE."`
         WHERE `id` = ".$_POST['ec_entry_sel']
       ))) === false
@@ -399 +399 @@
     $r = pwg_query("
       SELECT `id`
-      FROM `".EVNTCATS_TABLE."`
+      FROM `".EVNTCATS_AUTOLOG_TABLE."`
       WHERE `code` = '".$t1[0]."'
        AND `id` <> ".$_POST['ec_entry_sel']
@@ -425 +425 @@
     if (
       pwg_query("
-        INSERT INTO `".EVNTCATS_TABLE."` (
+        INSERT INTO `".EVNTCATS_AUTOLOG_TABLE."` (
           `code`,
           `user_id`,
@@ -459 +459 @@
     if (
       pwg_query("
-        UPDATE `".EVNTCATS_TABLE."`
+        UPDATE `".EVNTCATS_AUTOLOG_TABLE."`
         SET
           `user_id` =  ".$ec_user_id.",
@@ -493 +493 @@
   global $page;
   if (!pwg_query("
-    DELETE FROM `".EVNTCATS_TABLE."`
+    DELETE FROM `".EVNTCATS_AUTOLOG_TABLE."`
     WHERE `id` = ".$ec_id
   )) {

extensions/event_cats/include/evntcats_main_funcs.inc.php

@@ -155 +155 @@
       if ($new_action == '') {
         if (!pwg_query("
-          UPDATE `".EVNTCATS_TABLE."`
+          UPDATE `".EVNTCATS_AUTOLOG_TABLE."`
           SET `forced` = 'false'
           WHERE `id` = ".$ec_entry['id']
@@ -247 +247 @@
   
   $q = pwg_query("
-    SELECT * FROM `".EVNTCATS_TABLE."`
+    SELECT * FROM `".EVNTCATS_AUTOLOG_TABLE."`
     WHERE `code` IS NOT NULL
     ORDER BY `id`
@@ -352 +352 @@
  */
 function build_dup_arrays($append_tpl = false) {
-  global $template, $ec_lists, $conf, $ec_debug;
+  global $template, $ec_lists, $conf;
   
   if (count($ec_lists['user_ids']) == 0) build_ec_userids();
@@ -368 +368 @@
   
   // groups granted to duplication
-  $group_granted_ids = order_by_name(
+  $groups_granted_ids = order_by_name(
     array_from_query("
-      SELECT `arg2`
-        FROM ".EVNTCATS_TABLE."
-        WHERE `code` IS NULL
-          AND `arg1` = '1'
-          AND `arg2` IS NOT NULL
+      SELECT `val`
+        FROM ".EVNTCATS_DUPLIC_TABLE."
+        WHERE `item` = 'grp'
       ;",
-      'arg2'
+      'val'
     ),
     $groups
@@ -384 +382 @@
   $users_granted_direct_ids = order_by_name(
     array_from_query("
-      SELECT `arg2`
-        FROM ".EVNTCATS_TABLE."
-        WHERE `code` IS NULL
-          AND `arg1` = '2'
-          AND `arg2` IS NOT NULL
+      SELECT `val`
+        FROM ".EVNTCATS_DUPLIC_TABLE."
+        WHERE `item` = 'usr'
       ;",
-      'arg2'
+      'val'
     ),
     $ec_lists['user_ids']
@@ -398 +394 @@
   // certain group (in groups, level (friends, family, contacts),
   // or user status (generic))
-  $user_granted_ids = array();
-
+  $users_granted_ids = array();
+  
   $users_granted_thks_gen_ids = array();
-  if (read_ec_conf('duplic_gen') != '0') {
+  if ($ec_gen_granted = (read_ec_conf('duplic_gen') != '0')) {
     $users_granted_thks_gen_ids = order_by_name(
       array_diff(
@@ -415 +411 @@
     );
     foreach ($users_granted_thks_gen_ids as $user_id)
-     $user_granted_ids[$user_id] = l10n('user_status_generic');
-  } global $ec_debug; $ec_debug['1'] = $user_granted_ids;
-
+     $users_granted_ids[$user_id] = l10n('user_status_generic');
+  }
+
+  $types = array(
+    '1' => l10n('Level 1'),
+    '2' => l10n('Level 2'),
+    '4' => l10n('Level 4'),
+  );
+  $types_granted_ids = array();
   $users_granted_thks_types_ids = array();
   $c = intval(read_ec_conf('duplic_type'));
   if ($c != 0) {
-    $t = array();
-    if (($c & 1) != 0) $t[] = '1';
-    if (($c & 2) != 0) $t[] = '2';
-    if (($c & 4) != 0) $t[] = '4';
-    if (count($t) > 0) {
-      $types = array(
-        '1' => l10n('Level 1'),
-        '2' => l10n('Level 2'),
-        '4' => l10n('Level 4'),
-      );
+    if (($c & 1) != 0) $types_granted_ids[] = '1';
+    if (($c & 2) != 0) $types_granted_ids[] = '2';
+    if (($c & 4) != 0) $types_granted_ids[] = '4';
+    if (count($types_granted_ids) > 0) {
       $user_granted_from_type = array();
       $result = pwg_query("
         SELECT `user_id`, `level`
         FROM `".USER_INFOS_TABLE."`
-        WHERE `level` IN (".implode(',', $t).");
+        WHERE `level` IN (".implode(',', $types_granted_ids).");
       ");
       while ($row = mysql_fetch_array($result)) {
@@ -459 +455 @@
        foreach ($user_granted_from_type as $type_id => $type_users) {
         if (in_array($user_id, $type_users)) {
-          $user_granted_ids[$user_id]= $types[$type_id];
+          $users_granted_ids[$user_id]= $types[$type_id];
           break;
         }
        }
     }
-  } $ec_debug['2'] = $user_granted_ids;
+  }
 
   $users_granted_thks_groups_ids = array();
-  if (count($group_granted_ids) > 0) {
+  if (count($groups_granted_ids) > 0) {
     $granted_groups = array();
 
@@ -473 +469 @@
       SELECT `user_id`, `group_id`
       FROM `".USER_GROUP_TABLE."`
-      WHERE `group_id` IN (".implode(',', $group_granted_ids).");
+      WHERE `group_id` IN (".implode(',', $groups_granted_ids).");
     ");
     while ($row = mysql_fetch_array($result)) {
@@ -499 +495 @@
      foreach ($granted_groups as $group_id => $group_users)
       if (in_array($user_id, $group_users)) {
-        $user_granted_ids[$user_id]= $groups[$group_id];
+        $users_granted_ids[$user_id]= $groups[$group_id];
         break;
       }
     
-  } $ec_debug['3'] = $user_granted_ids;
+  }
 
   if ($append_tpl) {
-    $user_denied_ids = order_by_name(
+    $users_denied_ids = order_by_name(
       array_diff(
         array_keys($ec_lists['user_ids']),
@@ -517 +513 @@
     );
     
-    foreach ($user_granted_ids as $u => $g) $template->append(
+    foreach ($users_granted_ids as $u => $g) $template->append(
       'user_granted_indirects',
       array(
@@ -525 +521 @@
     );
     
-    $ec_debug['4'] = $user_granted_ids;
     $template->assign('all_groups', $groups);
-    $template->assign('group_granted_ids', $group_granted_ids);
-    $template->assign('group_denied_ids',order_by_name(
-      array_diff(array_keys($groups), $group_granted_ids), $groups
+    $template->assign('groups_granted_ids', $groups_granted_ids);
+    $template->assign('groups_denied_ids', order_by_name(
+      array_diff(array_keys($groups), $groups_granted_ids), $groups
+    ));
+    $template->assign('ec_gen_granted', $ec_gen_granted);
+    $template->assign('all_types', $types);
+    $template->assign('types_granted_ids', $types_granted_ids);
+    $template->assign('types_denied_ids', order_by_name(
+      array_diff(array_keys($types), $types_granted_ids), $types
     ));
     $template->assign('all_users', $ec_lists['user_ids']);
     $template->assign('users_granted_direct_ids', $users_granted_direct_ids);
-    $template->assign('user_denied_ids', $user_denied_ids);
-  }
-   $user_granted_ids = array_merge(
-    $user_granted_ids,
+    $template->assign('users_denied_ids', $users_denied_ids);
+  }
+  $users_granted_ids = array_merge(
+    array_keys($users_granted_ids),
     $users_granted_direct_ids
-   );
-  return $user_granted_ids;
+  );
+  
+  // Returns an array which values are all the user_ids allowed to display a
+  // "duplicate" link. The keys of this array are strange (for direct allowed
+  // users, keys are usernames), but normally not used
+  return $users_granted_ids;
 }