Changeset 4092 for extensions/event_cats/include

Timestamp:

Oct 23, 2009, 1:48:54 AM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] PNG, JS, TPL and CSS normally finished now. Remains "only" PHP and SQL...

Location:

extensions/event_cats/include

Files:

• ec_conf.inc.php (modified) (4 diffs)
• evntcats_funcs.inc.php (modified) (7 diffs)

extensions/event_cats/include/ec_conf.inc.php

@@ -33 +33 @@
  _ the number of digits when creating a new code automatically
    ($ec_conf[2] <=> read_ec_conf('auto_code_dg_nb')) ;
+ _ whether the "how to" banner has already been displayed or not
+   ($ec_conf[3] <=> read_ec_conf('howto')) ;
  _ what to do in case an unknown code is used with "autolog" parameter
-   ($ec_conf[3] <=> read_ec_conf('unknown_code')) :
+   ($ec_conf[4] <=> read_ec_conf('unknown_code')) :
    0 : nothing ("goto" home page, index.php (not logged in of course)) ;
    1 : redirected to "access denied" page ;
    2 : redirected to an Additional Page precised below.
  _ the id of the Additional Page which must be used in case of usage of an
-   unknow code ($ec_conf[4] <=> read_ec_conf('unknown_code_ap_id')).
+   unknow code ($ec_conf[5] <=> read_ec_conf('unknown_code_ap_id')).
 *****************************************************************************/
 
@@ -53 +55 @@
 }
 else {
-  $ec_conf = explode(',' , '0,1,10,0,0');
+  $ec_conf = explode(',' , '0,1,10,0,0,0');
   change_ec_conf('activated', 0);
 }
@@ -80 +82 @@
       $ec_conf[2] = $v;
     break;
-    case 'unknown_code':
+    case 'howto':
       $ec_conf[3] = $v;
     break;
+    case 'unknown_code':
+      $ec_conf[4] = $v;
+    break;
     case 'unknown_code_ap_id':
-      $ec_conf[4] = $v;
+      $ec_conf[5] = $v;
     break;
     default: return false;
@@ -110 +115 @@
     case 'dup_allow'         : return $ec_conf[1];
     case 'auto_code_dg_nb'   : return $ec_conf[2];
-    case 'unknown_code'      : return $ec_conf[3];
-    case 'unknown_code_ap_id': return $ec_conf[4];
+    case 'howto'             : return $ec_conf[3];
+    case 'unknown_code'      : return $ec_conf[4];
+    case 'unknown_code_ap_id': return $ec_conf[5];
     default                  : return false;
   }

extensions/event_cats/include/evntcats_funcs.inc.php

@@ -121 +121 @@
    *   (no return value)
    */
-  function ec_inpect($checked_item, $new_action,
-   $check_ec_nok = false, $check_forced = false) {
+  function ec_inpect($checked_item, $new_action, $check_ec_nok = true) {
     global $ec_lists;
     $first = array();
     $to_correct = array();
     
-    // $to_correct is needed because following code would not work anywhere :
+    // $to_correct is needed cause following code would not work everywhere :
     /*
     foreach ($table as $value) {
@@ -154 +153 @@
           if (
            $first[$ec_current_code] != $ec_entry[$checked_item] or
-           ($check_forced and $ec_entry[$checked_item] == 'true')
+           ($new_action == '' and $ec_entry[$checked_item] == 'true')
           ) {
             $to_correct[$ec_current_code] = true; // value not used in fact
@@ -166 +165 @@
     foreach ($ec_lists['ec_table'] as &$ec_entry) { // & is needed here
       if (isset($to_correct[$ec_entry['code']])) {
-        $ec_entry['action'] = ($check_forced) ?
-         $ec_entry['action'].$new_action : $new_action;
+        if ($new_action == '') {
+          if (
+            pwg_query('
+              UPDATE `'.EVNTCATS_TABLE.'`
+              SET `forced` = "false"
+              WHERE `id` = '.$ec_entry['id']
+            ) == null
+          ) die('Could not fix a "_f_pb"');
+          $ec_entry['forced'] = 'false';
+        }
+        else $ec_entry['action'] = $new_action;
       }
     }
@@ -173 +181 @@
 
   // Multiple action params for a single code check
-  ec_inpect('action', 'ec_nok_action_pb', true);
+  ec_inpect('action', 'ec_nok_action_pb');
   
   // Multiple user_ids for a single code check
-  ec_inpect('user_id', 'ec_nok_userid_pb');
+  ec_inpect('user_id', 'ec_nok_userid_pb', false);
   
   // Multiple "forced" params for a single code check
-  ec_inpect('forced', '_f_pb', true, true);
+  ec_inpect('forced', '');
   
   // User id and associated page validities checks
@@ -308 +316 @@
  */
 function ec_create_entry_OK() {
+  global $page;
+  $page['errors'][] = 'Y\'a p\'têt\' ben eu une erreur...';
   return false;
 }
@@ -322 +332 @@
  */
 function ec_duplicate_entry_OK() {
+  global $page;
+  $page['errors'][] = 'Y\'a sûrement eu une erreur...';
   return false;
 }
@@ -336 +348 @@
  */
 function ec_modify_entry_OK() {
+  global $page;
+  $page['errors'][] = 'Y\'a pas eu une erreur ?...';
   return false;
 }