Changeset 4219 for extensions/event_cats/include

Timestamp:

Nov 6, 2009, 1:41:47 PM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] All DB entries tools OK (tested).

Remains "only" account duplication management, and help and translation

Location:

extensions/event_cats/include

Files:

• evntcats_admin_funcs.inc.php (modified) (12 diffs)
• evntcats_main_funcs.inc.php (modified) (1 diff)

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -201 +201 @@
  */
 function ec_create_modify_entry_OK() {
-  global $page, $ec_lists;
+  global $page, $ec_lists, $ec_debug;
   
   // $_POST validity checks : action prevented in case of bad arguments
@@ -208 +208 @@
    return ec_end1('ec_act1', 'ec_bad_argument1');
   
-  if (!isset($_POST['ec_input_action']))
-   return ec_end1('ec_input_action', 'ec_bad_argument1');
+  if (
+    ($_POST['ec_act1']) != 'toggle_forced' and
+    !isset($_POST['ec_input_action'])
+  ) return ec_end1('ec_input_action', 'ec_bad_argument1');
   
   $is_creation = true;
+  $ec_user_id = 'NULL';
   $action = 'ec_ok';
-  $arg1 = '';
-  $arg2 = '';
+  $del_other = false;
   switch ($_POST['ec_act1']) {
     
@@ -238 +240 @@
     case 'modify_entry_submit':
       
-      $ec_user_id = '';
       if (isset($_POST['ec_sel_user'])) {
         if ($_POST['ec_sel_user'] == 'new') {
@@ -259 +260 @@
       else $action = 'ec_nok';
       
-     if ($_POST['ec_act1'] == 'create') break;
-      
-      $is_creation = false;
+    if ($_POST['ec_act1'] == 'create') break;
       
     case 'duplicate_entry_submit':
@@ -270 +269 @@
       ) return ec_end1('ec_entry_sel', 'ec_bad_argument5');
       
-     if ($_POST['ec_act1'] == 'modify_entry_submit') break;
+      if ($_POST['ec_act1'] == 'modify_entry_submit') if (
+        !isset($_POST['ec_sel_user']) or (
+          $_POST['ec_sel_user'] == 'new' or
+          $_POST['ec_sel_user'] == 'none' or (
+            $_POST['ec_sel_user'] == 'old' and
+            $_POST['ec_in_up_usr_list'] !=
+             $ec_lists['ec_table'][$_POST['ec_entry_sel']]['user_id']
+          )
+        )
+      ) $del_other = true;
+      
+    case 'toggle_forced':
+      
+      $ec_code    = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['code'];
+      if ($action == 'ec_ok' and $ec_user_id == 'NULL')
+       $ec_user_id = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['user_id'];
+      $arg1       = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['arg1'];
+      $arg2       = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['arg2'];
+      if (empty($arg1)) $arg1 = 'NULL';
+      if (empty($arg2)) $arg2 = 'NULL';
+      if (empty($ec_user_id)) $ec_user_id = 'NULL';
+      if ($_POST['ec_act1'] == 'toggle_forced') {
+        $forced = (
+          $ec_lists['ec_table'][$_POST['ec_entry_sel']]['forced'] == 'true'
+        ) ? 'false' : 'true';
+        $del_other = ($forced == 'true');
+        $action     = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['action'];
+      }
+      
+    if (
+      $_POST['ec_act1'] == 'toggle_forced' or
+      $_POST['ec_act1'] == 'modify_entry_submit'
+    ) {
+      $is_creation = false;
+      break;
+    }
       
       build_ec_duplicable_codes();
@@ -276 +310 @@
        $ec_lists['duplicable_codes']['ids'])
       ) return ec_end1('ec_entry_sel', 'ec_bad_argument5');
-      $ec_code    = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['code'];
-      $ec_user_id = $ec_lists['ec_table'][$_POST['ec_entry_sel']]['user_id'];
       
     break;
@@ -283 +315 @@
   }
   
-  // Preparation of $arg1, $arg2 and $forced
-  switch ($_POST['ec_input_action']) {
-    // case 'home':  // Home : nothing to do : "arg"s are ''
-    // case 'refused': $_POST['ec_sel_user'] unset, nothing to do
-    case 'add_p': // Additional Page
-      if (isset($_POST['ec_in_up_aps'])) $arg2 = $_POST['ec_in_up_aps'];
-      else ec_end1('ec_in_up_aps', 'ec_bad_argument1');
-    break;
-    case 'cat':   // Category
-    case 'img':   // Image
-      if (isset($_POST['ec_in_up_cat'])) {
-        $arg1 = $_POST['ec_in_up_cat'];
-        if ($_POST['ec_input_action'] == 'img') {
-          if (isset($_POST['ec_in_up_img'])) $arg2 = $_POST['ec_in_up_img'];
-          else ec_end1('ec_in_up_img', 'ec_bad_argument1');
+  if ($_POST['ec_act1'] != 'toggle_forced') {
+    // Preparation of $arg1, $arg2
+    switch ($_POST['ec_input_action']) {
+      case 'add_p': // Additional Page
+        if (isset($_POST['ec_in_up_aps'])) $arg2 = $_POST['ec_in_up_aps'];
+        else ec_end1('ec_in_up_aps', 'ec_bad_argument1');
+        $arg1 = 'NULL';
+      break;
+      case 'cat':   // Category
+      case 'img':   // Image
+        if (isset($_POST['ec_in_up_cat'])) {
+          $arg1 = $_POST['ec_in_up_cat'];
+          if ($_POST['ec_input_action'] == 'img') {
+            if (isset($_POST['ec_in_up_img'])) $arg2 = $_POST['ec_in_up_img'];
+            else ec_end1('ec_in_up_img', 'ec_bad_argument1');
+          }
+          else $arg2 = 'NULL';
         }
-      }
-      else ec_end1('ec_in_up_cat', 'ec_bad_argument1');
-    break;
-    default: ec_end1('ec_input_action', 'ec_bad_argument1');
-  }
-  
-  if (isset($_POST['ec_in_up_forced'])) {
-    if ($_POST['ec_act1'] == 'duplicate_entry_submit')
-     ec_end1('ec_in_up_forced', 'ec_bad_argument1');
-    if (!$is_creation) {
-      if (
-        $t1 = mysql_fetch_row(pwg_query("
-          SELECT `code`
-          FROM `".EVNTCATS_TABLE."`
-          WHERE `id` = '".$_POST['ec_entry_sel']."'
-        ")) === false
-      ) die('Code not found in DB ?!');
-      $r = pwg_query("
-        SELECT `id`
+        else ec_end1('ec_in_up_cat', 'ec_bad_argument1');
+      break;
+      case 'home':    // Home : nothing to do : "arg"s are ''
+      case 'refused': // $_POST['ec_sel_user'] unset, nothing to do
+        $arg1 = 'NULL'; $arg2 = 'NULL';
+      break;
+      default: ec_end1('ec_input_action', 'ec_bad_argument1');
+    }
+    
+    // Preparation of $forced
+    $forced = (isset($_POST['ec_in_up_forced'])) ? 'true' : 'false';
+    if ($_POST['ec_act1'] == 'duplicate_entry_submit' and $forced == 'true')
+     return ec_end1('ec_in_up_forced', 'ec_bad_argument1');
+    
+    // User and eventually group creation, if needed
+    if ($_POST['ec_act1'] != 'duplicate_entry_submit')
+     if (isset($_POST['ec_sel_user']) and $_POST['ec_sel_user'] == 'new')
+      if (!($ec_user_id = ec_create_user_OK())) return false;
+  }
+  
+  // Now we have all infos : check that future entry doesn't exist already
+  $arg1p = ($arg1 == 'NULL') ? 'IS NULL' : ' = '.$arg1;
+  $arg2p = ($arg2 == 'NULL') ? 'IS NULL' : ' = '.$arg2;
+  $ec_user_idp = ($ec_user_id == 'NULL') ? 'IS NULL' : ' = '.$ec_user_id;
+  if (($t1 = mysql_fetch_row(pwg_query(// $q =
+  "
+    SELECT `id`
+    FROM `".EVNTCATS_TABLE."`
+    WHERE `code`    = '".$ec_code."'
+      AND `user_id`    ".$ec_user_idp."
+      AND `action`  = '".$action."'
+      AND `arg1`       ".$arg1p."
+      AND `arg2`       ".$arg2p."
+      AND `forced`  = '".$forced."'
+  "))) !== false) { // print("<pre>$arg1 $arg2<br>$q</pre>");
+    $page['errors'][] = l10n('ec_entry_already_exists').$t1[0];
+    return false;
+  }
+  
+  // Delete other entries using the same code, if needed
+  if ($del_other) {
+    if ((
+      $t1 = mysql_fetch_row(pwg_query("
+        SELECT `code`
         FROM `".EVNTCATS_TABLE."`
-        WHERE `code` = '".$t1[0]."'
-         AND `id` <> '".$_POST['ec_entry_sel']."'
-      ");
-      while ($t2 = mysql_fetch_row($r)) if (!ec_delete_entry_OK($t2[0]))
-       return false;
-    }
-    $forced = 'true';
-  }
-  else $forced = 'false';
-  
-  // User and eventually group creation, if needed
-  if ($_POST['ec_act1'] != 'duplicate_entry_submit')
-   if ($_POST['ec_sel_user'] == 'new')
-    if (!($ec_user_id = ec_create_user_OK())) return false;
-  
-  // Now we have all infos
+        WHERE `id` = ".$_POST['ec_entry_sel']
+      ))) === false
+    ) die('Entry not found in DB ?!');
+    $r = pwg_query("
+      SELECT `id`
+      FROM `".EVNTCATS_TABLE."`
+      WHERE `code` = '".$t1[0]."'
+       AND `id` <> ".$_POST['ec_entry_sel']
+    );
+    while ($t2 = mysql_fetch_row($r)) if (!ec_delete_entry_OK($t2[0]))
+     return false;
+  }
+  
+  $ec_debug[] = array(
+    'del_other' => $del_other,
+    'code' => $ec_code,
+    'user_id' => $ec_user_id,
+    'user_idp' => $ec_user_idp,
+    'action' => $action,
+    'arg1' => $arg1,
+    'arg2' => $arg2,
+    'arg1p' => $arg1p,
+    'arg2p' => $arg2p,
+    'forced' => $forced,
+  );
+  
+  // Action !
+  $ret = true;
   if ($is_creation) {
     if (
@@ -346 +417 @@
         VALUES (
           '".$ec_code."',
-          '".$ec_user_id."',
+           ".$ec_user_id.",
           '".$action."',
-          '".$arg1."', '".$arg2."', '".$forced."'
+          ".$arg1.", ".$arg2.", '".$forced."'
         );
       ") === false
@@ -356 +427 @@
        'MySQL error '.mysql_errno().', "'.mysql_error().'"'
       ;
-      return false;
+      $ret = false;
     }
     else {
@@ -363 +434 @@
       $page['infos'][] =
        l10n('ec_entry_create_OK').mysql_insert_id().' : '.
-       $_POST['ec_in_up_code'].' => '.
+       $ec_code.' => '.
        $ec_lists['user_ids'][$ec_user_id].$forced
       ;
+      return true;
     }
   }
@@ -373 +445 @@
         UPDATE `".EVNTCATS_TABLE."`
         SET
-          `user_id` = '".$ec_user_id."',
+          `user_id` =  ".$ec_user_id.",
           `action`  = '".$action."',
-          `arg1`    = '".$arg1."',
-          `arg2`    = '".$arg2."',
+          `arg1`    =  ".$arg1.",
+          `arg2`    =  ".$arg2.",
           `forced`  = '".$forced."'
         WHERE `id`  = '".$_POST['ec_entry_sel']."'
@@ -385 +457 @@
        'MySQL error '.mysql_errno().', "'.mysql_error().'"'
       ;
-      return false;
-    }
-    else {
-      $page['infos'][] = l10n('ec_entry_modify_OK').$_POST['ec_entry_sel'];
-      build_ec_lists();
-    }
-  }
-  return true;
-}
-
-/*
- * ec_toggle_forced_entry()
- * Toggles the 'forced' property of an entry, provided it complies to the
- * rules.
- *
- * @param
- *   no param
- * @return
- *   no return value
- */
-function ec_toggle_forced_entry() {
-  global $page;
-  $page['errors'][] = 'ec_toggle_forced_entry';
+      $ret = false;
+    }
+    else $page['infos'][] = l10n('ec_entry_modify_OK').$_POST['ec_entry_sel'];
+  }
+  build_ec_lists();
+  return $ret;
 }
 

extensions/event_cats/include/evntcats_main_funcs.inc.php

@@ -69 +69 @@
     FROM `".IMAGE_CATEGORY_TABLE."` 
     WHERE `category_id` = ".$cat."
-     AND `image_id` = ".$img."`
-  ")) !== false);
+     AND `image_id` = ".$img
+  )) !== false);
 }