Changeset 4163 for extensions
- Timestamp:
- Oct 31, 2009, 11:50:34 PM (14 years ago)
- Location:
- extensions/event_cats
- Files:
-
- 3 edited
-
admin/template/autolog_new.js (modified) (19 diffs)
-
include/evntcats_funcs.inc.php (modified) (8 diffs)
-
language/fr_FR/plugin.lang.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/event_cats/admin/template/autolog_new.js
r4158 r4163 23 23 var ec_selected_old_entry = '-1'; 24 24 var ec_selected_old_code = '-1'; 25 // var ec_selected_old_code2 = '-1';26 25 var ec_selected_old_user = '-1'; 27 // var ec_selected_old_user2 = '-1';28 26 var ec_selected_AP = '-1'; 29 27 var ec_selected_cat = '-1'; … … 160 158 de('ec_in_up_usr_txt_id').disabled = t1; 161 159 de('ec_in_up_psd_txt_id').disabled = t1; 160 de('ec_confirm_psd_txt_id').disabled = t1; 162 161 de('ec_in_up_newgroup_id').disabled = t1; 163 162 de('ec_in_up_grp_txt_id').disabled = t1; … … 196 195 de('ec_in_up_usr_txt_id').value = ''; 197 196 de('ec_in_up_psd_txt_id').value = ''; 197 de('ec_confirm_psd_txt_id').value = ''; 198 198 de('ec_in_up_grp_txt_id').value = ''; 199 199 de('ec_in_up_newgroup_id').checked = ''; … … 205 205 de('ec_in_up_usr_txt_id').value = ec_new_user_text; 206 206 de('ec_in_up_psd_txt_id').value = ec_new_psd_text; 207 de('ec_confirm_psd_txt_id').value = ''; 207 208 de('ec_in_up_grp_txt_id').value = 208 209 (ec_selected_old_group) ? ec_new_grp_text : ''; … … 216 217 de('ec_in_up_usr_txt_id').value = ''; 217 218 de('ec_in_up_psd_txt_id').value = ''; 219 de('ec_confirm_psd_txt_id').value = ''; 218 220 de('ec_in_up_grp_txt_id').value = ''; 219 221 de('ec_in_up_newgroup_id').checked = ''; … … 385 387 386 388 function ec_gen_user() { 387 var t = ''; 389 var t1 = ''; 390 var t2 = ''; 388 391 var ec_word = ''; 389 392 var ec_cat_sel = ''; … … 402 405 } 403 406 else { 404 t = ec_gen_txt('8');405 if (t == '') {407 t1 = ec_gen_txt('8'); 408 if (t1 == '') { 406 409 alert("Failed :\n" + ec_err); 407 410 ec_new_psd_text = 'Failed...'; … … 409 412 } 410 413 else { 411 ec_new_psd_text = t ;414 ec_new_psd_text = t1; 412 415 ec_old_new_psd_text = ec_new_psd_text; 413 416 switch (ec_selected_action) { … … 418 421 ].label 419 422 ); 423 t2 = ec_new_user_text; 420 424 break; 421 425 case 'ec_input_action_cat': // Category … … 427 431 ec_reg_cat1.exec(ec_cat_sel)[1] : ec_cat_sel; 428 432 ec_new_user_text = ec_new_user_text.replace(/\s/, '_'); 433 t2 = ec_new_user_text; 429 434 if (ec_selected_action == 'ec_input_action_img') { 430 435 ec_new_user_text += '_' + d.ec_new_code.ec_in_up_imgs_id.value; … … 432 437 break; 433 438 case 'ec_input_action_home': // Home 434 t = ec_gen_txt('3');435 if (t == '') {439 t1 = ec_gen_txt('3'); 440 if (t1 == '') { 436 441 alert("Failed :\n" + ec_err); 437 442 ec_new_psd_text = 'Failed...'; 438 443 return false; 439 444 } 440 ec_new_user_text = ec_JS_message['ec_up_code_lbl_home'] + '_' + t; 441 break; 442 } 443 if (ec_selected_old_group) ec_new_grp_text = 'EC_' + ec_new_user_text; 445 t2 = ec_JS_message['ec_up_code_lbl_home']; 446 ec_new_user_text = t2 + '_' + t1; 447 break; 448 } 449 if (ec_selected_old_group) ec_new_grp_text = 'EC_' + t2; 444 450 ec_flag1 = true; 445 451 ec_mark_user('ec_sel_user_new'); … … 611 617 612 618 function ec_change_user_list(ec_id) { 613 // ec_selected_old_user2 = ec_selected_old_user;614 619 ec_selected_old_user = ec_id; 615 620 ec_mark_user('ec_sel_user_old'); … … 617 622 618 623 function ec_change_code_list(ec_id) { 619 // ec_selected_old_code2 = ec_selected_old_code;620 624 ec_selected_old_code = ec_id; 621 625 ec_mark_code('ec_sel_code_old'); 622 }623 624 function ec_mark_type(ec_id) {625 de('ec_act1_id').value = ec_id;626 de('ec_act2_id').value = '-1';627 ec_dont_check = true;628 d.ec_new_code.submit();629 626 } 630 627 … … 658 655 ec_selected_old_user = '-1'; 659 656 ec_selected_old_code = '-1'; 660 // ec_selected_old_code2 = '-1';661 657 ec_selected_AP = '-1'; 662 658 ec_selected_cat = '-1'; 663 // ec_selected_old_user2 = '-1';664 659 ec_selected_user = '-1'; 665 660 ec_selected_code = '-1'; … … 669 664 de('ec_in_up_usr_txt_id').value = ''; 670 665 de('ec_in_up_psd_txt_id').value = ''; 666 de('ec_confirm_psd_txt_id').value = ''; 671 667 de('ec_in_up_grp_txt_id').value = ''; 672 668 de('ec_in_up_newgroup_id').checked = ''; … … 705 701 de('ec_in_up_usr_txt_id').disabled = ''; 706 702 de('ec_in_up_psd_txt_id').disabled = ''; 703 de('ec_confirm_psd_txt_id').disabled = ''; 707 704 de('ec_in_up_newgroup_id').disabled = ''; 708 705 de('ec_in_up_grp_txt_id').disabled = ''; … … 724 721 de('ec_in_up_usr_txt_id').disabled = 'disabled'; 725 722 de('ec_in_up_psd_txt_id').disabled = 'disabled'; 723 de('ec_confirm_psd_txt_id').disabled = 'disabled'; 726 724 de('ec_in_up_newgroup_id').disabled = 'disabled'; 727 725 de('ec_in_up_grp_txt_id').disabled = 'disabled'; … … 754 752 de('ec_in_up_usr_txt_id').disabled = ''; 755 753 de('ec_in_up_psd_txt_id').disabled = ''; 754 de('ec_confirm_psd_txt_id').disabled = ''; 756 755 de('ec_in_up_newgroup_id').disabled = ''; 757 756 de('ec_in_up_grp_txt_id').disabled = ''; … … 774 773 de('ec_in_up_usr_txt_id').disabled = 'disabled'; 775 774 de('ec_in_up_psd_txt_id').disabled = 'disabled'; 776 de('ec_ in_up_psd_txt_id').disabled= 'disabled';775 de('ec_confirm_psd_txt_id').disabled = 'disabled'; 777 776 de('ec_in_up_newgroup_id').disabled = 'disabled'; 778 777 de('ec_in_up_grp_txt_id').disabled = 'disabled'; -
extensions/event_cats/include/evntcats_funcs.inc.php
r4157 r4163 157 157 158 158 /* 159 * ec_end ()160 * Process repetitive task when error in database modifying fu cntions.159 * ec_end1() 160 * Process repetitive task when error in database modifying functions. 161 161 * 162 162 * @param … … 166 166 * false as this function is used when there is a problem 167 167 */ 168 function ec_end ($pst, $msg) {168 function ec_end1($pst, $msg) { 169 169 global $page; 170 170 $page['errors'][] = … … 172 172 '$_POST[\''.$pst.'\'] = '. 173 173 $_POST[$pst] 174 ; 175 return false; 176 } 177 178 /* 179 * ec_end2() 180 * Process repetitive task when error in database modifying functions. 181 * 182 * @param 183 * $msg : message 184 * $num : number precising the point where the error occurred 185 * @return 186 * false as this function is used when there is a problem 187 */ 188 function ec_end2($msg, $num) { 189 global $page; 190 $page['errors'][] = 191 l10n($msg).' ('.$num.') '. 192 'MySQL error '.mysql_errno().', "'.mysql_error().'"' 174 193 ; 175 194 return false; … … 414 433 global $page, $ec_lists; 415 434 435 /* 436 437 ( 438 [ec_act1] => create 439 [ec_entry_sel] => -1 440 [ec_sel_code] => new 441 [ec_in_up_auto_code_length] => 10 442 [ec_in_up_code] => 94q0V1067D 443 [ec_sel_user] => new 444 [ec_in_up_usr_txt] => san_gimi 445 [ec_in_up_psd_txt] => 7Mv8QxZV 446 [ec_in_up_newgroup] => on 447 [ec_in_up_grp_txt] => EC_san_gimi 448 [ec_input_action] => cat 449 [ec_in_up_cat] => 6 450 [ec_in_up_img] => 451 ) 452 453 */ 416 454 /* foreach ($ec_lists['ec_table'] as $ec_entry) { 417 455 if ($_POST['ec_in_up_code'] == $ec_entry['code']) 418 return ec_end('ec_in_up_code', 'ec_bad_argument2'); 419 } 456 return ec_end1('ec_in_up_code', 'ec_bad_argument2'); 457 } 458 if ($t1 = (in_array($_POST['ec_in_up_usr_txt'], $ec_lists['user_ids']))) 459 $ec_user_id = $_POST['ec_in_up_usr_txt']; 420 460 if ($_POST['ec_sel_user'] == 'new') { 421 if (in_array( 422 $_POST['ec_in_up_usr_txt'], 423 $ec_lists['user_ids'] 424 )) return ec_end('ec_in_up_usr_txt', 'ec_bad_argument3'); 461 if ($t1) return ec_end1('ec_in_up_usr_txt', 'ec_bad_argument3'); 425 462 else { // New user account creation 426 463 $page['errors'] = register_user( 427 464 $_POST['ec_in_up_usr_txt'], $_POST['ec_in_up_psd_txt'], '', false 428 465 ); 429 } 466 if ( 467 count($page['errors']) != 0 or 468 !($ec_user_id = get_userid($_POST['ec_in_up_usr_txt'])) or 469 !pwg_query(" 470 UPDATE `".USER_INFOS_TABLE."` 471 SET `status` = 'generic' 472 WHERE `user_id` = ".$ec_user_id."; 473 ") 474 ) { 475 array_unshift($page['errors'], l10n('ec_user_create_pb')); 476 return false; 477 } 478 if ( 479 isset($_POST['ec_in_up_newgroup']) and 480 isset($_POST['ec_in_up_grp_txt']) and 481 $_POST['ec_in_up_grp_txt'] != '' 482 ) { // New group creation, and association with user_id at the same time 483 if ( 484 !($t = mysql_fetch_row(pwg_query(" 485 SELECT `id` 486 FROM `".GROUPS_TABLE."` 487 WHERE `name` = '".$_POST['ec_in_up_grp_txt']."'; 488 "))) 489 ) { 490 if ( 491 !pwg_query(" 492 INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`) 493 VALUES ('".$_POST['ec_in_up_grp_txt']."', 'false'); 494 ") 495 ) return ec_end2('ec_group_create_pb', '1'); 496 if ( 497 !($t = mysql_fetch_row(pwg_query(" 498 SELECT `id` 499 FROM `".GROUPS_TABLE."` 500 WHERE `name` = '".$_POST['ec_in_up_grp_txt']."'; 501 "))) 502 ) return ec_end2('ec_group_create_pb', '2'); 503 } 504 if ( 505 !(pwg_query(" 506 INSERT INTO `".USER_GROUP_TABLE."` (`user_id `, `group_id`) 507 VALUES ('".$ec_user_id."', '".$t['id']."'); 508 ")) 509 ) return ec_end2('ec_group_create_pb', '3'); 510 } 511 } 512 } 513 else { 514 if ($t1) { 515 if (ereg('^[a-zA-Z0-9_-]{4,32}$',$_POST['ec_in_up_code'])) { 516 if 517 } 518 else return ec_end1('ec_in_up_code', 'ec_bad_argument7'); 519 } 520 else return ec_end1('ec_in_up_usr_txt', 'ec_bad_argument6'); 430 521 } 431 522 */ … … 455 546 if (array_key_exists($_POST['ec_in_up_aps'],$ec_lists['add_pages'])) { 456 547 $arg2 = $_POST['ec_in_up_aps']; } 457 else return ec_end ('ec_in_up_aps', 'ec_bad_argument1');548 else return ec_end1('ec_in_up_aps', 'ec_bad_argument4'); 458 549 case 'home': 459 550 break; … … 466 557 ec_image_exists($_POST['ec_in_up_cat'], $_POST['ec_in_up_img']) 467 558 ) $arg2 = $_POST['ec_in_up_img']; 468 else return ec_end ('ec_in_up_img', 'ec_bad_argument1');559 else return ec_end1('ec_in_up_img', 'ec_bad_argument4'); 469 560 } 470 561 $arg1 = $_POST['ec_in_up_cat']; 471 562 } 472 else return ec_end ('ec_in_up_cat', 'ec_bad_argument1');563 else return ec_end1('ec_in_up_cat', 'ec_bad_argument4'); 473 564 break; 474 default: return ec_end ('ec_input_action', 'ec_bad_argument1');565 default: return ec_end1('ec_input_action', 'ec_bad_argument1'); 475 566 } 476 567 if (pwg_query(" … … 504 595 } 505 596 } 506 else return ec_end('ec_entry_sel', 'ec_bad_argument1'); 507 $page['errors'][] = '?!'; 508 return false; 597 else return ec_end1('ec_entry_sel', 'ec_bad_argument5'); 509 598 } 510 599 … … 572 661 } 573 662 } 574 else ec_end ('ec_entry_sel', 'ec_bad_argument1');663 else ec_end1('ec_entry_sel', 'ec_bad_argument1'); 575 664 } 576 665 -
extensions/event_cats/language/fr_FR/plugin.lang.php
r4158 r4163 111 111 $lang['ec_entry_dis_nok_pre3'] = 'Problème avec tentative de rendre périmée entrée '; 112 112 $lang['ec_entry_dis_nok_end3'] = ' (arg1 = NULL)'; 113 $lang['ec_user_create_pb'] = 'Création nouvel utilisateur impossible'; 114 $lang['ec_group_create_pb'] = 'Création nouveau groupe impossible : '; 113 115 $lang['ec_bad_argument1'] = 'Mauvais argument : '; 114 116 $lang['ec_bad_argument2'] = 'Code déjà existant : '; 115 117 $lang['ec_bad_argument3'] = 'Utilisateur déjà existant : '; 118 $lang['ec_bad_argument4'] = 'Additional Page, catégorie, ou image, inexistante : '; 119 $lang['ec_bad_argument5'] = 'Code inexistant ou non duplicable : '; 120 $lang['ec_bad_argument6'] = 'Utilisateur inexistant : '; 121 $lang['ec_bad_argument7'] = 'Code non conforme : '; 116 122 // Infos 117 123 $lang['ec_entry_del_ok_pre'] = 'Entrée ';
Note: See TracChangeset
for help on using the changeset viewer.
