Changeset 4181 for extensions/event_cats
- Timestamp:
- Nov 4, 2009, 7:14:50 PM (14 years ago)
- Location:
- extensions/event_cats
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/event_cats/admin/template/autolog_entries.tpl
r4171 r4181 7 7 {if $ec_ap_ok} 8 8 {'ec_plugin_ap_ok'|@translate} 9 <script type = "text/javascript"> <!--10 var ec_ap_ok = true; //-->9 <script type = "text/javascript"> 10 var ec_ap_ok = true; 11 11 </script> 12 12 {else} 13 13 {'ec_plugin_ap_nok'|@translate} 14 <script type = "text/javascript"> <!--15 var ec_ap_ok = false; //-->14 <script type = "text/javascript"> 15 var ec_ap_ok = false; 16 16 </script> 17 17 {/if} … … 24 24 25 25 <div style = "text-align:center; font-weight:bold; font-size:120%;"> 26 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"><label>{'ec_entry_table_title'|@translate}</label></a><br> 26 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> 27 <!--[if !IE]> <--> <label> <!--> <![endif]--> 28 {'ec_entry_table_title'|@translate} 29 <!--[if !IE]> <--> </label> <!--> <![endif]--> 30 <!-- What we're able to do for our "prefered" browser |-( ...! --> 31 </a><br> 27 32 </div><br> 28 33 … … 122 127 {* <!-- JavaScript functions --> *} 123 128 <script type = "text/javascript" src = "{$RACINE_URL}{$EVNTCATS_PATH}admin/template/autolog_entries.js"></script> 124 <script type = "text/javascript"> <!--129 <script type = "text/javascript"> 125 130 ec_JS_message['ec_confirm_delete'] = "{'ec_confirm_delete'|@translate|@escape:javascript}"; 126 131 ec_JS_message['ec_confirm_disable'] = "{'ec_confirm_disable'|@translate|@escape:javascript}"; … … 129 134 ec_JS_message['ec_clk_entry_miss'] = "{'ec_clk_entry_miss'|@translate|@escape:javascript}"; 130 135 ec_init(); 131 //--></script>136 </script> 132 137 133 138 {include file='../../../plugins/event_cats/admin/template/footer.inc.tpl'} -
extensions/event_cats/admin/template/autolog_new.js
r4179 r4181 21 21 var ec_default_entry = ''; 22 22 var ec_up_code_lbl_forced_txt = ''; 23 var ec_original_old_user = ''; 23 24 var ec_selected_old_entry = '-1'; 24 25 var ec_selected_old_code = '-1'; … … 72 73 ec_selected_user = 'ec_sel_user_old'; 73 74 ec_selected_old_user = ec_lists['user_id'][ec_id]; 75 ec_original_old_user = ec_selected_old_user; 74 76 if ( 75 77 ec_lists['arg1'][ec_id] != '' && … … 551 553 var t1 = true; 552 554 var t2 = true; 555 var t3 = false; 553 556 if (ec_dont_check) return true; 554 557 if (ec_is_creation) { 558 t3 = de('ec_sel_code_old').checked != ''; 555 559 if (( 556 560 de('ec_sel_code_new').checked != '' && … … 588 592 return false; 589 593 } 594 if ( 595 de('ec_sel_user_new').checked != '' || ( 596 de('ec_sel_user_old').checked != '' && 597 ec_original_old_user != d.ec_new_code.ec_in_up_usr_list.value 598 ) 599 ) if (!confirm(ec_JS_message['ec_confirm_change_user'])) return false; 590 600 } 591 601 if (( … … 629 639 return false; 630 640 } 631 if ((!ec_is_creation && !t1) || 632 (de('ec_in_up_forced_id').checked != '' && de('ec_sel_code_old').checked != '') 633 ) return confirm(ec_JS_message['ec_confirm_del_other']); 641 if (!ec_is_creation && !t1) 642 return confirm(ec_JS_message['ec_confirm_del_other']); 643 else if ( 644 (!ec_is_creation || t3) && 645 de('ec_in_up_forced_id').checked != '' 646 ) return confirm(ec_JS_message['ec_confirm_force']); 634 647 return true; 635 648 } -
extensions/event_cats/admin/template/autolog_new.tpl
r4179 r4181 26 26 <div style = "text-align:center;"> 27 27 <a style = "font-weight:bold; font-size:120%;" href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> 28 < label>28 <!--[if !IE]> <--> <label> <!--> <![endif]--> 29 29 {if $ec_is_creation} 30 30 {'ec_new_entry_title'|@translate} … … 32 32 {'ec_modify_entry_title'|@translate} 33 33 {/if} 34 </label> 34 <!--[if !IE]> <--> </label> <!--> <![endif]--> 35 <!-- What we're able to do for our "prefered" browser |-( ...! --> 35 36 </a> 36 37 {if $ec_is_creation} … … 172 173 {'ec_new_user_group'|@translate} 173 174 </span><br> 174 <input type = "text" name = " ec_in_up_grp_txt" id = "ec_in_up_grp_txt_id" maxlength = "32"175 <input type = "text" name = "groupname" id = "ec_in_up_grp_txt_id" maxlength = "32" 175 176 size = "20" onblur = "ec_new_grp_text = this.value; if (this.value != '') ec_selected_old_group = true;" 176 177 /> … … 274 275 ec_JS_message['ec_new_pwd_gen2'] = "{'ec_new_pwd_gen2'|@translate|@escape:javascript}"; 275 276 ec_JS_message['ec_act_entry_miss'] = "{'ec_act_entry_miss'|@translate|@escape:javascript}"; 277 ec_JS_message['ec_confirm_force'] = "{'ec_confirm_force'|@translate|@escape:javascript}"; 276 278 ec_JS_message['ec_confirm_del_other'] = "{'ec_confirm_del_other'|@translate|@escape:javascript}"; 277 279 ec_JS_message['ec_user_already_exists'] = "{'ec_user_already_exists'|@translate|@escape:javascript}"; 278 280 ec_JS_message['ec_code_already_exists'] = "{'ec_code_already_exists'|@translate|@escape:javascript}"; 279 281 ec_JS_message['ec_conf_pwd_dont_match'] = "{'ec_conf_pwd_dont_match'|@translate|@escape:javascript}"; 282 ec_JS_message['ec_confirm_change_user'] = "{'ec_confirm_change_user'|@translate|@escape:javascript}"; 280 283 ec_JS_message['ec_up_code_lbl_home'] = "{'ec_up_code_lbl_home'|@translate}"; 281 284 ec_JS_message['ec_submit_code_miss'] = "{'ec_submit_code_miss'|@translate}"; -
extensions/event_cats/include/evntcats_admin_funcs.inc.php
r4179 r4181 63 63 64 64 /* 65 * ec_end2() 66 * Process repetitive task when error in database modifying functions. 67 * 68 * @param 69 * $msg : message 70 * $num : number precising the point where the error occurred 71 * @return 72 * false as this function is used when there is a problem 73 */ 74 function ec_end2($msg, $num) { 65 * ec_create_user_OK() 66 * Creates new generic user and eventually new group as described in $_POST. 67 * 68 * @param 69 * no param needed 70 * @return 71 * the created user_id or false whether all operations suceeded or not 72 */ 73 function ec_create_user_OK() { 75 74 global $page; 76 75 77 return false; 76 // This function assumes that the validity of the different indexes it uses, 77 // have been checked before it is used. 78 79 // User creation, as generic 80 $ec_user_id = false; 81 $page['errors'] = register_user( 82 $_POST['login'], $_POST['password'], '', false 83 ); 84 if ( 85 count($page['errors']) != 0 or 86 !($ec_user_id = get_userid($_POST['login'])) 87 ) { 88 array_unshift($page['errors'], l10n('ec_user_create_pb')); 89 return false; 90 } 91 else 92 $page['infos'][] = l10n('ec_user_create_OK').$_POST['login']; 93 if ( 94 pwg_query(" 95 UPDATE `".USER_INFOS_TABLE."` 96 SET `status` = 'generic' 97 WHERE `user_id` = ".$ec_user_id."; 98 ") !== false 99 ) 100 $page['infos'][] = l10n('ec_user_generic_OK').$_POST['login']; 101 else 102 $page['errors'][] =l10n('ec_user_generic_pb').$_POST['login']; 103 104 // New group creation if required, 105 // and association with user_id at the same time 106 if ( 107 isset($_POST['ec_in_up_newgroup']) and 108 isset($_POST['groupname']) and 109 $_POST['groupname'] != '' 110 ) { 111 $t2 = 0; $t3 = false; $t4 = false; 112 while ( 113 !($t3 = mysql_fetch_row(pwg_query(" 114 SELECT `id` 115 FROM `".GROUPS_TABLE."` 116 WHERE `name` = '".$_POST['groupname']."'; 117 "))) and 118 $t2++ == 0 119 ) $t4 = pwg_query(" 120 INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`) 121 VALUES ('".$_POST['groupname']."', 'false'); 122 "); 123 if ($t4) 124 $page['infos'][]=l10n('ec_group_create_OK').$_POST['groupname']; 125 if (!$t3) 126 $page['errors'][] = 127 l10n('ec_group_create_pb').' (1) ; '. 128 'MySQL error '.mysql_errno().', "'.mysql_error().'"'; 129 if ( 130 pwg_query(" 131 INSERT INTO `".USER_GROUP_TABLE."` (`user_id`, `group_id`) 132 VALUES ('".$ec_user_id."', '".$t3[0]."'); 133 ") === false 134 ) $page['errors'][] = 135 l10n('ec_group_create_pb').' (2) ; '. 136 'MySQL error '.mysql_errno().', "'.mysql_error().'"'; 137 else 138 $page['infos'][] = 139 $_POST['login']. 140 l10n('ec_group_create_OK2'). 141 $_POST['groupname'] 142 ; 143 } 144 return $ec_user_id; 78 145 } 79 146 … … 168 235 169 236 // code and user_id (if needed) are OK, creation can be done 170 if ($_POST['ec_sel_user'] == 'new') { 171 172 // User creation, as generic 173 $page['errors'] = register_user( 174 $_POST['login'], $_POST['password'], '', false 175 ); 176 if ( 177 count($page['errors']) != 0 or 178 !($ec_user_id = get_userid($_POST['login'])) 179 ) { 180 array_unshift($page['errors'], l10n('ec_user_create_pb')); 181 return false; 182 } 183 else 184 $page['infos'][] = l10n('ec_user_create_OK').$_POST['login']; 185 if ( 186 pwg_query(" 187 UPDATE `".USER_INFOS_TABLE."` 188 SET `status` = 'generic' 189 WHERE `user_id` = ".$ec_user_id."; 190 ") !== false 191 ) 192 $page['infos'][] = l10n('ec_user_generic_OK').$_POST['login']; 193 else 194 $page['errors'][] =l10n('ec_user_generic_pb').$_POST['login']; 195 196 // New group creation if required, 197 // and association with user_id at the same time 198 if ( 199 isset($_POST['ec_in_up_newgroup']) and 200 isset($_POST['ec_in_up_grp_txt']) and 201 $_POST['ec_in_up_grp_txt'] != '' 202 ) { 203 $t2 = 0; $t4 = false; 204 while ( 205 !($t3 = mysql_fetch_row(pwg_query(" 206 SELECT `id` 207 FROM `".GROUPS_TABLE."` 208 WHERE `name` = '".$_POST['ec_in_up_grp_txt']."'; 209 "))) and 210 $t2++ == 0 211 ) $t4 = pwg_query(" 212 INSERT INTO `".GROUPS_TABLE."` (`name`, `is_default`) 213 VALUES ('".$_POST['ec_in_up_grp_txt']."', 'false'); 214 "); 215 if ($t4) 216 $page['infos'][]=l10n('ec_group_create_OK').$_POST['ec_in_up_grp_txt']; 217 if (!$t3) 218 $page['errors'][] = 219 l10n('ec_group_create_pb').' (1) ; '. 220 'MySQL error '.mysql_errno().', "'.mysql_error().'"'; 221 if ( 222 pwg_query(" 223 INSERT INTO `".USER_GROUP_TABLE."` (`user_id`, `group_id`) 224 VALUES ('".$ec_user_id."', '".$t3[0]."'); 225 ") === false 226 ) $page['errors'][] = 227 l10n('ec_group_create_pb').' (2) ; '. 228 'MySQL error '.mysql_errno().', "'.mysql_error().'"'; 229 else 230 $page['infos'][] = 231 $_POST['login']. 232 l10n('ec_group_create_OK2'). 233 $_POST['ec_in_up_grp_txt'] 234 ; 235 } 236 } 237 238 // User and eventually group creation, if needed 239 if ($_POST['ec_sel_user'] == 'new') 240 if (!($ec_user_id = ec_create_user_OK())) return false; 237 241 238 242 // Preparation of $arg1, $arg2 and $forced … … 293 297 return true; 294 298 } 295 /*296 297 $page['errors'][] = 'Y\'a p\'têt\' ben eu une erreur...';298 299 */300 299 } 301 300 … … 318 317 $arg1 = ''; $arg2 = ''; 319 318 switch ($_POST['ec_input_action']) { 319 // case 'home': // Home : nothing to do : "arg"s are '' 320 320 case 'add_p': 321 321 if (array_key_exists($_POST['ec_in_up_aps'],$ec_lists['add_pages'])) { 322 322 $arg2 = $_POST['ec_in_up_aps']; } 323 323 else return ec_end1('ec_in_up_aps', 'ec_bad_argument4'); 324 case 'home':325 break;326 324 case 'img': 327 325 case 'cat': -
extensions/event_cats/language/fr_FR/plugin.lang.php
r4179 r4181 76 76 $lang['ec_confirm_delete'] = "Vraiment supprimer l'entrée sélectionnée ?"; 77 77 $lang['ec_confirm_disable'] = "Vraiment rendre périmé le code sélectionné ?\n\rCela supprimera toutes les autres entrées utilisant le même code, s'il y en a."; 78 $lang['ec_confirm_force'] = " Vraiment forcer l'affichage pour le code sélectionné ?\n\rCela supprimera toutes les autres entrées utilisant le même code, s'il y en a.";78 $lang['ec_confirm_force'] = "Forcer l'affichage pour le code sélectionné\n\rsupprimera toutes les autres entrées utilisant le même code, s'il y en a. OK ?"; 79 79 $lang['ec_confirm_del_other'] = "Cela supprimera toutes les autres entrées utilisant le même code, s'il y en a.\n\rOK ?"; 80 $lang['ec_confirm_change_user'] = "Modifier l'utilisateur identifié supprimera\n\rtoutes les autres entrées utilisant le même code, s'il y en a. OK ?"; 80 81 $lang['ec_gen_user_act_miss'] = 'Sélectionnez d\'abord une page à afficher'; 81 82 $lang['ec_act_cat_miss'] = 'Catégorie ?';
Note: See TracChangeset
for help on using the changeset viewer.