From 0ba315912ba99c4fb7c30134754846cf7b66c8a0 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Mon, 30 Jan 2012 22:05:31 +0100 Subject: [PATCH 1/3] fix outdated README file --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index 60b18defd59..cd562b66c6c 100644 --- a/README +++ b/README @@ -1,10 +1,9 @@ ownCloud gives you freedom and control over your own data. A personal cloud which runs on your own server. -It is alpha software in development and should be treated accordingly. http://ownCloud.org -Installation instructions: http://owncloud.org/install +Installation instructions: http://owncloud.org/support Source code: http://gitorious.org/owncloud Mailing list: http://mail.kde.org/mailman/listinfo/owncloud From e0f655fb707e1c632602319a6b989e8f58866953 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 30 Jan 2012 16:49:24 -0500 Subject: [PATCH 2/3] Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113 --- apps/files_sharing/get.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index ca95a68c6ce..c80b0c2ef03 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -1,5 +1,4 @@ Date: Mon, 30 Jan 2012 23:19:43 +0100 Subject: [PATCH 3/3] provide server side close option for EventStream --- core/js/eventsource.js | 7 ++++++- lib/eventsource.php | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 422f97657bd..30b942f59e8 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -44,8 +44,13 @@ OC.EventSource=function(src){ $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ - } + //add close listener + this.listen('__internal__',function(data){ + if(data=='close'){ + this.close(); + } + }.bind(this)); } OC.EventSource.fallBackSources=[]; OC.EventSource.iframeCount=0;//number of fallback iframes diff --git a/lib/eventsource.php b/lib/eventsource.php index c123eb4b837..b0450ff3d55 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -70,4 +70,11 @@ class OC_EventSource{ echo PHP_EOL; flush(); } + + /** + * close the connection of the even source + */ + public function close(){ + $this->send('__internal__','close');//server side closing can be an issue, let the client do it + } } \ No newline at end of file