diff --git a/agc_2-X/trunk/www/vicidial/admin_lists_custom.php b/agc_2-X/trunk/www/vicidial/admin_lists_custom.php index 8110e663..de726f80 100644 --- a/agc_2-X/trunk/www/vicidial/admin_lists_custom.php +++ b/agc_2-X/trunk/www/vicidial/admin_lists_custom.php @@ -54,10 +54,11 @@ # 180504-1807 - Added new SWITCH field type # 191013-1014 - Fixes for PHP7 # 210211-0032 - Added SOURCESELECT field type +# 210304-2039 - Added option to "re-rank" field ranks when adding/updating a field in the middle of the form # -$admin_version = '2.14-45'; -$build = '210211-0032'; +$admin_version = '2.14-46'; +$build = '210304-2039'; require("dbconnect_mysqli.php"); require("functions.php"); @@ -117,6 +118,8 @@ if (isset($_GET["ConFiRm"])) {$ConFiRm=$_GET["ConFiRm"];} elseif (isset($_POST["ConFiRm"])) {$ConFiRm=$_POST["ConFiRm"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} +if (isset($_GET["field_rerank"])) {$field_rerank=$_GET["field_rerank"];} + elseif (isset($_POST["field_rerank"])) {$field_rerank=$_POST["field_rerank"];} ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### @@ -191,6 +194,8 @@ else $PHP_AUTH_PW = preg_replace("/'|\"|\\\\|;/","",$PHP_AUTH_PW); } +$field_rerank = preg_replace('/[^_0-9a-zA-Z]/','',$field_rerank); + $STARTtime = date("U"); $TODAY = date("Y-m-d"); $NOW_TIME = date("Y-m-d H:i:s"); @@ -614,7 +619,7 @@ if ( ($action == "COPY_FIELDS_SUBMIT") and ($list_id > 99) and ($source_list_id } ### add field function - $SQLsuccess = add_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$A_field_id[$o],$list_id,$A_field_label[$o],$A_field_name[$o],$A_field_description[$o],$A_field_rank[$o],$A_field_help[$o],$A_field_type[$o],$A_field_options[$o],$A_field_size[$o],$A_field_max[$o],$A_field_default[$o],$A_field_required[$o],$A_field_cost[$o],$A_multi_position[$o],$A_name_position[$o],$A_field_order[$o],$A_field_encrypt[$o],$A_field_show_hide[$o],$A_field_duplicate[$o],$vicidial_list_fields,$mysql_reserved_words); + $SQLsuccess = add_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$A_field_id[$o],$list_id,$A_field_label[$o],$A_field_name[$o],$A_field_description[$o],$A_field_rank[$o],$A_field_help[$o],$A_field_type[$o],$A_field_options[$o],$A_field_size[$o],$A_field_max[$o],$A_field_default[$o],$A_field_required[$o],$A_field_cost[$o],$A_multi_position[$o],$A_name_position[$o],$A_field_order[$o],$A_field_encrypt[$o],$A_field_show_hide[$o],$A_field_duplicate[$o],$vicidial_list_fields,$mysql_reserved_words,$field_rerank); if ($SQLsuccess > 0) {echo _QXZ("SUCCESS: Custom Field Added")." - $list_id|$A_field_label[$o]\n
";} @@ -679,7 +684,7 @@ if ( ($action == "COPY_FIELDS_SUBMIT") and ($list_id > 99) and ($source_list_id $current_field_id = $rowx[0]; ### modify field function - $SQLsuccess = modify_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$current_field_id,$list_id,$A_field_label[$o],$A_field_name[$o],$A_field_description[$o],$A_field_rank[$o],$A_field_help[$o],$A_field_type[$o],$A_field_options[$o],$A_field_size[$o],$A_field_max[$o],$A_field_default[$o],$A_field_required[$o],$A_field_cost[$o],$A_multi_position[$o],$A_name_position[$o],$A_field_order[$o],$A_field_encrypt[$o],$A_field_show_hide[$o],$A_field_duplicate[$o],$vicidial_list_fields); + $SQLsuccess = modify_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$current_field_id,$list_id,$A_field_label[$o],$A_field_name[$o],$A_field_description[$o],$A_field_rank[$o],$A_field_help[$o],$A_field_type[$o],$A_field_options[$o],$A_field_size[$o],$A_field_max[$o],$A_field_default[$o],$A_field_required[$o],$A_field_cost[$o],$A_multi_position[$o],$A_name_position[$o],$A_field_order[$o],$A_field_encrypt[$o],$A_field_show_hide[$o],$A_field_duplicate[$o],$vicidial_list_fields,$field_rerank); if ($SQLsuccess > 0) {echo _QXZ("SUCCESS: Custom Field Modified")." - $list_id|$A_field_label[$o]\n
";} @@ -903,7 +908,7 @@ if ( ($action == "ADD_CUSTOM_FIELD") and ($list_id > 99) ) } ### add field function - $SQLsuccess = add_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$field_id,$list_id,$field_label,$field_name,$field_description,$field_rank,$field_help,$field_type,$field_options,$field_size,$field_max,$field_default,$field_required,$field_cost,$multi_position,$name_position,$field_order,$field_encrypt,$field_show_hide,$field_duplicate,$vicidial_list_fields,$mysql_reserved_words); + $SQLsuccess = add_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$field_id,$list_id,$field_label,$field_name,$field_description,$field_rank,$field_help,$field_type,$field_options,$field_size,$field_max,$field_default,$field_required,$field_cost,$multi_position,$name_position,$field_order,$field_encrypt,$field_show_hide,$field_duplicate,$vicidial_list_fields,$mysql_reserved_words,$field_rerank); if ($SQLsuccess > 0) {echo _QXZ("SUCCESS: Custom Field Added")." - $list_id|$field_label\n
";} @@ -1005,7 +1010,7 @@ if ( ($action == "MODIFY_CUSTOM_FIELD_SUBMIT") and ($list_id > 99) and ($field_i else { ### modify field function - $SQLsuccess = modify_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$field_id,$list_id,$field_label,$field_name,$field_description,$field_rank,$field_help,$field_type,$field_options,$field_size,$field_max,$field_default,$field_required,$field_cost,$multi_position,$name_position,$field_order,$field_encrypt,$field_show_hide,$field_duplicate,$vicidial_list_fields); + $SQLsuccess = modify_field_function($DB,$link,$linkCUSTOM,$ip,$user,$table_exists,$field_id,$list_id,$field_label,$field_name,$field_description,$field_rank,$field_help,$field_type,$field_options,$field_size,$field_max,$field_default,$field_required,$field_cost,$multi_position,$name_position,$field_order,$field_encrypt,$field_show_hide,$field_duplicate,$vicidial_list_fields,$field_rerank); if ($SQLsuccess > 0) {echo _QXZ("SUCCESS: Custom Field Modified")." - $list_id|$field_label\n
";} @@ -1514,7 +1519,11 @@ if ( ($action == "MODIFY_CUSTOM_FIELDS") and ($list_id > 99) ) echo "\n"; echo "\n"; echo "\n"; - echo "   $NWB#lists_fields-field_order$NWE \n"; + echo "   $NWB#lists_fields-field_order$NWE \n"; + echo "         "._QXZ("Re-Rank Fields Below").":   $NWB#lists_fields-field_rerank$NWE \n"; echo ""._QXZ("Field Name")." $A_field_rank[$o]: $NWB#lists_fields-field_name$NWE \n"; echo ""._QXZ("Field Name Position")." $A_field_rank[$o]:   $NWB#lists_fields-field_order$NWE \n"; + echo "   $NWB#lists_fields-field_order$NWE \n"; + echo "         "._QXZ("Re-Rank Fields Below").":   $NWB#lists_fields-field_rerank$NWE \n"; echo ""._QXZ("Field Label").": $NWB#lists_fields-field_label$NWE \n"; echo ""._QXZ("Field Name").": $NWB#lists_fields-field_name$NWE \n"; echo ""._QXZ("Field Name Position").":