Merge pull request #13890 from owncloud/add-no-referrer

Add `rel="noreferrer"` where possible and switch to HTTPS

4 files changed, 28 insertions, 15 deletions

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a739e517ede..363b4741b74 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -525,11 +525,7 @@ if ($_['suggestedOverwriteCliUrl']) {
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
-<?php if (OC_Util::getEditionString() === ''): ?>
-	<p>
-		<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-	</p>
-<?php endif; ?>
+	<?php include('settings.development.notice.php'); ?>
 </div>
 
 <div class="section credits-footer">
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 403dde30dae..f559329c6bb 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -16,12 +16,12 @@
 	<?php } ?>
 
 		<li>
-			<a href="http://owncloud.org/support" target="_blank">
+			<a href="https://owncloud.org/support" target="_blank" rel="noreferrer">
 				<?php p($l->t( 'Online Documentation' )); ?> ↗
 			</a>
 		</li>
 		<li>
-			<a href="https://forum.owncloud.org" target="_blank">
+			<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
 				<?php p($l->t( 'Forum' )); ?> ↗
 			</a>
 		</li>
@@ -29,14 +29,14 @@
 	<?php if($_['admin']) { ?>
 		<li>
 			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
-				target="_blank">
+				target="_blank" rel="noreferrer">
 				<?php p($l->t( 'Bugtracker' )); ?> ↗
 			</a>
 		</li>
 	<?php } ?>
 
 	<li>
-		<a href="https://owncloud.com" target="_blank">
+		<a href="https://owncloud.com" target="_blank" rel="noreferrer">
 			<?php p($l->t( 'Commercial Support' )); ?> ↗
 		</a>
 	</li>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 02e61287937..f48737b6db7 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -40,10 +40,10 @@
 	<p class="center">
 		<?php print_unescaped($l->t('If you want to support the project
 		<a href="https://owncloud.org/contribute"
-			target="_blank">join development</a>
+			target="_blank" rel="noreferrer">join development</a>
 		or
 		<a href="https://owncloud.org/promote"
-			target="_blank">spread the word</a>!'));?>
+			target="_blank" rel="noreferrer">spread the word</a>!'));?>
 	</p>
 	<?php endif; ?>
 
@@ -189,7 +189,7 @@ if($_['passwordChangeSupported']) {
 	</select>
 	<?php if (OC_Util::getEditionString() === ''): ?>
 	<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
-		target="_blank">
+		target="_blank" rel="noreferrer">
 		<em><?php p($l->t('Help translate'));?></em>
 	</a>
 	<?php endif; ?>
@@ -294,9 +294,7 @@ if($_['passwordChangeSupported']) {
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
-<?php if (OC_Util::getEditionString() === ''): ?>
-	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-<?php endif; ?>
+	<?php include('settings.development.notice.php'); ?>
 </div>
 
 <div class="section credits-footer">
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
new file mode 100644
index 00000000000..c88c90f6b6b
--- /dev/null
+++ b/settings/templates/settings.development.notice.php
@@ -0,0 +1,19 @@
+<?php if (OC_Util::getEditionString() === ''): ?>
+	<p>
+		<?php print_unescaped(str_replace(
+			[
+				'{communityopen}',
+				'{githubopen}',
+				'{licenseopen}',
+				'{linkclose}',
+			],
+			[
+				'<a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">',
+				'<a href="https://github.com/owncloud" target="_blank" rel="noreferrer">',
+				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">',
+				'</a>',
+			],
+			$l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
+		)); ?>
+	</p>
+<?php endif; ?>