Changeset 4171
- Timestamp:
- Nov 2, 2009, 2:23:52 AM (14 years ago)
- Location:
- extensions/event_cats
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/event_cats/admin/autolog_new.inc.php
r4157 r4171 110 110 $template->assign('ec_ap_ok', $ec_ap_ok); 111 111 $template->assign('ec_lists', $ec_lists); 112 $template->assign('cat_display', (read_ec_conf('cat_display') == '0')); 112 113 $template->assign('ec_default_entry', $ec_default_entry); 113 114 $template->assign('ec_default_action', $ec_default_action); -
extensions/event_cats/admin/evntcats_admin.php
r4169 r4171 38 38 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 39 39 40 global $template, $conf, $lang, $test1, $prefixeTable, $ec_ err, $page,40 global $template, $conf, $lang, $test1, $prefixeTable, $ec_conf, $page, 41 41 $ec_lists, // array of following arrays : 42 42 // $ec_lists['ec_table'] : … … 188 188 'POST' => str_from_var($_POST), 189 189 'page' => str_from_var($page), 190 'ec_conf' => str_from_var($ec_conf), 190 191 'ec_lists' => (isset($ec_lists)) ? str_from_var($ec_lists) : '(unset)', 191 192 'code_list' => (isset($code_list)) ? str_from_var($code_list) : '(unset)', -
extensions/event_cats/admin/template/autolog_entries.js
r4092 r4171 28 28 29 29 function ec_check_ds(ec_id) { 30 var t = true; 30 31 ec_mark_line(ec_id); 31 document.getElementById('ec_act1_id').value = 'disable'; 32 document.forms['ec_view_codes'].submit(); 32 if (!ec_ap_ok) t = confirm(ec_JS_message['ec_confirm_disable']); 33 if (t) { 34 document.getElementById('ec_act1_id').value = 'disable'; 35 document.forms['ec_view_codes'].submit(); 36 } 33 37 } 34 38 … … 56 60 return false; 57 61 } 58 else return true;62 else return confirm(ec_JS_message['ec_confirm_test']); 59 63 } 60 64 -
extensions/event_cats/admin/template/autolog_entries.tpl
r4170 r4171 124 124 <script type = "text/javascript"><!-- 125 125 ec_JS_message['ec_confirm_delete'] = "{'ec_confirm_delete'|@translate|@escape:javascript}"; 126 ec_JS_message['ec_confirm_disable'] = "{'ec_confirm_disable'|@translate|@escape:javascript}"; 126 127 ec_JS_message['ec_confirm_test'] = "{'ec_confirm_test'|@translate|@escape:javascript}"; 127 128 ec_JS_message['ec_confirm_force'] = "{'ec_confirm_force'|@translate|@escape:javascript}"; -
extensions/event_cats/admin/template/autolog_new.js
r4163 r4171 7 7 var ec_flag1 = false; 8 8 var ec_flag2 = false; 9 var cat_display = false; 9 10 var ec_dont_check = false; 10 11 var ec_selected_old_group = false; … … 62 63 function ec_mark_entry(ec_id) { 63 64 var i = 0; 65 ec_chk_nover_cat = false; 64 66 if (ec_id == '-1') de('ec_in_up_entry_list_id').selectedIndex = '-1'; 65 67 else { … … 87 89 case 2: // Additionnal Page 88 90 ec_selected_action = 'ec_input_action_add_p'; 89 ec_selected_ cat= (ec_check_exist_value('ec_in_up_aps_id',91 ec_selected_AP = (ec_check_exist_value('ec_in_up_aps_id', 90 92 ec_lists['arg2'][ec_id])) ? ec_lists['arg2'][ec_id] : '-1'; 91 93 break; … … 113 115 } 114 116 } 117 ec_chk_nover_cat = true; 115 118 } 116 119 … … 267 270 switch (ec_selected_action) { 268 271 case 'ec_input_action_add_p': // Additional Page 269 de('ec_in_up_aps_id').value = ec_selected_AP; 272 if (ec_selected_AP == '-1') 273 de('ec_in_up_aps_id').selectedIndex = '-1'; 274 else 275 de('ec_in_up_aps_id').value = ec_selected_AP; 270 276 de('ec_in_up_cats_id').selectedIndex = '-1'; 271 277 de('ec_in_up_imgs_id').value = ''; … … 274 280 case 'ec_input_action_cat': // Category 275 281 de('ec_in_up_aps_id').selectedIndex = '-1'; 276 de('ec_in_up_cats_id').value = ec_selected_cat; 282 if (ec_selected_cat == '-1') 283 de('ec_in_up_cats_id').selectedIndex = '-1'; 284 else 285 de('ec_in_up_cats_id').value = ec_selected_cat; 277 286 de('ec_in_up_imgs_id').value = ''; 278 287 ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ? … … 282 291 case 'ec_input_action_img': // Image 283 292 de('ec_in_up_aps_id').selectedIndex = '-1'; 284 de('ec_in_up_cats_id').value = ec_selected_cat; 285 de('ec_in_up_imgs_id').value = ec_selected_img; 293 if (ec_selected_img == '-1') { 294 de('ec_in_up_cats_id').selectedIndex = '-1'; 295 de('ec_in_up_imgs_id').value = ''; 296 } 297 else { 298 de('ec_in_up_cats_id').value = ec_selected_cat; 299 de('ec_in_up_imgs_id').value = ec_selected_img; 300 } 286 301 ec_selected_user = (ec_selected_user == 'ec_sel_user_none') ? 287 302 'ec_sel_user_old' : ec_selected_user; … … 394 409 var ec_reg_ap = /^\S+/; 395 410 var ec_reg_cat1 = /\/\s(.+)$/; 411 var ec_reg_cat3 = /^\s*\-\s(.+)$/; 396 412 if ( 397 413 ec_selected_action == '' || … … 420 436 d.ec_new_code.ec_in_up_aps.selectedIndex 421 437 ].label 422 ); 438 )[0]; 439 ec_new_user_text = ec_new_user_text.substr(0, 32); 423 440 t2 = ec_new_user_text; 424 441 break; … … 428 445 d.ec_new_code.ec_in_up_cat.selectedIndex 429 446 ].label; 430 ec_new_user_text = (ec_reg_cat2.test(ec_cat_sel)) ? 431 ec_reg_cat1.exec(ec_cat_sel)[1] : ec_cat_sel; 432 ec_new_user_text = ec_new_user_text.replace(/\s/, '_'); 447 if (cat_display) ec_new_user_text = 448 (ec_reg_cat2.test(ec_cat_sel)) ? 449 ec_reg_cat1.exec(ec_cat_sel)[1] : ec_cat_sel; 450 else ec_new_user_text = ec_reg_cat3.exec(ec_cat_sel)[1]; 451 ec_new_user_text = ec_new_user_text.replace(/\s/g, '_'); 452 ec_new_user_text = ec_new_user_text.substr(0, 32); 433 453 t2 = ec_new_user_text; 434 454 if (ec_selected_action == 'ec_input_action_img') { -
extensions/event_cats/admin/template/autolog_new.tpl
r4158 r4171 267 267 <script type = "text/javascript"><!-- 268 268 ec_is_creation = {if $ec_is_creation}true{else}false{/if}; 269 cat_display = {if $cat_display}true{else}false{/if}; 269 270 ec_up_code_lbl_forced_txt = "{'ec_up_code_lbl_forced'|@translate}"; 270 271 ec_JS_message['ec_gen_user_act_miss'] = "{'ec_gen_user_act_miss'|@translate|@escape:javascript}"; -
extensions/event_cats/include/ec_conf.inc.php
r4092 r4171 33 33 _ the number of digits when creating a new code automatically 34 34 ($ec_conf[2] <=> read_ec_conf('auto_code_dg_nb')) ; 35 _ whether categories are displayed "cat / under_cat / ..." or 36 "cat <CR LF> - under_cat <CR LF> - ..." ($ec_conf[3] <=> 37 read_ec_conf('cat_display')) ; 35 38 _ whether the "how to" banner has already been displayed or not 36 ($ec_conf[ 3] <=> read_ec_conf('howto')) ;39 ($ec_conf[4] <=> read_ec_conf('howto')) ; 37 40 _ what to do in case an unknown code is used with "autolog" parameter 38 ($ec_conf[ 4] <=> read_ec_conf('unknown_code')) :41 ($ec_conf[5] <=> read_ec_conf('unknown_code')) : 39 42 0 : nothing ("goto" home page, index.php (not logged in of course)) ; 40 43 1 : redirected to "access denied" page ; 41 44 2 : redirected to an Additional Page precised below. 42 45 _ the id of the Additional Page which must be used in case of usage of an 43 unknow code ($ec_conf[ 5] <=> read_ec_conf('unknown_code_ap_id')).46 unknow code ($ec_conf[6] <=> read_ec_conf('unknown_code_ap_id')). 44 47 *****************************************************************************/ 45 48 … … 55 58 } 56 59 else { 57 $ec_conf = explode(',' , '0,1,10,0,0,0 ');60 $ec_conf = explode(',' , '0,1,10,0,0,0,0'); 58 61 change_ec_conf('activated', 0); 59 62 } … … 82 85 $ec_conf[2] = $v; 83 86 break; 84 case ' howto':87 case 'cat_display': 85 88 $ec_conf[3] = $v; 86 89 break; 87 case ' unknown_code':90 case 'howto': 88 91 $ec_conf[4] = $v; 89 92 break; 93 case 'unknown_code': 94 $ec_conf[5] = $v; 95 break; 90 96 case 'unknown_code_ap_id': 91 $ec_conf[ 5] = $v;97 $ec_conf[6] = $v; 92 98 break; 93 99 default: return false; … … 115 121 case 'dup_allow' : return $ec_conf[1]; 116 122 case 'auto_code_dg_nb' : return $ec_conf[2]; 117 case 'howto' : return $ec_conf[3]; 118 case 'unknown_code' : return $ec_conf[4]; 119 case 'unknown_code_ap_id': return $ec_conf[5]; 123 case 'cat_display' : return $ec_conf[3]; 124 case 'howto' : return $ec_conf[4]; 125 case 'unknown_code' : return $ec_conf[5]; 126 case 'unknown_code_ap_id': return $ec_conf[6]; 120 127 default : return false; 121 128 } -
extensions/event_cats/include/evntcats_main_funcs.inc.php
r4170 r4171 330 330 SELECT id,name,uppercats,global_rank 331 331 FROM '.CATEGORIES_TABLE, 332 $c, 'category_options', true);332 $c, 'category_options', (read_ec_conf('cat_display') == '0')); 333 333 $ec_lists['categories'] = $template->smarty->_tpl_vars['category_options']; 334 334 -
extensions/event_cats/language/en_UK/plugin.lang.php
r3963 r4171 7 7 */ 8 8 9 // $ec_err :10 $lang['ec_err_AP_fail'] = 'Reference to an Additional Page which doesn\'t exist'; // 111 $lang['ec_err_cod_dupl_frbdn'] = 'Code should be unique '; // 212 $lang['ec_err_AP_miss'] = 'Redirection to Additional Page, but AP not specified'; // 313 $lang['ec_err_USR_fail'] = 'An entry associates a code to an unknown user_id or username'; // 414 $lang['ec_err_CAT_fail'] = 'An unknown category has been given as arg1'; // 515 $lang['ec_err_IMG_fail'] = 'An image id not found in a certain category, has been given as arg2'; // 616 $lang['ec_err_USR_prbl'] = 'User not clear'; // 717 $lang['ec_err_USR_dupl'] = 'Code is associated to more than one user_id'; // 818 $lang['ec_err_CAT_miss'] = 'Category id misses'; // 919 $lang['ec_err_IMG_miss'] = 'Image id misses'; // 1020 $lang['ec_err_forced_prbl'] = 'Outdated code should always be forced'; // 1121 22 9 23 10 // $lang[''] = ''; -
extensions/event_cats/language/fr_FR/plugin.lang.php
r4163 r4171 75 75 $lang['ec_confirm_test'] = "Vraiment tester le code sélectionné ?\n\rCela terminera votre session d'administration."; 76 76 $lang['ec_confirm_delete'] = "Vraiment supprimer l'entrée sélectionnée ?"; 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."; 77 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 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 ?";
Note: See TracChangeset
for help on using the changeset viewer.