Changeset 4178 for extensions

Timestamp:

Nov 3, 2009, 11:17:17 AM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Continue entry creation in DB

Location:

extensions/event_cats

Files:

• admin/template/autolog_new.js (modified) (1 diff)
• include/evntcats_admin_funcs.inc.php (modified) (4 diffs)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/event_cats/admin/template/autolog_new.js

@@ -630 +630 @@
   }
   if ((!ec_is_creation && !t1) ||
-    de('ec_in_up_forced_id').checked != ''
+    (de('ec_in_up_forced_id').checked != '' && de('ec_sel_code_old').checked != '')
   ) return confirm(ec_JS_message['ec_confirm_del_other']);
   return true;

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -50 +50 @@
 function ec_end1($pst, $msg) {
   global $page;
-  $page['errors'][] =
-   l10n($msg).
-   '$_POST[\''.$pst.'\'] = '.
-   $_POST[$pst]
-  ;
+  if (isset($_POST[$pst]))
+   $page['errors'][] =
+    l10n($msg).
+    '$_POST[\''.$pst.'\'] = '.
+    $_POST[$pst];
+  else
+    $page['errors'][] =
+    l10n($msg).
+    '$_POST[\''.$pst.'\'] unset';
   return false;
 }
@@ -70 +74 @@
 function ec_end2($msg, $num) {
   global $page;
-  $page['errors'][] =
-   l10n($msg).' ('.$num.') '.
-   'MySQL error '.mysql_errno().', "'.mysql_error().'"'
-  ;
+  
   return false;
 }
@@ -203 +204 @@
   // code and user_id (if needed) are OK, creation can be done
   if ($_POST['ec_sel_user'] == 'new') {
+    
+    // User creation, as generic
     $page['errors'] = register_user(
      $_POST['ec_in_up_usr_txt'], $_POST['ec_in_up_psd_txt'], '', false
@@ -208 +211 @@
     if (
       count($page['errors']) != 0 or
-      !($ec_user_id = get_userid($_POST['ec_in_up_usr_txt'])) or
-      !pwg_query("
+      !($ec_user_id = get_userid($_POST['ec_in_up_usr_txt']))
+    ) {
+      array_unshift($page['errors'], l10n('ec_user_create_pb'));
+      return false;
+    }
+    else
+     $page['infos'][] = l10n('ec_user_create_OK').$_POST['ec_in_up_usr_txt'];
+    if (
+      pwg_query("
         UPDATE `".USER_INFOS_TABLE."`
         SET `status` = 'generic'
         WHERE `user_id` = ".$ec_user_id.";
-      ")
-    ) {
-      array_unshift($page['errors'], l10n('ec_user_create_pb'));
-      return false;
-    }
-    else $page['infos'][] = l10n('ec_user_create_OK').$ec_user_id;
+      ") !== false
+    )
+     $page['infos'][] = l10n('ec_user_generic_OK').$_POST['ec_in_up_usr_txt'];
+    else
+     $page['errors'][] =l10n('ec_user_generic_pb').$_POST['ec_in_up_usr_txt'];
+    
+    // New group creation if required,
+    // and association with user_id at the same time
     if (
       isset($_POST['ec_in_up_newgroup']) and
       isset($_POST['ec_in_up_grp_txt']) and
       $_POST['ec_in_up_grp_txt'] != ''
-    ) { // New group creation, and association with user_id at the same time
-      if (
-        !($t = mysql_fetch_row(pwg_query("
+    ) {
+      $t2 = 0; $t4 = false;
+      while (
+        !($t3 = mysql_fetch_row(pwg_query("
           SELECT `id`
           FROM `".GROUPS_TABLE."`
           WHERE `name` = '".$_POST['ec_in_up_grp_txt']."';
-        ")))
-      ) {
-        if (
-          !pwg_query("
-            INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`)
-            VALUES ('".$_POST['ec_in_up_grp_txt']."', 'false');
-          ")
-        ) return ec_end2('ec_group_create_pb', '1');
-        if (
-          !($t = mysql_fetch_row(pwg_query("
-            SELECT `id`
-            FROM `".GROUPS_TABLE."`
-            WHERE `name` = '".$_POST['ec_in_up_grp_txt']."';
-          ")))
-        ) return ec_end2('ec_group_create_pb', '2');
+        "))) and
+        $t2++ == 0
+      ) $t4 = pwg_query("
+          INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`)
+          VALUES ('".$_POST['ec_in_up_grp_txt']."', 'false');
+        ");
+      if ($t4)
+       $page['infos'][]=l10n('ec_group_create_OK').$_POST['ec_in_up_grp_txt'];
+      if (!$t3)
+       $page['errors'][] =
+        l10n('ec_group_create_pb').' (1) ; '.
+        'MySQL error '.mysql_errno().', "'.mysql_error().'"';
+      if (
+        pwg_query("
+          INSERT INTO `".USER_GROUP_TABLE."` (`user_id `, `group_id`)
+          VALUES ('".$ec_user_id."', '".$t3['id']."');
+        ") === false
+      ) $page['errors'][] = ;
+       l10n('ec_group_create_pb').' (2) ; '.
+       'MySQL error '.mysql_errno().', "'.mysql_error().'"';
+      else
+       $page['infos'][] =
+        $_POST['ec_in_up_usr_txt'].
+        l10n('ec_group_create_OK2').
+        $_POST['ec_in_up_grp_txt']
+       ;
+    }
+  }
+  
+  // Creation of new line in DB event_cats table with all arguments
+  $arg1 = ''; $arg2 = '';
+  if (isset($_POST['ec_input_action'])) switch ($_POST['ec_input_action']) {
+    // case 'home':  // Home : nothing to do : "arg"s are ''
+    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'])) {
+        $arg2 = $_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 (
-        !(pwg_query("
-          INSERT INTO `".USER_GROUP_TABLE."` (`user_id `, `group_id`)
-          VALUES ('".$ec_user_id."', '".$t['id']."');
-        "))
-      ) return ec_end2('ec_group_create_pb', '3');
-    }
-  }
-  else {
-    if ($t1) {
-      
-      $arg1 = ''; $arg2 = '';
-      switch ($_POST['ec_input_action']) {
-        // case 'home':  // Home : nothing to do : "arg"s are ''
-        case 'add_p': // Additional Page
-        break;
-        case 'cat':   // Category
-        case 'img':   // Image
-        break;
-        default : return ec_end1('ec_input_action', 'ec_bad_argument1');
-      }
-      
-      else return ec_end1('ec_in_up_code', 'ec_bad_argument7');
-    }
-    else return ec_end1('ec_in_up_usr_txt', 'ec_bad_argument6');
-  }
+      else ec_end1('ec_in_up_cat', 'ec_bad_argument1');
+    break;
+    default : ec_end1('ec_input_action', 'ec_bad_argument1');
+  }
+  else ec_end1('ec_input_action', 'ec_bad_argument1');
+  
+  $forced = (isset($_POST['[ec_in_up_forced]'])) ? 'true' : 'false';
+  
+  // Now we have the code, the user_id, arg1, arg2, and forced arguments
   */
   

extensions/event_cats/language/fr_FR/plugin.lang.php

@@ -112 +112 @@
 $lang['ec_entry_dis_nok_pre3']    = 'Problème avec tentative de rendre périmée entrée ';
 $lang['ec_entry_dis_nok_end3']    = ' (arg1 = NULL)';
+$lang['ec_user_create_OK']        = 'Création utilisateur ';
 $lang['ec_user_create_pb']        = 'Création nouvel utilisateur impossible';
-$lang['ec_user_create_OK']        = 'Création utilisateur ';
+$lang['ec_user_generic_OK']       = 'Utilisateur générique : ';
+$lang['ec_user_generic_pb']       = 'Problème passage utilisateur générique : ';
+$lang['ec_group_create_OK']       = 'Création nouveau groupe ';
+$lang['ec_group_create_OK2']      = ' associé à ';
 $lang['ec_group_create_pb']       = 'Création nouveau groupe impossible : ';
 $lang['ec_bad_argument1']         = 'Mauvais argument : ';