Changeset 4418 for extensions/event_cats/include

Timestamp:

Dec 3, 2009, 10:01:37 PM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] Adaptation for PEM

Location:

extensions/event_cats/include

Files:

• ec_conf.inc.php (modified) (2 diffs)
• evntcats_admin_funcs.inc.php (modified) (12 diffs)

extensions/event_cats/include/ec_conf.inc.php

@@ -79 +79 @@
   'unknown_code_ap_id'    // the id of the Additional Page which must be used
     => '0',               // in case of usage of an unknow code, several vals.
+                          // 
+  'comment_display'       // the way the comment is displayed in "entries"
+    => '0',               // tab : 0, as tooltip ; 1, on a line under code
 );
 
@@ -89 +92 @@
                                 '16', '20', '24', '25', '30', '32'),
   'unknown_code'       => array('0', '1', '2'),
-  'unknown_code_ap_id' => array()
+  'unknown_code_ap_id' => array(),
+  'comment_display'    => array('0', '1')
 );
 

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -97 +97 @@
   // This function assumes that the validity of the different indexes of
   // $_POST it uses, have already been checked.
+  
+  // Check if a category id has been posted, and if yes if this category is
+  // private.
+  /* $cat_assoc_needed = (
+  ); */
+  
+  // Check if an add. p. id has been posted, and if yes if this add. p. is
+  // private.
+  /* $ap_assoc_needed = (
+  ); */
   
   // User creation, as generic
@@ -161 +171 @@
       $_POST['login'], $_POST['groupname']
     );
+    
+    // If a category id has been posted, the newly created group must be
+    // allowed to navigate in this category
+    
+    /*
+    
+    if (isset($_POST['ec_in_up_cat'])) {
+      if (mysql_num_rows(pwg_query("
+        SELECT `id`
+        FROM `".CATEGORIES_TABLE."`
+        WHERE `id` = '".$_POST['ec_in_up_cat']."';
+      ")) == 0) return ec_end1('ec_in_up_cat', 'Category doesn\'t exist : ');
+      else {
+    
+  $query = '
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id IN ('.implode(',', get_uppercat_ids(array($page['cat']))).')
+  AND status = \'private\'
+;';
+  $private_uppercats = array_from_query($query, 'id');
+
+  // We must not reinsert already existing lines in group_access table
+  $granteds = array();
+  foreach ($private_uppercats as $cat_id)
+  {
+    $granteds[$cat_id] = array();
+  }
+  
+  $query = '
+SELECT group_id, cat_id
+  FROM '.GROUP_ACCESS_TABLE.'
+  WHERE cat_id IN ('.implode(',', $private_uppercats).')
+    AND group_id IN ('.implode(',', $_POST['grant_groups']).')
+;';
+  $result = pwg_query($query);
+  while ($row = mysql_fetch_array($result))
+  {
+    array_push($granteds[$row['cat_id']], $row['group_id']);
+  }
+
+  $inserts = array();
+  
+  foreach ($private_uppercats as $cat_id)
+  {
+    $group_ids = array_diff($_POST['grant_groups'], $granteds[$cat_id]);
+    foreach ($group_ids as $group_id)
+    {
+      array_push($inserts, array('group_id' => $group_id,
+                                 'cat_id' => $cat_id));
+    }
+  }
+
+  mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $inserts);
+    
+    
+      }
+    }
+    
+    */
+    
+    // If an add. p. id has been posted, the newly created group must be
+    // allowed to navigate in this additional page
+  }
+  else {
+    // If a category id has been posted, the newly created user must be
+    // allowed to navigate in this category
+    
+    // If an add. p. id has been posted, the newly created user must be
+    // allowed to navigate in this additional page => not possible to
+    // allow individually => must give a warning message
+    
   }
   return $ec_user_id;
@@ -191 +273 @@
       $ec_lists['duplicable_codes']['codes'][$ec_entry['code']]['id'] =
        $ec_entry['id'];
+      $ec_lists['duplicable_codes']['codes'][$ec_entry['code']]['comment'] =
+       $ec_entry['comment'];
       $ec_lists['duplicable_codes']['codes'][$ec_entry['code']]['user_id'] =
        $ec_entry['user_id'];
@@ -198 +282 @@
     $ec_lists['duplicable_codes']['ids'][$ec_id] =
      $ec_lists['duplicable_codes']['codes'][$ec_code]['id'];
+    $ec_lists['duplicable_codes']['comment'][$ec_id] =
+     $ec_lists['duplicable_codes']['codes'][$ec_code]['comment'];
   }
   
@@ -235 +321 @@
   $action = 'ec_ok';
   $del_other = false;
+  $comment = '';
   switch ($_POST['ec_act1']) {
     
-    // This "switch" command is a little bit tricky... it has been a pain to
+    // This "switch" statement is a little bit tricky... it has been a pain to
     // debug, and I wish to nobody to have to modify it :-\ !
     // Its principle is that it manages checks for four occurrences of
@@ -321 +408 @@
       $arg1       = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['arg1'];
       $arg2       = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['arg2'];
+      $comment    = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['comment'];
       if (empty($arg1)) $arg1 = 'NULL';
       if (empty($arg2)) $arg2 = 'NULL';
@@ -385 +473 @@
      return ec_end1('ec_in_up_forced', 'Bad argument : ');
     
+    // Preparation of $comment
+    $comment = (isset($_POST['ec_in_up_comment'])) ?
+     $_POST['ec_in_up_comment'] : $comment;
+    
     // User and eventually group creation, if needed
     if ($_POST['ec_act1'] != 'duplicate_entry_submit')
@@ -405 +497 @@
       AND `arg2`       ".$arg2p."
       AND `forced`  = '".$forced."'
+      AND `comment` = '".$comment."'
   "))) !== false) { // print("<pre>$arg1 $arg2<br>$q</pre>");
     $page['errors'][] = sprintf(l10n('ec_entry_already_exists'), $t1[0]);
@@ -440 +533 @@
     'arg2p' => $arg2p,
     'forced' => $forced,
+    'comment' => $comment,
   );
   
@@ -451 +545 @@
           `user_id`,
           `action`,
-          `arg1`, `arg2`, `forced`
+          `arg1`, `arg2`, `forced`, `comment`
         )
         VALUES (
@@ -457 +551 @@
            ".$ec_user_id.",
           '".$action."',
-          ".$arg1.", ".$arg2.", '".$forced."'
+          ".$arg1.", ".$arg2.", '".$forced."', '".$comment."'
         );
       ") === false
@@ -487 +581 @@
           `arg1`    =  ".$arg1.",
           `arg2`    =  ".$arg2.",
-          `forced`  = '".$forced."'
+          `forced`  = '".$forced."',
+          `comment` = '".$comment."'
         WHERE `id`  = '".$_POST['ec_entry_sel']."'
       ") === false