Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks

Merge tips & tricks section into setup checks

4 files changed, 23 insertions, 53 deletions

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 4080cfab029..b4619ee4bb0 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -424,6 +424,10 @@ Raw output
 		return $indexInfo->getListOfMissingIndexes();
 	}
 
+	protected function isSqliteUsed() {
+		return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
+	}
+
 	/**
 	 * @return DataResponse
 	 */
@@ -447,6 +451,8 @@ Raw output
 				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
 				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
 				'hasMissingIndexes' => $this->hasMissingIndexes(),
+				'isSqliteUsed' => $this->isSqliteUsed(),
+				'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
 			]
 		);
 	}
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 97ef8e15d8d..5c1714021fb 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -1314,8 +1314,18 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	}
 }
 
-#security-warning > ul {
-	color: $color-error;
+#security-warning {
+	a {
+		text-decoration: underline;
+	}
+
+	& > ul {
+		color: $color-error;
+	}
+
+	.extra-top-margin {
+		margin-top: 12px;
+	}
 }
 
 #admin-tips li {
diff --git a/settings/templates/settings/admin/overview.php b/settings/templates/settings/admin/overview.php
index 08aee8b5b76..5fb5e110eb1 100644
--- a/settings/templates/settings/admin/overview.php
+++ b/settings/templates/settings/admin/overview.php
@@ -28,7 +28,7 @@
 
 <div id="security-warning" class="section">
 	<h2><?php p($l->t('Security & setup warnings'));?></h2>
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information.'));?></p>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.'));?></p>
 	<ul>
 		<?php
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -173,6 +173,10 @@
 		<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
 	</p>
 
+	<p class="extra-top-margin">
+		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com']));?>
+	</p>
+
 </div>
 
 <div class="section">
diff --git a/settings/templates/settings/admin/tipstricks.php b/settings/templates/settings/admin/tipstricks.php
deleted file mode 100644
index 3ab337e06f8..00000000000
--- a/settings/templates/settings/admin/tipstricks.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/** @var \OCP\IL10N $l */
-/** @var array $_ */
-
-?>
-
-<div class="section" id="admin-tips">
-	<h2><?php p($l->t('Tips & tricks'));?></h2>
-	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
-	<ul>
-		<?php
-		// SQLite database performance issue
-		if ($_['databaseOverload']) {
-			?>
-			<li>
-				<?php p($l->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.')); ?><br>
-				<?php p($l->t('This is particularly recommended when using the desktop client for file synchronisation.')); ?><br>
-				<?php print_unescaped($l->t('To migrate to another database use the command line tool: \'occ db:convert-type\', or see the <a target="_blank" rel="noreferrer noopener" href="%s">documentation ↗</a>.', link_to_docs('admin-db-conversion') )); ?>
-			</li>
-		<?php } ?>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-backup')); ?>"><?php p($l->t('How to do backups'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-performance')); ?>"><?php p($l->t('Performance tuning'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-config')); ?>"><?php p($l->t('Improving the config.php'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('developer-theming')); ?>"><?php p($l->t('Theming'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="https://scan.nextcloud.com"><?php p($l->t('Check the security of your Nextcloud over our security scan'));?> ↗</a></li>
-		<li><a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-security')); ?>"><?php p($l->t('Hardening and security guidance'));?> ↗</a></li>
-	</ul>
-</div>