From a09ed01c82326f758c7e6201cda6dad55897b223 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Mon, 8 Jun 2015 12:01:17 +0200
Subject: [PATCH] Fixed problem with truncated date on CKEditor "Insert
 Timestamp" button

---
 scripts/ckeditor/plugins/timestamp/plugin.js                  | 2 +-
 src/elogd.c                                                   | 2 +-
 .../project.xcworkspace/xcshareddata/elogd.xccheckout         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ckeditor/plugins/timestamp/plugin.js b/scripts/ckeditor/plugins/timestamp/plugin.js
index d74d3a6d..6d9dad00 100755
--- a/scripts/ckeditor/plugins/timestamp/plugin.js
+++ b/scripts/ckeditor/plugins/timestamp/plugin.js
@@ -19,7 +19,7 @@ CKEDITOR.plugins.add( 'timestamp', {
 
 			// Define the function that will be fired when the command is executed.
 			exec: function( editor ) {
-				var URL = "../../?cmd=gettimedate";
+				var URL = "./?cmd=gettimedate";
 
 				$.ajax({
 				    url: URL,
diff --git a/src/elogd.c b/src/elogd.c
index c099fb1e..30d2ef14 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -28875,7 +28875,7 @@ int process_http_request(const char *request, int i_conn)
          strcpy(format, DEFAULT_TIME_FORMAT);
       time(&now);
       ts = localtime(&now);
-      my_strftime(str, sizeof(str), format, ts);
+      my_strftime(str, strsize, format, ts);
       show_http_header(NULL, FALSE, NULL);
       rsputs(str);
       rsputs(" ");
diff --git a/xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout b/xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout
index 61562469..2821ae73 100644
--- a/xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout
+++ b/xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout
@@ -7,7 +7,7 @@
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>81431534-03C4-4F18-8910-AA341A0BBED2</string>
 	<key>IDESourceControlProjectName</key>
-	<string>elogd</string>
+	<string>project</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>
@@ -16,7 +16,7 @@
 		<string>bitbucket.org:ritt/elog.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>xcode/elogd.xcodeproj</string>
+	<string>xcode/elogd.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>