From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 22 Jul 2013 09:55:20 +0000 (+0200)
Subject: Merge branch 'master' into disable-anon-upload-master
X-Git-Tag: v6.0.0alpha2~424^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=840e96cda39b97dc0c42b52946f0e98c62df3bf4;p=nextcloud-server.git

Merge branch 'master' into disable-anon-upload-master

Conflicts:
	settings/templates/admin.php
---

840e96cda39b97dc0c42b52946f0e98c62df3bf4
diff --cc settings/templates/admin.php
index 22c0b2b5f2f,d638a26c3fa..057d527db73
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -145,20 -145,10 +145,20 @@@ if (!$_['internetconnectionworking']) 
  				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
  			</td>
  		</tr>
 +		<?php if (!\OCP\App::isEnabled('files_encryption')) { ?>
 +		<tr>
 +			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
 +				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
 +				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
 +				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
 +				<em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
 +			</td>
 +		</tr>
 +		<?php } ?>
  		<tr>
- 			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+ 			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
  				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
- 					   value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+ 					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
  				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
  				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
  			</td>