diff --git a/admin/dropoff.admin.php b/admin/dropoff.admin.php index 1d982f4a..88650191 100644 --- a/admin/dropoff.admin.php +++ b/admin/dropoff.admin.php @@ -1,4 +1,6 @@ diff --git a/admin/judging_locations.admin.php b/admin/judging_locations.admin.php index 9ac8b5db..7c3a1461 100644 --- a/admin/judging_locations.admin.php +++ b/admin/judging_locations.admin.php @@ -63,6 +63,8 @@ $form_submit_button = ""; $output_no_records = ""; $goto_nav = ""; +$judge_loc_url_yes = ""; +$judge_loc_url_no = ""; if ($filter == "judges") $staff_row_field = "staff_judge"; diff --git a/includes/constants.inc.php b/includes/constants.inc.php index 2396875c..a32f3c04 100644 --- a/includes/constants.inc.php +++ b/includes/constants.inc.php @@ -71,6 +71,8 @@ $current_date = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "date"); $current_time = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "time"); + + $delay = $_SESSION['prefsWinnerDelay'] * 3600; } diff --git a/includes/current_version.inc.php b/includes/current_version.inc.php index f842ed0e..853fda88 100644 --- a/includes/current_version.inc.php +++ b/includes/current_version.inc.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/lib/common.lib.php b/lib/common.lib.php index 705bcd4a..14790a24 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1,3355 +1,3355 @@ -".$rank2.""; - else $return .= ""; - } - return $return; -} - -function build_action_link($icon,$base_url,$section,$go,$action,$filter,$id,$dbTable,$alt_title,$method=0,$tooltip_text="default") { - - $return = ""; - //$return .= ""; - - if (($method == 1) || ($method == 2)) { - $return .= ""; - //$return .= " "; - } - - if ($icon == "fa-trash-o") { - $return .= ""; - } - - else { - - if ($method == 2) { // print form link - $return .= ""; - } - - else { - $return .= ""; - } - } - - if (($method == 1) || ($method == 2)) { - $return .= $tooltip_text; - } - - else { - //$return .= ""; - $return .= ""; - - } - - //$return .= ""; - $return .= ""; - return $return; -} - -function build_output_link($icon,$base_url,$filename,$section,$go,$action,$filter,$id,$dbTable,$alt_title,$modal_window) { - - $return = ""; - - $return .= ""; - $return .= ""; - $return .= ""; - return $return; -} - - - -function build_form_action($base_url,$section,$go,$action,$filter,$id,$dbTable,$check_required) { - $return = ""; - if (strpos($section, 'step') !== FALSE) $section = "setup"; else $section = $section; - $return .= "