Index: trunk/kernel/include/config.php
===================================================================
diff -u -N -r2882 -r3736
--- trunk/kernel/include/config.php	(.../config.php)	(revision 2882)
+++ trunk/kernel/include/config.php	(.../config.php)	(revision 3736)
@@ -116,13 +116,7 @@
 
     function TimeFormat()
     {
-        if($this->Get("ampm_time")=="1")
-        {
-            $format = "g:i:s A";
-        }
-        else
-            $format = "H:i:s";
-        return $format;
+        return is12HourMode() ? 'g:i:s A' : 'H:i:s';
     }
 
     /* vartype should be either 1 or 2, 1 = perstant data, 2 = session data */
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r3576 -r3736
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 3576)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 3736)
@@ -41,26 +41,22 @@
 */
 	function ParseTimeStamp($d,$attribs=array())
 	{
-       if( isset($attribs["_tz"]) )
-       {
-            $d = GetLocalTime($d,$objSession->Get("tz"));
-       }
-       $part = isset($attribs["_part"]) ? strtolower($attribs["_part"]) : '';
-       if(strlen($part))
-       {
-          $ret = ExtractDatePart($part,$d);
-       }
-       else
-       {
-         if($d<=0)
-         {
-            $ret = "";
-         }
-         else
-            $ret = LangDate($d);
-       }		
-       return $ret;
-	}		
+		global $objSession;
+		
+		if (isset($attribs['_tz'])) {
+			$timezone = $attribs['_tz'] == 'auto' ? null : $objSession->Get('tz');
+			$d = GetLocalTime($d, $timezone);
+		}
+		
+		$part = isset($attribs['_part']) ? strtolower($attribs['_part']) : '';
+		if ($part) {
+			$ret = ExtractDatePart($part,$d);
+		}
+		else {
+			$ret = $d <= 0 ? '' : LangDate($d);
+		}
+		return $ret;
+	}
 	
 	function ParseObject($element)
     {
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() );
+	}
 
 ?>
Index: trunk/admin/include/mainscript.php
===================================================================
diff -u -N -r3145 -r3736
--- trunk/admin/include/mainscript.php	(.../mainscript.php)	(revision 3145)
+++ trunk/admin/include/mainscript.php	(.../mainscript.php)	(revision 3736)
@@ -64,11 +64,8 @@
 $monthpos = (int)DateFieldOrder($format,"month");
 $daypos = (int)DateFieldOrder($format,"day");
 
-$ampm = "false";
-if($objConfig->Get("ampm_time")=="1")
-{
-    $ampm = "true";
-}
+$ampm =  is12HourMode() ? 'true' : 'false';
+
 $SiteName = addslashes( strip_tags( $GLOBALS['objConfig']->Get('Site_Name') ) );
 
 require_once($pathtoroot.$admin."/lv/js/js_lang.php");
Index: trunk/kernel/include/dates.php
===================================================================
diff -u -N -r3282 -r3736
--- trunk/kernel/include/dates.php	(.../dates.php)	(revision 3282)
+++ trunk/kernel/include/dates.php	(.../dates.php)	(revision 3736)
@@ -196,12 +196,7 @@
     global $objConfig;
 
     $timestr = strtoupper($timestr);
-    if($objConfig->Get("ampm_time")=="1")
-    {
-      $valid = Is12HourTime($timestr);
-    }
-    else
-        $valid = !Is12HourTime($timestr);
+	$valid = is12HourMode() ? Is12HourTime($timestr) : !Is12HourTime($timestr);
 
     $time = GetTimeParts($timestr);
     $valid = $valid && (($time["hour"]<24) && ($time["min"]<60) && ($time["sec"]<60));
Index: trunk/kernel/admin/include/toolbar/browse.php
===================================================================
diff -u -N -r3648 -r3736
--- trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 3648)
+++ trunk/kernel/admin/include/toolbar/browse.php	(.../browse.php)	(revision 3736)
@@ -161,6 +161,7 @@
 $lang_Sort = language('la_Text_Sort');
 $lang_PerPage = language('la_prompt_PerPage');
 $lang_Select = language('la_Text_Select');
+$lang_InDevelopment = language('la_Text_InDevelopment');
 
 print <<<END
 
@@ -203,8 +204,8 @@
 var lang_Active = "$lang_Active";
 var lang_SubCats = "$lang_SubCats";
 var lang_SubItems = "$lang_SubItems";
+var lang_InDevelopment = "$lang_InDevelopment";
 
-
 var m_tab_CatTab_hide = $m_tab_CatTab_Hide;
 var hostname = '$rootURL';
 var env = '$envar';
@@ -542,12 +543,15 @@
 		var formname = '';
 		var action_prefix ='';
 
-		var isCatImportExport = activeTab && isAnyChecked('categories') && (actionValue == 'import' || actionValue == 'export');
+		var isCategoryExport = activeTab && isAnyChecked('categories') && (actionValue == 'export');
 		
 		// skip news & topics for export operations (not to raise js errors)
-		var allowProcessing = (activeTab.getAttribute("PrefixSpecial") != 'n' && activeTab.getAttribute("PrefixSpecial") != 'bb');
+		if ((actionValue == 'export') && (activeTab.getAttribute("PrefixSpecial") == 'n' || activeTab.getAttribute("PrefixSpecial") == 'bb')) {
+			alert(lang_InDevelopment);
+			return false;
+		}
 		
-		if (allowProcessing && activeTab && (!isAnyChecked('categories') || isCatImportExport))
+		if (activeTab && (!isAnyChecked('categories') || isCategoryExport))
 		{
 			form_name = activeTab.id;
 			action_prefix = activeTab.getAttribute("ActionPrefix");