Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

7 files changed, 90 insertions, 59 deletions

diff --git a/.gitignore b/.gitignore
index ac58f3e6a63..e2ff07d14d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,9 @@ nbproject
 # Cloud9IDE
 .settings.xml
 
+# vim ex mode
+.vimrc
+	
 # Mac OS
 .DS_Store
 
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 9308e0227ed..4f8f3743dc4 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -842,22 +842,22 @@ Contacts={
 					$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
 					var adrarray = this.data.ADR[adr]['value'];
 					var adrtxt = '';
-					if(adrarray[0].length > 0) {
+					if(adrarray[0] && adrarray[0].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
 					}
-					if(adrarray[1].length > 0) {
+					if(adrarray[1] && adrarray[1].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
 					}
-					if(adrarray[2].length > 0) {
+					if(adrarray[2] && adrarray[2].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
 					}
-					if(adrarray[3].length > 0 || adrarray[5].length > 0) {
+					if((adrarray[3] && adrarray[5]) && adrarray[3].length > 0 || adrarray[5].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
 					}
-					if(adrarray[4].length > 0) {
+					if(adrarray[4] && adrarray[4].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
 					}
-					if(adrarray[6].length > 0) {
+					if(adrarray[6] && adrarray[6].length > 0) {
 						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
 					}
 					$('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
@@ -1284,8 +1284,8 @@ Contacts={
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
 						if(jsondata.status != 'error'){
 							$('#chooseaddressbook_dialog').dialog({
-								minWidthwidth : 600,
-								close : function(event, ui) {
+								minWidth: 600,
+								close: function(event, ui) {
 									$(this).dialog('destroy').remove();
 								}
 							}).css('overflow','visible');
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 20a9e4afc9c..168e8af3e55 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -131,7 +131,7 @@ class OC_Contacts_VCard{
 		foreach($property->parameters as $key=>&$parameter){
 			if(strtoupper($parameter->name) == 'ENCODING') {
 				if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
-					$property->value = quoted_printable_decode($property->value);
+					$property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto'));
 					unset($property->parameters[$key]);
 				}
 			} elseif(strtoupper($parameter->name) == 'CHARSET') {
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 0c672cd6708..7414c1f3395 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -71,7 +71,7 @@ FileActions={
 				}
 				var html='<a href="#" class="action" style="display:none">';
 				if(img) { html+='<img src="'+img+'"/> '; }
-				html += name+'</a>';
+				html += t('files', name) +'</a>';
 				var element=$(html);
 				element.data('action',name);
 				element.click(function(event){
@@ -91,7 +91,7 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" original-title="Delete" class="action delete" style="display:none" />';
+			var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index d4083857977..df1e3cfd3c2 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,8 +34,8 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 7c3c3d37b18..f173357749e 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -95,9 +95,9 @@ $(document).ready(function(){
 		$(this).children('img').click();
 	});
 	
-	$('select.quota').live('change',function(){
+	$('select.quota, select.quota-user').live('change',function(){
 		var select=$(this);
-		var uid=$(this).parent().parent().data('uid');
+		var uid=$(this).parent().parent().parent().data('uid');
 		var quota=$(this).val();
 		var other=$(this).next();
 		if(quota!='other'){
@@ -110,7 +110,7 @@ $(document).ready(function(){
 			other.focus();
 		}
 	});
-	$('select.quota').each(function(i,select){
+	$('select.quota, select.quota-user').each(function(i,select){
 		$(select).data('previous',$(select).val());
 	})
 	
@@ -207,9 +207,9 @@ $(document).ready(function(){
 					applyMultiplySelect(select);
 					$('#content table tbody').last().append(tr);
 
-					tr.find('select.quota option').attr('selected',null);
-					tr.find('select.quota option').first().attr('selected','selected');
-					tr.find('select.quota').data('previous','default');
+					tr.find('select.quota-user option').attr('selected',null);
+					tr.find('select.quota-user option').first().attr('selected','selected');
+					tr.find('select.quota-user').data('previous','default');
 				}
 			}
 		);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 1951f17a0b7..ea3fe777ffe 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
 
 <div id="controls">
 	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
-		<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
-		<select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
-		<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
-		<?php endforeach;?>
-		</select>
-		<input type="submit" value="<?php echo $l->t('Create')?>" />
+		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+			type="password" id="newuserpassword"
+			placeholder="<?php echo $l->t('Password')?>" /> <select
+			id="newusergroups" data-placeholder="groups"
+			title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			<?php foreach($_["groups"] as $group): ?>
+			<option value="<?php echo $group['name'];?>">
+				<?php echo $group['name'];?>
+			</option>
+			<?php endforeach;?>
+		</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
 	</form>
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
-		<select class='quota'>
-			<?php foreach($_['quota_preset'] as $preset):?>
+		<div class="quota-select-wrapper">
+			<select class='quota'>
+				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
-					<option <?php if($_['default_quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+				<option
+				<?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
+					value='<?php echo $preset;?>'>
+					<?php echo $preset;?>
+				</option>
 				<?php endif;?>
-			<?php endforeach;?>
-			<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
-				<option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
-			<?php endif;?>
-			<option value='other'><?php echo $l->t('Other');?>...</option>
-		</select>
-		<input class='quota-other'></input>
+				<?php endforeach;?>
+				<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+				<option selected="selected"
+					value='<?php echo $_['default_quota'];?>'>
+					<?php echo $_['default_quota'];?>
+				</option>
+				<?php endif;?>
+				<option value='other'>
+					<?php echo $l->t('Other');?>
+					...
+				</option>
+			</select> <input class='quota-other'></input>
+		</div>
 	</div>
 </div>
 
@@ -49,38 +63,52 @@ foreach($_["groups"] as $group) {
 		</tr>
 	</thead>
 	<tbody>
-	<?php foreach($_["users"] as $user): ?>
+		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php echo $user["name"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>
-			<td class="password">
-				<span>●●●●●●●</span>
-				<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" />
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
+				src="<?php echo image_path('core','actions/rename.svg')?>"
+				alt="set new password" title="set new password" />
 			</td>
-			<td class="groups">
-				<select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+			<td class="groups"><select
+				data-username="<?php echo $user['name'] ;?>"
+				data-user-groups="<?php echo $user['groups'] ;?>"
+				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
-						<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
+					<option value="<?php echo $group['name'];?>">
+						<?php echo $group['name'];?>
+					</option>
 					<?php endforeach;?>
-				</select>
+			</select>
 			</td>
 			<td class="quota">
-				<select class='quota-user'>
-					<?php foreach($_['quota_preset'] as $preset):?>
-						<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
-					<?php endforeach;?>
-					<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
-						<option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option>
-					<?php endif;?>
-					<option value='other'><?php echo $l->t('Other');?>...</option>
-				</select>
-				<input class='quota-other'></input>
+				<div class="quota-select-wrapper">
+					<select class='quota-user'>
+						<?php foreach($_['quota_preset'] as $preset):?>
+						<option
+						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
+							value='<?php echo $preset;?>'>
+							<?php echo $preset;?>
+						</option>
+						<?php endforeach;?>
+						<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+						<option selected="selected" value='<?php echo $user['quota'];?>'>
+							<?php echo $user['quota'];?>
+						</option>
+						<?php endif;?>
+						<option value='other'>
+							<?php echo $l->t('Other');?>
+							...
+						</option>
+					</select> <input class='quota-other'></input>
+				</div>
 			</td>
-			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?>
-					<img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
-				<?php endif;?>
+			<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
+				alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
+				src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
 			</td>
 		</tr>
-	<?php endforeach; ?>
+		<?php endforeach; ?>
 	</tbody>
 </table>