Skip to content

Add CSP compliance #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richaferry wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Add CSP compliance #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions assets/js/menu-link.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
(function () {
'use strict';

function updateMenuLinks() {
document.querySelectorAll('.pp-version-notice-menu-config').forEach(function (config) {
var pluginName = config.dataset.pluginName;

document.querySelectorAll('a.pp-version-notice-upgrade-menu-item').forEach(function (link) {
if (link.classList.contains(pluginName)) {
link.target = '_blank';
link.href = config.dataset.redirectTo;
}
});
});
}

if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', updateMenuLinks);
} else {
updateMenuLinks();
}
}());
1 change: 1 addition & 0 deletions assets/js/menu-link.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions assets/js/redirect.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(function () {
'use strict';

var config = document.querySelector('.pp-version-notice-redirect');

if (config) {
window.setTimeout(function () {
window.location.replace(config.dataset.redirectTo);
}, 600);
}
}());
1 change: 1 addition & 0 deletions assets/js/redirect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(function(){var e=document.querySelector(".pp-version-notice-redirect");if(e)window.setTimeout(function(){window.location.replace(e.dataset.redirectTo)},600)})();
33 changes: 21 additions & 12 deletions templates/menu-link/menu-link-script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
<script type="application/javascript">
jQuery(function ($) {
var linksMap = JSON.parse('<?php echo json_encode($convertedUrlsMap); ?>'),
urlData = null;
<?php
$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
$version = defined('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION')
? PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION
: '2.2.1';

// Remove the domain and admin folder from the URL to match the menu's url.
for (var i = 0; i < linksMap.length; i++) {
urlData = linksMap[i];

$('a.pp-version-notice-upgrade-menu-item.' + urlData.pluginName).attr('target', '_blank').attr('href', urlData.redirectTo);
}
});
</script>
wp_enqueue_script(
'publishpress-wordpress-version-notices-menu-link',
plugins_url(
"assets/js/menu-link{$suffix}.js",
trailingslashit(PP_VERSION_NOTICES_BASE_PATH) . 'wordpress-version-notices.php'
),
[],
$version,
true
);
?>
<?php foreach ($convertedUrlsMap as $urlData) : ?>
<span class="pp-version-notice-menu-config"
data-plugin-name="<?php echo esc_attr($urlData['pluginName']); ?>"
data-redirect-to="<?php echo esc_url($urlData['redirectTo']); ?>" hidden></span>
<?php endforeach; ?>
31 changes: 21 additions & 10 deletions templates/menu-link/redirect-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
<div class="pp-version-notice-upgrade-menu-item-page">
<div class="pp-version-notice-upgrade-menu-item-page pp-version-notice-redirect" data-redirect-to="<?php echo esc_url($link); ?>">
<p>
<span class="dashicons dashicons-smiley spin bounce"></span>
<div class="message"><?php echo esc_html($message); ?></div>
</p>

<script type="application/javascript">
window.setTimeout(
function () {
window.location.replace("<?php echo esc_url($link); ?>");
},
600
);
</script>
</div>
</div>
<?php
$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
$version = defined('PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION')
? PUBLISHPRESS_WORDPRESS_VERSION_NOTICES_VERSION
: '2.2.1';
$handle = 'publishpress-wordpress-version-notices-redirect';
wp_register_script(
$handle,
plugins_url(
"assets/js/redirect{$suffix}.js",
trailingslashit(PP_VERSION_NOTICES_BASE_PATH) . 'wordpress-version-notices.php'
),
[],
$version,
false
);
wp_enqueue_script($handle);
wp_print_scripts($handle);
?>
Loading