Merge branch 'master' of gitorious.org:owncloud/owncloud

8 files changed, 20 insertions, 19 deletions

diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
index 235587855d9..d7e32558617 100644
--- a/apps/bookmarks/lib/search.php
+++ b/apps/bookmarks/lib/search.php
@@ -20,8 +20,8 @@
  *
  */
 
-class OC_Search_Provider_Bookmarks implements OC_Search_Provider{
-	static function search($query){
+class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
+	function search($query){
 		$results=array();
 		
 		$offset = 0;
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 8405866392d..da5fa35bc21 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Calendar implements OC_Search_Provider{
-	static function search($query){
+class OC_Search_Provider_Calendar extends OC_Search_Provider{
+	function search($query){
 		$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 		if(count($calendars)==0 || !OC_App::isEnabled('calendar')){
 			//return false;
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index cf0a5fe6997..31d8542091e 100644
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Contacts implements OC_Search_Provider{
-	static function search($query){
+class OC_Search_Provider_Contacts extends OC_Search_Provider{
+	function search($query){
 		$addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser(), 1);
 // 		if(count($calendars)==0 || !OC_App::isEnabled('contacts')){
 // 			//return false;
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 3a3db6dd38e..fa3535fd144 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -62,6 +62,8 @@ if ($source !== false) {
 		$tmpl->assign("fileList", $list->fetchPage());
 		$tmpl->assign("breadcrumb", $breadcrumbNav->fetchPage());
 		$tmpl->assign("readonly", true);
+		$tmpl->assign("allowZipDownload", false);
+		$tmpl->assign("dir", 'shared dir');
 		$tmpl->printPage();
 	} else {
 		//get time mimetype and set the headers
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index fc9e17c25c7..54d749d833e 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -2,8 +2,11 @@ $(document).ready(function() {
 	var shared_status = {};
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Share', function(filename) {
-			if (scanFiles.scanning){return;}//workaround to prevent aditional http request block scanning feedback
+			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
 			var icon;
+			if (typeof filename == 'undefined') {
+				return false;
+			}
 			var file = $('#dir').val()+'/'+filename;
 			if(shared_status[file])
 				return shared_status[file].icon;
@@ -145,7 +148,7 @@ $(document).ready(function() {
 				data: data,
 				success: function(token) {
 					if (token) {
-						showPublicLink(token);
+						showPublicLink(token, source.substr(source.lastIndexOf('/')));
 					}
 				}
 			});
@@ -203,7 +206,7 @@ function createDropdown(filename, files) {
 		if (users) {
 			$.each(users, function(index, row) {
 				if (row.uid_shared_with == 'public') {
-					showPublicLink(row.token);
+					showPublicLink(row.token, '/'+filename);
 				} else if (isNaN(index)) {
 					addUser(row.uid_shared_with, row.permissions, index.substr(0, index.lastIndexOf('-')));
 				} else {
@@ -234,9 +237,9 @@ function addUser(uid_shared_with, permissions, parentFolder) {
 	$(user).appendTo('#shared_list');
 }
 
-function showPublicLink(token) {
+function showPublicLink(token, file) {
 	$('#makelink').attr('checked', true);
 	$('#link').data('token', token);
-	$('#link').val(parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token);
+	$('#link').val(parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token+'&f='+file);
 	$('#link').show('blind');
 }
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index f7e0651275e..325c2acf249 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -41,8 +41,8 @@ OC_App::addNavigationEntry( array(
  'icon' => OC_Helper::imagePath('core', 'places/picture.svg'),
  'name' => $l->t('Pictures')));
 
- class OC_GallerySearchProvider implements OC_Search_Provider{
-	static function search($query){
+class OC_GallerySearchProvider extends OC_Search_Provider{
+	function search($query){
 		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ? AND album_name LIKE ?');
 		$result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%'));
 		$results=array();
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 9de291e8da2..a4e5a5dfebc 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -82,8 +82,8 @@ class OC_MEDIA{
 	}
 }
 
-class OC_MediaSearchProvider implements OC_Search_Provider{
-	static function search($query){
+class OC_MediaSearchProvider extends OC_Search_Provider{
+	function search($query){
 		require_once('lib_collection.php');
 		$artists=OC_MEDIA_COLLECTION::getArtists($query);
 		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$query);
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 3521a9d90cf..1e8dc6aacce 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -94,10 +94,6 @@ class OC_USER_LDAP extends OC_User_Backend {
 		if( !$this->ldap_dc )
 			return false;
 
-		$email = OC_Preferences::getValue($uid, 'settings', 'email', '');
-		if ( !empty( $email ) )
-			return false;
-
 		$email = $this->ldap_dc[$this->ldap_email_attr][0];
 		OC_Preferences::setValue($uid, 'settings', 'email', $email);
 	}