+ {__('By default, all donors will display. Use this setting to restrict the donor wall to only display certain donors. Use a comma-separated list of donor IDs.', 'give')}
+
+
+
+ } else if (filter === 'formID' ){
+ return <> saveSetting('formID', value)}/>
+
+ {__('Type the ID of your form to add it to the list. Only forms with these IDs you choose will be displayed in this grid.', 'give')}
+
+
+ }
+ };
+ return (
-
- saveSetting( 'donorsPerPage', value ) }
- help={ __('How many donors should show up on the initial page load?', 'give' ) }
- />
- saveSetting( 'ids', value ) }
- help={ __('By default, all donors will display. Use this setting to restrict the donor wall to only display certain donors. Use a comma-separated list of donor IDs.', 'give') }
- />
- saveSetting( 'formID', value ) }
- help={ __('By Default, donations to all forms will display. Use this setting to restrict the donor to display only donations to certains forms. Use a comma-separated list of form IDs.', 'give') }
- />
- saveSetting( 'categories', value ) }/>
- saveSetting( 'tags', value ) }/>
- saveSetting( 'orderBy', value ) } />
- saveSetting( 'order', value ) } />
- saveSetting( 'columns', value ) } />
- saveSetting( 'avatarSize', value ) } />
- saveSetting( 'showAvatar', value ) } />
- saveSetting( 'showName', value ) } />
- saveSetting( 'showCompanyName', value ) } />
- saveSetting( 'showForm', value ) } />
- saveSetting( 'showTotal', value ) } />
- saveSetting( 'showDate', value ) } />
- saveSetting( 'showComments', value ) } />
- saveSetting( 'showAnonymous', value ) } />
- saveSetting( 'onlyComments', value ) } />
- saveSetting( 'commentLength', value ) } />
- saveSetting( 'readMoreText', value ) } />
- saveSetting( 'loadMoreText', value ) } />
-
-
+
+
+ saveSetting('columns', value)}
+ help={__('Controls how many columns of the Form Grid appear. All sizes will adjust responsively to the space available. The maximum number allowed per row is 4', 'give')}
+ />
+ saveSetting( 'columns', value ) } />
+
+
+
+
+ saveSetting( 'toggleOptions', value ) }
+ selected={toggleOptions}/>
+ {toggleOptions === 'Donor info' ?
+ <>
+ saveSetting( 'showName', value ) } />
+ saveSetting( 'showCompanyName', value ) } />
+ saveSetting( 'showAnonymous', value ) } />
+ saveSetting( 'showAvatar', value ) } />
+ saveSetting( 'avatarSize', value ) } />
+ :
+ <>
+ saveSetting( 'showForm', value ) } />
+ saveSetting( 'showTotal', value ) } />
+ { !!window.Give_Tribute && saveSetting( 'showTributes', value ) } />}
+ saveSetting( 'showComments', value ) } />
+ saveSetting( 'onlyComments', value ) } />
+ saveSetting( 'commentLength', value ) } />
+ saveSetting( 'readMoreText', value ) } />
+
+ }
+
+
+
+
+ saveSetting( 'orderBy', value ) } />
+ saveSetting( 'order', value ) } />
+ saveSetting( 'filter', value ) } />
+
+ {filterValue(filter)}
+
+
+
+
+ saveSetting( 'donorsPerPage', value ) }
+ help={ __('How many donors should show up on the initial page load?', 'give' ) }
+ />
+ saveSetting( 'loadMoreText', value ) } />
+
+
+
+
+ setAttributes( { color: value } )}
+ />
+
+
+
);
};
diff --git a/blocks/donor-wall/edit/style.scss b/blocks/donor-wall/edit/style.scss
new file mode 100644
index 0000000000..304e89463e
--- /dev/null
+++ b/blocks/donor-wall/edit/style.scss
@@ -0,0 +1,44 @@
+.give-donor-wall-inspector{
+ flex-direction: row !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+
+ .components-base-control__label {
+ margin: 0 !important;
+ }
+
+ .components-base-control__field {
+ display: flex !important;
+ flex-direction: row!important;
+ align-items: center !important;
+ justify-content: space-between !important;
+
+ .components-text-control__input {
+ flex: .7 !important;
+ }
+ }
+
+ .components-flex-item {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: center !important;
+
+ .components-input-control__label{
+ flex: 1 !important;
+ margin: 0 !important;
+ }
+ }
+
+ .components-input-control__container {
+ max-width: 165px !important;
+
+ > select {
+ line-height: 1.2 !important;
+ }
+ }
+ }
+
+.components-form-token-field {
+ margin-top: -18px !important;
+ label { display: none !important;}
+}
diff --git a/blocks/donor-wall/index.js b/blocks/donor-wall/index.js
index 1571317f8a..4560a1ae4c 100644
--- a/blocks/donor-wall/index.js
+++ b/blocks/donor-wall/index.js
@@ -17,7 +17,7 @@ import GiveDonorWallGrid from './edit/block';
export default registerBlockType( 'give/donor-wall', {
title: __( 'Donor Wall', 'give' ),
- description: __( 'The GiveWP Donor Wall block inserts an existing donation form into the page. Each form\'s presentation can be customized below.', 'give' ),
+ description: __( 'The GiveWP Donor Wall block displays donations on the front end of the site. The settings below allow you to customize the information displayed', 'give' ),
category: 'give',
icon: ,
keywords: [
diff --git a/blocks/load.php b/blocks/load.php
index d37b343523..45d7329a28 100644
--- a/blocks/load.php
+++ b/blocks/load.php
@@ -34,3 +34,4 @@ function give_blocks_category( $categories, $post ) {
require_once GIVE_PLUGIN_DIR . 'blocks/donation-form/class-give-donation-form-block.php';
require_once GIVE_PLUGIN_DIR . 'blocks/donation-form-grid/class-give-donation-form-grid-block.php';
require_once GIVE_PLUGIN_DIR . 'blocks/donor-wall/class-give-donor-wall.php';
+
diff --git a/composer.json b/composer.json
index 454b8219d3..30aca8bf06 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
},
"config": {
"platform": {
- "php": "5.6.40"
+ "php": "7.0"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index c285f70db7..0000000000
--- a/cypress.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "env": {
- "wp_user": "admin",
- "wp_pass": "password",
- "site": {
- "url": "http://localhost:8888"
- }
- },
- "fixturesFolder": "tests/e2e/fixtues",
- "integrationFolder": "tests/e2e/integration",
- "pluginsFolder": "tests/e2e/plugins",
- "screenshotsFolder": "tests/e2e/screenshots",
- "videosFolder": "tests/e2e/videos",
- "supportFile": "tests/e2e/support/index.js"
-}
diff --git a/give.php b/give.php
index 7835c1e2be..941ac3021b 100644
--- a/give.php
+++ b/give.php
@@ -6,7 +6,7 @@
* Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
* Author: GiveWP
* Author URI: https://givewp.com/
- * Version: 2.20.2
+ * Version: 2.21.0
* Requires at least: 5.0
* Requires PHP: 7.0
* Text Domain: give
@@ -85,6 +85,7 @@
/**
* Main Give Class
*
+ * @since 2.21.0 Remove php dependency validation logic and constant
* @since 2.19.6 add $donations, $subscriptions, and replace $donors class with DonorRepositoryProxy
* @since 2.8.0 build in a service container
* @since 1.0
@@ -218,18 +219,6 @@ public function __construct()
*/
public function boot()
{
- // PHP version
- if (!defined('GIVE_REQUIRED_PHP_VERSION')) {
- define('GIVE_REQUIRED_PHP_VERSION', '5.6.0');
- }
-
- // Bailout: Need minimum php version to load plugin.
- if (function_exists('phpversion') && version_compare(GIVE_REQUIRED_PHP_VERSION, phpversion(), '>')) {
- add_action('admin_notices', [$this, 'minimum_phpversion_notice']);
-
- return;
- }
-
$this->setup_constants();
// Add compatibility notice for recurring and stripe support with Give 2.5.0.
@@ -305,7 +294,7 @@ private function setup_constants()
{
// Plugin version.
if (!defined('GIVE_VERSION')) {
- define('GIVE_VERSION', '2.20.2');
+ define('GIVE_VERSION', '2.21.0');
}
// Plugin Root File.
@@ -357,55 +346,6 @@ public function load_textdomain()
load_plugin_textdomain('give', false, $give_lang_dir);
}
- /**
- * Show minimum PHP version notice.
- *
- * @since 1.8.12
- * @access public
- */
- public function minimum_phpversion_notice()
- {
- // Bailout.
- if (!is_admin()) {
- return;
- }
-
- $notice_desc = '' . __(
- 'Your site could be faster and more secure with a newer PHP version.',
- 'give'
- ) . '
';
- $notice_desc .= '' . __(
- 'Hey, we\'ve noticed that you\'re running an outdated version of PHP. PHP is the programming language that WordPress and GiveWP are built on. The version that is currently used for your site is no longer supported. Newer versions of PHP are both faster and more secure. In fact, your version of PHP no longer receives security updates, which is why we\'re sending you this notice.',
- 'give'
- ) . '
';
- $notice_desc .= '' . __(
- 'Hosts have the ability to update your PHP version, but sometimes they don\'t dare to do that because they\'re afraid they\'ll break your site.',
- 'give'
- ) . '
';
- $notice_desc .= '' . __('To which version should I update?', 'give') . '
';
- $notice_desc .= '' . __(
- 'You should update your PHP version to either 5.6 or to 7.0 or 7.1. On a normal WordPress site, switching to PHP 5.6 should never cause issues. We would however actually recommend you switch to PHP7. There are some plugins that are not ready for PHP7 though, so do some testing first. PHP7 is much faster than PHP 5.6. It\'s also the only PHP version still in active development and therefore the better option for your site in the long run.',
- 'give'
- ) . '
';
- $notice_desc .= '' . __('Can\'t update? Ask your host!', 'give') . '
';
- $notice_desc .= '' . sprintf(
- __(
- 'If you cannot upgrade your PHP version yourself, you can send an email to your host. If they don\'t want to upgrade your PHP version, we would suggest you switch hosts. Have a look at one of the recommended %1$sWordPress hosting partners%2$s.',
- 'give'
- ),
- sprintf(
- '',
- esc_url('https://wordpress.org/hosting/')
- ),
- ''
- ) . '
';
-
- echo sprintf(
- '%1$s
',
- wp_kses_post($notice_desc)
- );
- }
-
/**
* Display compatibility notice for Give 2.5.0 and Recurring 1.8.13 when Stripe premium is not active.
*
diff --git a/includes/admin/admin-actions.php b/includes/admin/admin-actions.php
index 92fc36604c..bed2404881 100644
--- a/includes/admin/admin-actions.php
+++ b/includes/admin/admin-actions.php
@@ -76,10 +76,12 @@ function give_redirect_to_clean_url_admin_pages() {
if ( $redirect ) {
// Redirect.
wp_redirect(
- remove_query_arg(
- [ '_wp_http_referer', '_wpnonce' ],
- wp_unslash( $_SERVER['REQUEST_URI'] )
- )
+ esc_url_raw(
+ remove_query_arg(
+ [ '_wp_http_referer', '_wpnonce' ],
+ wp_unslash( $_SERVER['REQUEST_URI'] )
+ )
+ )
);
exit;
}
diff --git a/includes/admin/class-api-keys-table.php b/includes/admin/class-api-keys-table.php
index f02900e2c1..7cd6579157 100644
--- a/includes/admin/class-api-keys-table.php
+++ b/includes/admin/class-api-keys-table.php
@@ -316,7 +316,7 @@ public function query() {
foreach ( $users as $user ) {
$keys[ $user->ID ]['id'] = $user->ID;
$keys[ $user->ID ]['email'] = $user->user_email;
- $keys[ $user->ID ]['user'] = '' . $user->user_login . '';
+ $keys[ $user->ID ]['user'] = '' . $user->user_login . '';
$keys[ $user->ID ]['key'] = Give()->api->get_user_public_key( $user->ID );
$keys[ $user->ID ]['secret'] = Give()->api->get_user_secret_key( $user->ID );
diff --git a/includes/admin/donors/donor-actions.php b/includes/admin/donors/donor-actions.php
index 61d41b115b..b8538e36f4 100644
--- a/includes/admin/donors/donor-actions.php
+++ b/includes/admin/donors/donor-actions.php
@@ -161,7 +161,7 @@ function give_edit_donor( $args ) {
if ( $output['success'] ) {
wp_safe_redirect(
- esc_url(
+ esc_url_raw(
add_query_arg(
array(
'post_type' => 'give_forms',
@@ -358,7 +358,7 @@ function give_disconnect_donor_user_id( $args ) {
give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
}
- $output['redirect'] = $redirect_url;
+ $output['redirect'] = esc_url_raw( $redirect_url );
/**
* Fires after disconnecting user ID from a donor.
@@ -516,7 +516,7 @@ function give_remove_donor_email() {
$url = add_query_arg( 'give-messages[]', 'email-remove-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
}
- wp_safe_redirect( $url );
+ wp_safe_redirect( esc_url_raw( $url ) );
exit;
}
@@ -569,7 +569,7 @@ function give_set_donor_primary_email() {
$url = add_query_arg( 'give-messages[]', 'primary-email-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
}
- wp_safe_redirect( $url );
+ wp_safe_redirect( esc_url_raw( $url ) );
exit;
}
@@ -673,7 +673,7 @@ function give_process_donor_deletion( $args ) {
admin_url( 'edit.php?post_type=give_forms&page=give-donors' )
);
- wp_safe_redirect( $redirect_url );
+ wp_safe_redirect( esc_url_raw( $redirect_url ) );
give_die();
}
diff --git a/includes/admin/donors/donors.php b/includes/admin/donors/donors.php
index f16622a1ff..55f67ffcdd 100644
--- a/includes/admin/donors/donors.php
+++ b/includes/admin/donors/donors.php
@@ -827,9 +827,9 @@ class="button js-cancel">
'give-remove-donor-email'
);
?>
-
+
|
-
+
diff --git a/includes/admin/emails/abstract-email-notification.php b/includes/admin/emails/abstract-email-notification.php
index e2a89f2fd0..d2c1f505a5 100755
--- a/includes/admin/emails/abstract-email-notification.php
+++ b/includes/admin/emails/abstract-email-notification.php
@@ -909,22 +909,22 @@ public function preview_email_template_tags( $message ) {
'billing_address' => $payment_id ? give_email_tag_billing_address( array( 'payment_id' => $payment_id ) ) : '',
'email_access_link' => sprintf(
'%2$s',
- add_query_arg(
+ esc_url( add_query_arg(
array(
'give_nl' => uniqid(),
),
give_get_history_page_uri()
- ),
+ ) ),
__( 'View your donation history »', 'give' )
),
'donation_history_link' => sprintf(
'%2$s',
- add_query_arg(
+ esc_url( add_query_arg(
array(
'give_nl' => uniqid(),
),
give_get_history_page_uri()
- ),
+ ) ),
__( 'View your donation history »', 'give' )
),
'reset_password_link' => $user_id ? give_email_tag_reset_password_link( array( 'user_id' => $user_id ), $payment_id ) : '',
diff --git a/includes/admin/emails/class-donation-receipt-email.php b/includes/admin/emails/class-donation-receipt-email.php
index dbb20630a0..0e78cfe3f7 100755
--- a/includes/admin/emails/class-donation-receipt-email.php
+++ b/includes/admin/emails/class-donation-receipt-email.php
@@ -329,13 +329,15 @@ public function resend_donation_receipt( $data ) {
);
wp_redirect(
- add_query_arg(
- array(
- 'give-messages[]' => 'email-sent',
- 'give-action' => false,
- 'purchase_id' => false,
- )
- )
+ esc_url_raw(
+ add_query_arg(
+ array(
+ 'give-messages[]' => 'email-sent',
+ 'give-action' => false,
+ 'purchase_id' => false,
+ )
+ )
+ )
);
exit;
}
diff --git a/includes/admin/emails/class-donor-register-email.php b/includes/admin/emails/class-donor-register-email.php
index 8fd3e19d93..f5b1bf19da 100755
--- a/includes/admin/emails/class-donor-register-email.php
+++ b/includes/admin/emails/class-donor-register-email.php
@@ -174,7 +174,7 @@ public function email_preview_header( $email_preview_header, $email ) {
// Remove user id query param if set from request url.
$query = remove_query_arg( array( 'user_id' ), $query );
- $request_url = home_url( '/?' . str_replace( '', '', $query ) );
+ $request_url = esc_url( home_url( '/?' . str_replace( '', '', $query ) ) );
?>
diff --git a/includes/admin/emails/class-email-notifications.php b/includes/admin/emails/class-email-notifications.php
index 4f48f96f77..8a7f1546aa 100755
--- a/includes/admin/emails/class-email-notifications.php
+++ b/includes/admin/emails/class-email-notifications.php
@@ -396,7 +396,7 @@ public function send_preview_email() {
}
// Remove the test email query arg.
- wp_redirect( remove_query_arg( 'give_action' ) );
+ wp_redirect( esc_url_raw( remove_query_arg( 'give_action' ) ) );
exit;
}
diff --git a/includes/admin/emails/class-new-donor-register-email.php b/includes/admin/emails/class-new-donor-register-email.php
index 4242464ccd..e85ec5eaaa 100755
--- a/includes/admin/emails/class-new-donor-register-email.php
+++ b/includes/admin/emails/class-new-donor-register-email.php
@@ -169,7 +169,7 @@ public function email_preview_header( $email_preview_header, $email ) {
// Remove user id query param if set from request url.
$query = remove_query_arg( array( 'user_id' ), $query );
- $request_url = home_url( '/?' . str_replace( '', '', $query ) );
+ $request_url = esc_url( home_url( '/?' . str_replace( '', '', $query ) ) );
?>