AyeCode / invoicing

includes/admin/html-admin-page-addons.php

Indentation +47 added lines, -47 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 add_ThickBox();
 ?>
@@ -14,18 +14,18 @@ 
 	<?php if ( $tabs ){ ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
-			}
-			do_action( 'wpi_addons_tabs' );
-			?>
+            foreach ( $tabs as $name => $label ) {
+                echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
+            }
+            do_action( 'wpi_addons_tabs' );
+            ?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+        if($current_tab == 'membership'){
 
-			?>
+            ?>
 
 			<div class="wpi-membership-tab-conatiner">
 				<h2>With our WPInvoicing Membership you get access to all our products!</h2>
@@ -36,28 +36,28 @@ 
 
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108));
-						?>
+                        $wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
+                        echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108));
+                        ?>
 					</p>
 				<?php }?>
 			</div>
 
 			<?php
-		}else{
-			$installed_plugins = get_plugins();
+        }else{
+            $installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
-				?>
+            if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+                ?>
 				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
                         if(965==$addon->info->id){continue;}// don't show quote add on
-						?><li class="wpi-product">
+                        ?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
-										}
-										echo esc_html( $addon->info->title ); ?></h3>
+                                        if ( ! empty( $addon->info->excerpt) ){
+                                            echo wpi_help_tip( $addon->info->excerpt );
+                                        }
+                                        echo esc_html( $addon->info->title ); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
@@ -65,27 +65,27 @@ 
 										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
 									<?php endif;
 
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
-										}else{
-											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
-											}
-										}
-										echo '<a href="'.$url.'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}
-
-									?>
+                                    if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
+                                        echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
+                                        if(defined('WP_EASY_UPDATES_ACTIVE')){
+                                            $url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
+                                        }else{
+                                            // if installed show activation link
+                                            if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
+                                            }else{
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
+                                            }
+                                        }
+                                        echo '<a href="'.$url.'" class="thickbox">';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }
+
+                                    ?>
 
 								</span>
 
@@ -93,15 +93,15 @@ 
 								<span class="wpi-product-button">
 									<?php
                                     $addon_obj->output_button( $addon );
-									?>
+                                    ?>
 								</span>
 
 								<span class="wpi-price"><?php //print_r($addon); //echo wp_kses_post( $addon->price ); ?></span></li><?php endforeach; ?></ul>
 			<?php endif;
-		}
+        }
 
-	}
-	?>
+    }
+    ?>
 
 
 	<div class="clearfix" ></div>
@@ -120,8 +120,8 @@ 
 			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
-			?>
+            echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+            ?>
 		</span>
 	</div>
 

Braces +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 			</div>
 
 			<?php
-		}else{
+		} else{
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
 			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
@@ -69,14 +69,14 @@ 
 										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
 										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
 										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
+									} elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
 										if(defined('WP_EASY_UPDATES_ACTIVE')){
 											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
-										}else{
+										} else{
 											// if installed show activation link
 											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} else{
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}

includes/class-wpinv-addons.php

Indentation +201 added lines, -201 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,71 +15,71 @@ 
 class WPInv_Admin_Addons extends Ayecode_Addons {
 
 
-	/**
-	 * Get the extensions page tabs.
-	 *
-	 * @return array of tabs.
-	 */
-	public function get_tabs(){
-		$tabs = array(
-			'addons' => __("Addons", "invoicing"),
+    /**
+     * Get the extensions page tabs.
+     *
+     * @return array of tabs.
+     */
+    public function get_tabs(){
+        $tabs = array(
+            'addons' => __("Addons", "invoicing"),
             'gateways' => __("Payment Gateways", "invoicing"),
             'recommended_plugins' => __("Recommended plugins", "invoicing"),
             'membership' => __("Membership", "invoicing"),
-		);
-
-		return $tabs;
-	}
-
-	/**
-	 * Get section content for the addons screen.
-	 *
-	 * @param  string $section_id
-	 *
-	 * @return array
-	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
-		$api_url = "https://wpinvoicing.com/edd-api/v2/products/";
-		$section_data = new stdClass();
-
-		if($section_id=='recommended_plugins'){
-			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		}
-		elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
-			//if ( 1==1) {
-
-				$query_args = array( 'category' => $section_id, 'number' => 100);
-				$query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
-
-				$raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
-
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
-
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
-					}
-				}
-			}
-		}
-
-		$products = isset($section_data->products) ? $section_data->products : '';
-
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
-	}
-
-	/**
-	 * Outputs a button.
-	 *ccc
-	 * @param string $url
-	 * @param string $text
-	 * @param string $theme
-	 * @param string $plugin
-	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        );
+
+        return $tabs;
+    }
+
+    /**
+     * Get section content for the addons screen.
+     *
+     * @param  string $section_id
+     *
+     * @return array
+     */
+    public function get_section_data( $section_id ) {
+        $section      = self::get_tab( $section_id );
+        $api_url = "https://wpinvoicing.com/edd-api/v2/products/";
+        $section_data = new stdClass();
+
+        if($section_id=='recommended_plugins'){
+            $section_data->products = self::get_recommend_wp_plugins_edd_formatted();
+        }
+        elseif ( ! empty( $section ) ) {
+            if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+            //if ( 1==1) {
+
+                $query_args = array( 'category' => $section_id, 'number' => 100);
+                $query_args = apply_filters('wpeu_edd_api_query_args',$query_args,$api_url,$section_id);
+
+                $raw_section = wp_safe_remote_get( esc_url_raw( add_query_arg($query_args ,$api_url) ), array( 'user-agent' => 'Invoicing Addons Page','timeout'     => 15, ) );
+
+                if ( ! is_wp_error( $raw_section ) ) {
+                    $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+
+                    if ( ! empty( $section_data->products ) ) {
+                        set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+                    }
+                }
+            }
+        }
+
+        $products = isset($section_data->products) ? $section_data->products : '';
+
+        return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+    }
+
+    /**
+     * Outputs a button.
+     *ccc
+     * @param string $url
+     * @param string $text
+     * @param string $theme
+     * @param string $plugin
+     */
+    public function output_button( $addon ) {
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -91,123 +91,123 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array('supreme-directory','directory-starter');
-
-		$button_args = array(
-			'type' => $current_tab,
-			'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
-			'title' => isset($addon->info->title) ? $addon->info->title : '',
-			'button_text' => __('Free','invoicing'),
-			'price_text' => __('Free','invoicing'),
-			'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
-			'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
-			'class' => 'button-primary',
-			'install_status' => 'get',
-			'installed' => false,
-			'price' => '',
-			'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
-			'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
-			'onclick' => '',
-			'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
-			'active' => false,
-			'file' => '',
-			'update_url' => '',
-		);
-
-		if($current_tab == 'addons' && isset($addon->info->id) && $addon->info->id){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$status = self::install_plugin_install_status($addon);
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
-			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
-			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
-			$button_args['installed'] = self::is_theme_installed($addon);
-			if(!in_array($button_args['slug'],$wp_org_themes)){
-				$button_args['update_url'] = "https://wpinvoicing.com";
-			}
-		}elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
-			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
-			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
-			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
-			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
-		}
-
-		// set price
-		if(isset($addon->pricing) && !empty($addon->pricing)){
-			if(is_object($addon->pricing)){
-				$prices = (Array)$addon->pricing;
-				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
-				$button_args['price'] = $addon->pricing;
-			}
-		}
-
-		// set price text
-		if( $button_args['price'] && $button_args['price'] != '0.00' ){
-			$button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
-		}
-
-
-		// set if installed
-		if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
-			$button_args['installed'] = true;
-		}
+        $wp_org_themes = array('supreme-directory','directory-starter');
+
+        $button_args = array(
+            'type' => $current_tab,
+            'id' => isset($addon->info->id) ? absint($addon->info->id) : '',
+            'title' => isset($addon->info->title) ? $addon->info->title : '',
+            'button_text' => __('Free','invoicing'),
+            'price_text' => __('Free','invoicing'),
+            'link' => isset($addon->info->link) ? $addon->info->link : '', // link to product
+            'url' => isset($addon->info->link) ? $addon->info->link : '', // button url
+            'class' => 'button-primary',
+            'install_status' => 'get',
+            'installed' => false,
+            'price' => '',
+            'licensing' => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
+            'license' => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
+            'onclick' => '',
+            'slug' => isset($addon->info->slug) ? $addon->info->slug : '',
+            'active' => false,
+            'file' => '',
+            'update_url' => '',
+        );
+
+        if($current_tab == 'addons' && isset($addon->info->id) && $addon->info->id){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $status = self::install_plugin_install_status($addon);
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+            if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
+            $button_args['update_url'] = "https://wpinvoicing.com";
+        }elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+            if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
+            $button_args['installed'] = self::is_theme_installed($addon);
+            if(!in_array($button_args['slug'],$wp_org_themes)){
+                $button_args['update_url'] = "https://wpinvoicing.com";
+            }
+        }elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
+            include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+            $status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
+            $button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
+            $button_args['file'] = isset($status['file']) ? $status['file'] : '';
+        }
+
+        // set price
+        if(isset($addon->pricing) && !empty($addon->pricing)){
+            if(is_object($addon->pricing)){
+                $prices = (Array)$addon->pricing;
+                $button_args['price'] = reset($prices);
+            }elseif(isset($addon->pricing)){
+                $button_args['price'] = $addon->pricing;
+            }
+        }
+
+        // set price text
+        if( $button_args['price'] && $button_args['price'] != '0.00' ){
+            $button_args['price_text'] = sprintf( __('From: $%d', 'invoicing'), $button_args['price']);
+        }
+
+
+        // set if installed
+        if(in_array($button_args['install_status'], array('installed','latest_installed','update_available','newer_installed'))){
+            $button_args['installed'] = true;
+        }
 
 //		print_r($button_args);
-		// set if active
-		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
-			if($button_args['type'] != 'themes'){
-				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
-				$button_args['active'] = self::is_theme_active($addon);
-			}
-		}
-
-		// set button text and class
-		if($button_args['active']){
-			$button_args['button_text'] = __('Active','invoicing');
-			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
-			$button_args['button_text'] = __('Activate','invoicing');
-
-			if($button_args['type'] != 'themes'){
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}else{
-				if ( current_user_can( 'switch_themes' ) ) {
-					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
-					$button_args['url'] = '#';
-				}
-			}
-
-		}else{
-			if($button_args['type'] == 'recommended_plugins'){
-				$button_args['button_text'] = __('Install','invoicing');
-			}else{
-				$button_args['button_text'] = __('Get it','invoicing');
-
-				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
+        // set if active
+        if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
+            if($button_args['type'] != 'themes'){
+                $button_args['active'] = is_plugin_active($button_args['file']);
+            }else{
+                $button_args['active'] = self::is_theme_active($addon);
+            }
+        }
+
+        // set button text and class
+        if($button_args['active']){
+            $button_args['button_text'] = __('Active','invoicing');
+            $button_args['class'] = ' button-secondary disabled ';
+        }elseif($button_args['installed']){
+            $button_args['button_text'] = __('Activate','invoicing');
+
+            if($button_args['type'] != 'themes'){
+                if ( current_user_can( 'manage_options' ) ) {
+                    $button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }else{
+                if ( current_user_can( 'switch_themes' ) ) {
+                    $button_args['url'] = self::get_theme_activation_url($addon);
+                }else{
+                    $button_args['url'] = '#';
+                }
+            }
+
+        }else{
+            if($button_args['type'] == 'recommended_plugins'){
+                $button_args['button_text'] = __('Install','invoicing');
+            }else{
+                $button_args['button_text'] = __('Get it','invoicing');
+
+                /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 					$button_args['button_text'] = __('Install','invoicing');
 					$button_args['url'] = self::get_theme_install_url($button_args['slug']);
 					$button_args['onclick'] = 'gd_set_button_installing(this);';
 				}*/
 
-			}
-		}
+            }
+        }
 
 		
-		// filter the button arguments
-		$button_args = apply_filters('edd_api_button_args',$button_args);
+        // filter the button arguments
+        $button_args = apply_filters('edd_api_button_args',$button_args);
 
-		// set price text
-		if(isset($button_args['price_text'])){
-			?>
+        // set price text
+        if(isset($button_args['price_text'])){
+            ?>
 			<a
 				target="_blank"
 				class="addons-price-text"
@@ -215,15 +215,15 @@ 
 				<?php echo esc_html( $button_args['price_text'] ); ?>
 			</a>
 			<?php
-		}
+        }
 
 
-		$target = '';
-		if ( ! empty( $button_args['url'] ) ) {
-			$target = strpos($button_args['url'], get_site_url()) !== false ? '' : ' target="_blank" ';
-		}
+        $target = '';
+        if ( ! empty( $button_args['url'] ) ) {
+            $target = strpos($button_args['url'], get_site_url()) !== false ? '' : ' target="_blank" ';
+        }
 
-		?>
+        ?>
 		<a
 			data-licence="<?php echo esc_attr($button_args['license']);?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0;?>"
@@ -246,28 +246,28 @@ 
 		<?php
 
 
-	}
-
-
-	/**
-	 * Handles output of the addons page in admin.
-	 */
-	public function output() {
-		$tabs            = self::get_tabs();
-		$sections        = self::get_sections();
-		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
-		include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public function get_recommend_wp_plugins(){
-		$plugins = array(
+    }
+
+
+    /**
+     * Handles output of the addons page in admin.
+     */
+    public function output() {
+        $tabs            = self::get_tabs();
+        $sections        = self::get_sections();
+        $theme           = wp_get_theme();
+        $section_keys    = array_keys( $sections );
+        $current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        include_once( WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php' );
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public function get_recommend_wp_plugins(){
+        $plugins = array(
             'invoicing-quotes' => array(
                 'url'   => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'   => 'invoicing-quotes',
@@ -287,8 +287,8 @@ 
                 'name'   => 'UsersWP',
                 'desc'   => __('Allow frontend user login and registration as well as have slick profile pages.','invoicing'),
             ),
-		);
+        );
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 }

Braces +11 added lines, -12 removed lines

@@ -45,8 +45,7 @@ 
 
 		if($section_id=='recommended_plugins'){
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		}
-		elseif ( ! empty( $section ) ) {
+		} elseif ( ! empty( $section ) ) {
 			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
 			//if ( 1==1) {
 
@@ -121,13 +120,13 @@ 
 			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
 			if(isset($status['status'])){$button_args['install_status'] = $status['status'];}
 			$button_args['update_url'] = "https://wpinvoicing.com";
-		}elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+		} elseif($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
 			if(!empty($addon->licensing->edd_slug)){$button_args['slug'] = $addon->licensing->edd_slug;}
 			$button_args['installed'] = self::is_theme_installed($addon);
 			if(!in_array($button_args['slug'],$wp_org_themes)){
 				$button_args['update_url'] = "https://wpinvoicing.com";
 			}
-		}elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
+		} elseif($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug){
 			include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 			$status = install_plugin_install_status(array("slug"=>$button_args['slug'],"version"=>""));
 			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
@@ -139,7 +138,7 @@ 
 			if(is_object($addon->pricing)){
 				$prices = (Array)$addon->pricing;
 				$button_args['price'] = reset($prices);
-			}elseif(isset($addon->pricing)){
+			} elseif(isset($addon->pricing)){
 				$button_args['price'] = $addon->pricing;
 			}
 		}
@@ -160,7 +159,7 @@ 
 		if($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')){
 			if($button_args['type'] != 'themes'){
 				$button_args['active'] = is_plugin_active($button_args['file']);
-			}else{
+			} else{
 				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
@@ -169,27 +168,27 @@ 
 		if($button_args['active']){
 			$button_args['button_text'] = __('Active','invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		}elseif($button_args['installed']){
+		} elseif($button_args['installed']){
 			$button_args['button_text'] = __('Activate','invoicing');
 
 			if($button_args['type'] != 'themes'){
 				if ( current_user_can( 'manage_options' ) ) {
 					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$button_args['file']), 'activate-plugin_' . $button_args['file']);
-				}else{
+				} else{
 					$button_args['url'] = '#';
 				}
-			}else{
+			} else{
 				if ( current_user_can( 'switch_themes' ) ) {
 					$button_args['url'] = self::get_theme_activation_url($addon);
-				}else{
+				} else{
 					$button_args['url'] = '#';
 				}
 			}
 
-		}else{
+		} else{
 			if($button_args['type'] == 'recommended_plugins'){
 				$button_args['button_text'] = __('Install','invoicing');
-			}else{
+			} else{
 				$button_args['button_text'] = __('Get it','invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){

includes/libraries/class-ayecode-addons.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 if(!class_exists('Ayecode_Addons')) {
 
     abstract class Ayecode_Addons