@@ -29,25 +29,25 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public static function from_site_key() { |
| 31 | 31 | $message = sprintf( |
| 32 | - __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>' |
|
| 32 | + __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>' |
|
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | 35 | return new static( $message ); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * Create a new instance of the exception for a field class name that is |
|
| 40 | - * not recognized. |
|
| 41 | - * |
|
| 42 | - * @since %VERSION% |
|
| 43 | - * |
|
| 44 | - * @param string $field Class name of the service that was not recognized. |
|
| 45 | - * |
|
| 46 | - * @return static |
|
| 47 | - */ |
|
| 38 | + /** |
|
| 39 | + * Create a new instance of the exception for a field class name that is |
|
| 40 | + * not recognized. |
|
| 41 | + * |
|
| 42 | + * @since %VERSION% |
|
| 43 | + * |
|
| 44 | + * @param string $field Class name of the service that was not recognized. |
|
| 45 | + * |
|
| 46 | + * @return static |
|
| 47 | + */ |
|
| 48 | 48 | public static function from_secret_key() { |
| 49 | 49 | $message = sprintf( |
| 50 | - __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>' |
|
| 50 | + __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>' |
|
| 51 | 51 | ); |
| 52 | 52 | |
| 53 | 53 | return new static( $message ); |
@@ -23,42 +23,42 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | final class Recaptcha implements Service, AssetsAware { |
| 25 | 25 | |
| 26 | - use AssetsAwareness; |
|
| 26 | + use AssetsAwareness; |
|
| 27 | 27 | |
| 28 | - const VIEW_URI = 'views/recaptcha-box'; |
|
| 29 | - const JS_HANDLE = 'google-recaptcha-js'; |
|
| 30 | - const JS_URI = 'https://www.google.com/recaptcha/api.js'; |
|
| 31 | - const JS_DEPENDENCIES = [ 'jquery', 'form-submission-helpers' ]; |
|
| 32 | - const JS_VERSION = '1.0.0'; |
|
| 28 | + const VIEW_URI = 'views/recaptcha-box'; |
|
| 29 | + const JS_HANDLE = 'google-recaptcha-js'; |
|
| 30 | + const JS_URI = 'https://www.google.com/recaptcha/api.js'; |
|
| 31 | + const JS_DEPENDENCIES = [ 'jquery', 'form-submission-helpers' ]; |
|
| 32 | + const JS_VERSION = '1.0.0'; |
|
| 33 | 33 | |
| 34 | - public function register() { |
|
| 35 | - $this->register_assets(); |
|
| 34 | + public function register() { |
|
| 35 | + $this->register_assets(); |
|
| 36 | 36 | |
| 37 | - add_action( 'easy_forms_do_recaptcha_box', function( $view ) { |
|
| 38 | - $this->enqueue_assets(); |
|
| 39 | - echo $view->render_partial( static::VIEW_URI ); // phpcs:ignore WordPress.Security.EscapeOutput |
|
| 40 | - } ); |
|
| 41 | - } |
|
| 37 | + add_action( 'easy_forms_do_recaptcha_box', function( $view ) { |
|
| 38 | + $this->enqueue_assets(); |
|
| 39 | + echo $view->render_partial( static::VIEW_URI ); // phpcs:ignore WordPress.Security.EscapeOutput |
|
| 40 | + } ); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Get the context to pass onto the view. |
|
| 45 | - * |
|
| 46 | - * Override to provide data to the view. |
|
| 47 | - * |
|
| 48 | - * @since %VERSION% |
|
| 49 | - * |
|
| 50 | - * @return array Context to pass onto view. |
|
| 51 | - */ |
|
| 43 | + /** |
|
| 44 | + * Get the context to pass onto the view. |
|
| 45 | + * |
|
| 46 | + * Override to provide data to the view. |
|
| 47 | + * |
|
| 48 | + * @since %VERSION% |
|
| 49 | + * |
|
| 50 | + * @return array Context to pass onto view. |
|
| 51 | + */ |
|
| 52 | 52 | protected function get_context() { |
| 53 | 53 | return $this->recaptcha['recaptcha_options']; |
| 54 | - } |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - private function get_script_params() { |
|
| 57 | - $recaptcha_options = ( new RecaptchaModel() )->setup(); |
|
| 58 | - return $recaptcha_options['script_params']; |
|
| 59 | - } |
|
| 56 | + private function get_script_params() { |
|
| 57 | + $recaptcha_options = ( new RecaptchaModel() )->setup(); |
|
| 58 | + return $recaptcha_options['script_params']; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - public function __get( $name ) { |
|
| 61 | + public function __get( $name ) { |
|
| 62 | 62 | switch ( $name ) { |
| 63 | 63 | case 'script_params': |
| 64 | 64 | return $this->get_script_params(); |
@@ -66,23 +66,23 @@ discard block |
||
| 66 | 66 | default: |
| 67 | 67 | return null; |
| 68 | 68 | } |
| 69 | - } |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * Load asset objects for use. |
|
| 73 | - * |
|
| 74 | - * @since %SINCE% |
|
| 75 | - */ |
|
| 71 | + /** |
|
| 72 | + * Load asset objects for use. |
|
| 73 | + * |
|
| 74 | + * @since %SINCE% |
|
| 75 | + */ |
|
| 76 | 76 | protected function load_assets() { |
| 77 | 77 | $this->assets= [ |
| 78 | 78 | new ScriptAsset( |
| 79 | - self::JS_HANDLE, |
|
| 80 | - self::JS_URI . $this->script_params, |
|
| 81 | - self::JS_DEPENDENCIES, |
|
| 82 | - self::JS_VERSION, |
|
| 83 | - ScriptAsset::ENQUEUE_HEADER, |
|
| 84 | - true |
|
| 85 | - ), |
|
| 79 | + self::JS_HANDLE, |
|
| 80 | + self::JS_URI . $this->script_params, |
|
| 81 | + self::JS_DEPENDENCIES, |
|
| 82 | + self::JS_VERSION, |
|
| 83 | + ScriptAsset::ENQUEUE_HEADER, |
|
| 84 | + true |
|
| 85 | + ), |
|
| 86 | 86 | ]; |
| 87 | - } |
|
| 87 | + } |
|
| 88 | 88 | } |
| 89 | 89 | \ No newline at end of file |
@@ -6,32 +6,32 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Debugger implements Service { |
| 8 | 8 | |
| 9 | - const LOG_NAME = 'freddie_log'; |
|
| 10 | - |
|
| 11 | - public function register() { |
|
| 12 | - $this->register_log(); |
|
| 13 | - } |
|
| 14 | - |
|
| 15 | - public function register_log() :void { |
|
| 16 | - if ( ! get_option( self::LOG_NAME ) ) { |
|
| 17 | - add_option( self::LOG_NAME, [] ); |
|
| 18 | - } |
|
| 19 | - } |
|
| 20 | - |
|
| 21 | - public function get_log() { |
|
| 22 | - return get_option( self::LOG_NAME, [] ); |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - public function pretty_log() { |
|
| 26 | - $log = $this->get_log(); |
|
| 27 | - return $this->pretty_debug( 'Pretty Log', $log ); |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - public function pretty_debug( $label, $value ) { |
|
| 31 | - $res = "<strong>{$label}</strong>"; |
|
| 32 | - $res .= "<pre>"; |
|
| 33 | - $res .= esc_html( json_encode( $value, JSON_PRETTY_PRINT ) ); |
|
| 34 | - $res .= "</pre>"; |
|
| 35 | - echo $res; |
|
| 36 | - } |
|
| 9 | + const LOG_NAME = 'freddie_log'; |
|
| 10 | + |
|
| 11 | + public function register() { |
|
| 12 | + $this->register_log(); |
|
| 13 | + } |
|
| 14 | + |
|
| 15 | + public function register_log() :void { |
|
| 16 | + if ( ! get_option( self::LOG_NAME ) ) { |
|
| 17 | + add_option( self::LOG_NAME, [] ); |
|
| 18 | + } |
|
| 19 | + } |
|
| 20 | + |
|
| 21 | + public function get_log() { |
|
| 22 | + return get_option( self::LOG_NAME, [] ); |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + public function pretty_log() { |
|
| 26 | + $log = $this->get_log(); |
|
| 27 | + return $this->pretty_debug( 'Pretty Log', $log ); |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + public function pretty_debug( $label, $value ) { |
|
| 31 | + $res = "<strong>{$label}</strong>"; |
|
| 32 | + $res .= "<pre>"; |
|
| 33 | + $res .= esc_html( json_encode( $value, JSON_PRETTY_PRINT ) ); |
|
| 34 | + $res .= "</pre>"; |
|
| 35 | + echo $res; |
|
| 36 | + } |
|
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -13,31 +13,31 @@ |
||
| 13 | 13 | |
| 14 | 14 | interface OptinMeta { |
| 15 | 15 | |
| 16 | - const EMAIL = 'email'; |
|
| 17 | - const TEXT = 'text'; |
|
| 18 | - const NUMBER = 'number'; |
|
| 19 | - const URL = 'url'; |
|
| 20 | - const IMAGE_URL = 'imageurl'; |
|
| 21 | - const PHONE = 'phone'; |
|
| 22 | - const ZIP = 'zip'; |
|
| 23 | - const ADDRESS = 'address'; |
|
| 24 | - const DATE = 'date'; |
|
| 25 | - const BIRTHDAY = 'birthday'; |
|
| 26 | - const DROPDOWN = 'dropdown'; |
|
| 27 | - const RADIO = 'radio'; |
|
| 28 | - const CHECKBOX = 'checkbox'; |
|
| 16 | + const EMAIL = 'email'; |
|
| 17 | + const TEXT = 'text'; |
|
| 18 | + const NUMBER = 'number'; |
|
| 19 | + const URL = 'url'; |
|
| 20 | + const IMAGE_URL = 'imageurl'; |
|
| 21 | + const PHONE = 'phone'; |
|
| 22 | + const ZIP = 'zip'; |
|
| 23 | + const ADDRESS = 'address'; |
|
| 24 | + const DATE = 'date'; |
|
| 25 | + const BIRTHDAY = 'birthday'; |
|
| 26 | + const DROPDOWN = 'dropdown'; |
|
| 27 | + const RADIO = 'radio'; |
|
| 28 | + const CHECKBOX = 'checkbox'; |
|
| 29 | 29 | |
| 30 | - const FIELD_MAP = [ |
|
| 30 | + const FIELD_MAP = [ |
|
| 31 | 31 | self::EMAIL => Types::EMAIL, |
| 32 | 32 | self::TEXT => Types::TEXT, |
| 33 | 33 | self::NUMBER => Types::NUMBER, |
| 34 | 34 | self::URL => Types::URL, |
| 35 | - self::IMAGE_URL => Types::IMAGE_URL, |
|
| 36 | - self::PHONE => Types::PHONE, |
|
| 37 | - self::ZIP => Types::ZIP, |
|
| 38 | - self::ADDRESS => Types::ADDRESS, |
|
| 39 | - self::DATE => Types::DATE, |
|
| 40 | - self::BIRTHDAY => Types::BIRTHDAY, |
|
| 41 | - self::CHECKBOX => Types::CHECKBOX, |
|
| 35 | + self::IMAGE_URL => Types::IMAGE_URL, |
|
| 36 | + self::PHONE => Types::PHONE, |
|
| 37 | + self::ZIP => Types::ZIP, |
|
| 38 | + self::ADDRESS => Types::ADDRESS, |
|
| 39 | + self::DATE => Types::DATE, |
|
| 40 | + self::BIRTHDAY => Types::BIRTHDAY, |
|
| 41 | + self::CHECKBOX => Types::CHECKBOX, |
|
| 42 | 42 | ]; |
| 43 | 43 | } |
@@ -6,70 +6,70 @@ |
||
| 6 | 6 | |
| 7 | 7 | final class Recaptcha { |
| 8 | 8 | |
| 9 | - public $recaptcha_options; |
|
| 10 | - public $site_key; |
|
| 11 | - public $secret_key; |
|
| 9 | + public $recaptcha_options; |
|
| 10 | + public $site_key; |
|
| 11 | + public $secret_key; |
|
| 12 | 12 | |
| 13 | - const STATUS = 'yikes-mc-recaptcha-status'; |
|
| 14 | - const SITE_KEY = 'yikes-mc-recaptcha-site-key'; |
|
| 15 | - const SECRET_KEY = 'yikes-mc-recaptcha-secret-key'; |
|
| 13 | + const STATUS = 'yikes-mc-recaptcha-status'; |
|
| 14 | + const SITE_KEY = 'yikes-mc-recaptcha-site-key'; |
|
| 15 | + const SECRET_KEY = 'yikes-mc-recaptcha-secret-key'; |
|
| 16 | 16 | |
| 17 | - public function setup( $recaptcha_options = [] ) { |
|
| 18 | - if ( ! $this->has_recaptcha() ) { |
|
| 19 | - return false; |
|
| 20 | - } |
|
| 21 | - return $this->get_options( $recaptcha_options ); |
|
| 22 | - } |
|
| 17 | + public function setup( $recaptcha_options = [] ) { |
|
| 18 | + if ( ! $this->has_recaptcha() ) { |
|
| 19 | + return false; |
|
| 20 | + } |
|
| 21 | + return $this->get_options( $recaptcha_options ); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - private function has_recaptcha() { |
|
| 25 | - if ( get_option( static::STATUS, '' ) == '1' ) { |
|
| 26 | - return true; |
|
| 27 | - } |
|
| 28 | - return false; |
|
| 29 | - } |
|
| 24 | + private function has_recaptcha() { |
|
| 25 | + if ( get_option( static::STATUS, '' ) == '1' ) { |
|
| 26 | + return true; |
|
| 27 | + } |
|
| 28 | + return false; |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - private function get_site_key() { |
|
| 32 | - $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' ); |
|
| 33 | - if ( ! $site_key ) { |
|
| 34 | - throw InvalidRecaptcha::from_site_key(); |
|
| 35 | - } |
|
| 36 | - return $site_key; |
|
| 37 | - } |
|
| 31 | + private function get_site_key() { |
|
| 32 | + $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' ); |
|
| 33 | + if ( ! $site_key ) { |
|
| 34 | + throw InvalidRecaptcha::from_site_key(); |
|
| 35 | + } |
|
| 36 | + return $site_key; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - private function get_secret_key() { |
|
| 40 | - $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' ); |
|
| 41 | - if ( ! $secret_key ) { |
|
| 42 | - throw InvalidRecaptcha::from_secret_key(); |
|
| 43 | - } |
|
| 44 | - return $secret_key; |
|
| 45 | - } |
|
| 39 | + private function get_secret_key() { |
|
| 40 | + $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' ); |
|
| 41 | + if ( ! $secret_key ) { |
|
| 42 | + throw InvalidRecaptcha::from_secret_key(); |
|
| 43 | + } |
|
| 44 | + return $secret_key; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - private function get_options( $defaults ) { |
|
| 48 | - // Store the site language (to load recaptcha in a specific language). |
|
| 49 | - $locale = get_locale(); |
|
| 50 | - $locale_split = explode( '_', $locale ); |
|
| 47 | + private function get_options( $defaults ) { |
|
| 48 | + // Store the site language (to load recaptcha in a specific language). |
|
| 49 | + $locale = get_locale(); |
|
| 50 | + $locale_split = explode( '_', $locale ); |
|
| 51 | 51 | |
| 52 | - // Setup reCAPTCHA parameters. |
|
| 53 | - $lang = ! empty( $locale_split ) ? $locale_split[0] : $locale; |
|
| 54 | - $lang = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang; |
|
| 55 | - $type = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type |
|
| 56 | - $theme = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme |
|
| 57 | - $size = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size |
|
| 58 | - $data_cb = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size |
|
| 59 | - $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size |
|
| 52 | + // Setup reCAPTCHA parameters. |
|
| 53 | + $lang = ! empty( $locale_split ) ? $locale_split[0] : $locale; |
|
| 54 | + $lang = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang; |
|
| 55 | + $type = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type |
|
| 56 | + $theme = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme |
|
| 57 | + $size = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size |
|
| 58 | + $data_cb = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size |
|
| 59 | + $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size |
|
| 60 | 60 | |
| 61 | - $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit'; |
|
| 61 | + $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit'; |
|
| 62 | 62 | |
| 63 | - return [ |
|
| 64 | - 'language' => $lang, |
|
| 65 | - 'theme' => $theme, |
|
| 66 | - 'type' => $type, |
|
| 67 | - 'size' => $size, |
|
| 68 | - 'success_callback' => $data_cb, |
|
| 69 | - 'expired_callback' => $expired_cb, |
|
| 70 | - 'script_params' => $script_params, |
|
| 71 | - 'site_key' => $this->get_site_key(), |
|
| 72 | - 'secret_key' => $this->get_secret_key(), |
|
| 73 | - ]; |
|
| 74 | - } |
|
| 63 | + return [ |
|
| 64 | + 'language' => $lang, |
|
| 65 | + 'theme' => $theme, |
|
| 66 | + 'type' => $type, |
|
| 67 | + 'size' => $size, |
|
| 68 | + 'success_callback' => $data_cb, |
|
| 69 | + 'expired_callback' => $expired_cb, |
|
| 70 | + 'script_params' => $script_params, |
|
| 71 | + 'site_key' => $this->get_site_key(), |
|
| 72 | + 'secret_key' => $this->get_secret_key(), |
|
| 73 | + ]; |
|
| 74 | + } |
|
| 75 | 75 | } |
| 76 | 76 | \ No newline at end of file |
@@ -4,31 +4,31 @@ |
||
| 4 | 4 | |
| 5 | 5 | trait SubmitButton { |
| 6 | 6 | |
| 7 | - public function submit_button_classes() { |
|
| 8 | - $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-'; |
|
| 9 | - $submit_button_classes .= $this->form_id; |
|
| 10 | - $submit_button_classes .= ' btn btn-primary'; |
|
| 11 | - // Adding additional space in front of these classes. |
|
| 12 | - $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes']; |
|
| 13 | - $submit_button_classes .= $this->admin_class; |
|
| 14 | - return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id ); |
|
| 15 | - } |
|
| 7 | + public function submit_button_classes() { |
|
| 8 | + $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-'; |
|
| 9 | + $submit_button_classes .= $this->form_id; |
|
| 10 | + $submit_button_classes .= ' btn btn-primary'; |
|
| 11 | + // Adding additional space in front of these classes. |
|
| 12 | + $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes']; |
|
| 13 | + $submit_button_classes .= $this->admin_class; |
|
| 14 | + return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id ); |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | - public function submit_button_text( $shortcode_prop ) { |
|
| 18 | - $submit_button_text = ''; |
|
| 19 | - switch( true ) { |
|
| 20 | - case ! empty( $shortcode_prop ): |
|
| 21 | - $submit_button_text = $shortcode_prop; |
|
| 22 | - break; |
|
| 17 | + public function submit_button_text( $shortcode_prop ) { |
|
| 18 | + $submit_button_text = ''; |
|
| 19 | + switch( true ) { |
|
| 20 | + case ! empty( $shortcode_prop ): |
|
| 21 | + $submit_button_text = $shortcode_prop; |
|
| 22 | + break; |
|
| 23 | 23 | |
| 24 | - case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']: |
|
| 25 | - $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']; |
|
| 26 | - break; |
|
| 24 | + case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']: |
|
| 25 | + $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']; |
|
| 26 | + break; |
|
| 27 | 27 | |
| 28 | - default: |
|
| 29 | - $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 30 | - break; |
|
| 31 | - } |
|
| 32 | - return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id ); |
|
| 33 | - } |
|
| 28 | + default: |
|
| 29 | + $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 30 | + break; |
|
| 31 | + } |
|
| 32 | + return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id ); |
|
| 33 | + } |
|
| 34 | 34 | } |
| 35 | 35 | \ No newline at end of file |
@@ -10,129 +10,129 @@ |
||
| 10 | 10 | namespace YIKES\EasyForms\Form; |
| 11 | 11 | |
| 12 | 12 | trait FieldBuilder { |
| 13 | - protected function get_field_classes( $field ) { |
|
| 14 | - $field_classes = []; |
|
| 15 | - $label_classes = []; |
|
| 13 | + protected function get_field_classes( $field ) { |
|
| 14 | + $field_classes = []; |
|
| 15 | + $label_classes = []; |
|
| 16 | 16 | |
| 17 | - if( $field['additional-classes'] != '' ) { |
|
| 17 | + if( $field['additional-classes'] != '' ) { |
|
| 18 | 18 | |
| 19 | - $field_classes = explode( ' ' , $field['additional-classes'] ); |
|
| 19 | + $field_classes = explode( ' ' , $field['additional-classes'] ); |
|
| 20 | 20 | |
| 21 | - if( in_array( 'field-left-half' , $field_classes ) ) { |
|
| 22 | - $$label_classes[] = 'field-left-half'; |
|
| 23 | - $key = array_search( 'field-left-half' , $field_classes ); |
|
| 24 | - unset( $field_classes[$key] ); |
|
| 25 | - } // input half right |
|
| 26 | - if( in_array( 'field-right-half' , $field_classes ) ) { |
|
| 27 | - $$label_classes[] = 'field-right-half'; |
|
| 28 | - $key = array_search( 'field-right-half' , $field_classes ); |
|
| 29 | - unset( $field_classes[$key] ); |
|
| 30 | - } // input thirds (1/3 width, floated left) |
|
| 31 | - if( in_array( 'field-third' , $field_classes ) ) { |
|
| 32 | - $$label_classes[] = 'field-third'; |
|
| 33 | - $key = array_search( 'field-third' , $field_classes ); |
|
| 34 | - unset( $field_classes[$key] ); |
|
| 35 | - } // 2 column radio |
|
| 36 | - if( in_array( 'option-2-col' , $field_classes ) ) { |
|
| 37 | - $$label_classes[] = 'option-2-col'; |
|
| 38 | - $key = array_search( 'option-2-col' , $field_classes ); |
|
| 39 | - unset( $field_classes[$key] ); |
|
| 40 | - } // 3 column radio |
|
| 41 | - if( in_array( 'option-3-col' , $field_classes ) ) { |
|
| 42 | - $$label_classes[] = 'option-3-col'; |
|
| 43 | - $key = array_search( 'option-3-col' , $field_classes ); |
|
| 44 | - unset( $field_classes[$key] ); |
|
| 45 | - } // 4 column radio |
|
| 46 | - if( in_array( 'option-4-col' , $field_classes ) ) { |
|
| 47 | - $$label_classes[] = 'option-4-col'; |
|
| 48 | - $key = array_search( 'option-4-col' , $field_classes ); |
|
| 49 | - unset( $field_classes[$key] ); |
|
| 50 | - } // inline radio & checkboxes etc |
|
| 51 | - if( in_array( 'option-inline' , $field_classes ) ) { |
|
| 52 | - $$label_classes[] = 'option-inline'; |
|
| 53 | - $key = array_search( 'option-inline' , $field_classes ); |
|
| 54 | - unset( $field_classes[$key] ); |
|
| 55 | - } |
|
| 56 | - } |
|
| 21 | + if( in_array( 'field-left-half' , $field_classes ) ) { |
|
| 22 | + $$label_classes[] = 'field-left-half'; |
|
| 23 | + $key = array_search( 'field-left-half' , $field_classes ); |
|
| 24 | + unset( $field_classes[$key] ); |
|
| 25 | + } // input half right |
|
| 26 | + if( in_array( 'field-right-half' , $field_classes ) ) { |
|
| 27 | + $$label_classes[] = 'field-right-half'; |
|
| 28 | + $key = array_search( 'field-right-half' , $field_classes ); |
|
| 29 | + unset( $field_classes[$key] ); |
|
| 30 | + } // input thirds (1/3 width, floated left) |
|
| 31 | + if( in_array( 'field-third' , $field_classes ) ) { |
|
| 32 | + $$label_classes[] = 'field-third'; |
|
| 33 | + $key = array_search( 'field-third' , $field_classes ); |
|
| 34 | + unset( $field_classes[$key] ); |
|
| 35 | + } // 2 column radio |
|
| 36 | + if( in_array( 'option-2-col' , $field_classes ) ) { |
|
| 37 | + $$label_classes[] = 'option-2-col'; |
|
| 38 | + $key = array_search( 'option-2-col' , $field_classes ); |
|
| 39 | + unset( $field_classes[$key] ); |
|
| 40 | + } // 3 column radio |
|
| 41 | + if( in_array( 'option-3-col' , $field_classes ) ) { |
|
| 42 | + $$label_classes[] = 'option-3-col'; |
|
| 43 | + $key = array_search( 'option-3-col' , $field_classes ); |
|
| 44 | + unset( $field_classes[$key] ); |
|
| 45 | + } // 4 column radio |
|
| 46 | + if( in_array( 'option-4-col' , $field_classes ) ) { |
|
| 47 | + $$label_classes[] = 'option-4-col'; |
|
| 48 | + $key = array_search( 'option-4-col' , $field_classes ); |
|
| 49 | + unset( $field_classes[$key] ); |
|
| 50 | + } // inline radio & checkboxes etc |
|
| 51 | + if( in_array( 'option-inline' , $field_classes ) ) { |
|
| 52 | + $$label_classes[] = 'option-inline'; |
|
| 53 | + $key = array_search( 'option-inline' , $field_classes ); |
|
| 54 | + unset( $field_classes[$key] ); |
|
| 55 | + } |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - // if the form is set to inline, add the inline class to our labels |
|
| 59 | - if( $this->form_inline ) { |
|
| 60 | - $label_classes[] = 'label-inline'; |
|
| 61 | - } |
|
| 58 | + // if the form is set to inline, add the inline class to our labels |
|
| 59 | + if( $this->form_inline ) { |
|
| 60 | + $label_classes[] = 'label-inline'; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - if( isset( $field['hide-label'] ) ) { |
|
| 64 | - if( absint( $field['hide-label'] ) === 1 ) { |
|
| 65 | - $this->increase_hidden_label_count(); |
|
| 66 | - $field_classes[] = 'field-no-label'; |
|
| 67 | - } |
|
| 68 | - } |
|
| 63 | + if( isset( $field['hide-label'] ) ) { |
|
| 64 | + if( absint( $field['hide-label'] ) === 1 ) { |
|
| 65 | + $this->increase_hidden_label_count(); |
|
| 66 | + $field_classes[] = 'field-no-label'; |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - return [ |
|
| 71 | - 'field_classes' => $field_classes, |
|
| 72 | - 'label_classes' => $label_classes, |
|
| 73 | - ]; |
|
| 74 | - } |
|
| 70 | + return [ |
|
| 71 | + 'field_classes' => $field_classes, |
|
| 72 | + 'label_classes' => $label_classes, |
|
| 73 | + ]; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - protected function increase_hidden_label_count() { |
|
| 77 | - $this->hidden_label_count = $this->hidden_label_count++; |
|
| 78 | - } |
|
| 76 | + protected function increase_hidden_label_count() { |
|
| 77 | + $this->hidden_label_count = $this->hidden_label_count++; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - protected function get_label( $field ) { |
|
| 81 | - $label = []; |
|
| 82 | - if( $field['type'] == 'email' ) { |
|
| 83 | - $label['props']['visible'] = ''; |
|
| 84 | - } else { |
|
| 85 | - $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : ''; |
|
| 86 | - } |
|
| 87 | - if ( isset( $field['hide-label'] ) ) { |
|
| 88 | - $label['hide-label'] = true; |
|
| 89 | - } |
|
| 90 | - if ( isset( $field['label'] ) ) { |
|
| 91 | - $label['value'] = $field['label']; |
|
| 92 | - } |
|
| 93 | - return $label; |
|
| 94 | - } |
|
| 80 | + protected function get_label( $field ) { |
|
| 81 | + $label = []; |
|
| 82 | + if( $field['type'] == 'email' ) { |
|
| 83 | + $label['props']['visible'] = ''; |
|
| 84 | + } else { |
|
| 85 | + $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : ''; |
|
| 86 | + } |
|
| 87 | + if ( isset( $field['hide-label'] ) ) { |
|
| 88 | + $label['hide-label'] = true; |
|
| 89 | + } |
|
| 90 | + if ( isset( $field['label'] ) ) { |
|
| 91 | + $label['value'] = $field['label']; |
|
| 92 | + } |
|
| 93 | + return $label; |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - protected function get_value( $field ) { |
|
| 97 | - // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type) |
|
| 98 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 99 | - $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value ); |
|
| 100 | - return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id ); |
|
| 101 | - } |
|
| 96 | + protected function get_value( $field ) { |
|
| 97 | + // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type) |
|
| 98 | + $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 99 | + $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value ); |
|
| 100 | + return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id ); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - protected function get_placeholder( $field ) { |
|
| 104 | - return isset( $field['placeholder'] ) ? $field['placeholder'] : ''; |
|
| 105 | - } |
|
| 103 | + protected function get_placeholder( $field ) { |
|
| 104 | + return isset( $field['placeholder'] ) ? $field['placeholder'] : ''; |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | - protected function get_hidden( $field ) { |
|
| 108 | - $visible = true; |
|
| 109 | - // if both hide label and hide field are checked, we gotta hide the field! |
|
| 110 | - if( isset( $field['hide' ] ) && $field['hide'] == 1 ) { |
|
| 111 | - if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) { |
|
| 112 | - $visible = false; |
|
| 113 | - } |
|
| 114 | - } |
|
| 115 | - return $visible; |
|
| 116 | - } |
|
| 107 | + protected function get_hidden( $field ) { |
|
| 108 | + $visible = true; |
|
| 109 | + // if both hide label and hide field are checked, we gotta hide the field! |
|
| 110 | + if( isset( $field['hide' ] ) && $field['hide'] == 1 ) { |
|
| 111 | + if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) { |
|
| 112 | + $visible = false; |
|
| 113 | + } |
|
| 114 | + } |
|
| 115 | + return $visible; |
|
| 116 | + } |
|
| 117 | 117 | |
| 118 | - protected function get_description( $field ) { |
|
| 119 | - $show_description = false; |
|
| 120 | - $description_above = false; |
|
| 121 | - $description = ''; |
|
| 118 | + protected function get_description( $field ) { |
|
| 119 | + $show_description = false; |
|
| 120 | + $description_above = false; |
|
| 121 | + $description = ''; |
|
| 122 | 122 | |
| 123 | - if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) { |
|
| 124 | - $show_description = true; |
|
| 125 | - $description = $field['description']; |
|
| 126 | - } |
|
| 123 | + if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) { |
|
| 124 | + $show_description = true; |
|
| 125 | + $description = $field['description']; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) { |
|
| 129 | - $description_above = true; |
|
| 130 | - } |
|
| 128 | + if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) { |
|
| 129 | + $description_above = true; |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | - return [ |
|
| 133 | - 'show_description' => $show_description, |
|
| 134 | - 'description_above' => $description_above, |
|
| 135 | - 'description' => $description, |
|
| 136 | - ]; |
|
| 137 | - } |
|
| 132 | + return [ |
|
| 133 | + 'show_description' => $show_description, |
|
| 134 | + 'description_above' => $description_above, |
|
| 135 | + 'description' => $description, |
|
| 136 | + ]; |
|
| 137 | + } |
|
| 138 | 138 | } |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function get_id() { |
| 105 | - return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge; |
|
| 106 | - } |
|
| 105 | + return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge; |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | 108 | public function get_value() { |
| 109 | 109 | return $this->value; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | </p> |
| 140 | 140 | |
| 141 | 141 | <?php |
| 142 | - endif; |
|
| 142 | + endif; |
|
| 143 | 143 | ?> |
| 144 | 144 | <input type="<?= esc_attr( $this->get_type() ); ?>" |
| 145 | 145 | class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>" |
@@ -3,25 +3,25 @@ discard block |
||
| 3 | 3 | namespace YIKES\EasyForms\Form; |
| 4 | 4 | |
| 5 | 5 | trait FormHelper { |
| 6 | - public function form_title( $title, $custom_title, $form_name ) { |
|
| 7 | - $form_title = ''; |
|
| 8 | - switch( true ) { |
|
| 9 | - case ! empty( $custom_title ) && isset( $custom_title ): |
|
| 10 | - $form_title = $custom_title; |
|
| 11 | - break; |
|
| 12 | - case ! empty( $title ) && isset( $title ): |
|
| 13 | - $form_title = $title; |
|
| 14 | - break; |
|
| 15 | - default: |
|
| 16 | - $form_title = $form_name; |
|
| 17 | - break; |
|
| 18 | - } |
|
| 6 | + public function form_title( $title, $custom_title, $form_name ) { |
|
| 7 | + $form_title = ''; |
|
| 8 | + switch( true ) { |
|
| 9 | + case ! empty( $custom_title ) && isset( $custom_title ): |
|
| 10 | + $form_title = $custom_title; |
|
| 11 | + break; |
|
| 12 | + case ! empty( $title ) && isset( $title ): |
|
| 13 | + $form_title = $title; |
|
| 14 | + break; |
|
| 15 | + default: |
|
| 16 | + $form_title = $form_name; |
|
| 17 | + break; |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_title ), $this->form_id ); |
|
| 21 | - } |
|
| 20 | + return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_title ), $this->form_id ); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - public function form_description( $description, $custom_description ) { |
|
| 24 | - if ( $description ) { |
|
| 23 | + public function form_description( $description, $custom_description ) { |
|
| 24 | + if ( $description ) { |
|
| 25 | 25 | if ( ! empty( $custom_description ) ) { |
| 26 | 26 | /** |
| 27 | 27 | * Filter the description that is displayed through the shortcode. |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | return apply_filters( 'yikes-mailchimp-form-description', $this->form_data['form_description'], $this->form_id ); |
| 35 | 35 | } |
| 36 | 36 | } else { |
| 37 | - return false; |
|
| 38 | - } |
|
| 39 | - } |
|
| 37 | + return false; |
|
| 38 | + } |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - protected function reduce_field_count() { |
|
| 41 | + protected function reduce_field_count() { |
|
| 42 | 42 | $this->field_count = $this->field_count --; |
| 43 | 43 | } |
| 44 | 44 | |
@@ -47,24 +47,24 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | public function form_classes( bool $is_submitted ) { |
| 50 | - $form_classes = 'yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id; |
|
| 51 | - if ( isset( $this->form_inline ) && $this->form_inline != 0 ) { |
|
| 52 | - $form_classes .= ' yikes-mailchimp-form-inline'; |
|
| 53 | - } |
|
| 50 | + $form_classes = 'yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id; |
|
| 51 | + if ( isset( $this->form_inline ) && $this->form_inline != 0 ) { |
|
| 52 | + $form_classes .= ' yikes-mailchimp-form-inline'; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) { |
|
| 56 | - $form_classes .= ' yikes-easy-mc-display-none'; |
|
| 57 | - } |
|
| 55 | + if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) { |
|
| 56 | + $form_classes .= ' yikes-easy-mc-display-none'; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - $form_classes .= $this->form_data['form_settings']['yikes-easy-mc-form-class-names']; |
|
| 60 | - return apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id ); |
|
| 59 | + $form_classes .= $this->form_data['form_settings']['yikes-easy-mc-form-class-names']; |
|
| 60 | + return apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id ); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function inline_form_override() { |
| 64 | 64 | return isset( $this->has_recaptcha ) || ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'eu-opt-in-compliance-for-mailchimp/yikes-inc-easy-mailchimp-eu-law-compliance-extension.php' ) ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function edit_form_link() { |
|
| 67 | + public function edit_form_link() { |
|
| 68 | 68 | if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
| 69 | 69 | $edit_form_link = '<span class="edit-link">'; |
| 70 | 70 | $edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
@@ -74,5 +74,5 @@ discard block |
||
| 74 | 74 | $edit_form_link = ''; |
| 75 | 75 | } |
| 76 | 76 | return $edit_form_link; |
| 77 | - } |
|
| 77 | + } |
|
| 78 | 78 | } |