Changeset 4181 for extensions/event_cats/include

Timestamp:

Nov 4, 2009, 7:14:50 PM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Some debugging ; adapt certain labels so that it can be recognized in other modules

(See ​http://fr.piwigo.org/forum/viewtopic.php?pid=122608#p122608 ) mainly

File:

• extensions/event_cats/include/evntcats_admin_funcs.inc.php (modified) (4 diffs)

extensions/event_cats/include/evntcats_admin_funcs.inc.php

@@ -63 +63 @@
 
 /*
- * ec_end2()
- * Process repetitive task when error in database modifying functions.
- *
- * @param
- *   $msg : message
- *   $num : number precising the point where the error occurred
- * @return
- *   false as this function is used when there is a problem
- */
-function ec_end2($msg, $num) {
+ * ec_create_user_OK()
+ * Creates new generic user and eventually new group as described in $_POST.
+ *
+ * @param
+ *   no param needed
+ * @return
+ *   the created user_id or false whether all operations suceeded or not
+ */
+function ec_create_user_OK() {
   global $page;
   
-  return false;
+  // This function assumes that the validity of the different indexes it uses,
+  // have been checked before it is used.
+  
+  // User creation, as generic
+  $ec_user_id = false;
+  $page['errors'] = register_user(
+   $_POST['login'], $_POST['password'], '', false
+  );
+  if (
+    count($page['errors']) != 0 or
+    !($ec_user_id = get_userid($_POST['login']))
+  ) {
+    array_unshift($page['errors'], l10n('ec_user_create_pb'));
+    return false;
+  }
+  else
+   $page['infos'][] = l10n('ec_user_create_OK').$_POST['login'];
+  if (
+    pwg_query("
+      UPDATE `".USER_INFOS_TABLE."`
+      SET `status` = 'generic'
+      WHERE `user_id` = ".$ec_user_id.";
+    ") !== false
+  )
+   $page['infos'][] = l10n('ec_user_generic_OK').$_POST['login'];
+  else
+   $page['errors'][] =l10n('ec_user_generic_pb').$_POST['login'];
+  
+  // New group creation if required,
+  // and association with user_id at the same time
+  if (
+    isset($_POST['ec_in_up_newgroup']) and
+    isset($_POST['groupname']) and
+    $_POST['groupname'] != ''
+  ) {
+    $t2 = 0; $t3 = false; $t4 = false;
+    while (
+      !($t3 = mysql_fetch_row(pwg_query("
+        SELECT `id`
+        FROM `".GROUPS_TABLE."`
+        WHERE `name` = '".$_POST['groupname']."';
+      "))) and
+      $t2++ == 0
+    ) $t4 = pwg_query("
+        INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`)
+        VALUES ('".$_POST['groupname']."', 'false');
+      ");
+    if ($t4)
+     $page['infos'][]=l10n('ec_group_create_OK').$_POST['groupname'];
+    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[0]."');
+      ") === false
+    ) $page['errors'][] =
+     l10n('ec_group_create_pb').' (2) ; '.
+     'MySQL error '.mysql_errno().', "'.mysql_error().'"';
+    else
+     $page['infos'][] =
+      $_POST['login'].
+      l10n('ec_group_create_OK2').
+      $_POST['groupname']
+     ;
+  }
+  return $ec_user_id;
 }
 
@@ -168 +235 @@
   
   // 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['login'], $_POST['password'], '', false
-    );
-    if (
-      count($page['errors']) != 0 or
-      !($ec_user_id = get_userid($_POST['login']))
-    ) {
-      array_unshift($page['errors'], l10n('ec_user_create_pb'));
-      return false;
-    }
-    else
-     $page['infos'][] = l10n('ec_user_create_OK').$_POST['login'];
-    if (
-      pwg_query("
-        UPDATE `".USER_INFOS_TABLE."`
-        SET `status` = 'generic'
-        WHERE `user_id` = ".$ec_user_id.";
-      ") !== false
-    )
-     $page['infos'][] = l10n('ec_user_generic_OK').$_POST['login'];
-    else
-     $page['errors'][] =l10n('ec_user_generic_pb').$_POST['login'];
-    
-    // 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'] != ''
-    ) {
-      $t2 = 0; $t4 = false;
-      while (
-        !($t3 = mysql_fetch_row(pwg_query("
-          SELECT `id`
-          FROM `".GROUPS_TABLE."`
-          WHERE `name` = '".$_POST['ec_in_up_grp_txt']."';
-        "))) 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[0]."');
-        ") === false
-      ) $page['errors'][] =
-       l10n('ec_group_create_pb').' (2) ; '.
-       'MySQL error '.mysql_errno().', "'.mysql_error().'"';
-      else
-       $page['infos'][] =
-        $_POST['login'].
-        l10n('ec_group_create_OK2').
-        $_POST['ec_in_up_grp_txt']
-       ;
-    }
-  }
+  
+  // User and eventually group creation, if needed
+  if ($_POST['ec_sel_user'] == 'new')
+   if (!($ec_user_id = ec_create_user_OK())) return false;
   
   // Preparation of $arg1, $arg2 and $forced
@@ -293 +297 @@
     return true;
   }
-  /*
-  
-  $page['errors'][] = 'Y\'a p\'têt\' ben eu une erreur...';
-  
-   */
 }
 
@@ -318 +317 @@
     $arg1 = ''; $arg2 = '';
     switch ($_POST['ec_input_action']) {
+      // case 'home':  // Home : nothing to do : "arg"s are ''
       case 'add_p':
         if (array_key_exists($_POST['ec_in_up_aps'],$ec_lists['add_pages'])) {
          $arg2 = $_POST['ec_in_up_aps']; }
         else return ec_end1('ec_in_up_aps', 'ec_bad_argument4');
-      case 'home':
-      break;
       case 'img':
       case 'cat':