Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php

3 files changed, 26 insertions, 16 deletions

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4aad9b507e7..52127f6710d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -96,7 +96,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="ajax"
-					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_ajax">AJAX</label><br/>
@@ -106,7 +106,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="webcron"
-					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_webcron">Webcron</label><br/>
@@ -116,7 +116,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="cron"
-					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_cron">Cron</label><br/>
@@ -132,34 +132,44 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
 				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
 			</td>
 		</tr>
 		<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_links" id="allowLinks"
-					   value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
 				<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"');?>>
 				<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>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] == 'global') print_unescaped('checked="checked"'); ?> />
+					   value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') print_unescaped('checked="checked"'); ?> />
+					   value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
 			</td>
 		</tr>
@@ -204,7 +214,7 @@ if (!$_['internetconnectionworking']) {
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 	<option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option>
 	<?php for ($i = 0; $i < 5; $i++):
-	if ($i != $_['loglevel']):?>
+	if ($i !== $_['loglevel']):?>
 		<option value='<?php p($i)?>'><?php p($levels[$i])?></option>
 		<?php endif;
 endfor;?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 147ad834a9c..ee5ebae708f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -96,7 +96,7 @@ if($_['passwordChangeSupported']) {
 		<?php endforeach;?>
 		</select>
 		<?php if (OC_Util::getEditionString() === ''): ?>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
 			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 		<?php endif; ?>
 	</fieldset>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9fcc11ab89a..4ddef3ff1b5 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -43,12 +43,12 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
-					<?php if($_['default_quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
 						value='none'>
 					<?php p($l->t('Unlimited'));?>
 				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset!='default'):?>
+				<?php if($preset !== 'default'):?>
 				<option
 				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
 					value='<?php p($preset);?>'>
@@ -132,12 +132,12 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="quota">
 				<select class='quota-user'>
 					<option
-						<?php if($user['quota']=='default') print_unescaped('selected="selected"');?>
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
 							value='default'>
 						<?php p($l->t('Default'));?>
 					</option>
 					<option
-					<?php if($user['quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
 							value='none'>
 						<?php p($l->t('Unlimited'));?>
 					</option>