Changeset 4019

Timestamp:

Oct 10, 2009, 11:10:22 PM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Continue $_POST analysis (slowly)

Location:

extensions/event_cats

Files:

• admin/evntcats_admin.php (modified) (1 diff)
• admin/template/autolog_new.js (modified) (6 diffs)
• admin/template/autolog_new.tpl (modified) (3 diffs)
• include/evntcats_funcs.inc.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

extensions/event_cats/admin/evntcats_admin.php

@@ -72 +72 @@
 // +-----------------------------------------------------------------------+
 
-// Effectuer quand même un test sur $_POST['act1'] : si demande de création d'entré, mais
-// que cette demande ne peut aboutir, rediriger sur page création d'entrée ; sinon sur entrées existantes.
-
 $page['tab'] = (!($ec_exist_entries = (mysql_fetch_row(pwg_query('
   SELECT * FROM `'.EVNTCATS_TABLE.'`
   WHERE `code` IS NOT NULL
 '))))) ? 'autolog_new' : 'autolog_entries';
-if (isset($_POST['ec_act1']) and
- ($_POST['ec_act1'] == 'autolog_new' or $_POST['ec_act1'] == 'duplicate_entry'))
-    $page['tab'] = 'autolog_new';
+if (isset($_POST['ec_act1'])) {
+  if (
+    $_POST['ec_act1'] == 'autolog_new' or
+    $_POST['ec_act1'] == 'duplicate_entry'
+  )
+   $page['tab'] = 'autolog_new';
+  else if ($_POST['ec_act1'] == 'create')
+   $page['tab'] = (ec_create_entry_OK()) ? 'autolog_entries' : 'autolog_new';
+}
 else if (isset($_GET['tab'])) switch ($_GET['tab']) {
   case 'autolog_new':

extensions/event_cats/admin/template/autolog_new.js

@@ -23 +23 @@
   document.getElementById(ec_selected_user).checked = 'checked';
   switch (ec_selected_user) {
-    case 'ec_sel_user_none': // None
+    /* case 'ec_sel_user_none': // None
       ec_selected_action =
        (ec_ap_ok && (ec_selected_action != 'ec_input_action_home')) ?
@@ -30 +30 @@
       document.getElementById('ec_in_up_psd_txt_id').value = '';
       document.getElementById('ec_in_up_usr_list_id').value = '-1';
-    break;
+    break; */
     case 'ec_sel_user_new': // New user
       document.getElementById('ec_in_up_usr_txt_id').value =
@@ -68 +68 @@
         document.getElementById('ec_in_up_cats_id').value = ec_selected_cat;
         document.getElementById('ec_in_up_imgs_id').value = '';
-        ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
-         'ec_sel_user_old' : ec_selected_user;
+        /* ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
+         'ec_sel_user_old' : ec_selected_user; */
         document.getElementById('ec_in_up_imgs_warn').innerHTML = '';
       break;
@@ -76 +76 @@
         document.getElementById('ec_in_up_cats_id').value = ec_selected_cat;
         document.getElementById('ec_in_up_imgs_id').value = ec_selected_img;
-        ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
-         'ec_sel_user_old' : ec_selected_user;
+        /* ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ?
+         'ec_sel_user_old' : ec_selected_user; */
         ec_check_img_text();
       break;
@@ -237 +237 @@
 }
 
+function ec_check_submit() {
+  if (document.getElementById('ec_in_up_code_id').value == '') {
+    alert(ec_JS_message['ec_submit_code_miss']);
+    return false;
+  }
+  if ((
+    document.getElementById('ec_sel_user_new').checked != '' &&
+    document.getElementById('ec_in_up_usr_txt_id').value == ''
+    ) || (
+    document.getElementById('ec_sel_user_old').checked != '' &&
+    document.ec_new_code.ec_in_up_usr_list.value == '-1'
+    ) || (
+    document.getElementById('ec_sel_user_new').checked == '' &&
+    document.getElementById('ec_sel_user_old').checked == ''
+    )
+  ) {
+    alert(ec_JS_message['ec_submit_user_miss']);
+    return false;
+  }
+}
+
 function ec_test() {
   alert('OK.');
@@ -254 +275 @@
   ec_old_new_psd_text = '';
   ec_test_reg = '';
-  document.getElementById('ec_act1_id').value = '';
+  document.getElementById('ec_act1_id').value = 'create';
   document.getElementById('ec_in_up_pwd_warn').innerHTML = '';
-  document.getElementById('ec_sel_user_none').checked = 'checked';
-  document.getElementById('ec_sel_user_none').checked = '';
+  document.getElementById('ec_sel_user_new').checked = 'checked';
+  document.getElementById('ec_sel_user_new').checked = '';
   document.getElementById('ec_input_action_home').checked = 'checked';
   document.getElementById('ec_input_action_home').checked = '';

extensions/event_cats/admin/template/autolog_new.tpl

@@ -41 +41 @@
 
 {* <!-- Parameters list --> *}
-<form class = "filter" method = "post" name = "ec_new_code" action = "">
+<form class = "filter" method = "post" name = "ec_new_code" action = "" onsubmit = "return ec_check_submit();">
   <input type = "hidden" id = "ec_act1_id" name = "ec_act1" />
   
@@ -199 +199 @@
   </table>
   <p>
-    <input class = "submit" type = "submit{* button *}" {* name = "ec_submit" *} value = "{'Submit'|@translate}" onclick = "ec_validate();"/>
-    <input class = "submit" type = "reset" {* name = "ec_reset" *} value = "{'Reset'|@translate}" onclick = "ec_init();"/>
+    <input class = "submit" type = "submit" value = "{'Submit'|@translate}"/>
+    <input class = "submit" type = "reset" value = "{'Reset'|@translate}" onclick = "ec_init();"/>
   </p>
 </form>
@@ -211 +211 @@
   ec_JS_message['ec_new_pwd_gen']       = "{'ec_new_pwd_gen'|@translate|@escape:javascript}";
   ec_JS_message['ec_up_code_lbl_home']  = "{'ec_up_code_lbl_home'|@translate}";
+  ec_JS_message['ec_submit_code_miss']  = "{'ec_submit_code_miss'|@translate}";
+  ec_JS_message['ec_submit_user_miss']  = "{'ec_submit_user_miss'|@translate}";
   ec_init();
 //--></script>

extensions/event_cats/include/evntcats_funcs.inc.php

@@ -298 +298 @@
 
 /*
+ * ec_create_entry_OK()
+ * returns true or false whether the creation of a new entry described by
+ * $_POST was OK or not.
+ *
+ * @param
+ *   no param
+ * @return
+ *   true if creation was OK ; false if not
+ */
+function ec_create_entry_OK() {
+  return false;
+}
+
+/*
  * str_from_var($var)
  * returns a string easing array var informations displaying in Piwigo :

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

@@ -64 +64 @@
 $lang['ec_act_cat_miss']          = 'Catégorie ?';
 $lang['ec_new_pwd_gen']           = 'Pensez à NOTER le mot de passe !';
+$lang['ec_submit_code_miss']      = 'Vous devez fournir un code.';
+$lang['ec_submit_user_miss']      = 'Vous devez fournir un utilisateur.';
 
 // In PHP files

extensions/event_cats/main.inc.php

@@ -5 +5 @@
 Version: 1.0.0
 Description: A single URL can be enough to be identified, and a user can duplicate his account to create a new one getting immediately the same properties. / On peut être identifié grâce à un simple URL, et on peut dupliquer son compte pour créer un nouveau compte ayant immédiatement les mêmes propriétés.
-Plugin URI: (Doesn't exist for the moment)
+Plugin URI: http://piwigo.org/svn/extensions/event_cats
 Author: P@t, LucMorizur
 Author URI: http://www.gauchon.fr, http://lucmorizur.free.fr