From b432ea29c9d99a386077c738d6e29d4bc093c15f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 4 Feb 2015 16:25:37 +0100 Subject: [PATCH 1/3] Add `rel="noreferrer"` where possible and switch to HTTPS Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage". --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 2 +- core/templates/layout.user.php | 2 +- settings/templates/admin.php | 2 +- settings/templates/help.php | 8 ++++---- settings/templates/personal.php | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 96229fd370..768a965599 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -24,7 +24,7 @@ - + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c799205b7c..19b89e47e5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -25,7 +25,7 @@ - +
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4ffec917c9..34fad7e6cd 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ - +
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 65c6359e50..55887b0df4 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -517,7 +517,7 @@ if ($_['suggestedOverwriteCliUrl']) { getTitle()); ?>

- t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> + t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?>

diff --git a/settings/templates/help.php b/settings/templates/help.php index 403dde30da..f559329c6b 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -16,12 +16,12 @@
  • - + t( 'Online Documentation' )); ?> ↗
  • - + t( 'Forum' )); ?> ↗
    • @@ -29,14 +29,14 @@
  • + target="_blank" rel="noreferrer"> t( 'Bugtracker' )); ?> ↗
  • - + t( 'Commercial Support' )); ?> ↗
    • diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 3bd5971f44..d6bc1d2bb5 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -40,10 +40,10 @@

    t('If you want to support the project join development + target="_blank" rel="noreferrer">join development or spread the word!'));?> + target="_blank" rel="noreferrer">spread the word!'));?>

    @@ -181,7 +181,7 @@ if($_['passwordChangeSupported']) { + target="_blank" rel="noreferrer"> t('Help translate'));?> @@ -287,7 +287,7 @@ if($_['passwordChangeSupported']) {

    t('Version'));?>

    getTitle()); ?>
    - t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> + t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?>
    From 4172ba48d4c2ffc34c2020b256aca333de692c23 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 9 Feb 2015 16:01:52 +0100 Subject: [PATCH 2/3] Deduplicate template code and do not translate the links --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 2 +- core/templates/layout.noscript.warning.php | 11 +++++++++++ core/templates/layout.user.php | 2 +- settings/templates/admin.php | 6 +----- settings/templates/personal.php | 4 +--- .../templates/settings.development.notice.php | 19 +++++++++++++++++++ 7 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 core/templates/layout.noscript.warning.php create mode 100644 settings/templates/settings.development.notice.php diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 768a965599..7069c0c263 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -24,7 +24,7 @@ - + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 19b89e47e5..8deda443d9 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -25,7 +25,7 @@ - +
    diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php new file mode 100644 index 0000000000..ba781f5502 --- /dev/null +++ b/core/templates/layout.noscript.warning.php @@ -0,0 +1,11 @@ + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 34fad7e6cd..292fa5cf55 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ - +
    diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 55887b0df4..d3cf1dc972 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -515,11 +515,7 @@ if ($_['suggestedOverwriteCliUrl']) {

    t('Version'));?>

    getTitle()); ?> - -

    - t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -

    - +
    diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d6bc1d2bb5..b98156a7c5 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -286,9 +286,7 @@ if($_['passwordChangeSupported']) {

    t('Version'));?>

    getTitle()); ?>
    - - t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> - +
    diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php new file mode 100644 index 0000000000..c88c90f6b6 --- /dev/null +++ b/settings/templates/settings.development.notice.php @@ -0,0 +1,19 @@ + +

    + ', + '', + '', + '', + ], + $l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') + )); ?> +

    + From 8791f1992eb4476fbf427f2ffde22498d3770cb0 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 16 Feb 2015 13:37:54 +0100 Subject: [PATCH 3/3] Add noreferrer to footer URI --- lib/private/defaults.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/private/defaults.php b/lib/private/defaults.php index c16ebdbe24..773f2ba4b4 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -212,7 +212,8 @@ class OC_Defaults { if ($this->themeExist('getShortFooter')) { $footer = $this->theme->getShortFooter(); } else { - $footer = '' .$this->getEntity() . ''. + $footer = '' .$this->getEntity() . ''. ' – ' . $this->getSlogan(); }