Merge branch 'master' into share_api

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

6 files changed, 123 insertions, 29 deletions

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 7236deb65c9..cc9208ad08f 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -1,16 +1,25 @@
 <?php
 
 // Init owncloud
+global $eventSource;
 
+if(!OC_User::isLoggedIn()){
+	exit;
+}
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
+session_write_close();
 
 // Get the params
-$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
-$filename = isset( $_POST['filename'] ) ? stripslashes($_POST['filename']) : '';
-$content = isset( $_POST['content'] ) ? $_POST['content'] : '';
-$source = isset( $_POST['source'] ) ? stripslashes($_POST['source']) : '';
+$dir = isset( $_REQUEST['dir'] ) ? stripslashes($_REQUEST['dir']) : '';
+$filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename']) : '';
+$content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
+$source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
+
+if($source){
+	$eventSource=new OC_EventSource();
+}else{
+	OC_JSON::callCheck();
+}
 
 if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
@@ -21,22 +30,49 @@ if(strpos($filename,'/')!==false){
 	exit();
 }
 
+function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max){
+	static $filesize = 0;
+	static $lastsize = 0;
+	global $eventSource;
+
+	switch($notification_code) {
+		case STREAM_NOTIFY_FILE_SIZE_IS:
+			$filesize = $bytes_max;
+			break;
+			
+		case STREAM_NOTIFY_PROGRESS:
+			if ($bytes_transferred > 0) {
+				if (!isset($filesize)) {
+				} else {
+					$progress = (int)(($bytes_transferred/$filesize)*100);
+					if($progress>$lastsize){//limit the number or messages send
+						$eventSource->send('progress',$progress);
+					}
+					$lastsize=$progress;
+				}
+			}
+			break;
+	}
+}
+
 if($source){
 	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
 		OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
 		exit();
 	}
-	$sourceStream=fopen($source,'rb');
+
+	$ctx = stream_context_create(null, array('notification' =>'progress'));
+	$sourceStream=fopen($source,'rb', false, $ctx);
 	$target=$dir.'/'.$filename;
 	$result=OC_Filesystem::file_put_contents($target,$sourceStream);
 	if($result){
 		$mime=OC_Filesystem::getMimetype($target);
-		OCP\JSON::success(array("data" => array('mime'=>$mime)));
-		exit();
+		$eventSource->send('success',$mime);
 	}else{
-		OCP\JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
-		exit();
+		$eventSource->send('error',"Error while downloading ".$source. ' to '.$target);
 	}
+	$eventSource->close();
+	exit();
 }else{
 	if($content){
 		if(OC_Filesystem::file_put_contents($dir.'/'.$filename,$content)){
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 6fcf97688c2..eef38858516 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -16,6 +16,11 @@ session_write_close();
 if($force or !OC_FileCache::inCache('')){
 	if(!$checkOnly){
 		OCP\DB::beginTransaction();
+		
+		if(OC_Cache::isFast()){
+			OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up
+		}
+		
 		OC_FileCache::scan($dir,$eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index f9953ba4de5..5514aed197f 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -1,5 +1,16 @@
 <?php
 
+// fix webdav properties, remove namespace information between curly bracket (update from OC4 to OC5)
+$installedVersion=OCP\Config::getAppValue('files', 'installed_version');

+if (version_compare($installedVersion, '1.1.4', '<')) {
+	$query = OC_DB::prepare( "SELECT propertyname, propertypath, userid FROM `*PREFIX*properties`" );

+	$result = $query->execute();

+	while( $row = $result->fetchRow()){

+		$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyname = ? WHERE userid = ? AND propertypath = ?' );

+		$query->execute( array( preg_replace("/^{.*}/", "", $row["propertyname"]),$row["userid"], $row["propertypath"] ));

+	}
+}
+
 //update from OC 3
 
 //try to remove remaining files.
diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version
index 8cfbc905b39..1b87bcd0b09 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.1
\ No newline at end of file
+1.1.4
\ No newline at end of file
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 2f06f15f896..daa250c9bd4 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -506,23 +506,27 @@ $(document).ready(function() {
 						localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.','');
 					}
 					localName = getUniqueName(localName);
-					$.post(
-						OC.filePath('files','ajax','newfile.php'),
-						{dir:$('#dir').val(),source:name,filename:localName},
-						function(result){
-							if(result.status == 'success'){
-								var date=new Date();
-								FileList.addFile(localName,0,date);
-								var tr=$('tr').filterAttr('data-file',localName);
-								tr.data('mime',result.data.mime);
-								getMimeIcon(result.data.mime,function(path){
-									tr.find('td.filename').attr('style','background-image:url('+path+')');
-								});
-							}else{
-								OC.dialogs.alert(result.data.message, 'Error');
-							}
-						}
-					);
+					$('#uploadprogressbar').progressbar({value:0});
+					$('#uploadprogressbar').fadeIn();
+
+					var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+					eventSource.listen('progress',function(progress){
+						$('#uploadprogressbar').progressbar('value',progress);
+					});
+					eventSource.listen('success',function(mime){
+						$('#uploadprogressbar').fadeOut();
+						var date=new Date();
+						FileList.addFile(localName,0,date);
+						var tr=$('tr').filterAttr('data-file',localName);
+						tr.data('mime',mime);
+						getMimeIcon(mime,function(path){
+							tr.find('td.filename').attr('style','background-image:url('+path+')');
+						});
+					});
+					eventSource.listen('error',function(error){
+						$('#uploadprogressbar').fadeOut();
+						alert(error);
+					});
 					break;
 			}
 			var li=$(this).parent();
diff --git a/apps/files/share.php b/apps/files/share.php
new file mode 100755
index 00000000000..4f7c1f55fcf
--- /dev/null
+++ b/apps/files/share.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Michael Gapczynski
+* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class OC_Share_Backend_Files extends OCP\Share_Backend {
+
+	public function getSource($item, $uid) {
+		return $item;
+	}
+}
+
+class OC_Share_Backend_Folders extends OC_Share_Backend_Files {
+
+	public function share($
+	public function getDirectoryContent($folder) {
+		
+	}
+}
+
+?>
\ No newline at end of file