Index: trunk/globals.php =================================================================== diff -u -N -r3648 -r3736 --- trunk/globals.php (.../globals.php) (revision 3648) +++ trunk/globals.php (.../globals.php) (revision 3736) @@ -529,67 +529,31 @@ return $ret; } */ -function ExtractDatePart($part,$datestamp) +function ExtractDatePart($part, $datestamp) { - switch($part) - { - case "month": - if($datestamp<=0) - { - $ret = ""; - } - else - $ret = adodb_date("m",$datestamp); - break; - case "day": - if($datestamp<=0) - { - $ret = ""; - } - else - $ret = adodb_date("d", $datestamp); - break; - case "year": - if($datestamp<=0) - { - $ret = ""; - } - else - $ret = adodb_date("Y", $datestamp); - break; - case "time_24hr": - if($datestamp<=0) - { - $ret = ""; - } - else - $ret = adodb_date("H:i", $datestamp); - break; - case "time_12hr": - if($datestamp<=0) - { - $ret = ""; - } - else - $ret = adodb_date("g:i a",$datestamp); - break; - default: - $ret = adodb_date($part, $datestamp); - break; - } - return $ret; + if ($datestamp <= 0) return ''; + + $formats = Array( 'month' => 'm', 'day' => 'd', 'year' => 'Y', + 'time_24hr' => 'H:i', 'time_12hr' => 'g:i a', 'time' => GetTimeFormat() ); + + $format = isset($formats[$part]) ? $formats[$part] : $part; + return adodb_date($format, $datestamp); } -function GetLocalTime($TimeStamp,$TargetZone=NULL) +function GetLocalTime($TimeStamp, $TargetZone = null) { - if($TargetZone==NULL) - $TargetZone = $objConfig->Get("Config_Site_Time"); - $server = $objConfig->Get("Config_Server_Time"); - if($TargetZone!=$server) - { - $offset = ($server - $TargetZone) * -1; - $TimeStamp = $TimeStamp + (3600 * $offset); + global $objConfig; + + if ($TargetZone == null) { + $TargetZone = $objConfig->Get('Config_Site_Time'); } + + $server = $objConfig->Get('Config_Server_Time'); + if ($TargetZone != $server) { + $offset = ($server - $TargetZone) * -1; + $TimeStamp = $TimeStamp + (3600 * $offset); + } + return $TimeStamp; } @@ -2062,5 +2026,15 @@ } return $GLOBALS[$var_name]; } + + /** + * Returns true in case of AM/PM time + * + * @return bool + */ + function is12HourMode() + { + return preg_match('/(a|A)/', GetTimeFormat() ); + } ?>