Changeset 4333 for extensions/event_cats/admin

Timestamp:

Nov 21, 2009, 6:59:31 PM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] Remove bug types could not be granted to duplication when from blank

File:

• extensions/event_cats/admin/evntcats_admin.php (modified) (4 diffs)

extensions/event_cats/admin/evntcats_admin.php

@@ -77 +77 @@
 build_ec_lists(); // in evntcats_main_funcs.php
 
+$dup_types_exist = false;
+$dup_entries_exist = false;
+$ec_exist_entries = false;
+function check_DB() {
+  global $dup_types_exist, $dup_entries_exist, $ec_exist_entries, $ec_lists;
+  
+  $dup_types_exist = build_dup_groups(); // build_dup_groups() returns
+  // true if an entry exists for duplication management for types
+  
+  // both arrays below are built when executing build_dup_groups() function
+  $dup_entries_exist = (
+    $dup_types_exist or
+    count($ec_lists['groups_granted_ids']) > 0 or
+    count($ec_lists['users_granted_direct_ids']) > 0
+  );
+  
+  $ec_exist_entries = (mysql_num_rows(pwg_query("
+    SELECT * FROM `".EVNTCATS_TABLE."`
+    WHERE `code` IS NOT NULL ;
+  ")) != 0);
+}
+
+check_DB();
+
 // If no entry exist, default tab is 'autolog_new'.
-$page['tab'] = (!($ec_exist_entries = (mysql_num_rows(pwg_query("
-  SELECT * FROM `".EVNTCATS_TABLE."`
-  WHERE `code` IS NOT NULL ;
-")) != 0))) ? 'autolog_new' : 'autolog_entries';
-
-// If no entry exist, but some duplication management entries exist, default
-// tab is 'duplication'.
-if (!$ec_exist_entries and read_ec_conf('dup_allow') == '2') $page['tab'] = 'duplication';
+$page['tab'] = (!$ec_exist_entries) ? 'autolog_new' : 'autolog_entries';
+
+// If no entry exist, but some duplication management entries exist, and
+// duplication setting is "managed per groups", default tab is 'duplication'
+if (
+  !$ec_exist_entries and
+  read_ec_conf('dup_allow') == '2' and
+  $dup_entries_exist
+) $page['tab'] = 'duplication';
 
 // If a modification of duplication management has been posted, default tab
@@ -166 +191 @@
   )
 ) {
-  $c = ($no_previous = (count($t = mysql_fetch_row(pwg_query("
-    SELECT `arg2`
-    FROM `".EVNTCATS_TABLE."`
-    WHERE `code` IS NULL
-      AND `arg1` = 3
-      AND `arg2` IS NOT NULL
-    LIMIT 1;
-  "))) == 0)) ? 0 : intval($t[0]);
+  $c = $ec_lists['types_granted'];
   if (isset($_POST['deny_types']))
    foreach ($_POST['deny_types'] as $v) $c = $c & ~$v;
   if (isset($_POST['deny_generic'])) $c = $c & 7;
-  $q = ($no_previous) ? "
-    INSERT INTO `".EVNTCATS_TABLE."`
-    (`arg1`, `arg2`)
-    VALUES (3, $c);
-  " : "
+  $q = ($dup_types_exist) ? "
     UPDATE `".EVNTCATS_TABLE."`
     SET `arg2` = $c
     WHERE `arg1` = 3
     LIMIT 1 ;
+  " : "
+    INSERT INTO `".EVNTCATS_TABLE."`
+    (`arg1`, `arg2`)
+    VALUES (3, $c);
   ";
   if (pwg_query($q) === false) ec_end2(3);
@@ -197 +215 @@
   )
 ) {
-  $c = ($no_previous = (count($t = mysql_fetch_row(pwg_query("
-    SELECT `arg2`
-    FROM `".EVNTCATS_TABLE."`
-    WHERE `code` IS NULL
-      AND `arg1` = 3
-      AND `arg2` IS NOT NULL
-    LIMIT 1;
-  "))) == 0)) ? 0 : intval($t[0]);
+  $c = $ec_lists['types_granted'];
   if (isset($_POST['grant_types']))
    foreach ($_POST['grant_types'] as $v) $c = $c | $v;
   if (isset($_POST['grant_generic'])) $c = $c | 8;
-  $q = ($no_previous) ? "
-    INSERT INTO `".EVNTCATS_TABLE."`
-    (`arg1`, `arg2`)
-    VALUES (3, $c);
-  " : "
+  $q = ($dup_types_exist) ? "
     UPDATE `".EVNTCATS_TABLE."`
     SET `arg2` = $c
     WHERE `arg1` = 3
     LIMIT 1 ;
+  " : "
+    INSERT INTO `".EVNTCATS_TABLE."`
+    (`arg1`, `arg2`)
+    VALUES (3, $c);
   ";
   if (pwg_query($q) === false) ec_end2(4);
@@ -309 +320 @@
 // +-----------------------------------------------------------------------+
 
-$ec_exist_entries = (mysql_num_rows(pwg_query("
-  SELECT * FROM `".EVNTCATS_TABLE."`
-  WHERE `code` IS NOT NULL
-")) != 0);
-
+check_DB();
+  
 if (
   $page['tab'] == 'duplication' and