Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop

Conflicts:
	src/elogd.c

Makefile

@@ -173,18 +173,25 @@ install: $(EXECS)
 	@$(INSTALL) -v -m 0644 scripts/*.js $(ELOGDIR)/scripts/
 
 	@echo "Installing CKeditor to $(ELOGDIR)/scripts/ckeditor"
-	cp -r scripts/* $(ELOGDIR)/scripts
+	@cp -r scripts/* $(ELOGDIR)/scripts
 
 	@echo "Installing resources to $(ELOGDIR)/resources"
 	@$(INSTALL) -m 0644 resources/* $(ELOGDIR)/resources/
-	@$(INSTALL) -m 0644 ssl/* $(ELOGDIR)/ssl/
+	@if [ ! -f $(ELOGDIR)/ssl/server.crt ]; then  \
+	  $(INSTALL) -v -m 0644 ssl/server.crt $(ELOGDIR)/ssl/ ;\
+	fi
+	@if [ ! -f $(ELOGDIR)/ssl/server.key ]; then  \
+	  $(INSTALL) -v -m 0644 ssl/server.key $(ELOGDIR)/ssl/ ;\
+	fi
 
 	@echo "Installing themes to $(ELOGDIR)/themes"
 	@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/
-	@for file in `find themes/default -type f | grep -v .svn` ; \
+	@for file in `find themes/default -type f | grep -v .svn` ;\
           do \
-          $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
+	    if [ ! -f $(ELOGDIR)/themes/default/`basename $$file` ]; then  \
-          done
+              $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
+	    fi; \
+	  done
 
 	@echo "Installing example logbook to $(ELOGDIR)/logbooks/demo"
 	@if [ ! -f $(ELOGDIR)/logbooks/demo ]; then  \
@@ -193,7 +200,9 @@ install: $(EXECS)
 
 	@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
 	@mkdir -p -m 0755 $(RCDIR)
-	@$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd
+	@if [ ! -f $(RCDIR)/elogd ]; then  \
+	  @$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd ; \
+	fi
 
 	@if [ ! -f $(ELOGDIR)/elogd.cfg ]; then  \
 	  $(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \

scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js

@@ -73,7 +73,7 @@ CKEDITOR.dialog.add( 'fileuploadDialog', function( editor ) {
 				    			}
 				    			formData.append('cmd', "Upload");          // Command for server to recognize this as an file upload
 
-				    			var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment;
+				    			var URL = 'upload.html?next_attachment=' + parent.next_attachment;
 
 								$.ajax({
 								  xhr: function()

scripts/ckeditor/plugins/image2/dialogs/image2.js

@@ -572,7 +572,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
 				    			}
 				    			formData.append('cmd', "Upload");          // Command for server to recognize this as an file upload
 
-				    			var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment;
+				    			var URL = 'upload.html?next_attachment=' + parent.next_attachment;
 
 								$.ajax({
 								  xhr: function()

scripts/load-ckeditor.js

@@ -4,7 +4,7 @@
 //
 // NOTE: This function works SYNCRHONOUSLY
 function localize(str) {
-    var URL = '/' + parent.logbook + "/?cmd=loc&value=" + str;
+    var URL = "?cmd=loc&value=" + str;
 
     return $.ajax({
         type: "GET",
@@ -13,8 +13,6 @@ function localize(str) {
     }).responseText;
 }
 
-console.log(localize("Submit"));
-
 // After the page has loaded, load the Ckeditor and the attachment dropbox
 $(document).ready(function() {
 
@@ -29,7 +27,6 @@ $(document).ready(function() {
 
         // Make the editor bigger (at least 500px high and 80% of the viewport otherwise)
         var width = Math.max(500, 0.8 * $(window).height() );
-        console.log(width);
         editor.resize("100%", new String(width));
 
         // Create a new command with the desired exec function
@@ -147,7 +144,7 @@ $(document).ready(function() {
         formData.append('cmd', "Upload");          // Command for server to recognize this as an file upload
 
         if (tests.formdata) {
-            var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment;
+            var URL = 'upload.html?next_attachment=' + parent.next_attachment;
 
             // set the flag so the chkupload validator doesn't trigger
             uploading_dropped_files = true;

src/elogd.h

@@ -229,6 +229,7 @@ long _timezone;
 
 typedef struct {
    int message_id;
+   char subdir[256];
    char file_name[32];
    time_t file_time;
    int offset;

xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout

@@ -13,10 +13,10 @@
 		<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>
 		<string>bitbucket.org:tmidas/mxml.git</string>
 		<key>FDBEF18BB209C3ECA837D3C38A566472CB958C8E</key>
-		<string>https://bitbucket.org/ritt/elog.git</string>
+		<string>bitbucket.org:ritt/elog.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>xcode/elogd.xcodeproj/project.xcworkspace</string>
+	<string>xcode/elogd.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>
@@ -25,7 +25,7 @@
 		<string>../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://bitbucket.org/ritt/elog.git</string>
+	<string>bitbucket.org:ritt/elog.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>