WordImpress / Google-Maps-Builder

includes/admin/upgrades/upgrades.php

Spacing +16 added lines, -16 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  */
 function gmb_upgrades_screen() {
 
-	$action = isset( $_GET['gmb-upgrade'] ) ? sanitize_text_field( $_GET['gmb-upgrade'] ) : '';
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
-	$total  = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
-	$custom = isset( $_GET['custom'] ) ? absint( $_GET['custom'] ) : 0;
-	$number = isset( $_GET['number'] ) ? absint( $_GET['number'] ) : 100;
-	$steps  = round( ( $total / $number ), 0 );
+	$action = isset($_GET['gmb-upgrade']) ? sanitize_text_field($_GET['gmb-upgrade']) : '';
+	$step   = isset($_GET['step']) ? absint($_GET['step']) : 1;
+	$total  = isset($_GET['total']) ? absint($_GET['total']) : false;
+	$custom = isset($_GET['custom']) ? absint($_GET['custom']) : 0;
+	$number = isset($_GET['number']) ? absint($_GET['number']) : 100;
+	$steps  = round(($total / $number), 0);
 
 	$doing_upgrade_args = array(
 		'page'        => 'gmb-upgrades',
@@ -36,23 +36,23 @@ 
 		'custom'      => $custom,
 		'steps'       => $steps
 	);
-	update_option( 'gmb_doing_upgrade', $doing_upgrade_args );
-	if ( $step > $steps ) {
+	update_option('gmb_doing_upgrade', $doing_upgrade_args);
+	if ($step > $steps) {
 		// Prevent a weird case where the estimate was off. Usually only a couple.
 		$steps = $step;
 	}
 	?>
 	<div class="wrap">
-		<h2><?php _e( 'Maps Builder - Upgrade', 'gmb' ); ?></h2>
+		<h2><?php _e('Maps Builder - Upgrade', 'gmb'); ?></h2>
 
-		<?php if ( ! empty( $action ) ) : ?>
+		<?php if ( ! empty($action)) : ?>
 
 			<div id="gmb-upgrade-status">
-				<p><?php _e( 'The upgrade process has started, please be patient. This could take several minutes. You will be automatically redirected when the upgrade is finished.', 'gmb' ); ?></p>
+				<p><?php _e('The upgrade process has started, please be patient. This could take several minutes. You will be automatically redirected when the upgrade is finished.', 'gmb'); ?></p>
 
-				<?php if ( ! empty( $total ) ) : ?>
+				<?php if ( ! empty($total)) : ?>
 					<p>
-						<strong><?php printf( __( 'Step %d of approximately %d running', 'gmb' ), $step, $steps ); ?></strong>
+						<strong><?php printf(__('Step %d of approximately %d running', 'gmb'), $step, $steps); ?></strong>
 					</p>
 				<?php endif; ?>
 			</div>
@@ -66,8 +66,8 @@ 
 
 			<div id="gmb-upgrade-status" class="updated" style="margin-top:15px;">
 				<p style="margin-bottom:8px;">
-					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' ); ?>
-					<img src="<?php echo GMB_PLUGIN_URL . '/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
+					<?php _e('The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb'); ?>
+					<img src="<?php echo GMB_PLUGIN_URL.'/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
 				</p>
 			</div>
 			<script type="text/javascript">

Braces +5 added lines, -2 removed lines

@@ -62,11 +62,14 @@
 				}, 250 );
 			</script>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
 			<div id="gmb-upgrade-status" class="updated" style="margin-top:15px;">
 				<p style="margin-bottom:8px;">
-					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' ); ?>
+					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' );
+}
+?>
 					<img src="<?php echo GMB_PLUGIN_URL . '/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
 				</p>
 			</div>

includes/class-gmb-widget.php

Spacing +39 added lines, -39 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,10 +21,10 @@ 
  * @return void
  */
 function init_gmb_forms_widget() {
-	register_widget( 'Google_Maps_Builder_Widget' );
+	register_widget('Google_Maps_Builder_Widget');
 }
 
-add_action( 'widgets_init', 'init_gmb_forms_widget' );
+add_action('widgets_init', 'init_gmb_forms_widget');
 
 /**
  *  Google Places Reviews
@@ -56,36 +56,36 @@ 
 
 		parent::__construct(
 			'gmb_maps_widget', // Base ID
-			__( 'Maps Builder Widget', $this->plugin_slug ), // Name
+			__('Maps Builder Widget', $this->plugin_slug), // Name
 			array(
 				'classname'   => 'gmb-maps-widget',
-				'description' => __( 'Display a Google Map in your theme\'s widget powered sidebar.', $this->plugin_slug )
+				'description' => __('Display a Google Map in your theme\'s widget powered sidebar.', $this->plugin_slug)
 			) //Args
 		);
 
 		//Actions
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_widget_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_widget_scripts'));
 
 
 	}
 
 	//Load Widget JS Script ONLY on Widget page
-	public function admin_widget_scripts( $hook ) {
+	public function admin_widget_scripts($hook) {
 
 		// Use minified libraries if SCRIPT_DEBUG is turned off
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 		//Widget Script
-		if ( $hook == 'widgets.php' ) {
+		if ($hook == 'widgets.php') {
 
-			wp_register_style( $this->plugin_slug . '-admin-styles', GMB_PLUGIN_URL . 'assets/css/gmb-admin' . $suffix . '.css', array(), GMB_VERSION );
-			wp_enqueue_style( $this->plugin_slug . '-admin-styles' );
+			wp_register_style($this->plugin_slug.'-admin-styles', GMB_PLUGIN_URL.'assets/css/gmb-admin'.$suffix.'.css', array(), GMB_VERSION);
+			wp_enqueue_style($this->plugin_slug.'-admin-styles');
 
-			wp_register_script( 'gmb-qtip', GMB_PLUGIN_URL . 'assets/js/plugins/jquery.qtip' . $suffix . '.js', array( 'jquery' ), GMB_VERSION );
-			wp_enqueue_script( 'gmb-qtip' );
+			wp_register_script('gmb-qtip', GMB_PLUGIN_URL.'assets/js/plugins/jquery.qtip'.$suffix.'.js', array('jquery'), GMB_VERSION);
+			wp_enqueue_script('gmb-qtip');
 
-			wp_register_script( 'gmb-admin-widgets-scripts', GMB_PLUGIN_URL . 'assets/js/admin/admin-widget' . $suffix . '.js', array( 'jquery' ), GMB_VERSION, false );
-			wp_enqueue_script( 'gmb-admin-widgets-scripts' );
+			wp_register_script('gmb-admin-widgets-scripts', GMB_PLUGIN_URL.'assets/js/admin/admin-widget'.$suffix.'.js', array('jquery'), GMB_VERSION, false);
+			wp_enqueue_script('gmb-admin-widgets-scripts');
 		}
 
 
@@ -100,35 +100,35 @@ 
 	 * @return null
 	 * @see WP_Widget::form()
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		$instance = wp_parse_args( (array) $instance, $this->widget_defaults ); ?>
+		$instance = wp_parse_args((array) $instance, $this->widget_defaults); ?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Widget Title', 'gpr' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>"
-			       name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Widget Title', 'gpr'); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
+			       name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $instance['title']; ?>" />
 		</p>
 
 
 		<?php
 		//Query Give Forms
-		$args      = array(
+		$args = array(
 			'post_type'      => 'google_maps',
 			'posts_per_page' => - 1,
 			'post_status'    => 'publish',
 		);
-		$gmb_forms = get_posts( $args );
+		$gmb_forms = get_posts($args);
 		?>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>"><?php _e( 'Select a Map:', $this->plugin_slug ); ?>
-				<span class="dashicons gmb-tooltip-icon" data-tooltip="<?php _e( 'Select a map that you would like to embed in this widget area.', $this->plugin_slug ); ?>"></span>
+			<label for="<?php echo esc_attr($this->get_field_id('id')); ?>"><?php _e('Select a Map:', $this->plugin_slug); ?>
+				<span class="dashicons gmb-tooltip-icon" data-tooltip="<?php _e('Select a map that you would like to embed in this widget area.', $this->plugin_slug); ?>"></span>
 			</label>
-			<select class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>">
-				<option value="current"><?php _e( 'Please select...', $this->plugin_slug ); ?></option>
-				<?php foreach ( $gmb_forms as $gmb_form ) { ?>
-					<option <?php selected( absint( $instance['id'] ), $gmb_form->ID ); ?> value="<?php echo esc_attr( $gmb_form->ID ); ?>"><?php echo $gmb_form->post_title; ?></option>
+			<select class="widefat" name="<?php echo esc_attr($this->get_field_name('id')); ?>" id="<?php echo esc_attr($this->get_field_id('id')); ?>">
+				<option value="current"><?php _e('Please select...', $this->plugin_slug); ?></option>
+				<?php foreach ($gmb_forms as $gmb_form) { ?>
+					<option <?php selected(absint($instance['id']), $gmb_form->ID); ?> value="<?php echo esc_attr($gmb_form->ID); ?>"><?php echo $gmb_form->post_title; ?></option>
 				<?php } ?>
 			</select>
 		</p>
@@ -136,7 +136,7 @@ 
 
 		<div class="gmb-widget-upgrade clear">
 			<span class="powered-by"></span>
-			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=WIDGET&utm_campaign=MBF%20Widgets" target="_blank" class="button button-small"><?php _e( 'Upgrade to Pro', $this->plugin_slug ); ?>
+			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=WIDGET&utm_campaign=MBF%20Widgets" target="_blank" class="button button-small"><?php _e('Upgrade to Pro', $this->plugin_slug); ?>
 				<span class="new-window"></span></a>
 		</div>
 
@@ -152,14 +152,14 @@ 
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		echo $args['before_widget'];
 
-		do_action( 'gmb_before_forms_widget' );
+		do_action('gmb_before_forms_widget');
 
-		if ( ! empty( $instance['title'] ) ) {
-			echo $args['before_title'] . apply_filters( 'widget_title', $instance['title'] ) . $args['after_title'];
+		if ( ! empty($instance['title'])) {
+			echo $args['before_title'].apply_filters('widget_title', $instance['title']).$args['after_title'];
 		}
 
 		$atts = array(
@@ -167,14 +167,14 @@ 
 		);
 
 		//Ensure a map has been set
-		if ( $instance['id'] !== 'current' ) {
-			echo Google_Maps_Builder()->engine->google_maps_shortcode( $atts );
+		if ($instance['id'] !== 'current') {
+			echo Google_Maps_Builder()->engine->google_maps_shortcode($atts);
 		}
 
 
 		echo $args['after_widget'];
 
-		do_action( 'gmb_after_forms_widget' );
+		do_action('gmb_after_forms_widget');
 
 	}
 
@@ -185,11 +185,11 @@ 
 	 * @DESC: Saves the widget options
 	 * @SEE WP_Widget::update
 	 */
-	function update( $new_instance, $old_instance ) {
+	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
 		//loop through options array and save to new instance
-		foreach ( $this->widget_defaults as $field => $value ) {
-			$instance[ $field ] = strip_tags( stripslashes( $new_instance[ $field ] ) );
+		foreach ($this->widget_defaults as $field => $value) {
+			$instance[$field] = strip_tags(stripslashes($new_instance[$field]));
 		}
 
 		return $instance;