Adding app icon and fixing admin setting

2 files changed, 7 insertions, 72 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 95afaf1ac0a..976d0a5c3f1 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -159,6 +159,7 @@ foreach ($forms as $index => $form) {
 if ($filesExternal) {
 	$formsAndMore[] = array('anchor' => 'files_external', 'section-name' => $l->t('External Storage'));
 }
+
 $template->assign('fileSharingSettings', $fileSharingSettings);
 $template->assign('filesExternal', $filesExternal);
 $template->assign('updaterAppPanel', $updaterAppPanel);
@@ -184,12 +185,13 @@ $formsMap = array_map(function ($form) {
 $formsAndMore = array_merge($formsAndMore, $formsMap);
 
 // add bottom hardcoded forms from the template
-$formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
-$formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
-$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
-$formsAndMore[] = array('anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks'));
+$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption')];
+$formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
+$formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server')];
+$formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
+$formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {
-	$formsAndMore[] = array('anchor' => 'updater', 'section-name' => $l->t('Updates'));
+	$formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
 }
 
 $template->assign('forms', $formsAndMore);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1b0ed66563e..1b8ab0e3819 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -295,73 +295,6 @@ if ($_['cronErrors']) {
 	</p>
 </div>
 
-<div class="section" id="shareAPI">
-	<h2><?php p($l->t('Sharing'));?></h2>
-		<p id="enable">
-			<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-				   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-				   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
-		</p>
-
-			<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
-				<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
-						   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
-				<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
-
-				<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/>
-
-				<input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification"
-					value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
-
-				<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate"
-				       value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
-
-			</p>
-				<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
-					<?php p($l->t( 'Expire after ' )); ?>
-					<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
-						   value='<?php p($_['shareExpireAfterNDays']) ?>' />
-					<?php p($l->t( 'days' )); ?>
-					<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate"
-						   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
-					<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
-				</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-				   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers"
-				   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
-			<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
-				   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
-			<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files to other users'));?></label><br/>
-		</p>
-		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
-			<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups"
-			       value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
-			<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
-		</p>
-			<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
-				<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px"/>
-				<br />
-				<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
-			</p>
-</div>
-
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server Side Encryption'));?></h2>
 		<p id="enable">