import version 0.11rc1

This commit has been made by 'bzr import'. I used the upstream tarball
of Version 0.11rc1 for creating it. It has the md5sum:

75608d8bb72dff9a556850ccd0ae8cb9

1 files changed, 27 insertions, 13 deletions

diff --git a/lib/common/BoxTimeToText.cpp b/lib/common/BoxTimeToText.cpp
index 7997376b..c212297c 100644
--- a/lib/common/BoxTimeToText.cpp
+++ b/lib/common/BoxTimeToText.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -58,23 +58,31 @@
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    BoxTimeToISO8601String(box_time_t)
-//		Purpose: Convert a 64 bit box time to a ISO 8601 complient string
+//		Name:    BoxTimeToISO8601String(box_time_t, bool)
+//		Purpose: Convert a 64 bit box time to a ISO 8601 compliant 
+//			string, either in local or UTC time
 //		Created: 2003/10/10
 //
 // --------------------------------------------------------------------------
-std::string BoxTimeToISO8601String(box_time_t Time)
+std::string BoxTimeToISO8601String(box_time_t Time, bool localTime)
 {
+	time_t timeInSecs = BoxTimeToSeconds(Time);
+	char str[128];	// more than enough space
+
 #ifdef WIN32
 	struct tm *time;
-	time_t bob = BoxTimeToSeconds(Time);
+	__time64_t winTime = timeInSecs;
 
-	__time64_t winTime = bob;
+	if(localTime)
+	{
+		time = _localtime64(&winTime);
+	}
+	else
+	{
+		time = _gmtime64(&winTime);
+	}
 
-	time = _gmtime64(&winTime);
-	char str[128];	// more than enough space
-	
-	if ( time == NULL )
+	if(time == NULL)
 	{
 		// ::sprintf(str, "%016I64x ", bob);
 		return std::string("unable to convert time");
@@ -84,11 +92,17 @@ std::string BoxTimeToISO8601String(box_time_t Time)
 		time->tm_mon + 1, time->tm_mday, time->tm_hour, 
 		time->tm_min, time->tm_sec);
 #else // ! WIN32
-	time_t timeInSecs = BoxTimeToSeconds(Time);
 	struct tm time;
-	gmtime_r(&timeInSecs, &time);
+
+	if(localTime)
+	{
+		localtime_r(&timeInSecs, &time);
+	}
+	else
+	{
+		gmtime_r(&timeInSecs, &time);
+	}
 	
-	char str[128];	// more than enough space
 	sprintf(str, "%04d-%02d-%02dT%02d:%02d:%02d", time.tm_year + 1900,
 		time.tm_mon + 1, time.tm_mday, time.tm_hour, 
 		time.tm_min, time.tm_sec);