From 9295f49553a04f17b58391523317881ad8edba19 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 13 May 2012 23:24:04 +0200
Subject: Contacts: Add error checking and reporting to import from files app.

---
 apps/contacts/templates/part.import.php | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'apps/contacts/templates')

diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
index 2dac7dd0ca1..b8793042997 100755
--- a/apps/contacts/templates/part.import.php
+++ b/apps/contacts/templates/part.import.php
@@ -1,27 +1,27 @@
 <div id="contacts_import_dialog" title="<?php echo $l->t("Import a contacts file"); ?>">
-<div id="form_container">
-<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
-<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose the addressbook'); ?></b>
-<select style="width:100%;" id="contacts" name="contacts">
-<?php
-$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
-echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-?>
-</select>
-<div id="newaddressbookform" style="display: none;">
-	<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
-</div>
-<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-</div>
+	<div id="form_container">
+		<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
+		<input type="hidden" id="path" value="<?php echo $_['path'];?>">
+		<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+		<p class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
+		<select style="width:100%;" id="contacts" name="contacts">
+		<?php
+		$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+		$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
+		echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+		?>
+		</select>
+		<div id="newaddressbookform" style="display: none;">
+			<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
+		</div>
+		<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
+	</div>
 <div id="progressbar_container" style="display: none">
-<p style="text-align:center;"><b><?php echo $l->t('Importing contacts'); ?></b>
-<div id="progressbar"></div>
-<div id="import_done" style="display: none;">
-<p style="text-align:center;"><b><?php echo $l->t('Contacts imported successfully'); ?></b></p>
-<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
-</div>
-</div>
+	<p style="text-align:center;"><?php echo $l->t('Importing contacts'); ?></p>
+	<div id="progressbar"></div>
+		<div id="import_done" style="display: none;">
+			<p style="text-align:center;"></p>
+			<input type="button" value="<?php echo $l->t('Close'); ?>" id="import_done_button">
+		</div>
+	</div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From de850dfa525c215aa8d4473b8ccf9a8d59fcf3b8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 14 May 2012 17:40:16 +0200
Subject: Contacts: Fix layout in contacts list that I had broken in an earlier
 fix :-P

---
 apps/contacts/css/contacts.css            |  3 +--
 apps/contacts/js/contacts.js              | 34 +++++++++++++++----------------
 apps/contacts/templates/part.contacts.php |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'apps/contacts/templates')

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 2553b43a873..79274c2dd95 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -4,8 +4,7 @@
 #leftcontent { top: 3.5em !important; padding: 0; margin: 0; }
 #rightcontent { top: 3.5em !important; padding-top: 5px; }
 #contacts { background: #fff; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0; }
-#contacts li { height: 28px; display: block; margin: 0 0 0 5px; padding: 0 0 0 25px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
-#contacts li:hover { background-color: #eee }
+#contacts a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #contacts_newcontact { float: left; margin: 0.2em 0 0 1em; }
 #chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 44f1c220f91..a74258199c5 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -160,9 +160,8 @@ Contacts={
 			// Name has changed. Update it and reorder.
 			$('#fn').change(function(){
 				var name = $('#fn').val();
-				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]').clone();
-				$('#contacts [data-id="'+Contacts.UI.Card.id+'"]').remove();
-				$(item).html(name);
+				var item = $('#contacts [data-id="'+Contacts.UI.Card.id+'"]');
+				$(item).find('a').html(name);
 				var added = false;
 				$('#contacts li').each(function(){
 					if ($(this).text().toLowerCase() > name.toLowerCase()) {
@@ -302,7 +301,7 @@ Contacts={
 								if(jsondata.status == 'success'){
 									Contacts.UI.Card.loadContact(jsondata.data);
 									$('#leftcontent .active').removeClass('active');
-									var item = $('<li role="botton" data-id="'+jsondata.data.id+'" class="active" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</li>');
+									var item = $('<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>');
 									var added = false;
 									$('#leftcontent ul li').each(function(){
 										if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
@@ -625,7 +624,7 @@ Contacts={
 				q = q + '&id=' + this.id + '&name=' + name;
 				if(checksum != undefined && checksum != '') { // save
 					q = q + '&checksum=' + checksum;
-					console.log('Saving: ' + q);
+					//console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'saveproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
@@ -643,7 +642,7 @@ Contacts={
 						}
 					},'json');
 				} else { // add
-					console.log('Adding: ' + q);
+					//console.log('Adding: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'addproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
@@ -1498,8 +1497,8 @@ Contacts={
 					$('#contacts li').unbind('inview');
 					$('#contacts li').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
 						if (isInView) {
-							if (!$(this).attr('style')) {
-								$(this).css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
+							if (!$(this).find('a').attr('style')) {
+								$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
 							}
 						}
 					})}, 500);
@@ -1508,19 +1507,19 @@ Contacts={
 			// Add thumbnails to the contact list as they become visible in the viewport.
 			lazyupdate:function(){
 				$('#contacts li').live('inview', function(){
-					if (!$(this).attr('style')) {
-						$(this).css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
+					if (!$(this).find('a').attr('style')) {
+						$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
 					}
 				});
 			},
 			refreshThumbnail:function(id){
-				var item = $('#contacts [data-id="'+id+'"]');
+				var item = $('#contacts [data-id="'+id+'"]').find('a');
 				item.html(Contacts.UI.Card.fn);
 				item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
 			},
 			scrollTo:function(id){
 				$('#contacts').animate({
-					scrollTop: $('#leftcontent li[data-id="'+id+'"]').offset().top}, 'slow','swing');
+					scrollTop: $('#leftcontent li[data-id="'+id+'"]').offset().top-20}, 'slow','swing');
 			}
 		}
 	}
@@ -1548,9 +1547,10 @@ $(document).ready(function(){
 	});
 	$('#contacts').click(function(event){
 		var $tgt = $(event.target);
-		if ($tgt.is('li')) {
-			var id = $($tgt).data('id');
-			$($tgt).addClass('active');
+		if ($tgt.is('li') || $tgt.is('a')) {
+			var item = $tgt.is('li')?$($tgt):($tgt).parent();
+			var id = item.data('id');
+			item.addClass('active');
 			var oldid = $('#rightcontent').data('id');
 			if(oldid != 0){
 				$('#contacts li[data-id="'+oldid+'"]').removeClass('active');
@@ -1576,9 +1576,9 @@ $(document).ready(function(){
 				// bottom part of element is visible
 			} else {
 				// whole part of element is visible
-				if (!$(this).attr('style')) {
+				if (!$(this).find('a').attr('style')) {
 					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-					$(this).css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
+					$(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat');
 				}/* else {
 					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
 				}*/
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 225a1ef0cf3..00a61f72fdd 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -8,5 +8,5 @@
 		}
 	}
 ?>
-	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><?php echo $display; ?></li>
+	<li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
 <?php endforeach; ?>
-- 
cgit v1.2.3


From 583dce5276fa626c2e463ccb0a81c81235aae7c5 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 15 May 2012 00:52:00 +0200
Subject: removing executable bit - again

---
 apps/admin_dependencies_chk/appinfo/app.php                  | 0
 apps/admin_dependencies_chk/settings.php                     | 0
 apps/admin_migrate/appinfo/app.php                           | 0
 apps/admin_migrate/settings.php                              | 0
 apps/bookmarks/addBm.php                                     | 0
 apps/bookmarks/ajax/addBookmark.php                          | 0
 apps/bookmarks/ajax/delBookmark.php                          | 0
 apps/bookmarks/ajax/editBookmark.php                         | 0
 apps/bookmarks/ajax/recordClick.php                          | 0
 apps/bookmarks/ajax/updateList.php                           | 0
 apps/bookmarks/appinfo/app.php                               | 0
 apps/bookmarks/appinfo/migrate.php                           | 0
 apps/bookmarks/bookmarksHelper.php                           | 0
 apps/bookmarks/index.php                                     | 0
 apps/bookmarks/lib/bookmarks.php                             | 0
 apps/bookmarks/lib/search.php                                | 0
 apps/bookmarks/settings.php                                  | 0
 apps/bookmarks/templates/bookmarklet.php                     | 0
 apps/calendar/ajax/calendar/activation.php                   | 0
 apps/calendar/ajax/calendar/delete.php                       | 0
 apps/calendar/ajax/calendar/edit.form.php                    | 0
 apps/calendar/ajax/calendar/edit.php                         | 0
 apps/calendar/ajax/calendar/new.form.php                     | 0
 apps/calendar/ajax/calendar/new.php                          | 0
 apps/calendar/ajax/calendar/overview.php                     | 0
 apps/calendar/ajax/calendar/update.php                       | 0
 apps/calendar/ajax/categories/rescan.php                     | 0
 apps/calendar/ajax/changeview.php                            | 0
 apps/calendar/ajax/event/delete.php                          | 0
 apps/calendar/ajax/event/edit.form.php                       | 0
 apps/calendar/ajax/event/edit.php                            | 0
 apps/calendar/ajax/event/move.php                            | 0
 apps/calendar/ajax/event/new.form.php                        | 0
 apps/calendar/ajax/event/new.php                             | 0
 apps/calendar/ajax/event/resize.php                          | 0
 apps/calendar/ajax/events.php                                | 0
 apps/calendar/ajax/import/dialog.php                         | 0
 apps/calendar/ajax/import/import.php                         | 0
 apps/calendar/ajax/settings/getfirstday.php                  | 0
 apps/calendar/ajax/settings/gettimezonedetection.php         | 0
 apps/calendar/ajax/settings/guesstimezone.php                | 0
 apps/calendar/ajax/settings/setfirstday.php                  | 0
 apps/calendar/ajax/settings/settimeformat.php                | 0
 apps/calendar/ajax/settings/settimezone.php                  | 0
 apps/calendar/ajax/settings/timeformat.php                   | 0
 apps/calendar/ajax/settings/timezonedetection.php            | 0
 apps/calendar/ajax/share/activation.php                      | 0
 apps/calendar/ajax/share/changepermission.php                | 0
 apps/calendar/ajax/share/dropdown.php                        | 0
 apps/calendar/ajax/share/share.php                           | 0
 apps/calendar/ajax/share/unshare.php                         | 0
 apps/calendar/appinfo/app.php                                | 0
 apps/calendar/appinfo/remote.php                             | 0
 apps/calendar/appinfo/update.php                             | 0
 apps/calendar/export.php                                     | 0
 apps/calendar/index.php                                      | 0
 apps/calendar/lib/app.php                                    | 0
 apps/calendar/lib/calendar.php                               | 0
 apps/calendar/lib/object.php                                 | 0
 apps/calendar/lib/search.php                                 | 0
 apps/calendar/lib/share.php                                  | 0
 apps/calendar/settings.php                                   | 0
 apps/calendar/templates/calendar.php                         | 0
 apps/calendar/templates/part.choosecalendar.php              | 0
 apps/calendar/templates/part.choosecalendar.rowfields.php    | 0
 apps/calendar/templates/part.eventform.php                   | 0
 apps/calendar/templates/part.import.php                      | 0
 apps/calendar/templates/part.showevent.php                   | 0
 apps/calendar/templates/settings.php                         | 0
 apps/calendar/templates/share.dropdown.php                   | 0
 apps/contacts/ajax/activation.php                            | 0
 apps/contacts/ajax/addbook.php                               | 0
 apps/contacts/ajax/addcontact.php                            | 0
 apps/contacts/ajax/addproperty.php                           | 0
 apps/contacts/ajax/categories/categoriesfor.php              | 0
 apps/contacts/ajax/categories/delete.php                     | 0
 apps/contacts/ajax/categories/list.php                       | 0
 apps/contacts/ajax/categories/rescan.php                     | 0
 apps/contacts/ajax/chooseaddressbook.php                     | 0
 apps/contacts/ajax/contactdetails.php                        | 0
 apps/contacts/ajax/contacts.php                              | 0
 apps/contacts/ajax/createaddressbook.php                     | 0
 apps/contacts/ajax/cropphoto.php                             | 0
 apps/contacts/ajax/currentphoto.php                          | 0
 apps/contacts/ajax/deletebook.php                            | 0
 apps/contacts/ajax/deletecard.php                            | 0
 apps/contacts/ajax/deleteproperty.php                        | 0
 apps/contacts/ajax/editaddress.php                           | 0
 apps/contacts/ajax/editaddressbook.php                       | 0
 apps/contacts/ajax/editname.php                              | 0
 apps/contacts/ajax/importaddressbook.php                     | 0
 apps/contacts/ajax/importdialog.php                          | 0
 apps/contacts/ajax/loadcard.php                              | 0
 apps/contacts/ajax/loadintro.php                             | 0
 apps/contacts/ajax/loadphoto.php                             | 0
 apps/contacts/ajax/oc_photo.php                              | 0
 apps/contacts/ajax/savecrop.php                              | 0
 apps/contacts/ajax/saveproperty.php                          | 0
 apps/contacts/ajax/updateaddressbook.php                     | 0
 apps/contacts/ajax/uploadimport.php                          | 0
 apps/contacts/ajax/uploadphoto.php                           | 0
 apps/contacts/appinfo/app.php                                | 0
 apps/contacts/appinfo/migrate.php                            | 0
 apps/contacts/appinfo/remote.php                             | 0
 apps/contacts/dynphoto.php                                   | 0
 apps/contacts/export.php                                     | 0
 apps/contacts/import.php                                     | 0
 apps/contacts/index.php                                      | 0
 apps/contacts/lib/addressbook.php                            | 0
 apps/contacts/lib/app.php                                    | 0
 apps/contacts/lib/hooks.php                                  | 0
 apps/contacts/lib/search.php                                 | 0
 apps/contacts/lib/vcard.php                                  | 0
 apps/contacts/photo.php                                      | 0
 apps/contacts/settings.php                                   | 0
 apps/contacts/templates/index.php                            | 0
 apps/contacts/templates/part.chooseaddressbook.php           | 0
 apps/contacts/templates/part.chooseaddressbook.rowfields.php | 0
 apps/contacts/templates/part.contact.php                     | 0
 apps/contacts/templates/part.contactphoto.php                | 0
 apps/contacts/templates/part.cropphoto.php                   | 0
 apps/contacts/templates/part.edit_address_dialog.php         | 0
 apps/contacts/templates/part.edit_name_dialog.php            | 0
 apps/contacts/templates/part.import.php                      | 0
 apps/contacts/templates/part.importaddressbook.php           | 0
 apps/contacts/templates/settings.php                         | 0
 apps/contacts/thumbnail.php                                  | 0
 apps/external/ajax/setsites.php                              | 0
 apps/external/appinfo/app.php                                | 0
 apps/external/index.php                                      | 0
 apps/external/lib/external.php                               | 0
 apps/external/settings.php                                   | 0
 apps/external/templates/settings.php                         | 0
 apps/files/admin.php                                         | 0
 apps/files/ajax/autocomplete.php                             | 0
 apps/files/ajax/delete.php                                   | 0
 apps/files/ajax/download.php                                 | 0
 apps/files/ajax/list.php                                     | 0
 apps/files/ajax/move.php                                     | 0
 apps/files/ajax/newfile.php                                  | 0
 apps/files/ajax/newfolder.php                                | 0
 apps/files/ajax/rawlist.php                                  | 0
 apps/files/ajax/rename.php                                   | 0
 apps/files/ajax/scan.php                                     | 0
 apps/files/ajax/upload.php                                   | 0
 apps/files/appinfo/app.php                                   | 0
 apps/files/download.php                                      | 0
 apps/files/index.php                                         | 0
 apps/files/settings.php                                      | 0
 apps/files/templates/admin.php                               | 0
 apps/files/templates/index.php                               | 0
 apps/files/templates/part.breadcrumb.php                     | 0
 apps/files/templates/part.list.php                           | 0
 apps/files_archive/appinfo/app.php                           | 0
 apps/files_archive/lib/storage.php                           | 0
 apps/files_archive/tests/storage.php                         | 0
 apps/files_encryption/appinfo/app.php                        | 0
 apps/files_encryption/lib/crypt.php                          | 0
 apps/files_encryption/lib/cryptstream.php                    | 0
 apps/files_encryption/lib/proxy.php                          | 0
 apps/files_encryption/settings.php                           | 0
 apps/files_encryption/tests/encryption.php                   | 0
 apps/files_encryption/tests/stream.php                       | 0
 apps/files_external/lib/ftp.php                              | 0
 apps/files_external/lib/google.php                           | 0
 apps/files_external/lib/swift.php                            | 0
 apps/files_external/lib/webdav.php                           | 0
 apps/files_external/tests/ftp.php                            | 0
 apps/files_imageviewer/appinfo/app.php                       | 0
 apps/files_pdfviewer/appinfo/app.php                         | 0
 apps/files_sharing/ajax/email.php                            | 0
 apps/files_sharing/ajax/getitem.php                          | 0
 apps/files_sharing/ajax/setpermissions.php                   | 0
 apps/files_sharing/ajax/share.php                            | 0
 apps/files_sharing/ajax/toggleresharing.php                  | 0
 apps/files_sharing/ajax/unshare.php                          | 0
 apps/files_sharing/ajax/userautocomplete.php                 | 0
 apps/files_sharing/appinfo/app.php                           | 0
 apps/files_sharing/get.php                                   | 0
 apps/files_sharing/lib_share.php                             | 0
 apps/files_sharing/list.php                                  | 0
 apps/files_sharing/settings.php                              | 0
 apps/files_sharing/sharedstorage.php                         | 0
 apps/files_texteditor/ajax/loadfile.php                      | 0
 apps/files_texteditor/ajax/mtime.php                         | 0
 apps/files_texteditor/ajax/savefile.php                      | 0
 apps/files_texteditor/appinfo/app.php                        | 0
 apps/files_versions/ajax/getVersions.php                     | 0
 apps/files_versions/ajax/rollbackVersion.php                 | 0
 apps/files_versions/ajax/togglesettings.php                  | 0
 apps/files_versions/appinfo/app.php                          | 0
 apps/files_versions/history.php                              | 0
 apps/files_versions/settings.php                             | 0
 apps/files_versions/templates/history.php                    | 0
 apps/files_versions/templates/settings.php                   | 0
 apps/files_versions/versions.php                             | 0
 apps/gallery/ajax/createAlbum.php                            | 0
 apps/gallery/ajax/galleryOp.php                              | 0
 apps/gallery/ajax/sharing.php                                | 0
 apps/gallery/ajax/thumbnail.php                              | 0
 apps/gallery/appinfo/app.php                                 | 0
 apps/gallery/index.php                                       | 0
 apps/gallery/lib/album.php                                   | 0
 apps/gallery/lib/hooks_handlers.php                          | 0
 apps/gallery/lib/images_utils.php                            | 0
 apps/gallery/lib/photo.php                                   | 0
 apps/gallery/lib/scanner.php                                 | 0
 apps/gallery/lib/sharing.php                                 | 0
 apps/gallery/sharing.php                                     | 0
 apps/gallery/templates/index.php                             | 0
 apps/gallery/templates/view_album.php                        | 0
 apps/media/ajax/api.php                                      | 0
 apps/media/ajax/autoupdate.php                               | 0
 apps/media/appinfo/app.php                                   | 0
 apps/media/index.php                                         | 0
 apps/media/lib_ampache.php                                   | 0
 apps/media/lib_collection.php                                | 0
 apps/media/lib_media.php                                     | 0
 apps/media/lib_scanner.php                                   | 0
 apps/media/server/xml.server.php                             | 0
 apps/media/settings.php                                      | 0
 apps/media/templates/music.php                               | 0
 apps/media/templates/player.php                              | 0
 apps/media/templates/settings.php                            | 0
 apps/remoteStorage/WebDAV.php                                | 0
 apps/remoteStorage/ajax/revokeToken.php                      | 0
 apps/remoteStorage/appinfo/app.php                           | 0
 apps/remoteStorage/auth.php                                  | 0
 apps/remoteStorage/lib_remoteStorage.php                     | 0
 apps/remoteStorage/settings.php                              | 0
 apps/remoteStorage/templates/settings.php                    | 0
 apps/tasks/ajax/addtaskform.php                              | 0
 apps/tasks/ajax/edittask.php                                 | 0
 apps/tasks/ajax/edittaskform.php                             | 0
 apps/tasks/ajax/getdetails.php                               | 0
 apps/tasks/index.php                                         | 0
 apps/tasks/templates/part.taskform.php                       | 0
 apps/tasks/templates/tasks.php                               | 0
 apps/user_ldap/appinfo/app.php                               | 0
 apps/user_ldap/group_ldap.php                                | 0
 apps/user_ldap/lib_ldap.php                                  | 0
 apps/user_ldap/settings.php                                  | 0
 apps/user_ldap/user_ldap.php                                 | 0
 apps/user_migrate/admin.php                                  | 0
 apps/user_migrate/ajax/export.php                            | 0
 apps/user_migrate/appinfo/app.php                            | 0
 apps/user_migrate/settings.php                               | 0
 apps/user_migrate/templates/settings.php                     | 0
 apps/user_openid/appinfo/app.php                             | 0
 apps/user_openid/phpmyid.php                                 | 0
 apps/user_openid/settings.php                                | 0
 apps/user_openid/templates/nomode.php                        | 0
 apps/user_openid/templates/settings.php                      | 0
 apps/user_openid/user.php                                    | 0
 apps/user_openid/user_openid.php                             | 0
 apps/user_webfinger/appinfo/app.php                          | 0
 apps/user_webfinger/webfinger.php                            | 0
 lib/archive/tar.php                                          | 0
 lib/archive/zip.php                                          | 0
 tests/lib/archive.php                                        | 0
 tests/lib/archive/tar.php                                    | 0
 tests/lib/archive/zip.php                                    | 0
 262 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 apps/admin_dependencies_chk/appinfo/app.php
 mode change 100755 => 100644 apps/admin_dependencies_chk/settings.php
 mode change 100755 => 100644 apps/admin_migrate/appinfo/app.php
 mode change 100755 => 100644 apps/admin_migrate/settings.php
 mode change 100755 => 100644 apps/bookmarks/addBm.php
 mode change 100755 => 100644 apps/bookmarks/ajax/addBookmark.php
 mode change 100755 => 100644 apps/bookmarks/ajax/delBookmark.php
 mode change 100755 => 100644 apps/bookmarks/ajax/editBookmark.php
 mode change 100755 => 100644 apps/bookmarks/ajax/recordClick.php
 mode change 100755 => 100644 apps/bookmarks/ajax/updateList.php
 mode change 100755 => 100644 apps/bookmarks/appinfo/app.php
 mode change 100755 => 100644 apps/bookmarks/appinfo/migrate.php
 mode change 100755 => 100644 apps/bookmarks/bookmarksHelper.php
 mode change 100755 => 100644 apps/bookmarks/index.php
 mode change 100755 => 100644 apps/bookmarks/lib/bookmarks.php
 mode change 100755 => 100644 apps/bookmarks/lib/search.php
 mode change 100755 => 100644 apps/bookmarks/settings.php
 mode change 100755 => 100644 apps/bookmarks/templates/bookmarklet.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/activation.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/delete.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/edit.form.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/edit.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/new.form.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/new.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/overview.php
 mode change 100755 => 100644 apps/calendar/ajax/calendar/update.php
 mode change 100755 => 100644 apps/calendar/ajax/categories/rescan.php
 mode change 100755 => 100644 apps/calendar/ajax/changeview.php
 mode change 100755 => 100644 apps/calendar/ajax/event/delete.php
 mode change 100755 => 100644 apps/calendar/ajax/event/edit.form.php
 mode change 100755 => 100644 apps/calendar/ajax/event/edit.php
 mode change 100755 => 100644 apps/calendar/ajax/event/move.php
 mode change 100755 => 100644 apps/calendar/ajax/event/new.form.php
 mode change 100755 => 100644 apps/calendar/ajax/event/new.php
 mode change 100755 => 100644 apps/calendar/ajax/event/resize.php
 mode change 100755 => 100644 apps/calendar/ajax/events.php
 mode change 100755 => 100644 apps/calendar/ajax/import/dialog.php
 mode change 100755 => 100644 apps/calendar/ajax/import/import.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/getfirstday.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/gettimezonedetection.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/guesstimezone.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/setfirstday.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/settimeformat.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/settimezone.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/timeformat.php
 mode change 100755 => 100644 apps/calendar/ajax/settings/timezonedetection.php
 mode change 100755 => 100644 apps/calendar/ajax/share/activation.php
 mode change 100755 => 100644 apps/calendar/ajax/share/changepermission.php
 mode change 100755 => 100644 apps/calendar/ajax/share/dropdown.php
 mode change 100755 => 100644 apps/calendar/ajax/share/share.php
 mode change 100755 => 100644 apps/calendar/ajax/share/unshare.php
 mode change 100755 => 100644 apps/calendar/appinfo/app.php
 mode change 100755 => 100644 apps/calendar/appinfo/remote.php
 mode change 100755 => 100644 apps/calendar/appinfo/update.php
 mode change 100755 => 100644 apps/calendar/export.php
 mode change 100755 => 100644 apps/calendar/index.php
 mode change 100755 => 100644 apps/calendar/lib/app.php
 mode change 100755 => 100644 apps/calendar/lib/calendar.php
 mode change 100755 => 100644 apps/calendar/lib/object.php
 mode change 100755 => 100644 apps/calendar/lib/search.php
 mode change 100755 => 100644 apps/calendar/lib/share.php
 mode change 100755 => 100644 apps/calendar/settings.php
 mode change 100755 => 100644 apps/calendar/templates/calendar.php
 mode change 100755 => 100644 apps/calendar/templates/part.choosecalendar.php
 mode change 100755 => 100644 apps/calendar/templates/part.choosecalendar.rowfields.php
 mode change 100755 => 100644 apps/calendar/templates/part.eventform.php
 mode change 100755 => 100644 apps/calendar/templates/part.import.php
 mode change 100755 => 100644 apps/calendar/templates/part.showevent.php
 mode change 100755 => 100644 apps/calendar/templates/settings.php
 mode change 100755 => 100644 apps/calendar/templates/share.dropdown.php
 mode change 100755 => 100644 apps/contacts/ajax/activation.php
 mode change 100755 => 100644 apps/contacts/ajax/addbook.php
 mode change 100755 => 100644 apps/contacts/ajax/addcontact.php
 mode change 100755 => 100644 apps/contacts/ajax/addproperty.php
 mode change 100755 => 100644 apps/contacts/ajax/categories/categoriesfor.php
 mode change 100755 => 100644 apps/contacts/ajax/categories/delete.php
 mode change 100755 => 100644 apps/contacts/ajax/categories/list.php
 mode change 100755 => 100644 apps/contacts/ajax/categories/rescan.php
 mode change 100755 => 100644 apps/contacts/ajax/chooseaddressbook.php
 mode change 100755 => 100644 apps/contacts/ajax/contactdetails.php
 mode change 100755 => 100644 apps/contacts/ajax/contacts.php
 mode change 100755 => 100644 apps/contacts/ajax/createaddressbook.php
 mode change 100755 => 100644 apps/contacts/ajax/cropphoto.php
 mode change 100755 => 100644 apps/contacts/ajax/currentphoto.php
 mode change 100755 => 100644 apps/contacts/ajax/deletebook.php
 mode change 100755 => 100644 apps/contacts/ajax/deletecard.php
 mode change 100755 => 100644 apps/contacts/ajax/deleteproperty.php
 mode change 100755 => 100644 apps/contacts/ajax/editaddress.php
 mode change 100755 => 100644 apps/contacts/ajax/editaddressbook.php
 mode change 100755 => 100644 apps/contacts/ajax/editname.php
 mode change 100755 => 100644 apps/contacts/ajax/importaddressbook.php
 mode change 100755 => 100644 apps/contacts/ajax/importdialog.php
 mode change 100755 => 100644 apps/contacts/ajax/loadcard.php
 mode change 100755 => 100644 apps/contacts/ajax/loadintro.php
 mode change 100755 => 100644 apps/contacts/ajax/loadphoto.php
 mode change 100755 => 100644 apps/contacts/ajax/oc_photo.php
 mode change 100755 => 100644 apps/contacts/ajax/savecrop.php
 mode change 100755 => 100644 apps/contacts/ajax/saveproperty.php
 mode change 100755 => 100644 apps/contacts/ajax/updateaddressbook.php
 mode change 100755 => 100644 apps/contacts/ajax/uploadimport.php
 mode change 100755 => 100644 apps/contacts/ajax/uploadphoto.php
 mode change 100755 => 100644 apps/contacts/appinfo/app.php
 mode change 100755 => 100644 apps/contacts/appinfo/migrate.php
 mode change 100755 => 100644 apps/contacts/appinfo/remote.php
 mode change 100755 => 100644 apps/contacts/dynphoto.php
 mode change 100755 => 100644 apps/contacts/export.php
 mode change 100755 => 100644 apps/contacts/import.php
 mode change 100755 => 100644 apps/contacts/index.php
 mode change 100755 => 100644 apps/contacts/lib/addressbook.php
 mode change 100755 => 100644 apps/contacts/lib/app.php
 mode change 100755 => 100644 apps/contacts/lib/hooks.php
 mode change 100755 => 100644 apps/contacts/lib/search.php
 mode change 100755 => 100644 apps/contacts/lib/vcard.php
 mode change 100755 => 100644 apps/contacts/photo.php
 mode change 100755 => 100644 apps/contacts/settings.php
 mode change 100755 => 100644 apps/contacts/templates/index.php
 mode change 100755 => 100644 apps/contacts/templates/part.chooseaddressbook.php
 mode change 100755 => 100644 apps/contacts/templates/part.chooseaddressbook.rowfields.php
 mode change 100755 => 100644 apps/contacts/templates/part.contact.php
 mode change 100755 => 100644 apps/contacts/templates/part.contactphoto.php
 mode change 100755 => 100644 apps/contacts/templates/part.cropphoto.php
 mode change 100755 => 100644 apps/contacts/templates/part.edit_address_dialog.php
 mode change 100755 => 100644 apps/contacts/templates/part.edit_name_dialog.php
 mode change 100755 => 100644 apps/contacts/templates/part.import.php
 mode change 100755 => 100644 apps/contacts/templates/part.importaddressbook.php
 mode change 100755 => 100644 apps/contacts/templates/settings.php
 mode change 100755 => 100644 apps/contacts/thumbnail.php
 mode change 100755 => 100644 apps/external/ajax/setsites.php
 mode change 100755 => 100644 apps/external/appinfo/app.php
 mode change 100755 => 100644 apps/external/index.php
 mode change 100755 => 100644 apps/external/lib/external.php
 mode change 100755 => 100644 apps/external/settings.php
 mode change 100755 => 100644 apps/external/templates/settings.php
 mode change 100755 => 100644 apps/files/admin.php
 mode change 100755 => 100644 apps/files/ajax/autocomplete.php
 mode change 100755 => 100644 apps/files/ajax/delete.php
 mode change 100755 => 100644 apps/files/ajax/download.php
 mode change 100755 => 100644 apps/files/ajax/list.php
 mode change 100755 => 100644 apps/files/ajax/move.php
 mode change 100755 => 100644 apps/files/ajax/newfile.php
 mode change 100755 => 100644 apps/files/ajax/newfolder.php
 mode change 100755 => 100644 apps/files/ajax/rawlist.php
 mode change 100755 => 100644 apps/files/ajax/rename.php
 mode change 100755 => 100644 apps/files/ajax/scan.php
 mode change 100755 => 100644 apps/files/ajax/upload.php
 mode change 100755 => 100644 apps/files/appinfo/app.php
 mode change 100755 => 100644 apps/files/download.php
 mode change 100755 => 100644 apps/files/index.php
 mode change 100755 => 100644 apps/files/settings.php
 mode change 100755 => 100644 apps/files/templates/admin.php
 mode change 100755 => 100644 apps/files/templates/index.php
 mode change 100755 => 100644 apps/files/templates/part.breadcrumb.php
 mode change 100755 => 100644 apps/files/templates/part.list.php
 mode change 100755 => 100644 apps/files_archive/appinfo/app.php
 mode change 100755 => 100644 apps/files_archive/lib/storage.php
 mode change 100755 => 100644 apps/files_archive/tests/storage.php
 mode change 100755 => 100644 apps/files_encryption/appinfo/app.php
 mode change 100755 => 100644 apps/files_encryption/lib/crypt.php
 mode change 100755 => 100644 apps/files_encryption/lib/cryptstream.php
 mode change 100755 => 100644 apps/files_encryption/lib/proxy.php
 mode change 100755 => 100644 apps/files_encryption/settings.php
 mode change 100755 => 100644 apps/files_encryption/tests/encryption.php
 mode change 100755 => 100644 apps/files_encryption/tests/stream.php
 mode change 100755 => 100644 apps/files_external/lib/ftp.php
 mode change 100755 => 100644 apps/files_external/lib/google.php
 mode change 100755 => 100644 apps/files_external/lib/swift.php
 mode change 100755 => 100644 apps/files_external/lib/webdav.php
 mode change 100755 => 100644 apps/files_external/tests/ftp.php
 mode change 100755 => 100644 apps/files_imageviewer/appinfo/app.php
 mode change 100755 => 100644 apps/files_pdfviewer/appinfo/app.php
 mode change 100755 => 100644 apps/files_sharing/ajax/email.php
 mode change 100755 => 100644 apps/files_sharing/ajax/getitem.php
 mode change 100755 => 100644 apps/files_sharing/ajax/setpermissions.php
 mode change 100755 => 100644 apps/files_sharing/ajax/share.php
 mode change 100755 => 100644 apps/files_sharing/ajax/toggleresharing.php
 mode change 100755 => 100644 apps/files_sharing/ajax/unshare.php
 mode change 100755 => 100644 apps/files_sharing/ajax/userautocomplete.php
 mode change 100755 => 100644 apps/files_sharing/appinfo/app.php
 mode change 100755 => 100644 apps/files_sharing/get.php
 mode change 100755 => 100644 apps/files_sharing/lib_share.php
 mode change 100755 => 100644 apps/files_sharing/list.php
 mode change 100755 => 100644 apps/files_sharing/settings.php
 mode change 100755 => 100644 apps/files_sharing/sharedstorage.php
 mode change 100755 => 100644 apps/files_texteditor/ajax/loadfile.php
 mode change 100755 => 100644 apps/files_texteditor/ajax/mtime.php
 mode change 100755 => 100644 apps/files_texteditor/ajax/savefile.php
 mode change 100755 => 100644 apps/files_texteditor/appinfo/app.php
 mode change 100755 => 100644 apps/files_versions/ajax/getVersions.php
 mode change 100755 => 100644 apps/files_versions/ajax/rollbackVersion.php
 mode change 100755 => 100644 apps/files_versions/ajax/togglesettings.php
 mode change 100755 => 100644 apps/files_versions/appinfo/app.php
 mode change 100755 => 100644 apps/files_versions/history.php
 mode change 100755 => 100644 apps/files_versions/settings.php
 mode change 100755 => 100644 apps/files_versions/templates/history.php
 mode change 100755 => 100644 apps/files_versions/templates/settings.php
 mode change 100755 => 100644 apps/files_versions/versions.php
 mode change 100755 => 100644 apps/gallery/ajax/createAlbum.php
 mode change 100755 => 100644 apps/gallery/ajax/galleryOp.php
 mode change 100755 => 100644 apps/gallery/ajax/sharing.php
 mode change 100755 => 100644 apps/gallery/ajax/thumbnail.php
 mode change 100755 => 100644 apps/gallery/appinfo/app.php
 mode change 100755 => 100644 apps/gallery/index.php
 mode change 100755 => 100644 apps/gallery/lib/album.php
 mode change 100755 => 100644 apps/gallery/lib/hooks_handlers.php
 mode change 100755 => 100644 apps/gallery/lib/images_utils.php
 mode change 100755 => 100644 apps/gallery/lib/photo.php
 mode change 100755 => 100644 apps/gallery/lib/scanner.php
 mode change 100755 => 100644 apps/gallery/lib/sharing.php
 mode change 100755 => 100644 apps/gallery/sharing.php
 mode change 100755 => 100644 apps/gallery/templates/index.php
 mode change 100755 => 100644 apps/gallery/templates/view_album.php
 mode change 100755 => 100644 apps/media/ajax/api.php
 mode change 100755 => 100644 apps/media/ajax/autoupdate.php
 mode change 100755 => 100644 apps/media/appinfo/app.php
 mode change 100755 => 100644 apps/media/index.php
 mode change 100755 => 100644 apps/media/lib_ampache.php
 mode change 100755 => 100644 apps/media/lib_collection.php
 mode change 100755 => 100644 apps/media/lib_media.php
 mode change 100755 => 100644 apps/media/lib_scanner.php
 mode change 100755 => 100644 apps/media/server/xml.server.php
 mode change 100755 => 100644 apps/media/settings.php
 mode change 100755 => 100644 apps/media/templates/music.php
 mode change 100755 => 100644 apps/media/templates/player.php
 mode change 100755 => 100644 apps/media/templates/settings.php
 mode change 100755 => 100644 apps/remoteStorage/WebDAV.php
 mode change 100755 => 100644 apps/remoteStorage/ajax/revokeToken.php
 mode change 100755 => 100644 apps/remoteStorage/appinfo/app.php
 mode change 100755 => 100644 apps/remoteStorage/auth.php
 mode change 100755 => 100644 apps/remoteStorage/lib_remoteStorage.php
 mode change 100755 => 100644 apps/remoteStorage/settings.php
 mode change 100755 => 100644 apps/remoteStorage/templates/settings.php
 mode change 100755 => 100644 apps/tasks/ajax/addtaskform.php
 mode change 100755 => 100644 apps/tasks/ajax/edittask.php
 mode change 100755 => 100644 apps/tasks/ajax/edittaskform.php
 mode change 100755 => 100644 apps/tasks/ajax/getdetails.php
 mode change 100755 => 100644 apps/tasks/index.php
 mode change 100755 => 100644 apps/tasks/templates/part.taskform.php
 mode change 100755 => 100644 apps/tasks/templates/tasks.php
 mode change 100755 => 100644 apps/user_ldap/appinfo/app.php
 mode change 100755 => 100644 apps/user_ldap/group_ldap.php
 mode change 100755 => 100644 apps/user_ldap/lib_ldap.php
 mode change 100755 => 100644 apps/user_ldap/settings.php
 mode change 100755 => 100644 apps/user_ldap/user_ldap.php
 mode change 100755 => 100644 apps/user_migrate/admin.php
 mode change 100755 => 100644 apps/user_migrate/ajax/export.php
 mode change 100755 => 100644 apps/user_migrate/appinfo/app.php
 mode change 100755 => 100644 apps/user_migrate/settings.php
 mode change 100755 => 100644 apps/user_migrate/templates/settings.php
 mode change 100755 => 100644 apps/user_openid/appinfo/app.php
 mode change 100755 => 100644 apps/user_openid/phpmyid.php
 mode change 100755 => 100644 apps/user_openid/settings.php
 mode change 100755 => 100644 apps/user_openid/templates/nomode.php
 mode change 100755 => 100644 apps/user_openid/templates/settings.php
 mode change 100755 => 100644 apps/user_openid/user.php
 mode change 100755 => 100644 apps/user_openid/user_openid.php
 mode change 100755 => 100644 apps/user_webfinger/appinfo/app.php
 mode change 100755 => 100644 apps/user_webfinger/webfinger.php
 mode change 100755 => 100644 lib/archive/tar.php
 mode change 100755 => 100644 lib/archive/zip.php
 mode change 100755 => 100644 tests/lib/archive.php
 mode change 100755 => 100644 tests/lib/archive/tar.php
 mode change 100755 => 100644 tests/lib/archive/zip.php

(limited to 'apps/contacts/templates')

diff --git a/apps/admin_dependencies_chk/appinfo/app.php b/apps/admin_dependencies_chk/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/admin_dependencies_chk/settings.php b/apps/admin_dependencies_chk/settings.php
old mode 100755
new mode 100644
diff --git a/apps/admin_migrate/appinfo/app.php b/apps/admin_migrate/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/settings.php b/apps/bookmarks/settings.php
old mode 100755
new mode 100644
diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/share/activation.php b/apps/calendar/ajax/share/activation.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/import.php b/apps/contacts/import.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
old mode 100755
new mode 100644
diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
old mode 100755
new mode 100644
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/external/index.php b/apps/external/index.php
old mode 100755
new mode 100644
diff --git a/apps/external/lib/external.php b/apps/external/lib/external.php
old mode 100755
new mode 100644
diff --git a/apps/external/settings.php b/apps/external/settings.php
old mode 100755
new mode 100644
diff --git a/apps/external/templates/settings.php b/apps/external/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files/admin.php b/apps/files/admin.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
old mode 100755
new mode 100644
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
old mode 100755
new mode 100644
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files/download.php b/apps/files/download.php
old mode 100755
new mode 100644
diff --git a/apps/files/index.php b/apps/files/index.php
old mode 100755
new mode 100644
diff --git a/apps/files/settings.php b/apps/files/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
old mode 100755
new mode 100644
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
old mode 100755
new mode 100644
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
old mode 100755
new mode 100644
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
old mode 100755
new mode 100644
diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_archive/lib/storage.php b/apps/files_archive/lib/storage.php
old mode 100755
new mode 100644
diff --git a/apps/files_archive/tests/storage.php b/apps/files_archive/tests/storage.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
old mode 100755
new mode 100644
diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
old mode 100755
new mode 100644
diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
old mode 100755
new mode 100644
diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php
old mode 100755
new mode 100644
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
old mode 100755
new mode 100644
diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/files_versions/versions.php b/apps/files_versions/versions.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/index.php b/apps/gallery/index.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/lib/sharing.php b/apps/gallery/lib/sharing.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
old mode 100755
new mode 100644
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
old mode 100755
new mode 100644
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
old mode 100755
new mode 100644
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
old mode 100755
new mode 100644
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/media/index.php b/apps/media/index.php
old mode 100755
new mode 100644
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
old mode 100755
new mode 100644
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
old mode 100755
new mode 100644
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
old mode 100755
new mode 100644
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
old mode 100755
new mode 100644
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
old mode 100755
new mode 100644
diff --git a/apps/media/settings.php b/apps/media/settings.php
old mode 100755
new mode 100644
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
old mode 100755
new mode 100644
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
old mode 100755
new mode 100644
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
old mode 100755
new mode 100644
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/ajax/addtaskform.php b/apps/tasks/ajax/addtaskform.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/ajax/edittask.php b/apps/tasks/ajax/edittask.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/ajax/edittaskform.php b/apps/tasks/ajax/edittaskform.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/ajax/getdetails.php b/apps/tasks/ajax/getdetails.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/index.php b/apps/tasks/index.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/templates/part.taskform.php b/apps/tasks/templates/part.taskform.php
old mode 100755
new mode 100644
diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
old mode 100755
new mode 100644
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
old mode 100755
new mode 100644
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
old mode 100755
new mode 100644
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
old mode 100755
new mode 100644
diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
old mode 100755
new mode 100644
diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php
old mode 100755
new mode 100644
diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/templates/nomode.php b/apps/user_openid/templates/nomode.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
old mode 100755
new mode 100644
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
old mode 100755
new mode 100644
diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
old mode 100755
new mode 100644
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
old mode 100755
new mode 100644
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
old mode 100755
new mode 100644
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
old mode 100755
new mode 100644
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
old mode 100755
new mode 100644
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 2f1e60180962d77752ed2b630f4945ee676b2125 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 17 May 2012 14:29:20 +0200
Subject: Contacts: Disable in-app import if encryption is enabled, and make an
 attempt of supporting IE uploads too. Can't test it though...

---
 apps/contacts/css/contacts.css                     |  3 +-
 apps/contacts/js/contacts.js                       |  5 ++--
 apps/contacts/templates/part.importaddressbook.php | 32 +++++++++++++---------
 3 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'apps/contacts/templates')

diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
index 79274c2dd95..94a0db4f77e 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -91,7 +91,8 @@ dl.addresscard .action { float: right; }
 
 #file_upload_form { width: 0; height: 0; }
 #file_upload_target, #import_upload_target, #crop_target { display:none; }
-#file_upload_start, #import_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; /*position:absolute; left:0; top:0;*/ width:0; height:0;}
+#file_upload_start, #import_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1001; /*position:absolute; left:0; top:0;*/ width:0; height:0;}
+#import_upload_start { width: 16px; height: 16px; margin: 0 0 0 0; }
 input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .big { font-weight:bold; font-size:1.2em; }
 .huge { font-weight:bold; font-size:1.5em; }
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 94e3e350d71..d60d523542e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1287,7 +1287,7 @@ Contacts={
 								close : function(event, ui) {
 									$(this).dialog('destroy').remove();
 								}
-							});
+							}).css('overflow','visible');
 						} else {
 							alert(jsondata.data.message);
 						}
@@ -1338,7 +1338,8 @@ Contacts={
 				$('#importaddressbook_dialog').find('.upload').click(function() {
 					Contacts.UI.Addressbooks.droptarget.html(t('contacts', 'Uploading...'));
 					Contacts.UI.loading(Contacts.UI.Addressbooks.droptarget, true);
-					$('#import_upload_start').trigger('click');
+					//$('#import_upload_start').trigger('click');
+					//return false;
 				});
 				$('#importaddressbook_dialog').find('.upload').tipsy();
 				this.droptarget = $('#import_drop_target');
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index a055dd60356..6702262f231 100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -6,28 +6,34 @@
  * See the COPYING-README file.
  */
 ?>
-<td id="importaddressbook_dialog" title="<?php echo $l->t("Import Addressbook"); ?>" colspan="6">
+<td id="importaddressbook_dialog" colspan="6">
+<?php 
+if(OCP\App::isEnabled('files_encryption')) { 
+	echo '<strong>'.$l->t('Currently this import function doesn\'t work while encryption is enabled.<br />Please upload your VCF file with the file manager and click on it to import.').'</strong>';
+} else { ?>
 <table>
 <tr>
 	<th><?php echo $l->t('Select address book to import to:') ?></th>
 	<td>
-		<select id="book" name="book" class="float">
-		<?php
-		$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-		echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-		?>
-		</select>
-		<span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file to import contacts."); ?> (Max. <?php echo  $_['uploadMaxHumanFilesize']; ?>)</span>
-		<a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>"></a>
+		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
+			<select id="book" name="book" class="float">
+			<?php
+			$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+			echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+			?>
+			</select>
+			<span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file to import contacts."); ?> (Max. <?php echo  $_['uploadMaxHumanFilesize']; ?>)</span>
+			<a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>">
+			<input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
+			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+		</form>
 	</td>
 </tr>
 </table>
-<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
-<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-<input id="import_upload_start" type="file" accept="text/*" name="importfile" />
+
 <input id="close_button" style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this);" value="<?php echo $l->t("Cancel"); ?>">
 <iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-</form>
+<?php } ?>
 </td>
 <script type="text/javascript">
 Contacts.UI.Addressbooks.loadImportHandlers();
-- 
cgit v1.2.3