Index: trunk/globals.php
===================================================================
diff -u -N -r3866 -r3983
--- trunk/globals.php	(.../globals.php)	(revision 3866)
+++ trunk/globals.php	(.../globals.php)	(revision 3983)
@@ -1161,41 +1161,36 @@
 	unset($objTagList);
 }
 
-function GetDateFormat($LangId=0)
-{
-  global $objLanguages;
+	function GetDateFormat($LangId = 0, $is_input = false)
+	{
+		global $objLanguages;
+	
+		if (!$LangId) {
+			$LangId = $objLanguages->GetPrimary();
+		}
+		
+		$l = $objLanguages->GetItem($LangId);
+		$fmt = is_object($l) ? $l->Get(($is_input ? 'Input' : '').'DateFormat') : 'm-d-Y';
+	
+		if (getArrayValue($GLOBALS, 'FrontEnd')) {
+			return $fmt;
+		}
+		return preg_replace('/y+/i','Y', $fmt);
+	}
 
-  if(!$LangId)
-    $LangId= $objLanguages->GetPrimary();
-  $l = $objLanguages->GetItem($LangId);
-  if(is_object($l))
-  {
-  	$fmt = $l->Get("DateFormat");
-  }
-  else
-    $fmt = "m-d-Y";
+	function GetTimeFormat($LangId = 0, $is_input = false)
+	{
+		global $objLanguages;
 
-	if(isset($GLOBALS['FrontEnd'])&&$GLOBALS['FrontEnd'])
+		if (!$LangId) {
+			$LangId = $objLanguages->GetPrimary();
+		}
+		$l = $objLanguages->GetItem($LangId);
+		
+		$fmt = is_object($l) ? $l->Get(($is_input ? 'Input' : '').'TimeFormat') : 'H:i:s';
 		return $fmt;
-	return preg_replace('/y+/i','Y',$fmt);
-}
+	}
 
-function GetTimeFormat($LangId=0)
-{
-  global $objLanguages;
-
-  if(!$LangId)
-    $LangId= $objLanguages->GetPrimary();
-  $l = $objLanguages->GetItem($LangId);
-  if(is_object($l))
-  {
-  	$fmt = $l->Get("TimeFormat");
-  }
-  else
-    $fmt = "H:i:s";
-  return $fmt;
-}
-
 /**
  * Gets one of currently selected language options
  *
@@ -1214,18 +1209,32 @@
 	return is_object($l)?$l->Get($optionName):false;
 }
 
-function LangDate($TimeStamp=NULL,$LangId=0)
+/**
+ * Returns formatted timestamp
+ *
+ * @param int $TimeStamp
+ * @param int $LangId
+ * @param bool $is_input use input date format instead of display date format
+ * @return string
+ */
+function LangDate($TimeStamp = null, $LangId = 0, $is_input = false)
 {
-  $fmt = GetDateFormat($LangId);
-  $ret = adodb_date($fmt,$TimeStamp);
-  return $ret;
+  $fmt = GetDateFormat($LangId, $is_input);
+  return adodb_date($fmt, $TimeStamp);
 }
 
-function LangTime($TimeStamp=NULL,$LangId=0)
+/**
+ * Returns formatted timestamp
+ *
+ * @param int $TimeStamp
+ * @param int $LangId
+ * @param bool $is_input use input time format instead of display time format
+ * @return string
+ */
+function LangTime($TimeStamp = null, $LangId = 0, $is_input = false)
 {
-  $fmt = GetTimeFormat($LangId);
-  $ret = adodb_date($fmt,$TimeStamp);
-  return $ret;
+  $fmt = GetTimeFormat($LangId, $is_input);
+  return adodb_date($fmt, $TimeStamp);
 }
 
 function LangNumber($Num,$DecPlaces=NULL,$LangId=0)