Changeset 3985 for extensions/event_cats/include/evntcats_funcs.inc.php

Timestamp:

Oct 7, 2009, 9:31:04 AM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Form submit beginning, "forced problem" improvement

File:

• extensions/event_cats/include/evntcats_funcs.inc.php (modified) (8 diffs)

extensions/event_cats/include/evntcats_funcs.inc.php

@@ -183 +183 @@
     foreach ($ec_lists['ec_table'] as &$ec_entry) { // & is needed here
       if (isset($to_correct[$ec_entry['code']])) {
-        $ec_entry['action'] = $new_action;
+        $ec_entry['action'] = ($check_forced) ?
+         $ec_entry['action'].$new_action : $new_action;
       }
     }
@@ -195 +196 @@
   
   // Multiple "forced" params for a single code check
-  ec_inpect('forced', 'ec_ok_forced_pb', true, true);
+  ec_inpect('forced', '_f_pb', true, true);
   
   // User id and associated page validities checks
@@ -202 +203 @@
     // Check if associated user_id exists
     if (
-     $ec_entry['action'] == 'ec_ok' and
+     is_in($ec_entry['action'], 'ec_ok') and
      !array_key_exists($ec_entry['user_id'], $ec_lists['user_ids'])
     ) {
@@ -211 +212 @@
     $a = 0;
     if (!empty($ec_entry['arg1']) and
-     (strpos($ec_entry['action'], 'ec_ok') !== false)) $a++; // Only arg2
+     is_in($ec_entry['action'], 'ec_ok')) $a++; // Only arg2
     // is significant if action is ec_nok[_xxx] .
     if (!empty($ec_entry['arg2'])) $a+= 2;
@@ -220 +221 @@
         if (
           $ec_ap_ok and (
-            $ec_entry['action'] == 'ec_ok' or
+            is_in($ec_entry['action'], 'ec_ok') or
             $ec_entry['action'] == 'ec_nok'
           ) and
@@ -231 +232 @@
       case 1: // Category
       case 3: // Image
-        if ($ec_entry['action'] == 'ec_ok') {
+        if (is_in($ec_entry['action'], 'ec_ok')) {
           if (array_key_exists($ec_entry['arg1'], $ec_lists['categories'])) {
             if ($a == 3) { // case 3: // Image
@@ -274 +275 @@
     $res = pwg_query('SELECT id,title FROM '.ADD_PAGES_TABLE);
     while ($r = mysql_fetch_assoc($res)) {
-      $c = (strpos($r['title'], '/user_id=')) ? '/user_id=' : '/group_id=';
+      $c = (is_in($r['title'], '/user_id=')) ? '/user_id=' : '/group_id=';
       $a = explode($c ,$r['title']);
       $ec_lists['add_pages'][$r['id']] = $a[0];
@@ -297 +298 @@
   // Construction of $ec_lists['ec_table'] array var
   build_ec_table();
+}
+
+/*
+ * is_in($haystack, $needle)
+ * returns true or false whether $needle is a string found in string $haystack
+ *
+ * @param
+ *   $haystack : the string in which to search
+ *   $needle   : the string looked for
+ * @return
+ *   true if $needle is found in $haystack ; false if not
+ */
+function is_in($haystack, $needle) {
+  return (strpos($haystack, $needle) !== false);
 }