AyeCode / invoicing

vendor/ayecode/wp-super-duper/wp-super-duper.php

Spacing +557 added lines, -557 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
 
 	/**
@@ -37,27 +37,27 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name']
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -65,66 +65,66 @@ 
 				$this->register_shortcode();
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
 				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				add_action('admin_enqueue_scripts', array($this, 'register_block'));
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
+				add_action('admin_head', array($this, 'generator'));
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
 		/**
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -135,11 +135,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -148,8 +148,8 @@ 
 			$params    = array();
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -171,7 +171,7 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
@@ -180,29 +180,29 @@ 
 					$param['heading'] = $val['title'];
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('' => __("No"), '1' => __("Yes"));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -219,7 +219,7 @@ 
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
 		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -231,12 +231,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -245,13 +245,13 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -264,37 +264,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those ocasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -321,16 +321,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -338,7 +338,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -356,9 +356,9 @@ 
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
 		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -368,21 +368,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -396,12 +396,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -417,7 +417,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -475,7 +475,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -512,10 +512,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -526,7 +526,7 @@ 
 		 * @param string $editor_id
 		 * @param string $insert_shortcode_function
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -645,7 +645,7 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
@@ -653,15 +653,15 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -674,9 +674,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -761,11 +761,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -974,11 +974,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -999,9 +999,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 
@@ -1016,11 +1016,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
+		public function widget_css($advanced = true) {
 			ob_start();
 			?>
 			<style>
-				<?php if( $advanced ){ ?>
+				<?php if ($advanced) { ?>
 				.sd-advanced-setting {
 					display: none;
 				}
@@ -1062,10 +1062,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1135,7 +1135,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1230,7 +1230,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1239,10 +1239,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1253,14 +1253,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1273,8 +1273,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array(__CLASS__, 'render_shortcode'));
 		}
 
 		/**
@@ -1284,33 +1284,33 @@ 
 		 */
 		public static function render_shortcode() {
 
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . wp_slash($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				echo do_shortcode( $shortcode );
+				echo do_shortcode($shortcode);
 
 			}
 			wp_die();
@@ -1324,45 +1324,45 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = $this->argument_values( $args );
+		public function shortcode_output($args = array(), $content = '') {
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this ); //@todo this does not seem right @kiran?
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this); //@todo this does not seem right @kiran?
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1370,20 +1370,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1393,8 +1393,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 
 		/**
@@ -1404,13 +1404,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1426,26 +1426,26 @@ 
 		 *
 		 * @return array
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1472,12 +1472,12 @@ 
 		 * @return array Get arguments.
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1489,7 +1489,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1497,9 +1497,9 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 			}
 		}
 
@@ -1513,13 +1513,13 @@ 
 			$show      = false;
 			$arguments = $this->arguments;
 
-			if ( empty( $arguments ) ) {
+			if (empty($arguments)) {
 				$arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1538,15 +1538,15 @@ 
 
 			$url = $this->url;
 
-			if ( ! $url ) {
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url       = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1567,46 +1567,46 @@ 
 		 * @since 1.1.0
 		 * @return string
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
+		public function group_arguments($arguments) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General" );
+				$general        = __("General");
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1650,9 +1650,9 @@ 
 					var prev_attributes = [];
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
 
 					/**
 					 * Register Basic Block.
@@ -1666,30 +1666,30 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 					}?>
 
 						<?php
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -1702,10 +1702,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -1713,41 +1713,41 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
 								// set if we should show alignment
-								if ( $key == 'alignment' ) {
+								if ($key == 'alignment') {
 									$show_alignment = true;
 								}
 
 								$extra = '';
 
-								if ( $args['type'] == 'checkbox' ) {
+								if ($args['type'] == 'checkbox') {
 									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+								} elseif ($args['type'] == 'number') {
 									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 									$type = 'array';
-									if ( is_array( $args['default'] ) ) {
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+									if (is_array($args['default'])) {
+										$default = isset($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 									}
-								} elseif ( $args['type'] == 'multiselect' ) {
+								} elseif ($args['type'] == 'multiselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								} else {
 									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								}
 								echo $key . " : {";
 								echo "type : '$type',";
@@ -1771,7 +1771,7 @@ 
 							var $value = '';
 							<?php
 							// if we have a post_type and a category then link them
-							if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+							if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 							?>
 							if(typeof(prev_attributes[props.id]) != 'undefined' ){
 								$pt = props.attributes.post_type;
@@ -1787,13 +1787,13 @@ 
 
 								// taxonomies
 								if( $value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run ){
-									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];}else{'/wp/v2/"+$value+"/categories';} ?>"}).then(terms => {
-										while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+									wp.apiFetch({path: "<?php if (isset($this->arguments['post_type']['onchange_rest']['path'])) {echo $this->arguments['post_type']['onchange_rest']['path']; } else {'/wp/v2/"+$value+"/categories'; } ?>"}).then(terms => {
+										while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 									}
-									taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+									taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 									jQuery.each( terms, function( key, val ) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 									});
 
 									// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1801,7 +1801,7 @@ 
 									props.setAttributes({category: [0] });
 									props.setAttributes({category: $old_cat_value });
 
-									return taxonomies_<?php echo str_replace("-","_", $this->id);?>;
+									return taxonomies_<?php echo str_replace("-", "_", $this->id); ?>;
 								});
 								}
 
@@ -1813,12 +1813,12 @@ 
 									};
 									jQuery.post(ajaxurl, data, function(response) {
 										response = JSON.parse(response);
-										while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+										while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 										}
 
 										jQuery.each( response, function( key, val ) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 										});
 
 										// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1826,7 +1826,7 @@ 
 										props.setAttributes({sort_by: [0] });
 										props.setAttributes({sort_by: $old_sort_by_value });
 
-										return sort_by_<?php echo str_replace("-","_", $this->id);?>;
+										return sort_by_<?php echo str_replace("-", "_", $this->id); ?>;
 									});
 
 								}
@@ -1853,12 +1853,12 @@ 
 									is_fetching = true;
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -1867,7 +1867,7 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 										}
 
 										props.setAttributes({content: env});
@@ -1891,7 +1891,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -1909,9 +1909,9 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									if (!empty($this->arguments)) {
 
-									if ( $show_advanced ) {
+									if ($show_advanced) {
 									?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
@@ -1932,19 +1932,19 @@ 
 
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
+									$arguments = $this->group_arguments($this->arguments);
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
-									foreach($arguments as $key => $args){
+									foreach ($arguments as $key => $args) {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( $key ); ?>',
-											initialOpen: <?php if ( $panel_count ) {
+											title: '<?php esc_attr_e($key); ?>',
+											initialOpen: <?php if ($panel_count) {
 											echo "false";
 										} else {
 											echo "true";
@@ -1954,29 +1954,29 @@ 
 
 
 
-										foreach ( $args as $k => $a ) {
+										foreach ($args as $k => $a) {
 
-											$this->block_row_start( $k, $a );
-											$this->build_block_arguments( $k, $a );
-											$this->block_row_end( $k, $a );
+											$this->block_row_start($k, $a);
+											$this->build_block_arguments($k, $a);
+											$this->block_row_end($k, $a);
 										}
 										?>
 									),
 									<?php
-									$panel_count ++;
+									$panel_count++;
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings" ); ?>',
+											title: '<?php esc_attr_e("Settings"); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -1990,9 +1990,9 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -2016,19 +2016,19 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
 								}
 							}
 							<?php
@@ -2040,7 +2040,7 @@ 
 
 							// if has html element
 							if ($html) {
-								content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 
@@ -2058,11 +2058,11 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							if (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -2085,45 +2085,45 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 				echo $element_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label',
 								},
-								'<?php echo addslashes( $args['row']['title'] ); ?>'
+								'<?php echo addslashes($args['row']['title']); ?>'
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -2132,36 +2132,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 pr-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -2169,25 +2169,25 @@ 
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -2195,20 +2195,20 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: Number($key) } )";
 				}
 			}
@@ -2246,11 +2246,11 @@ 
 							return;
 						}
 			*/
-			elseif ( $args['type'] == 'color' ) {
+			elseif ($args['type'] == 'color') {
 				$type = 'ColorPicker';
 				$onchange = "";
 				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
+				if (!empty($args['disable_alpha'])) {
 					$extra .= "disableAlpha: true,";
 				}
 				$onchangecomplete = "onChangeComplete: function($key) {
@@ -2260,49 +2260,49 @@ 
                         });
                     },";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . addslashes($option_label) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple: true, ';
 				}
-			} elseif ( $args['type'] == 'alignment' ) {
+			} elseif ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			}elseif ($args['type'] == 'margins') {
 
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -2314,21 +2314,21 @@ 
 			echo $icon;
 			?>
 			el( wp.components.<?php echo $type; ?>, {
-			label: '<?php echo addslashes( $args['title'] ); ?>',
-			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo addslashes( $args['desc'] );
+			label: '<?php echo addslashes($args['title']); ?>',
+			help: '<?php if (isset($args['desc'])) {
+				echo addslashes($args['desc']);
 			} ?>',
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . addslashes($args['placeholder']) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
-			<?php echo $onchangecomplete;?>
+			<?php echo $onchangecomplete; ?>
 			onChange: function ( <?php echo $key; ?> ) {
 			<?php echo $onchange; ?>
 			}
@@ -2347,16 +2347,16 @@ 
 		 *
 		 * @return string
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
+				if ($html) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= " $key='$val' ";
 					}
 				} else {
-					foreach ( $custom_attributes as $key => $val ) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= "'$key': '$val',";
 					}
 				}
@@ -2372,86 +2372,86 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args ) {
+		public function block_element($args) {
 
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
 							echo "\n el( '" . $new_args['element'] . "', {";
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
+									echo $this->block_element(array($new_key => $new_value));
 								}
 							}
 
-							echo "},";// end attributes
+							echo "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value));
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ) );
+											$this->block_element(array('' => $new_value));
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							echo ")";// end content
+							echo ")"; // end content
 
 							echo ", \n";
 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						if (substr($element, 0, 3) === "if_") {
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -2466,12 +2466,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
+		public function block_props_replace($string, $no_wrap = false) {
 
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 			}
 
 			return $string;
@@ -2483,55 +2483,55 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
+		public function widget($args, $instance) {
 
 			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
 				$before_widget = $args['before_widget'];
-				$before_widget = str_replace($class_original,$class,$before_widget);
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = str_replace($class_original, $class, $before_widget);
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
 				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $class  ) . "'>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "<span class='" . esc_attr($class) . "'>" : '';
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "</span>" : '';
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif ( $output && $no_wrap ) {
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -2544,7 +2544,7 @@ 
 		 */
 		public function is_elementor_widget_output() {
 			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
 				$result = true;
 			}
 
@@ -2559,7 +2559,7 @@ 
 		 */
 		public function is_elementor_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax')) {
 				$result = true;
 			}
 
@@ -2574,7 +2574,7 @@ 
 		 */
 		public function is_divi_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
 				$result = true;
 			}
 
@@ -2589,7 +2589,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -2604,7 +2604,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -2619,7 +2619,7 @@ 
 		 */
 		public function is_cornerstone_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+			if (!empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint') {
 				$result = true;
 			}
 
@@ -2634,7 +2634,7 @@ 
 		 */
 		public function is_fusion_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+			if (!empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce'])) {
 				$result = true;
 			}
 
@@ -2649,7 +2649,7 @@ 
 		 */
 		public function is_oxygen_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+			if (!empty($_REQUEST['ct_builder']) || (!empty($_REQUEST['action']) && (substr($_REQUEST['action'], 0, 11) === "oxy_render_" || substr($_REQUEST['action'], 0, 10) === "ct_render_"))) {
 				$result = true;
 			}
 
@@ -2664,21 +2664,21 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
 			}
 
@@ -2693,34 +2693,34 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if(empty($instance['widget_title_tag'])){
+				if (empty($instance['widget_title_tag'])) {
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+				} else {
+					$title_tag = esc_attr($instance['widget_title_tag']);
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -2734,7 +2734,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -2742,20 +2742,20 @@ 
 			// set it as a SD widget
 			echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
 			$arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			if (is_array($arguments_raw)) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+				$arguments = $this->group_arguments($arguments_raw);
 
 				// Do we have sections?
 				$has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
+				if ($has_sections) {
 					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 
 						?>
 						<script>
@@ -2765,26 +2765,26 @@ 
 
 						$hide       = $panel_count ? ' style="display:none;" ' : '';
 						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes($key) . "'>" . esc_attr($key) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes($key) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+						foreach ($args as $k => $a) {
 
 							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
+							$this->widget_inputs($a, $instance);
 							$this->widget_inputs_row_end($k, $a);
 
 						}
 
 						echo "</div>";
 
-						$panel_count ++;
+						$panel_count++;
 
 					}
 				} else {
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
+						$this->widget_inputs($args, $instance);
 						$this->widget_inputs_row_end($key, $args);
 					}
 				}
@@ -2792,33 +2792,33 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// maybe open
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
+					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php if (!empty($args['row']['element_require'])) {
+						echo $this->convert_element_require($args['row']['element_require']);
 					} ?>'>
-					<?php if(!empty($args['row']['title'])){ ?>
-					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<?php if (!empty($args['row']['title'])) { ?>
+					<label class="mb-0 "><?php echo esc_attr($args['row']['title']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php }?>
-					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
+					<div class='row <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				}elseif (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0'>";
-				}else{
+				} else {
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
 		}
 
-		public function widget_inputs_row_end($key, $args){
+		public function widget_inputs_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 
@@ -2834,7 +2834,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -2854,14 +2854,14 @@ 
 		 *
 		 * @return string $output
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_element_require($input) {
 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -2872,56 +2872,56 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			data-argument='<?php echo esc_attr($args['name']); ?>'
+			data-element_require='<?php if ($element_require) {
+				echo $this->convert_element_require($element_require);
 			} ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -2932,46 +2932,46 @@ 
 				case "color":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-						                               type="<?php echo esc_attr( $args['type'] ); ?>"
-						                               value="<?php echo esc_attr( $value ); ?>">
+						                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+						                               type="<?php echo esc_attr($args['type']); ?>"
+						                               value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
+						                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                name="<?php echo esc_attr($this->get_field_name($args['name']));
+						                                if ($multiple) {
 							                                echo "[]";
 						                                } ?>"
-						<?php if ( $multiple ) {
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -2983,32 +2983,32 @@ 
 				case "checkbox":
 					?>
 					<input <?php echo $placeholder; ?>
-						<?php checked( 1, $value, true ) ?>
+						<?php checked(1, $value, true) ?>
 						<?php echo $custom_attributes; ?>
-						class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+						class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 						value="1">
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                  id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                  name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-					><?php echo esc_attr( $value ); ?></textarea>
+						                                  id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                  name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+					><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-					       value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+					       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+					       value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -3023,15 +3023,15 @@ 
 
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -3043,14 +3043,14 @@ 
 		 * @return string
 		 * @todo, need to make its own tooltip script
 		 */
-		public function widget_field_desc( $args ) {
+		public function widget_field_desc($args) {
 
 			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
+			if (isset($args['desc']) && $args['desc']) {
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
+					$description = $this->desc_tip($args['desc']);
 				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
 				}
 			}
 
@@ -3064,12 +3064,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 
 			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+			if (isset($args['title']) && $args['title']) {
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
 					$title = esc_attr($args['title']);
 				}
@@ -3086,11 +3086,11 @@ 
 		 *
 		 * @return string
 		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		function desc_tip($tip, $allow_html = false) {
+			if ($allow_html) {
+				$tip = $this->sanitize_tooltip($tip);
 			} else {
-				$tip = esc_attr( $tip );
+				$tip = esc_attr($tip);
 			}
 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -3103,8 +3103,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+		public function sanitize_tooltip($var) {
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
 				'br'     => array(),
 				'em'     => array(),
 				'strong' => array(),
@@ -3114,7 +3114,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -3126,23 +3126,23 @@ 
 		 * @return array
 		 * @todo we should add some sanitation here.
 		 */
-		public function update( $new_instance, $old_instance ) {
+		public function update($new_instance, $old_instance) {
 
 			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
+			$instance = array_merge((array) $old_instance, (array) $new_instance);
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->get_arguments();
 			}
 
 			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $argument) {
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+						$instance[$argument['name']] = '0';
 					}
 				}
 			}
@@ -3160,7 +3160,7 @@ 
 		 */
 		public function is_block_content_call() {
 			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
 				$result = true;
 			}
 
@@ -3173,9 +3173,9 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -3186,14 +3186,14 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";

includes/admin/wpinv-admin-functions.php

Spacing +47 added lines, -47 removed lines

@@ -7,65 +7,65 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
-        return (int)$id;
-    } else if ( get_the_ID() ) {
+    if (isset($id) && !empty($id)) {
+        return (int) $id;
+    } else if (get_the_ID()) {
         return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
+    } else if (isset($post->ID) && !empty($post->ID)) {
         return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
         return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
         return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
         return (int) $_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-add_action( 'admin_init', 'wpinv_show_test_payment_gateway_notice' );
-function wpinv_show_test_payment_gateway_notice(){
-    add_action( 'admin_notices', 'wpinv_test_payment_gateway_messages' );
+add_action('admin_init', 'wpinv_show_test_payment_gateway_notice');
+function wpinv_show_test_payment_gateway_notice() {
+    add_action('admin_notices', 'wpinv_test_payment_gateway_messages');
 }
 
-function wpinv_test_payment_gateway_messages(){
+function wpinv_test_payment_gateway_messages() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $name = array(); $test_gateways = '';
     if ($gateways) {
@@ -76,9 +76,9 @@ 
         }
         $test_gateways = implode(', ', $name);
     }
-    if(isset($test_gateways) && !empty($test_gateways)){
+    if (isset($test_gateways) && !empty($test_gateways)) {
         $link = admin_url('admin.php?page=wpinv-settings&tab=gateways');
-        $notice = wp_sprintf( __('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link );
+        $notice = wp_sprintf(__('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link);
         ?>
         <div class="notice notice-warning is-dismissible">
             <p><?php echo $notice; ?></p>
@@ -95,29 +95,29 @@ 
     global $wpdb;
 
     // Only do this on our settings page.
-    if ( empty( $_GET[ 'page' ] ) || 'wpinv-settings' !== $_GET[ 'page' ] ) {
+    if (empty($_GET['page']) || 'wpinv-settings' !== $_GET['page']) {
         return;
     }
 
     // Check tables.
-    $tables             = array(
+    $tables = array(
         "{$wpdb->prefix}wpinv_subscriptions",
         "{$wpdb->prefix}getpaid_invoices",
         "{$wpdb->prefix}getpaid_invoice_items",
     );
 
-    foreach ( $tables as $table ) {
-        if ( $table != $wpdb->get_var( "SHOW TABLES LIKE '$table'" ) ) {
+    foreach ($tables as $table) {
+        if ($table != $wpdb->get_var("SHOW TABLES LIKE '$table'")) {
 
-            $url     = esc_url(
+            $url = esc_url(
                 wp_nonce_url(
-                    add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                    add_query_arg('getpaid-admin-action', 'create_missing_tables'),
                     'getpaid-nonce',
                     'getpaid-nonce'
                 )
             );
-            $message  = __( 'Some GetPaid database tables are missing. To use GetPaid without any issues, click on the button below to create the missing tables.', 'invoicing' );
-            $message2 = __( 'Create Tables', 'invoicing' );
+            $message  = __('Some GetPaid database tables are missing. To use GetPaid without any issues, click on the button below to create the missing tables.', 'invoicing');
+            $message2 = __('Create Tables', 'invoicing');
             echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
             break;
 
@@ -125,7 +125,7 @@ 
     }
 
 }
-add_action( 'admin_notices', 'wpinv_check_for_missing_tables' );
+add_action('admin_notices', 'wpinv_check_for_missing_tables');
 
 add_action('admin_init', 'wpinv_admin_search_by_invoice');
 
@@ -135,7 +135,7 @@ 
 function wpinv_admin_search_by_invoice() {
     global $typenow;
 
-    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote' ) {
+    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote') {
         add_filter('posts_search', 'wpinv_posts_search_example_type', 10, 2);
     }
 }
@@ -150,9 +150,9 @@ 
     global $wpdb;
 
     if ($query->is_main_query() && !empty($query->query['s'])) {
-        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql( $query->query['s'] ) . "%' )";
-        if ( ! empty( $search ) ) {
-            $search = preg_replace( '/^ AND /', '', $search );
+        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql($query->query['s']) . "%' )";
+        if (!empty($search)) {
+            $search = preg_replace('/^ AND /', '', $search);
             $search = " AND ( {$search} OR ( {$conditions_str} ) )";
         } else {
             $search = " AND ( {$conditions_str} )";
@@ -165,14 +165,14 @@ 
 /**
  * Resets invoice counts.
  */
-function wpinv_reset_invoice_count(){
-    if ( ! empty( $_GET['reset_invoice_count'] ) && isset( $_GET['_nonce'] ) && wp_verify_nonce( $_GET['_nonce'], 'reset_invoice_count' ) ) {
+function wpinv_reset_invoice_count() {
+    if (!empty($_GET['reset_invoice_count']) && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
         wpinv_update_option('invoice_sequence_start', 1);
         delete_option('wpinv_last_invoice_number');
-        getpaid_admin()->show_success( __( 'Invoice number sequence reset successfully.', 'invoicing' ) );
-        $url = remove_query_arg( array('reset_invoice_count', '_nonce') );
+        getpaid_admin()->show_success(__('Invoice number sequence reset successfully.', 'invoicing'));
+        $url = remove_query_arg(array('reset_invoice_count', '_nonce'));
         wp_redirect($url);
         exit();
     }
 }
-add_action( 'admin_init', 'wpinv_reset_invoice_count' );
\ No newline at end of file
+add_action('admin_init', 'wpinv_reset_invoice_count');
\ No newline at end of file

includes/user-functions.php

Spacing +103 added lines, -103 removed lines

@@ -6,7 +6,7 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *  Generates a users select dropdown.
@@ -16,13 +16,13 @@ 
  * @param array $args
  * @see wp_dropdown_users
  */
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
 
-    if ( is_array( $args ) && ! empty( $args['show'] ) && 'display_name_with_email' == $args['show'] ) {
+    if (is_array($args) && !empty($args['show']) && 'display_name_with_email' == $args['show']) {
         $args['show'] = 'display_name_with_login';
     }
 
-    return wp_dropdown_users( $args );
+    return wp_dropdown_users($args);
 }
 
 /**
@@ -32,9 +32,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -48,7 +48,7 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
 
 /**
@@ -57,19 +57,19 @@ 
  * @since 1.0.19
  * @return int|WP_Error
  */
-function wpinv_create_user( $email, $prefix = '' ) {
+function wpinv_create_user($email, $prefix = '') {
 
     // Prepare user values.
-    $prefix = preg_replace( '/\s+/', '', $prefix );
-    $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
+    $prefix = preg_replace('/\s+/', '', $prefix);
+    $prefix = empty($prefix) ? $email : $prefix;
+	$args = array(
+		'user_login' => wpinv_generate_user_name($prefix),
 		'user_pass'  => wp_generate_password(),
 		'user_email' => $email,
         'role'       => 'subscriber',
     );
 
-    return wp_insert_user( $args );
+    return wp_insert_user($args);
 
 }
 
@@ -79,26 +79,26 @@ 
  * @since 1.0.19
  * @return bool|WP_User
  */
-function wpinv_generate_user_name( $prefix = '' ) {
+function wpinv_generate_user_name($prefix = '') {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
-    $prefix = trim( $prefix, '.' );
+	$prefix = strtok($prefix, '@');
+    $prefix = trim($prefix, '.');
 
 	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+	$prefix = sanitize_user($prefix, true);
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
+	if (empty($prefix) || in_array(strtolower($prefix), array_map('strtolower', $illegal_logins), true)) {
+		$prefix = 'gtp_' . zeroise(wp_rand(0, 9999), 4);
 	}
 
     $username = $prefix;
     $postfix  = 2;
 
-    while ( username_exists( $username ) ) {
+    while (username_exists($username)) {
         $username = $prefix + $postfix;
-        $postfix ++;
+        $postfix++;
     }
 
     return $username;
@@ -115,31 +115,31 @@ 
     $tabs = array(
 
         'gp-invoices'   => array(
-            'label'     => __( 'Invoices', 'invoicing' ), // Name of the tab.
+            'label'     => __('Invoices', 'invoicing'), // Name of the tab.
             'content'   => '[wpinv_history]', // Content of the tab. Or specify "callback" to provide a callback instead.
             'icon'      => 'fas fa-file-invoice', // Shown on some profile plugins.
         ),
 
         'gp-subscriptions' => array(
-            'label'        => __( 'Subscriptions', 'invoicing' ),
+            'label'        => __('Subscriptions', 'invoicing'),
             'content'      => '[wpinv_subscriptions]',
             'icon'         => 'fas fa-redo',
         ),
 
         'gp-edit-address'  => array(
-            'label'        => __( 'Billing Address', 'invoicing' ),
+            'label'        => __('Billing Address', 'invoicing'),
             'callback'     => 'getpaid_display_address_edit_tab',
             'icon'         => 'fas fa-credit-card',
         ),
 
     );
 
-    $tabs = apply_filters( 'getpaid_user_content_tabs', $tabs );
+    $tabs = apply_filters('getpaid_user_content_tabs', $tabs);
 
     // Make sure address editing is last on the list.
-    if ( isset( $tabs['gp-edit-address'] ) ) {
+    if (isset($tabs['gp-edit-address'])) {
         $address = $tabs['gp-edit-address'];
-        unset( $tabs['gp-edit-address'] );
+        unset($tabs['gp-edit-address']);
         $tabs['gp-edit-address'] = $address;
     }
 
@@ -153,19 +153,19 @@ 
  * @param array $tab
  * @return array
  */
-function getpaid_prepare_user_content_tab( $tab ) {
+function getpaid_prepare_user_content_tab($tab) {
 
-    if ( ! empty( $tab['callback'] ) ) {
-        return call_user_func( $tab['callback'] );
+    if (!empty($tab['callback'])) {
+        return call_user_func($tab['callback']);
     }
 
-    if ( ! empty( $tab['content'] ) ) {
-        return convert_smilies( capital_P_dangit( wp_filter_content_tags( do_shortcode( shortcode_unautop( wpautop( wptexturize( do_blocks( $tab['content'] ) ) ) ) ) ) ) );
+    if (!empty($tab['content'])) {
+        return convert_smilies(capital_P_dangit(wp_filter_content_tags(do_shortcode(shortcode_unautop(wpautop(wptexturize(do_blocks($tab['content']))))))));
     }
 
     $notice = aui()->alert(
         array(
-            'content'     => __( 'This tab has no content or content callback.', 'invoicing' ),
+            'content'     => __('This tab has no content or content callback.', 'invoicing'),
             'type'        => 'error',
         )
     );
@@ -181,14 +181,14 @@ 
  * @param string $default
  * @return array
  */
-function getpaid_get_tab_url( $tab, $default ) {
+function getpaid_get_tab_url($tab, $default) {
     global $getpaid_tab_url;
 
-    if ( empty( $getpaid_tab_url ) ) {
+    if (empty($getpaid_tab_url)) {
         return $default;
     }
 
-    return sprintf( $getpaid_tab_url, $tab );
+    return sprintf($getpaid_tab_url, $tab);
 
 }
 
@@ -208,19 +208,19 @@ 
 
                 <?php
 
-                    foreach ( getpaid_user_address_fields() as $key => $label ) {
+                    foreach (getpaid_user_address_fields() as $key => $label) {
 
                         // Display the country.
-                        if ( 'country' == $key ) {
+                        if ('country' == $key) {
 
                             echo aui()->select(
                                 array(
                                     'options'     => wpinv_get_country_list(),
-                                    'name'        => esc_attr( $key ),
-                                    'id'          => 'wpinv-' . sanitize_html_class( $key ),
-                                    'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                    'name'        => esc_attr($key),
+                                    'id'          => 'wpinv-' . sanitize_html_class($key),
+                                    'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
                                     'placeholder' => $label,
-                                    'label'       => wp_kses_post( $label ),
+                                    'label'       => wp_kses_post($label),
                                     'label_type'  => 'vertical',
                                     'class'       => 'getpaid-address-field',
                                 )
@@ -229,11 +229,11 @@ 
                         }
 
                         // Display the state.
-                        else if ( 'state' == $key ) {
+                        else if ('state' == $key) {
 
-                            echo getpaid_get_states_select_markup (
-                                getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-                                getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+                            echo getpaid_get_states_select_markup(
+                                getpaid_get_user_address_field(get_current_user_id(), 'country'),
+                                getpaid_get_user_address_field(get_current_user_id(), 'state'),
                                 $label,
                                 $label,
                                 '',
@@ -246,13 +246,13 @@ 
 
                             echo aui()->input(
                                 array(
-                                    'name'        => esc_attr( $key ),
-                                    'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                    'name'        => esc_attr($key),
+                                    'id'          => 'wpinv-' . sanitize_html_class($key),
                                     'placeholder' => $label,
-                                    'label'       => wp_kses_post( $label ),
+                                    'label'       => wp_kses_post($label),
                                     'label_type'  => 'vertical',
                                     'type'        => 'text',
-                                    'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                    'value'       => sanitize_text_field(getpaid_get_user_address_field(get_current_user_id(), $key)),
                                     'class'       => 'getpaid-address-field',
                                 )
                             );
@@ -261,21 +261,21 @@ 
 
                     }
 
-                    do_action( 'getpaid_display_address_edit_tab' );
+                    do_action('getpaid_display_address_edit_tab');
 
                     echo aui()->input(
                         array(
                             'name'             => 'getpaid_profile_edit_submit_button',
                             'id'               => 'getpaid_profile_edit_submit_button',
-                            'value'            => __( 'Save Address', 'invoicing' ),
-                            'help_text'        => __( 'New invoices will use this address as the billing address.', 'invoicing' ),
+                            'value'            => __('Save Address', 'invoicing'),
+                            'help_text'        => __('New invoices will use this address as the billing address.', 'invoicing'),
                             'type'             => 'submit',
                             'class'            => 'btn btn-primary btn-block submit-button',
                         )
                     );
 
-                    wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' );
-                    getpaid_hidden_field( 'getpaid-action', 'edit_billing_details' );
+                    wp_nonce_field('getpaid-nonce', 'getpaid-nonce');
+                    getpaid_hidden_field('getpaid-action', 'edit_billing_details');
                 ?>
 
             </form>
@@ -292,20 +292,20 @@ 
  * @since 2.1.4
  * @param array $data
  */
-function getpaid_save_address_edit_tab( $data ) {
+function getpaid_save_address_edit_tab($data) {
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( isset( $data[ $field ] ) ) {
-            $value = sanitize_text_field( $data[ $field ] );
-            update_user_meta( get_current_user_id(), '_wpinv_' . $field, $value );
+        if (isset($data[$field])) {
+            $value = sanitize_text_field($data[$field]);
+            update_user_meta(get_current_user_id(), '_wpinv_' . $field, $value);
         }
 
-        wpinv_set_error( 'address_updated', __( 'You billing address has been updated', 'invoicing' ), 'success');
+        wpinv_set_error('address_updated', __('You billing address has been updated', 'invoicing'), 'success');
     }
 
 }
-add_action( 'getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab' );
+add_action('getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab');
 
 
 /*
@@ -323,27 +323,27 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_filter_userswp_account_tabs( $tabs ) {
+function getpaid_filter_userswp_account_tabs($tabs) {
 
     // Abort if the integration is inactive.
-    if ( ! getpaid_is_userswp_integration_active() ) {
+    if (!getpaid_is_userswp_integration_active()) {
         return $tabs;
     }
 
-    $new_tabs   = array();
+    $new_tabs = array();
 
-    foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+    foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
-        $new_tabs[ $slug ] = array(
-            'title' => $tab[ 'label'],
-            'icon'  =>  $tab[ 'icon'],
+        $new_tabs[$slug] = array(
+            'title' => $tab['label'],
+            'icon'  =>  $tab['icon'],
         );
 
     }
 
-    return array_merge( $tabs, $new_tabs );
+    return array_merge($tabs, $new_tabs);
 }
-add_filter( 'uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs' );
+add_filter('uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs');
 
 /**
  * Display our UsersWP account tabs.
@@ -352,18 +352,18 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_display_userswp_account_tabs( $tab ) {
+function getpaid_display_userswp_account_tabs($tab) {
     global $getpaid_tab_url;
 
     $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        $getpaid_tab_url = add_query_arg( 'type', '%s', uwp_get_account_page_url() );
-        echo getpaid_prepare_user_content_tab( $our_tabs[ $tab ] );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        $getpaid_tab_url = add_query_arg('type', '%s', uwp_get_account_page_url());
+        echo getpaid_prepare_user_content_tab($our_tabs[$tab]);
     }
 
 }
-add_action( 'uwp_account_form_display', 'getpaid_display_userswp_account_tabs' );
+add_action('uwp_account_form_display', 'getpaid_display_userswp_account_tabs');
 
 
 /**
@@ -374,17 +374,17 @@ 
  * @param  string $tab   Current tab.
  * @return string Title.
  */
-function getpaid_filter_userswp_account_title( $title, $tab ) {
+function getpaid_filter_userswp_account_title($title, $tab) {
 
-    $our_tabs   = getpaid_get_user_content_tabs();
+    $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return $our_tabs[ $tab ]['label'];
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return $our_tabs[$tab]['label'];
     }
 
     return $title;
 }
-add_filter( 'uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2 );
+add_filter('uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2);
 
 /**
  * Registers the UsersWP integration settings.
@@ -393,26 +393,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_userswp_settings( $settings ) {
+function getpaid_register_userswp_settings($settings) {
 
-    if ( defined( 'USERSWP_PLUGIN_FILE' ) ) {
+    if (defined('USERSWP_PLUGIN_FILE')) {
 
         $settings[] = array(
 
             'id'       => 'userswp',
-            'label'    => __( 'UsersWP', 'invoicing' ),
+            'label'    => __('UsersWP', 'invoicing'),
             'settings' => array(
 
                 'userswp_settings' => array(
                     'id'   => 'userswp_settings',
-                    'name' => '<h3>' . __( 'UsersWP', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('UsersWP', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_userswp' => array(
                     'id'         => 'enable_userswp',
-                    'name'       => __( 'Enable Integration', 'invoicing' ),
-                    'desc'       => __( 'Display GetPaid items on UsersWP account page.', 'invoicing' ),
+                    'name'       => __('Enable Integration', 'invoicing'),
+                    'desc'       => __('Display GetPaid items on UsersWP account page.', 'invoicing'),
                     'type'       => 'checkbox',
                     'std'        => 1,
                 )
@@ -425,7 +425,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_userswp_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_userswp_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -434,8 +434,8 @@ 
  * @return bool
  */
 function getpaid_is_userswp_integration_active() {
-    $enabled = wpinv_get_option( 'enable_userswp', 1 );
-    return defined( 'USERSWP_PLUGIN_FILE' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_userswp', 1);
+    return defined('USERSWP_PLUGIN_FILE') && !empty($enabled);
 }
 
 /*
@@ -453,26 +453,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_buddypress_settings( $settings ) {
+function getpaid_register_buddypress_settings($settings) {
 
-    if ( class_exists( 'BuddyPress' ) ) {
+    if (class_exists('BuddyPress')) {
 
         $settings[] = array(
 
             'id'       => 'buddypress',
-            'label'    => __( 'BuddyPress', 'invoicing' ),
+            'label'    => __('BuddyPress', 'invoicing'),
             'settings' => array(
 
                 'buddypress_settings' => array(
                     'id'   => 'buddypress_settings',
-                    'name' => '<h3>' . __( 'BuddyPress', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('BuddyPress', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_buddypress' => array(
                     'id'         => 'enable_buddypress',
-                    'name'       => __( 'Enable Integration', 'invoicing' ),
-                    'desc'       => __( 'Display GetPaid items on BuddyPress account pages.', 'invoicing' ),
+                    'name'       => __('Enable Integration', 'invoicing'),
+                    'desc'       => __('Display GetPaid items on BuddyPress account pages.', 'invoicing'),
                     'type'       => 'checkbox',
                     'std'        => 1,
                 )
@@ -485,7 +485,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_buddypress_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_buddypress_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -494,8 +494,8 @@ 
  * @return bool
  */
 function getpaid_is_buddypress_integration_active() {
-    $enabled = wpinv_get_option( 'enable_buddypress', 1 );
-    return class_exists( 'BuddyPress' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_buddypress', 1);
+    return class_exists('BuddyPress') && !empty($enabled);
 }
 
 /**
@@ -506,10 +506,10 @@ 
  */
 function getpaid_setup_buddypress_integration() {
 
-    if ( getpaid_is_buddypress_integration_active() ) {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php' );
+    if (getpaid_is_buddypress_integration_active()) {
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php');
         buddypress()->getpaid = new BP_GetPaid_Component();
     }
 
 }
-add_action( 'bp_setup_components', 'getpaid_setup_buddypress_integration' );
+add_action('bp_setup_components', 'getpaid_setup_buddypress_integration');

includes/data/tax-rates.php

Spacing +29 added lines, -29 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
@@ -18,7 +18,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -27,7 +27,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -36,7 +36,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -45,7 +45,7 @@ 
         'global'       => true,
         'rate'         => 19,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -54,7 +54,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 15,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -63,7 +63,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 25,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -72,7 +72,7 @@ 
         'global'       => true,
         'rate'         => 16,
         'reduced_rate' => 5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -81,7 +81,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -90,7 +90,7 @@ 
         'global'       => true,
         'rate'         => 24,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -99,7 +99,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -108,7 +108,7 @@ 
         'global'       => true,
         'rate'         => 24,
         'reduced_rate' => 14,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -117,7 +117,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -126,7 +126,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -135,7 +135,7 @@ 
         'global'       => true,
         'rate'         => 22,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -144,7 +144,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -153,7 +153,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -162,7 +162,7 @@ 
         'global'       => true,
         'rate'         => 17,
         'reduced_rate' => 14,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -171,7 +171,7 @@ 
         'global'       => true,
         'rate'         => 27,
         'reduced_rate' => 18,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -180,7 +180,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 13.5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -189,7 +189,7 @@ 
         'global'       => true,
         'rate'         => 18,
         'reduced_rate' => 7,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -198,7 +198,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -207,7 +207,7 @@ 
         'global'       => true,
         'rate'         => 23,
         'reduced_rate' => 8,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -216,7 +216,7 @@ 
         'global'       => true,
         'rate'         => 23,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -225,7 +225,7 @@ 
         'global'       => true,
         'rate'         => 19,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -234,7 +234,7 @@ 
         'global'       => true,
         'rate'         => 22,
         'reduced_rate' => 9.5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -243,7 +243,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -252,7 +252,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -261,7 +261,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     )
 
 );

includes/class-bp-getpaid-component.php

Spacing +27 added lines, -27 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main GetPaid Class.
@@ -55,7 +55,7 @@ 
 	 *     @type array    $meta_tables           Optional. An array of metadata table names.
 	 * }
 	 */
-	public function setup_globals( $args = array() ) {
+	public function setup_globals($args = array()) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -76,29 +76,29 @@ 
 	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+	public function setup_nav($main_nav = array(), $sub_nav = array()) {
 
 		// Abort if the integration is inactive.
-        if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
+        if (!getpaid_is_buddypress_integration_active() || !is_user_logged_in()) {
             return;
         }
     
         // Or a user is not viewing their profile.
-        if ( bp_displayed_user_id() != bp_loggedin_user_id() ) {
+        if (bp_displayed_user_id() != bp_loggedin_user_id()) {
             return;
         }
 
 		// Determine user to use.
 		$user_domain   = bp_loggedin_user_domain();
 		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
+		$payments_link = trailingslashit($user_domain . $slug);
 
 		// Add 'Payments' to the main navigation.
 		$main_nav = array(
-			'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+			'name'                => _x('Billing', 'BuddyPress profile payments screen nav', 'invoicing'),
 			'slug'                => $slug,
-			'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'     => array( $this, 'display_current_tab' ),
+			'position'            => apply_filters('wpinv_bp_nav_position', wpinv_get_option('wpinv_menu_position', 91), $slug),
+			'screen_function'     => array($this, 'display_current_tab'),
 			'default_subnav_slug' => 'gp-edit-address',
             'show_for_displayed_user' => false,
 			'item_css_id'         => $this->id,
@@ -107,15 +107,15 @@ 
 		);
 
 		// Add the subnav items to the payments nav item if we are using a theme that supports this.
-        foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
+        foreach (getpaid_get_user_content_tabs() as $_slug => $tab) {
 
             $sub_nav[] = array(
-                'name'            => $tab[ 'label'],
+                'name'            => $tab['label'],
                 'slug'            => $_slug,
                 'parent_url'      => $payments_link,
                 'parent_slug'     => $slug,
                 'position' => 10,
-                'screen_function'        => function() use ( $tab ) {
+                'screen_function'        => function() use ($tab) {
 					$GLOBALS['getpaid_bp_current_tab'] = $tab;
 					$this->display_current_tab();
                 },
@@ -125,7 +125,7 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
+		parent::setup_nav($main_nav, $sub_nav);
 	}
 
 	/**
@@ -139,29 +139,29 @@ 
 	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
 	 *                            description.
 	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+	public function setup_admin_bar($wp_admin_nav = array()) {
 
 		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+			$payments_link = trailingslashit(bp_loggedin_user_domain() . 'getpaid/');
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-getpaid',
-                'title'  => _x( 'Billing', 'BuddyPress my account payments sub nav', 'invoicing' ),
+                'title'  => _x('Billing', 'BuddyPress my account payments sub nav', 'invoicing'),
                 'href'   => $payments_link . 'gp-edit-address'
             );
 
-            foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+            foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-getpaid',
                     'id'       => 'my-account-getpaid' . $slug,
-                    'title'    => $tab[ 'label'],
-                    'href'     => trailingslashit( $payments_link . $slug ),
+                    'title'    => $tab['label'],
+                    'href'     => trailingslashit($payments_link . $slug),
                     'position' => 20
                 );
 
@@ -169,7 +169,7 @@ 
 
 		}
 
-		parent::setup_admin_bar( $wp_admin_nav );
+		parent::setup_admin_bar($wp_admin_nav);
 	}
 
 	/**
@@ -180,9 +180,9 @@ 
 	public function get_current_tab() {
 		global $getpaid_bp_current_tab;
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
+		if (empty($getpaid_bp_current_tab)) {
 			return array(
-				'label'     => __( 'Invoices', 'invoicing' ),
+				'label'     => __('Invoices', 'invoicing'),
 				'content'   => '[wpinv_history]',
 				'icon'      => 'fas fa-file-invoice',
 			);
@@ -198,10 +198,10 @@ 
 	 */
 	public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+		add_action('bp_template_content', array($this, 'handle_display_current_tab'));
+		$template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
 
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 * @since 2.1.5
 	 */
 	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+		echo getpaid_prepare_user_content_tab($this->get_current_tab());
 	}
 
 }

includes/admin/class-wpinv-subscriptions-list-table.php

Spacing +76 added lines, -76 removed lines

@@ -3,9 +3,9 @@ 
  * Displays a list of all subscriptions rules
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -78,7 +78,7 @@ 
 
 		$this->prepare_query();
 
-		$this->base_url = remove_query_arg( 'status' );
+		$this->base_url = remove_query_arg('status');
 
 	}
 
@@ -91,21 +91,21 @@ 
 		$query = array(
 			'number'  => $this->per_page,
 			'paged'   => $this->get_paged(),
-			'status'  => ( isset( $_GET['status'] ) && array_key_exists( $_GET['status'], getpaid_get_subscription_statuses() ) ) ? $_GET['status'] : 'all',
-			'orderby' => ( isset( $_GET['orderby'] ) ) ? $_GET['orderby'] : 'id',
-			'order'   => ( isset( $_GET['order'] ) ) ? $_GET['order'] : 'DESC',
+			'status'  => (isset($_GET['status']) && array_key_exists($_GET['status'], getpaid_get_subscription_statuses())) ? $_GET['status'] : 'all',
+			'orderby' => (isset($_GET['orderby'])) ? $_GET['orderby'] : 'id',
+			'order'   => (isset($_GET['order'])) ? $_GET['order'] : 'DESC',
 		);
 
 		// Prepare class properties.
-		$this->query               = new GetPaid_Subscriptions_Query( $query );
+		$this->query               = new GetPaid_Subscriptions_Query($query);
 		$this->total_count         = $this->query->get_total();
 		$this->current_total_count = $this->query->get_total();
 		$this->items               = $this->query->get_results();
-		$this->status_counts       = getpaid_get_subscription_status_counts( $query );
+		$this->status_counts       = getpaid_get_subscription_status_counts($query);
 
-		if ( 'all' != $query['status'] ) {
-			unset( $query['status'] );
-			$this->total_count   = getpaid_get_subscriptions( $query, 'count' );
+		if ('all' != $query['status']) {
+			unset($query['status']);
+			$this->total_count = getpaid_get_subscriptions($query, 'count');
 		}
 
 	}
@@ -122,26 +122,26 @@ 
 	 */
 	public function get_views() {
 
-		$current  = isset( $_GET['status'] ) ? $_GET['status'] : 'all';
+		$current  = isset($_GET['status']) ? $_GET['status'] : 'all';
 		$views    = array(
 
 			'all' => sprintf(
 				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', false, $this->base_url ) ),
+				esc_url(add_query_arg('status', false, $this->base_url)),
 				$current === 'all' ? ' class="current"' : '',
-				__('All','invoicing' ),
+				__('All', 'invoicing'),
 				$this->total_count
 			)
 
 		);
 
-		foreach ( array_filter( $this->status_counts ) as $status => $count ) {
+		foreach (array_filter($this->status_counts) as $status => $count) {
 
-			$views[ $status ] = sprintf(
+			$views[$status] = sprintf(
 				'<a href="%s" %s>%s&nbsp;<span class="count">(%d)</span></a>',
-				esc_url( add_query_arg( 'status', urlencode( $status ), $this->base_url ) ),
+				esc_url(add_query_arg('status', urlencode($status), $this->base_url)),
 				$current === $status ? ' class="current"' : '',
-				sanitize_text_field( getpaid_get_subscription_status_label( $status ) ),
+				sanitize_text_field(getpaid_get_subscription_status_label($status)),
 				$count
 			);
 
@@ -158,8 +158,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_default( $item, $column_name ) {
-		return apply_filters( "getpaid_subscriptions_table_column_$column_name", $item->$column_name );
+	public function column_default($item, $column_name) {
+		return apply_filters("getpaid_subscriptions_table_column_$column_name", $item->$column_name);
 	}
 
 	/**
@@ -168,8 +168,8 @@ 
 	 * @param WPInv_Subscription $item
 	 * @return string
 	 */
-	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="id[]" value="%s" />', esc_html( $item->get_id() ) );
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="id[]" value="%s" />', esc_html($item->get_id()));
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_status( $item ) {
+	public function column_status($item) {
 		return $item->get_status_label_html();
 	}
 
@@ -190,44 +190,44 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_subscription( $item ) {
+	public function column_subscription($item) {
 
-		$username = __( '(Missing User)', 'invoicing' );
+		$username = __('(Missing User)', 'invoicing');
 
-		$user = get_userdata( $item->get_customer_id() );
-		if ( $user ) {
+		$user = get_userdata($item->get_customer_id());
+		if ($user) {
 
 			$username = sprintf(
 				'<a href="user-edit.php?user_id=%s">%s</a>',
-				absint( $user->ID ),
-				! empty( $user->display_name ) ? sanitize_text_field( $user->display_name ) : sanitize_email( $user->user_email )
+				absint($user->ID),
+				!empty($user->display_name) ? sanitize_text_field($user->display_name) : sanitize_email($user->user_email)
 			);
 
 		}
 
 		// translators: $1: is opening link, $2: is subscription id number, $3: is closing link tag, $4: is user's name
 		$column_content = sprintf(
-			_x( '%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing' ),
-			'<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . absint( $item->get_id() ) ) ) . '">',
-			'<strong>' . esc_attr( $item->get_id() ) . '</strong>', '</a>',
+			_x('%1$s#%2$s%3$s for %4$s', 'Subscription title on admin table. (e.g.: #211 for John Doe)', 'invoicing'),
+			'<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . absint($item->get_id()))) . '">',
+			'<strong>' . esc_attr($item->get_id()) . '</strong>', '</a>',
 			$username
 		);
 
 		$row_actions = array();
 
 		// View subscription.
-		$view_url    = esc_url( add_query_arg( 'id', $item->get_id(), admin_url( 'admin.php?page=wpinv-subscriptions' ) ));
-		$row_actions['view'] = '<a href="' . $view_url . '">' . __( 'View Subscription', 'invoicing' ) . '</a>';
+		$view_url    = esc_url(add_query_arg('id', $item->get_id(), admin_url('admin.php?page=wpinv-subscriptions')));
+		$row_actions['view'] = '<a href="' . $view_url . '">' . __('View Subscription', 'invoicing') . '</a>';
 
 		// View invoice.
-		$invoice = get_post( $item->get_parent_invoice_id() );
+		$invoice = get_post($item->get_parent_invoice_id());
 
-		if ( ! empty( $invoice ) ) {
-			$invoice_url            = get_edit_post_link( $invoice );
-			$row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __( 'View Invoice', 'invoicing' ) . '</a>';
+		if (!empty($invoice)) {
+			$invoice_url            = get_edit_post_link($invoice);
+			$row_actions['invoice'] = '<a href="' . $invoice_url . '">' . __('View Invoice', 'invoicing') . '</a>';
 		}
 
-		$delete_url            = esc_url(
+		$delete_url = esc_url(
 			wp_nonce_url(
 				add_query_arg(
 					array(
@@ -239,11 +239,11 @@ 
 				'getpaid-nonce'
 			)
 		);
-		$row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __( 'Delete Subscription', 'invoicing' ) . '</a>';
+		$row_actions['delete'] = '<a class="text-danger" href="' . $delete_url . '">' . __('Delete Subscription', 'invoicing') . '</a>';
 
-		$row_actions = $this->row_actions( apply_filters( 'getpaid_subscription_table_row_actions', $row_actions, $item ) );
+		$row_actions = $this->row_actions(apply_filters('getpaid_subscription_table_row_actions', $row_actions, $item));
 
-		return "<strong>$column_content</strong>" . $this->column_amount( $item ) . $row_actions;
+		return "<strong>$column_content</strong>" . $this->column_amount($item) . $row_actions;
 	}
 
 	/**
@@ -253,8 +253,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_renewal_date( $item ) {
-		return getpaid_format_date_value( $item->get_expiration() );
+	public function column_renewal_date($item) {
+		return getpaid_format_date_value($item->get_expiration());
 	}
 
 	/**
@@ -264,8 +264,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_start_date( $item ) {
-		return getpaid_format_date_value( $item->get_date_created() );
+	public function column_start_date($item) {
+		return getpaid_format_date_value($item->get_date_created());
 	}
 
 	/**
@@ -275,8 +275,8 @@ 
 	 * @since       1.0.19
 	 * @return      string
 	 */
-	public function column_amount( $item ) {
-		$amount = getpaid_get_formatted_subscription_amount( $item );
+	public function column_amount($item) {
+		$amount = getpaid_get_formatted_subscription_amount($item);
 		return "<span class='text-muted form-text mt-2 mb-2'>$amount</span>";
 	}
 
@@ -287,9 +287,9 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_renewals( $item ) {
+	public function column_renewals($item) {
 		$max_bills = $item->get_bill_times();
-		return $item->get_times_billed() . ' / ' . ( empty( $max_bills ) ? "&infin;" : $max_bills );
+		return $item->get_times_billed() . ' / ' . (empty($max_bills) ? "&infin;" : $max_bills);
 	}
 
 	/**
@@ -299,16 +299,16 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function column_item( $item ) {
-		$_item = get_post( $item->get_product_id() );
+	public function column_item($item) {
+		$_item = get_post($item->get_product_id());
 
-		if ( ! empty( $_item ) ) {
-			$link = get_edit_post_link( $_item );
-			$link = esc_url( $link );
-			$name = esc_html( get_the_title( $_item ) );
+		if (!empty($_item)) {
+			$link = get_edit_post_link($_item);
+			$link = esc_url($link);
+			$name = esc_html(get_the_title($_item));
 			return "<a href='$link'>$name</a>";
 		} else {
-			return sprintf( __( 'Item #%s', 'invoicing' ), $item->get_product_id() );
+			return sprintf(__('Item #%s', 'invoicing'), $item->get_product_id());
 		}
 
 	}
@@ -319,7 +319,7 @@ 
 	 * @return      int
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -332,13 +332,13 @@ 
 		$hidden   = array();
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->set_pagination_args(
 			array(
 			'total_items' => $this->current_total_count,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->current_total_count / $this->per_page )
+			'total_pages' => ceil($this->current_total_count / $this->per_page)
 			)
 		);
 	}
@@ -348,18 +348,18 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_columns(){
+	public function get_columns() {
 		$columns = array(
 			'cb'                => '<input type="checkbox" />',
-			'subscription'      => __( 'Subscription', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'renewal_date'      => __( 'Next Payment', 'invoicing' ),
-			'renewals'          => __( 'Payments', 'invoicing' ),
-			'item'              => __( 'Item', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
+			'subscription'      => __('Subscription', 'invoicing'),
+			'start_date'        => __('Start Date', 'invoicing'),
+			'renewal_date'      => __('Next Payment', 'invoicing'),
+			'renewals'          => __('Payments', 'invoicing'),
+			'item'              => __('Item', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'manage_getpaid_subscriptions_table_columns', $columns );
+		return apply_filters('manage_getpaid_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -369,15 +369,15 @@ 
 	 */
 	public function get_sortable_columns() {
 		$sortable = array(
-			'subscription' => array( 'id', true ),
-			'start_date'   => array( 'created', true ),
-			'renewal_date' => array( 'expiration', true ),
-			'renewals'     => array( 'bill_times', true ),
-			'item'         => array( 'product_id', true ),
-			'status'       => array( 'status', true ),
+			'subscription' => array('id', true),
+			'start_date'   => array('created', true),
+			'renewal_date' => array('expiration', true),
+			'renewals'     => array('bill_times', true),
+			'item'         => array('product_id', true),
+			'status'       => array('status', true),
 		);
 
-		return apply_filters( 'manage_getpaid_subscriptions_sortable_table_columns', $sortable );
+		return apply_filters('manage_getpaid_subscriptions_sortable_table_columns', $sortable);
 	}
 
 	/**
@@ -386,7 +386,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return ! empty( $this->current_total_count );
+		return !empty($this->current_total_count);
 	}
 
 	/**

includes/wpinv-subscription.php

Spacing +221 added lines, -221 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscription Class
@@ -68,27 +68,27 @@ 
 	 * @param  int|string|object|WPInv_Subscription $subscription Subscription id, profile_id, or object to read.
 	 * @param  bool $deprecated
 	 */
-	function __construct( $subscription = 0, $deprecated = false ) {
+	function __construct($subscription = 0, $deprecated = false) {
 
-		parent::__construct( $subscription );
+		parent::__construct($subscription);
 
-		if ( ! $deprecated && ! empty( $subscription ) && is_numeric( $subscription ) ) {
-			$this->set_id( $subscription );
-		} elseif ( $subscription instanceof self ) {
-			$this->set_id( $subscription->get_id() );
-		} elseif ( ! empty( $subscription->id ) ) {
-			$this->set_id( $subscription->id );
-		} elseif ( $deprecated && $subscription_id = self::get_subscription_id_by_field( $subscription, 'profile_id' ) ) {
-			$this->set_id( $subscription_id );
+		if (!$deprecated && !empty($subscription) && is_numeric($subscription)) {
+			$this->set_id($subscription);
+		} elseif ($subscription instanceof self) {
+			$this->set_id($subscription->get_id());
+		} elseif (!empty($subscription->id)) {
+			$this->set_id($subscription->id);
+		} elseif ($deprecated && $subscription_id = self::get_subscription_id_by_field($subscription, 'profile_id')) {
+			$this->set_id($subscription_id);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
 		// Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+			$this->data_store->read($this);
 		}
 
 	}
@@ -103,17 +103,17 @@ 
 	 * @since 1.0.19
 	 * @return int
 	 */
-	public static function get_subscription_id_by_field( $value, $field = 'profile_id' ) {
+	public static function get_subscription_id_by_field($value, $field = 'profile_id') {
         global $wpdb;
 
 		// Trim the value.
-		$value = trim( $value );
+		$value = trim($value);
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return 0;
 		}
 
-		if ( 'invoice_id' == $field ) {
+		if ('invoice_id' == $field) {
 			$field = 'parent_payment_id';
 		}
 
@@ -125,28 +125,28 @@ 
 		);
 
 		// Ensure a field has been passed.
-		if ( empty( $field ) || ! in_array( $field, $fields ) ) {
+		if (empty($field) || !in_array($field, $fields)) {
 			return 0;
 		}
 
 		// Maybe retrieve from the cache.
-		$subscription_id   = wp_cache_get( $value, "getpaid_subscription_{$field}s_to_subscription_ids" );
-		if ( ! empty( $subscription_id ) ) {
+		$subscription_id = wp_cache_get($value, "getpaid_subscription_{$field}s_to_subscription_ids");
+		if (!empty($subscription_id)) {
 			return $subscription_id;
 		}
 
         // Fetch from the db.
         $table            = $wpdb->prefix . 'wpinv_subscriptions';
         $subscription_id  = (int) $wpdb->get_var(
-            $wpdb->prepare( "SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value )
+            $wpdb->prepare("SELECT `id` FROM $table WHERE `$field`=%s LIMIT 1", $value)
         );
 
-		if ( empty( $subscription_id ) ) {
+		if (empty($subscription_id)) {
 			return 0;
 		}
 
 		// Update the cache with our data.
-		wp_cache_set( $value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids" );
+		wp_cache_set($value, $subscription_id, "getpaid_subscription_{$field}s_to_subscription_ids");
 
 		return $subscription_id;
 	}
@@ -155,17 +155,17 @@ 
      * Clears the subscription's cache.
      */
     public function clear_cache() {
-		wp_cache_delete( $this->get_parent_payment_id(), 'getpaid_subscription_parent_payment_ids_to_subscription_ids' );
-		wp_cache_delete( $this->get_transaction_id(), 'getpaid_subscription_transaction_ids_to_subscription_ids' );
-		wp_cache_delete( $this->get_profile_id(), 'getpaid_subscription_profile_ids_to_subscription_ids' );
-		wp_cache_delete( $this->get_id(), 'getpaid_subscriptions' );
+		wp_cache_delete($this->get_parent_payment_id(), 'getpaid_subscription_parent_payment_ids_to_subscription_ids');
+		wp_cache_delete($this->get_transaction_id(), 'getpaid_subscription_transaction_ids_to_subscription_ids');
+		wp_cache_delete($this->get_profile_id(), 'getpaid_subscription_profile_ids_to_subscription_ids');
+		wp_cache_delete($this->get_id(), 'getpaid_subscriptions');
 	}
 
 	/**
      * Checks if a subscription key is set.
      */
-    public function _isset( $key ) {
-        return isset( $this->data[$key] ) || method_exists( $this, "get_$key" );
+    public function _isset($key) {
+        return isset($this->data[$key]) || method_exists($this, "get_$key");
 	}
 
 	/*
@@ -190,8 +190,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_customer_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'customer_id', $context );
+	public function get_customer_id($context = 'view') {
+		return (int) $this->get_prop('customer_id', $context);
 	}
 
 	/**
@@ -201,8 +201,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WP_User|false WP_User object on success, false on failure.
 	 */
-	public function get_customer( $context = 'view' ) {
-		return get_userdata( $this->get_customer_id( $context ) );
+	public function get_customer($context = 'view') {
+		return get_userdata($this->get_customer_id($context));
 	}
 
 	/**
@@ -212,8 +212,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_parent_invoice_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'parent_payment_id', $context );
+	public function get_parent_invoice_id($context = 'view') {
+		return (int) $this->get_prop('parent_payment_id', $context);
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-    public function get_parent_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_parent_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
 	}
 
 	/**
@@ -233,8 +233,8 @@ 
      * @since  1.0.0
      * @return int
      */
-    public function get_original_payment_id( $context = 'view' ) {
-        return $this->get_parent_invoice_id( $context );
+    public function get_original_payment_id($context = 'view') {
+        return $this->get_parent_invoice_id($context);
     }
 
 	/**
@@ -244,8 +244,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-	public function get_parent_invoice( $context = 'view' ) {
-		return new WPInv_Invoice( $this->get_parent_invoice_id( $context ) );
+	public function get_parent_invoice($context = 'view') {
+		return new WPInv_Invoice($this->get_parent_invoice_id($context));
 	}
 
 	/**
@@ -255,8 +255,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Invoice
 	 */
-    public function get_parent_payment( $context = 'view' ) {
-        return $this->get_parent_invoice( $context );
+    public function get_parent_payment($context = 'view') {
+        return $this->get_parent_invoice($context);
 	}
 
 	/**
@@ -266,8 +266,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_product_id( $context = 'view' ) {
-		return (int) $this->get_prop( 'product_id', $context );
+	public function get_product_id($context = 'view') {
+		return (int) $this->get_prop('product_id', $context);
 	}
 
 	/**
@@ -277,8 +277,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return WPInv_Item
 	 */
-	public function get_product( $context = 'view' ) {
-		return new WPInv_Item( $this->get_product_id( $context ) );
+	public function get_product($context = 'view') {
+		return new WPInv_Item($this->get_product_id($context));
 	}
 
 	/**
@@ -290,8 +290,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_gateway( $context = 'view' ) {
-		return $this->get_parent_invoice( $context )->get_gateway();
+	public function get_gateway($context = 'view') {
+		return $this->get_parent_invoice($context)->get_gateway();
 	}
 
 	/**
@@ -301,8 +301,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_period( $context = 'view' ) {
-		return $this->get_prop( 'period', $context );
+	public function get_period($context = 'view') {
+		return $this->get_prop('period', $context);
 	}
 
 	/**
@@ -312,8 +312,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_frequency( $context = 'view' ) {
-		return (int) $this->get_prop( 'frequency', $context );
+	public function get_frequency($context = 'view') {
+		return (int) $this->get_prop('frequency', $context);
 	}
 
 	/**
@@ -323,8 +323,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_initial_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'initial_amount', $context ) );
+	public function get_initial_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('initial_amount', $context));
 	}
 
 	/**
@@ -334,8 +334,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_amount( $context = 'view' ) {
-		return (float) wpinv_sanitize_amount( $this->get_prop( 'recurring_amount', $context ) );
+	public function get_recurring_amount($context = 'view') {
+		return (float) wpinv_sanitize_amount($this->get_prop('recurring_amount', $context));
 	}
 
 	/**
@@ -345,8 +345,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_bill_times( $context = 'view' ) {
-		return (int) $this->get_prop( 'bill_times', $context );
+	public function get_bill_times($context = 'view') {
+		return (int) $this->get_prop('bill_times', $context);
 	}
 
 	/**
@@ -356,8 +356,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_transaction_id( $context = 'view' ) {
-		return $this->get_prop( 'transaction_id', $context );
+	public function get_transaction_id($context = 'view') {
+		return $this->get_prop('transaction_id', $context);
 	}
 
 	/**
@@ -367,8 +367,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_created( $context = 'view' ) {
-		return $this->get_prop( 'created', $context );
+	public function get_created($context = 'view') {
+		return $this->get_prop('created', $context);
 	}
 
 	/**
@@ -378,8 +378,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_created( $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_created($context);
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	public function get_time_created() {
 		$created = $this->get_date_created();
-		return empty( $created ) ? current_time( 'timestamp' ) : strtotime( $created, current_time( 'timestamp' ) );
+		return empty($created) ? current_time('timestamp') : strtotime($created, current_time('timestamp'));
 	}
 
 	/**
@@ -400,11 +400,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -416,8 +416,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
+	public function get_next_renewal_date($context = 'view') {
+		return $this->get_prop('expiration', $context);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_next_renewal_date( $context );
+	public function get_expiration($context = 'view') {
+		return $this->get_next_renewal_date($context);
 	}
 
 	/**
@@ -440,12 +440,12 @@ 
 	public function get_expiration_time() {
 		$expiration = $this->get_expiration();
 
-		if ( empty( $expiration ) || '0000-00-00 00:00:00' == $expiration ) {
-			return current_time( 'timestamp' );
+		if (empty($expiration) || '0000-00-00 00:00:00' == $expiration) {
+			return current_time('timestamp');
 		}
 
-		$expiration = strtotime( $expiration, current_time( 'timestamp' ) );
-		return $expiration < current_time( 'timestamp' ) ? current_time( 'timestamp' ) : $expiration;
+		$expiration = strtotime($expiration, current_time('timestamp'));
+		return $expiration < current_time('timestamp') ? current_time('timestamp') : $expiration;
 	}
 
 	/**
@@ -455,11 +455,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_next_renewal_date_gmt( $context = 'view' ) {
-        $date = $this->get_next_renewal_date( $context );
+	public function get_next_renewal_date_gmt($context = 'view') {
+        $date = $this->get_next_renewal_date($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
 	}
@@ -471,8 +471,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_trial_period( $context = 'view' ) {
-		return $this->get_prop( 'trial_period', $context );
+	public function get_trial_period($context = 'view') {
+		return $this->get_prop('trial_period', $context);
 	}
 
 	/**
@@ -482,8 +482,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
 	}
 
 	/**
@@ -493,8 +493,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_profile_id( $context = 'view' ) {
-		return $this->get_prop( 'profile_id', $context );
+	public function get_profile_id($context = 'view') {
+		return $this->get_prop('profile_id', $context);
 	}
 
 	/*
@@ -509,8 +509,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The customer's id.
 	 */
-	public function set_customer_id( $value ) {
-		$this->set_prop( 'customer_id', (int) $value );
+	public function set_customer_id($value) {
+		$this->set_prop('customer_id', (int) $value);
 	}
 
 	/**
@@ -519,8 +519,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-	public function set_parent_invoice_id( $value ) {
-		$this->set_prop( 'parent_payment_id', (int) $value );
+	public function set_parent_invoice_id($value) {
+		$this->set_prop('parent_payment_id', (int) $value);
 	}
 
 	/**
@@ -529,8 +529,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The parent invoice id.
 	 */
-    public function set_parent_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_parent_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
      * @since 1.0.19
 	 * @param  int $value The parent invoice id.
      */
-    public function set_original_payment_id( $value ) {
-        $this->set_parent_invoice_id( $value );
+    public function set_original_payment_id($value) {
+        $this->set_parent_invoice_id($value);
 	}
 
 	/**
@@ -549,8 +549,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription product id.
 	 */
-	public function set_product_id( $value ) {
-		$this->set_prop( 'product_id', (int) $value );
+	public function set_product_id($value) {
+		$this->set_prop('product_id', (int) $value);
 	}
 
 	/**
@@ -559,8 +559,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value The renewal period.
 	 */
-	public function set_period( $value ) {
-		$this->set_prop( 'period', $value );
+	public function set_period($value) {
+		$this->set_prop('period', $value);
 	}
 
 	/**
@@ -569,9 +569,9 @@ 
 	 * @since 1.0.19
 	 * @param  int $value The subscription frequency.
 	 */
-	public function set_frequency( $value ) {
-		$value = empty( $value ) ? 1 : (int) $value;
-		$this->set_prop( 'frequency', absint( $value ) );
+	public function set_frequency($value) {
+		$value = empty($value) ? 1 : (int) $value;
+		$this->set_prop('frequency', absint($value));
 	}
 
 	/**
@@ -580,8 +580,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The initial subcription amount.
 	 */
-	public function set_initial_amount( $value ) {
-		$this->set_prop( 'initial_amount', wpinv_sanitize_amount( $value ) );
+	public function set_initial_amount($value) {
+		$this->set_prop('initial_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -590,8 +590,8 @@ 
 	 * @since 1.0.19
 	 * @param  float $value The recurring subcription amount.
 	 */
-	public function set_recurring_amount( $value ) {
-		$this->set_prop( 'recurring_amount', wpinv_sanitize_amount( $value ) );
+	public function set_recurring_amount($value) {
+		$this->set_prop('recurring_amount', wpinv_sanitize_amount($value));
 	}
 
 	/**
@@ -600,8 +600,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value Bill times.
 	 */
-	public function set_bill_times( $value ) {
-		$this->set_prop( 'bill_times', (int) $value );
+	public function set_bill_times($value) {
+		$this->set_prop('bill_times', (int) $value);
 	}
 
 	/**
@@ -610,8 +610,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value Bill times.
 	 */
-	public function set_transaction_id( $value ) {
-		$this->set_prop( 'transaction_id', sanitize_text_field( $value ) );
+	public function set_transaction_id($value) {
+		$this->set_prop('transaction_id', sanitize_text_field($value));
 	}
 
 	/**
@@ -620,15 +620,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_created( $value ) {
-        $date = strtotime( $value );
+	public function set_created($value) {
+        $date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('created', date('Y-m-d H:i:s', $date));
             return;
         }
 
-		$this->set_prop( 'created', '' );
+		$this->set_prop('created', '');
 
 	}
 
@@ -638,8 +638,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_date_created( $value ) {
-		$this->set_created( $value );
+	public function set_date_created($value) {
+		$this->set_created($value);
     }
 
 	/**
@@ -648,15 +648,15 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_next_renewal_date( $value ) {
-		$date = strtotime( $value );
+	public function set_next_renewal_date($value) {
+		$date = strtotime($value);
 
-        if ( $date && $value !== '0000-00-00 00:00:00' ) {
-            $this->set_prop( 'expiration', date( 'Y-m-d H:i:s', $date ) );
+        if ($date && $value !== '0000-00-00 00:00:00') {
+            $this->set_prop('expiration', date('Y-m-d H:i:s', $date));
             return;
 		}
 
-		$this->set_prop( 'expiration', '' );
+		$this->set_prop('expiration', '');
 
 	}
 
@@ -666,8 +666,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value strtotime compliant date.
 	 */
-	public function set_expiration( $value ) {
-		$this->set_next_renewal_date( $value );
+	public function set_expiration($value) {
+		$this->set_next_renewal_date($value);
     }
 
 	/**
@@ -676,8 +676,8 @@ 
 	 * @since 1.0.19
 	 * @param string $value trial period e.g 1 year.
 	 */
-	public function set_trial_period( $value ) {
-		$this->set_prop( 'trial_period', $value );
+	public function set_trial_period($value) {
+		$this->set_prop('trial_period', $value);
 	}
 
 	/**
@@ -686,19 +686,19 @@ 
 	 * @since 1.0.19
 	 * @param string $new_status    New subscription status.
 	 */
-	public function set_status( $new_status ) {
+	public function set_status($new_status) {
 
 		// Abort if this is not a valid status;
-		if ( ! array_key_exists( $new_status, getpaid_get_subscription_statuses() ) ) {
+		if (!array_key_exists($new_status, getpaid_get_subscription_statuses())) {
 			return;
 		}
 
 		$old_status = $this->get_status();
-		$this->set_prop( 'status', $new_status );
+		$this->set_prop('status', $new_status);
 
-		if ( true === $this->object_read && $old_status !== $new_status ) {
+		if (true === $this->object_read && $old_status !== $new_status) {
 			$this->status_transition = array(
-				'from'   => ! empty( $this->status_transition['from'] ) ? $this->status_transition['from'] : $old_status,
+				'from'   => !empty($this->status_transition['from']) ? $this->status_transition['from'] : $old_status,
 				'to'     => $new_status,
 			);
 		}
@@ -711,8 +711,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value the remote profile id.
 	 */
-	public function set_profile_id( $value ) {
-		$this->set_prop( 'profile_id', sanitize_text_field( $value ) );
+	public function set_profile_id($value) {
+		$this->set_prop('profile_id', sanitize_text_field($value));
 	}
 
 	/*
@@ -730,8 +730,8 @@ 
 	 * @param string|array String or array of strings to check for.
 	 * @return bool
      */
-    public function has_status( $status ) {
-        return in_array( $this->get_status(), wpinv_clean( wpinv_parse_list( $status ) ) );
+    public function has_status($status) {
+        return in_array($this->get_status(), wpinv_clean(wpinv_parse_list($status)));
 	}
 
 	/**
@@ -741,7 +741,7 @@ 
      */
     public function has_trial_period() {
 		$period = $this->get_trial_period();
-        return ! empty( $period );
+        return !empty($period);
 	}
 
 	/**
@@ -750,7 +750,7 @@ 
 	 * @return bool
 	 */
 	public function is_active() {
-		return $this->has_status( 'active trialling' ) && ! $this->is_expired();
+		return $this->has_status('active trialling') && !$this->is_expired();
 	}
 
 	/**
@@ -759,7 +759,7 @@ 
 	 * @return bool
 	 */
 	public function is_expired() {
-		return $this->has_status( 'expired' ) || ( $this->has_status( 'active cancelled trialling' ) && $this->get_expiration_time() < current_time( 'mysql' ) );
+		return $this->has_status('expired') || ($this->has_status('active cancelled trialling') && $this->get_expiration_time() < current_time('mysql'));
 	}
 
 	/**
@@ -769,7 +769,7 @@ 
 	 */
 	public function is_last_renewal() {
 		$max_bills = $this->get_bill_times();
-		return ! empty( $max_bills ) && $max_bills <= $this->get_times_billed();
+		return !empty($max_bills) && $max_bills <= $this->get_times_billed();
 	}
 
 	/*
@@ -784,11 +784,11 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -799,8 +799,8 @@ 
 	/**
 	 * Backwards compatibilty.
 	 */
-	public function update( $args = array() ) {
-		return $this->create( $args );
+	public function update($args = array()) {
+		return $this->create($args);
 	}
 
     /**
@@ -809,12 +809,12 @@ 
      * @since  1.0.0
      * @return WP_Post[]
      */
-    public function get_child_payments( $hide_pending = true ) {
+    public function get_child_payments($hide_pending = true) {
 
-		$statuses = array( 'publish', 'wpi-processing', 'wpi-renewal' );
+		$statuses = array('publish', 'wpi-processing', 'wpi-renewal');
 
-		if ( ! $hide_pending ) {
-			$statuses = array_keys( wpinv_get_invoice_statuses() );
+		if (!$hide_pending) {
+			$statuses = array_keys(wpinv_get_invoice_statuses());
 		}
 
         return get_posts(
@@ -846,7 +846,7 @@ 
 		);
 
 		// Maybe include parent invoice.
-        if ( $this->get_parent_payment()->is_paid() ) {
+        if ($this->get_parent_payment()->is_paid()) {
             $count++;
         }
 
@@ -862,7 +862,7 @@ 
     public function get_times_billed() {
         $times_billed = $this->get_total_payments();
 
-        if ( (float) $this->get_initial_amount() == 0 && $times_billed > 0 ) {
+        if ((float) $this->get_initial_amount() == 0 && $times_billed > 0) {
             $times_billed--;
         }
 
@@ -877,49 +877,49 @@ 
 	 * @param  WPInv_Invoice $invoice If adding an existing invoice.
      * @return bool
      */
-    public function add_payment( $args = array(), $invoice = false ) {
+    public function add_payment($args = array(), $invoice = false) {
 
 		// Process each payment once.
-        if ( ! empty( $args['transaction_id'] ) && $this->payment_exists( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id']) && $this->payment_exists($args['transaction_id'])) {
             return false;
         }
 
 		// Are we creating a new invoice?
-		if ( empty( $invoice ) ) {
+		if (empty($invoice)) {
 			$invoice = $this->create_payment();
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				return false;
 			}
 
 		}
 
-		$invoice->set_status( 'wpi-renewal' );
+		$invoice->set_status('wpi-renewal');
 
 		// Maybe set a transaction id.
-		if ( ! empty( $args['transaction_id'] ) ) {
-			$invoice->set_transaction_id( $args['transaction_id'] );
+		if (!empty($args['transaction_id'])) {
+			$invoice->set_transaction_id($args['transaction_id']);
 		}
 
 		// Set the completed date.
-		$invoice->set_completed_date( current_time( 'mysql' ) );
+		$invoice->set_completed_date(current_time('mysql'));
 
 		// And the gateway.
-		if ( ! empty( $args['gateway'] ) ) {
-			$invoice->set_gateway( $args['gateway'] );
+		if (!empty($args['gateway'])) {
+			$invoice->set_gateway($args['gateway']);
 		}
 
 		$invoice->save();
 
-		if ( ! $invoice->exists() ) {
+		if (!$invoice->exists()) {
 			return false;
 		}
 
-		do_action( 'getpaid_after_create_subscription_renewal_invoice', $invoice, $this );
-		do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
-        do_action( 'wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id() );
+		do_action('getpaid_after_create_subscription_renewal_invoice', $invoice, $this);
+		do_action('wpinv_recurring_add_subscription_payment', $invoice, $this);
+        do_action('wpinv_recurring_record_payment', $invoice->get_id(), $this->get_parent_invoice_id(), $invoice->get_recurring_total(), $invoice->get_transaction_id());
 
-        update_post_meta( $invoice->get_id(), '_wpinv_subscription_id', $this->id );
+        update_post_meta($invoice->get_id(), '_wpinv_subscription_id', $this->id);
 
         return $invoice->get_id();
 	}
@@ -934,22 +934,22 @@ 
 
 		$parent_invoice = $this->get_parent_payment();
 
-		if ( ! $parent_invoice->exists() ) {
+		if (!$parent_invoice->exists()) {
 			return false;
 		}
 
 		// Duplicate the parent invoice.
-		$invoice = getpaid_duplicate_invoice( $parent_invoice );
-		$invoice->set_parent_id( $parent_invoice->get_id() );
+		$invoice = getpaid_duplicate_invoice($parent_invoice);
+		$invoice->set_parent_id($parent_invoice->get_id());
 
 		// Maybe recalculate discount (Pre-GetPaid Fix).
-		$discount = new WPInv_Discount( $invoice->get_discount_code() );
-		if ( $discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount() ) {
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+		$discount = new WPInv_Discount($invoice->get_discount_code());
+		if ($discount->exists() && $discount->is_recurring() && 0 == $invoice->get_total_discount()) {
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 		}
 
 		$invoice->recalculate_total();
-		$invoice->set_status( 'wpi-pending' );
+		$invoice->set_status('wpi-pending');
 		$invoice->save();
 
 		return $invoice->exists() ? $invoice : false;
@@ -964,20 +964,20 @@ 
 	public function renew() {
 
 		// Complete subscription if applicable
-		if ( $this->is_last_renewal() ) {
+		if ($this->is_last_renewal()) {
 			return $this->complete();
 		}
 
 		// Calculate new expiration
 		$frequency      = $this->get_frequency();
 		$period         = $this->get_period();
-		$new_expiration = strtotime( "+ $frequency $period", $this->get_expiration_time() );
+		$new_expiration = strtotime("+ $frequency $period", $this->get_expiration_time());
 
-		$this->set_expiration( date( 'Y-m-d H:i:s',$new_expiration ) );
-		$this->set_status( 'active' );
+		$this->set_expiration(date('Y-m-d H:i:s', $new_expiration));
+		$this->set_status('active');
 		$this->save();
 
-		do_action( 'getpaid_subscription_renewed', $this );
+		do_action('getpaid_subscription_renewed', $this);
 
 		return $this->get_id();
 	}
@@ -993,11 +993,11 @@ 
 	public function complete() {
 
 		// Only mark a subscription as complete if it's not already cancelled.
-		if ( $this->has_status( 'cancelled' ) ) {
+		if ($this->has_status('cancelled')) {
 			return false;
 		}
 
-		$this->set_status( 'completed' );
+		$this->set_status('completed');
 		return $this->save();
 
 	}
@@ -1009,14 +1009,14 @@ 
 	 * @param  bool $check_expiration
 	 * @return int|bool Subscription id or false if $check_expiration is true and expiration date is in the future.
 	 */
-	public function expire( $check_expiration = false ) {
+	public function expire($check_expiration = false) {
 
-		if ( $check_expiration && $this->get_expiration_time() > current_time( 'timestamp' ) ) {
+		if ($check_expiration && $this->get_expiration_time() > current_time('timestamp')) {
 			// Do not mark as expired since real expiration date is in the future
 			return false;
 		}
 
-		$this->set_status( 'expired' );
+		$this->set_status('expired');
 		return $this->save();
 
 	}
@@ -1028,7 +1028,7 @@ 
 	 * @return int Subscription id.
 	 */
 	public function failing() {
-		$this->set_status( 'failing' );
+		$this->set_status('failing');
 		return $this->save();
 	}
 
@@ -1039,7 +1039,7 @@ 
      * @return int Subscription id.
      */
     public function cancel() {
-		$this->set_status( 'cancelled' );
+		$this->set_status('cancelled');
 		return $this->save();
     }
 
@@ -1050,7 +1050,7 @@ 
 	 * @return bool
 	 */
 	public function can_cancel() {
-		return apply_filters( 'wpinv_subscription_can_cancel', $this->has_status( $this->get_cancellable_statuses() ), $this );
+		return apply_filters('wpinv_subscription_can_cancel', $this->has_status($this->get_cancellable_statuses()), $this);
 	}
 
     /**
@@ -1061,7 +1061,7 @@ 
      * @return      array
      */
     public function get_cancellable_statuses() {
-        return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
+        return apply_filters('wpinv_recurring_cancellable_statuses', array('active', 'trialling', 'failing'));
     }
 
 	/**
@@ -1071,8 +1071,8 @@ 
 	 * @return string
 	 */
 	public function get_cancel_url() {
-		$url = getpaid_get_authenticated_action_url( 'subscription_cancel', $this->get_view_url() );
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+		$url = getpaid_get_authenticated_action_url('subscription_cancel', $this->get_view_url());
+		return apply_filters('wpinv_subscription_cancel_url', $url, $this);
 	}
 
 	/**
@@ -1083,10 +1083,10 @@ 
 	 */
 	public function get_view_url() {
 
-		$url = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$url = add_query_arg( 'subscription', $this->get_id(), $url );
+		$url = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$url = add_query_arg('subscription', $this->get_id(), $url);
 
-		return apply_filters( 'getpaid_get_subscription_view_url', $url, $this );
+		return apply_filters('getpaid_get_subscription_view_url', $url, $this);
 	}
 
 	/**
@@ -1099,7 +1099,7 @@ 
 	 * @return bool
 	 */
 	public function can_renew() {
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+		return apply_filters('wpinv_subscription_can_renew', true, $this);
 	}
 
 	/**
@@ -1109,8 +1109,8 @@ 
 	 * @return string
 	 */
 	public function get_renew_url() {
-		$url = wp_nonce_url( add_query_arg( array( 'getpaid-action' => 'renew_subscription', 'sub_id' => $this->get_id ) ), 'getpaid-nonce' );
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+		$url = wp_nonce_url(add_query_arg(array('getpaid-action' => 'renew_subscription', 'sub_id' => $this->get_id)), 'getpaid-nonce');
+		return apply_filters('wpinv_subscription_renew_url', $url, $this);
 	}
 
 	/**
@@ -1120,7 +1120,7 @@ 
 	 * @return bool
 	 */
 	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
+		return apply_filters('wpinv_subscription_can_update', false, $this);
 	}
 
 	/**
@@ -1130,8 +1130,8 @@ 
 	 * @return string
 	 */
 	public function get_update_url() {
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->get_id() ) );
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+		$url = add_query_arg(array('action' => 'update', 'subscription_id' => $this->get_id()));
+		return apply_filters('wpinv_subscription_update_url', $url, $this);
 	}
 
 	/**
@@ -1141,7 +1141,7 @@ 
 	 * @return string
 	 */
 	public function get_status_label() {
-		return getpaid_get_subscription_status_label( $this->get_status() );
+		return getpaid_get_subscription_status_label($this->get_status());
 	}
 
 	/**
@@ -1152,7 +1152,7 @@ 
 	 */
 	public function get_status_class() {
 		$statuses = getpaid_get_subscription_status_classes();
-		return isset( $statuses[ $this->get_status() ] ) ? $statuses[ $this->get_status() ] : 'badge-dark';
+		return isset($statuses[$this->get_status()]) ? $statuses[$this->get_status()] : 'badge-dark';
 	}
 
     /**
@@ -1163,9 +1163,9 @@ 
      */
     public function get_status_label_html() {
 
-		$status_label = sanitize_text_field( $this->get_status_label() );
-		$class        = esc_attr( $this->get_status_class() );
-		$status       = sanitize_html_class( $this->get_status() );
+		$status_label = sanitize_text_field($this->get_status_label());
+		$class        = esc_attr($this->get_status_class());
+		$status       = sanitize_html_class($this->get_status());
 
 		return "<span class='bsui'><span class='badge $class $status'>$status_label</span></span>";
     }
@@ -1177,9 +1177,9 @@ 
      * @param  string $txn_id The transaction ID from the merchant processor
      * @return bool
      */
-    public function payment_exists( $txn_id = '' ) {
-		$invoice_id = WPInv_Invoice::get_invoice_id_by_field( $txn_id, 'transaction_id' );
-        return ! empty( $invoice_id );
+    public function payment_exists($txn_id = '') {
+		$invoice_id = WPInv_Invoice::get_invoice_id_by_field($txn_id, 'transaction_id');
+        return !empty($invoice_id);
 	}
 
 	/**
@@ -1191,35 +1191,35 @@ 
 		// Reset status transition variable.
 		$this->status_transition = false;
 
-		if ( $status_transition ) {
+		if ($status_transition) {
 			try {
 
 				// Fire a hook for the status change.
-				do_action( 'wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition );
-				do_action( 'getpaid_subscription_' . $status_transition['to'], $this, $status_transition );
+				do_action('wpinv_subscription_' . $status_transition['to'], $this->get_id(), $this, $status_transition);
+				do_action('getpaid_subscription_' . $status_transition['to'], $this, $status_transition);
 
-				if ( ! empty( $status_transition['from'] ) ) {
+				if (!empty($status_transition['from'])) {
 
 					/* translators: 1: old subscription status 2: new subscription status */
-					$transition_note = sprintf( __( 'Subscription status changed from %1$s to %2$s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['from'] ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status changed from %1$s to %2$s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['from']), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 					// Fire another hook.
-					do_action( 'getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this );
-					do_action( 'getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to'] );
+					do_action('getpaid_subscription_status_' . $status_transition['from'] . '_to_' . $status_transition['to'], $this->get_id(), $this);
+					do_action('getpaid_subscription_status_changed', $this, $status_transition['from'], $status_transition['to']);
 
 				} else {
 					/* translators: %s: new invoice status */
-					$transition_note = sprintf( __( 'Subscription status set to %s.', 'invoicing' ), getpaid_get_subscription_status_label( $status_transition['to'] ) );
+					$transition_note = sprintf(__('Subscription status set to %s.', 'invoicing'), getpaid_get_subscription_status_label($status_transition['to']));
 
 					// Note the transition occurred.
-					$this->get_parent_payment()->add_note( $transition_note, false, false, true );
+					$this->get_parent_payment()->add_note($transition_note, false, false, true);
 
 				}
-			} catch ( Exception $e ) {
-				$this->get_parent_payment()->add_note( __( 'Error during subscription status transition.', 'invoicing' ) . ' ' . $e->getMessage() );
+			} catch (Exception $e) {
+				$this->get_parent_payment()->add_note(__('Error during subscription status transition.', 'invoicing') . ' ' . $e->getMessage());
 			}
 		}
 
@@ -1245,7 +1245,7 @@ 
 	 */
 	public function activate() {
 		$status = 'trialling' == $this->get_status() ? 'trialling' : 'active';
-		$this->set_status( $status );
+		$this->set_status($status);
 		return $this->save();
 	}
 

templates/payment-forms/elements/price_select.php

Spacing +33 added lines, -33 removed lines

@@ -7,35 +7,35 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Ensure that we have options.
-if ( empty( $options ) ) {
+if (empty($options)) {
     return;
 }
 
 // Prepare price options.
-$options = getpaid_convert_price_string_to_options( $options );
-$keys    = array_keys( $options );
-$value   = empty( $options ) ? '' : $keys[0];
+$options = getpaid_convert_price_string_to_options($options);
+$keys    = array_keys($options);
+$value   = empty($options) ? '' : $keys[0];
 
 // Prepare id.
-$id = esc_attr( $id );
+$id = esc_attr($id);
 
-$select_type = empty( $select_type ) ? 'select' : $select_type;
+$select_type = empty($select_type) ? 'select' : $select_type;
 
 // Item select;
-if ( $select_type == 'select' ) {
+if ($select_type == 'select') {
     echo aui()->select(
         array(
             'name'       => $id,
-            'id'         => $id . uniqid( '_' ),
-            'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
+            'id'         => $id . uniqid('_'),
+            'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
             'value'      => $value,
-            'label'      => empty( $label ) ? '' : sanitize_text_field( $label ),
+            'label'      => empty($label) ? '' : sanitize_text_field($label),
             'label_type' => 'vertical',
             'class'      => 'getpaid-price-select-dropdown getpaid-refresh-on-change',
-            'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+            'help_text'  => empty($description) ? '' : wp_kses_post($description),
             'options'    => $options,
         )
     );
@@ -43,18 +43,18 @@ 
 }
 
 // Item radios;
-if ( $select_type == 'radios' ) {
+if ($select_type == 'radios') {
     echo aui()->radio(
         array(
-            'name'       => esc_attr( $id ),
-            'id'         => esc_attr( $id ) . uniqid( '_' ),
-            'label'      => empty( $label ) ? '' : sanitize_text_field( $label ),
+            'name'       => esc_attr($id),
+            'id'         => esc_attr($id) . uniqid('_'),
+            'label'      => empty($label) ? '' : sanitize_text_field($label),
             'label_type' => 'vertical',
             'class'      => 'getpaid-price-select-radio getpaid-refresh-on-change w-100',
             'value'      => $value,
             'inline'     => false,
             'options'    => $options,
-            'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+            'help_text'  => empty($description) ? '' : wp_kses_post($description),
         )
     );
     return;
@@ -62,30 +62,30 @@ 
 
 
 // Display the label.
-if ( ! empty( $label ) ) {
-    $label = sanitize_text_field( $label );
+if (!empty($label)) {
+    $label = sanitize_text_field($label);
     echo "<label>$label</label>";
 }
 
 // Item buttons;
-if ( $select_type == 'buttons' || $select_type == 'circles' ) {
+if ($select_type == 'buttons' || $select_type == 'circles') {
 
     $class = 'getpaid-price-buttons';
 
-    if ( $select_type == 'circles' ) {
+    if ($select_type == 'circles') {
         $class .= ' getpaid-price-circles';
     }
     echo "<div class='$class'>";
 
-    foreach ( $options as $price => $label ) {
-        $label   = sanitize_text_field( $label );
-        $price   = esc_attr( $price );
-        $_id     = $id . uniqid( '_' );
-        $checked = checked( $price, $value, false );
+    foreach ($options as $price => $label) {
+        $label   = sanitize_text_field($label);
+        $price   = esc_attr($price);
+        $_id     = $id . uniqid('_');
+        $checked = checked($price, $value, false);
 
         $class = 'rounded';
 
-        if ( $select_type == 'circles' ) {
+        if ($select_type == 'circles') {
             $class = '';
         }
         echo "
@@ -101,13 +101,13 @@ 
 }
 
 // Item checkboxes;
-if ( $select_type == 'checkboxes' ) {
+if ($select_type == 'checkboxes') {
     echo '<div class="form-group">';
 
-    foreach ( $options as $price => $label ) {
-        $label   = sanitize_text_field( $label );
-        $price   = esc_attr( $price );
-        $checked = checked( $price, $value, false );
+    foreach ($options as $price => $label) {
+        $label   = sanitize_text_field($label);
+        $price   = esc_attr($price);
+        $checked = checked($price, $value, false);
         echo "
             <label class='d-block'>
                 <input type='checkbox' class='getpaid-price-select-checkbox getpaid-refresh-on-change w-auto' name='{$id}[]' value='$price' $checked />
@@ -120,6 +120,6 @@ 
 
 }
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     echo "<small class='form-text text-muted'>$description</small>";
 }

templates/payment-forms/elements/address.php

Spacing +21 added lines, -21 removed lines

@@ -7,57 +7,57 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $fields ) ) {
+if (empty($fields)) {
 	return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
 // Prepare the user's country.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
 	$country = $form->invoice->get_country();
 }
 
-if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+if (empty($country)) {
+	$country = empty($country) ? getpaid_get_ip_country() : $country;
+	$country = empty($country) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
-$address_type = empty( $address_type ) ? 'billing' : $address_type;
+$address_type = empty($address_type) ? 'billing' : $address_type;
 
 ?>
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 	<!-- Start Billing/Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-billing-address-title">
-		<?php _e( 'Billing / Shipping Address', 'invoicing' ); ?>
+		<?php _e('Billing / Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 	<!-- Start Billing Address Title -->
 	<h4 class="mb-3 getpaid-billing-address-title">
-		<?php _e( 'Billing Address', 'invoicing' ); ?>
+		<?php _e('Billing Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type || 'billing' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'billing' === $address_type) : ?>
 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
 			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_billing_fields', $form);
 		?>
 	</div>
 	<!-- End Billing Address -->
@@ -65,7 +65,7 @@ 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 
 	<?php
@@ -76,7 +76,7 @@ 
 			    'name'       => 'same-shipping-address',
 			    'id'         => "shipping-toggle$uniqid",
 			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
+			    'label'      => wp_kses_post($shipping_address_toggle),
 			    'value'      => 1,
 			    'checked'    => true,
 				'class'      => 'w-auto',
@@ -88,7 +88,7 @@ 
 
 	<!-- Start Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-address-title">
-		<?php _e( 'Shipping Address', 'invoicing' ); ?>
+		<?php _e('Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Shipping Address Title -->
 
@@ -97,14 +97,14 @@ 
 
 
 	
-<?php if ( 'both' === $address_type || 'shipping' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'shipping' === $address_type) : ?>
 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
 			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_shipping_fields', $form);
 		?>
 	</div>
 	<!-- End Shipping Address -->