Changeset 4329 for extensions/event_cats/include/evntcats_main_funcs.inc.php

Timestamp:

Nov 20, 2009, 10:56:32 PM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Finish duplication management, configuration management, code cleaning

File:

• extensions/event_cats/include/evntcats_main_funcs.inc.php (modified) (10 diffs)

extensions/event_cats/include/evntcats_main_funcs.inc.php

@@ -180 +180 @@
  */
 function build_ec_addp() {
-  global $ec_lists, $ec_ap_ok;
-  if ($ec_ap_ok) {
+  global $ec_lists;
+  if (EC_AP_OK) {
     $res = pwg_query("SELECT `id`, `title` FROM `".ADD_PAGES_TABLE."`");
     while ($r = mysql_fetch_assoc($res)) {
@@ -244 +244 @@
  */
 function build_ec_table() {
-  global $ec_lists, $ec_ap_ok;
+  global $ec_lists;
   
   $q = pwg_query("
@@ -287 +287 @@
       case 2: // Additional Page
         if (
-          $ec_ap_ok and (
+          EC_AP_OK and (
             is_in($ec_entry['action'], 'ec_ok') or
             $ec_entry['action'] == 'ec_nok'
@@ -322 +322 @@
 function build_ec_lists() {
   
-  global $ec_ap_ok, $template, $ec_lists, $conf;
-  
   // Construction of $ec_lists['add_pages'] array var
   build_ec_addp();
@@ -373 +371 @@
         FROM ".EVNTCATS_TABLE."
         WHERE `code` IS NULL
-          AND `arg1` = '1'
+          AND `arg1` = 1
           AND `arg2` IS NOT NULL
       ;",
@@ -385 +383 @@
     array_from_query("
       SELECT `arg2`
-        FROM ".EVNTCATS_TABLE."
+        FROM `".EVNTCATS_TABLE."`
         WHERE `code` IS NULL
-          AND `arg1` = '2'
+          AND `arg1` = 2
           AND `arg2` IS NOT NULL
       ;",
@@ -400 +398 @@
   $users_granted_ids = array();
   
+  $c = (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]);
+  
   $users_granted_thks_gen_ids = array();
-  if ($ec_gen_granted = (read_ec_conf('duplic_gen') != '0')) {
+  if ($ec_gen_granted = (($c & 8) != 0)) {
     $users_granted_thks_gen_ids = order_by_name(
       array_diff(
@@ -425 +432 @@
   $types_granted_ids = array();
   $users_granted_thks_types_ids = array();
-  $c = intval(read_ec_conf('duplic_type'));
-  if ($c != 0) {
+  if (($c & 7) != 0) {
     if (($c & 1) != 0) $types_granted_ids[] = '1';
     if (($c & 2) != 0) $types_granted_ids[] = '2';
@@ -547 +553 @@
   // 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
+  // users, keys are usernames), but should not used
   return $users_granted_ids;
 }
@@ -561 +567 @@
  */
 function dup_allowed($user_id) {
-  return true;
+  return in_array($user_id, build_dup_arrays());
 }