Index: trunk/admin/include/mainscript.php =================================================================== diff -u -N -r3907 -r3983 --- trunk/admin/include/mainscript.php (.../mainscript.php) (revision 3907) +++ trunk/admin/include/mainscript.php (.../mainscript.php) (revision 3983) @@ -45,30 +45,27 @@ $phrase_edit = $adminURL."/config/edit_label.php?env=".$env2; $submit_done = isset($_REQUEST['submit_done']) ? 1 : 0; // returns form submit status -$Cal = GetDateFormat(); -if(strpos($Cal,"y")) -{ - $Cal = str_replace("y","yy",$Cal); +$Cal = GetDateFormat(0, true); +if (strpos($Cal, 'y')) { + $Cal = str_replace('y','yy',$Cal); } -else - $Cal = str_replace("Y","y",$Cal); +else { + $Cal = str_replace('Y','y',$Cal); +} $Cal = str_replace("m","mm",$Cal); $Cal = str_replace("n","m",$Cal); $Cal = str_replace("d","dd",$Cal); -$format = GetStdFormat(GetDateFormat()); +$format = GetStdFormat(GetDateFormat(0, true)); $yearpos = (int)DateFieldOrder($format,"year"); $monthpos = (int)DateFieldOrder($format,"month"); $daypos = (int)DateFieldOrder($format,"day"); $ampm = is12HourMode() ? 'true' : 'false'; -$processable_formats = Array('m/d/y', 'm/d/Y'); - -$skip_date_validation = in_array(GetDateFormat(), $processable_formats) ? 'false' : 'true'; $SiteName = addslashes( strip_tags( $GLOBALS['objConfig']->Get('Site_Name') ) ); require_once($pathtoroot.$admin."/lv/js/js_lang.php"); @@ -109,7 +106,6 @@ var lang_MoveUp = "$lang_MoveUp"; var lang_MoveDn = "$lang_MoveDn"; var ampm = $ampm; -var skip_date_validation = $skip_date_validation; var listview_clear=1; var CalDateFormat = "$Cal"; @@ -306,9 +302,6 @@ function ValidDate(date_str) { var valid = true; - if (skip_date_validation) { - return valid; - } if( trim(date_str) == '' ) return true; // is valid in case if not entered parts = date_str.split(/\s*\D\s*/);