Check response before comparing versions

Fix issue in updater causing critical error, update plugin name

custom-visual-builder-button.php

@@ -1,9 +1,9 @@
 <?php
 /**
- * Plugin Name: Avada Button Shortcode
+ * Plugin Name: 4sure - Avada Button Shortcode
  * Plugin URI: https://4sure.com.au
  * Description: Adds Avada button shortcodes to the classic editor
- * Version: 1.0.2
+ * Version: 1.0.8
  * Author: 4sure
  * Requires PHP: 7.2
  * Requires at least: 5.8
@@ -22,8 +22,8 @@ add_action( 'wp_enqueue_scripts', 'vbb_enqueue_styles' );
 function vbb_enqueue_styles(){
     wp_enqueue_style( 'vbb-widget-styles', VBB_PLUGIN_PATH.'css/frontend-button-widget-styles.css' );
 }
-add_shortcode('button', 'custom_visual_builder_button');
-function custom_visual_builder_button($atts = array()){
+add_shortcode('button', 'vbb_custom_visual_builder_button');
+function vbb_custom_visual_builder_button($atts = array()){
     $args = shortcode_atts(
         array(
         'target'    => '',
@@ -52,7 +52,7 @@ function custom_visual_builder_button($atts = array()){
     return $html;
 }
 //add media button to visual builder
-function add_shortcodes_media_button() {
+function vbb_add_shortcodes_media_button() {
     $the_page = get_current_screen();
     $current_page = $the_page->post_type;
     $allowed = array(
@@ -61,10 +61,11 @@ function add_shortcodes_media_button() {
         'product',
         'tribe_events'
     );
-    if (in_array($current_page, $allowed, false) || $the_page->base == 'toplevel_page_access-manager' || $the_page->base == 'post'){
+    if (in_array($current_page, $allowed, false) || $the_page->base == 'toplevel_page_access-manager' || $the_page->base == 'post' || $the_page->base == 'toplevel_page_acc-default-settings'){
         printf( '<a href="%s" class="button generate-button-shortcode">' . '<span class="wp-media-buttons-icon dashicons dashicons-shortcode"></span> %s' . '</a>', '#', __( 'Generate Button', 'textdomain' ) );
     }
-    if(get_current_screen()->base == 'toplevel_page_access-manager'){
+    $current_screen = get_current_screen()->base;
+    if ($current_screen == 'toplevel_page_access-manager' || $current_screen == 'toplevel_page_acc-default-settings'){
         echo '<script type="text/javascript">
         jQuery(document).ready(function($){
             $(".generate-button-shortcode").click(function(e){
@@ -76,19 +77,20 @@ function add_shortcodes_media_button() {
         </script>';
     }
 }
-add_action( 'media_buttons', 'add_shortcodes_media_button');
+add_action( 'media_buttons', 'vbb_add_shortcodes_media_button');
 //Button shortcode admin bar widget
-add_action('admin_enqueue_scripts', 'my_enqueue');
-function my_enqueue($hook) {
+add_action('admin_enqueue_scripts', 'vbb_admin_scripts_enqueue');
+function vbb_admin_scripts_enqueue($hook) {
     // Only add to the edit post/page admin page.
-    if ('post.php' == $hook || 'post-new.php' == $hook || 'toplevel_page_access-manager' == $hook) {
-        wp_enqueue_script('admin_custom_script', VBB_PLUGIN_PATH.'js/custom-admin-scripts.js');
+    if ('post.php' == $hook || 'post-new.php' == $hook || 'toplevel_page_access-manager' == $hook || 'toplevel_page_acc-default-settings' == $hook) {
+        wp_enqueue_script('admin_custom_script', VBB_PLUGIN_PATH.'js/custom-admin-scripts.js', array('jquery-ui-dialog'));
         wp_enqueue_script('jquery-ui', 'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js');
     }else{return;}
 }
-add_action( 'edit_form_after_editor', 'render_button_shortcode_dialog' );
-add_action( 'toplevel_page_access-manager', 'render_button_shortcode_dialog', 20 );
-function render_button_shortcode_dialog( $post ){
+add_action( 'edit_form_after_editor', 'vbb_render_button_shortcode_dialog' );
+add_action( 'toplevel_page_access-manager', 'vbb_render_button_shortcode_dialog', 20 );
+add_action( 'toplevel_page_acc-default-settings', 'vbb_render_button_shortcode_dialog', 20 );
+function vbb_render_button_shortcode_dialog( $post ){
 	echo '
     <style>
         #button-shortcode-dialog{display: none;}
@@ -194,8 +196,8 @@ function render_button_shortcode_dialog( $post ){
     <div id="page-mask"></div>
     ';
 }
-add_action('admin_bar_menu', 'add_toolbar_items', 100);
-function add_toolbar_items($admin_bar){
+add_action('admin_bar_menu', 'vbb_add_toolbar_items', 100);
+function vbb_add_toolbar_items($admin_bar){
     $admin_bar->add_menu( array(
         'id'    => 'generate-button-shortcode',
         'title' => 'Generate Button',
@@ -205,12 +207,13 @@ function add_toolbar_items($admin_bar){
         ),
     ));
 }
-add_action( 'admin_head', 'hide_button_widget' );
-function hide_button_widget() {
+add_action( 'admin_head', 'vbb_hide_button_widget' );
+function vbb_hide_button_widget() {
     echo '<style> 
     #wp-admin-bar-generate-button-shortcode{display: none;}
     body.post-php #wp-admin-bar-generate-button-shortcode,
     body.post-new-php #wp-admin-bar-generate-button-shortcode,
-    body.toplevel_page_access-manager #wp-admin-bar-generate-button-shortcode{display: list-item;}
+    body.toplevel_page_access-manager #wp-admin-bar-generate-button-shortcode,
+    body.toplevel_page_acc-default-settings #wp-admin-bar-generate-button-shortcode{display: list-item;}
     </style>';
 }

js/custom-admin-scripts.js

@@ -14,6 +14,7 @@ jQuery(document).ready(function($){
         },
         minWidth: 480
     });
+    if(typeof acf != 'undefined'){
         acf.addAction('load', function(){
             $(document).on("click", ".generate-button-shortcode", function(e){
                 e.preventDefault();
@@ -21,6 +22,14 @@ jQuery(document).ready(function($){
                 $("#page-mask").css({"opacity":1, "pointer-events": "auto"});
             });
         });
+    }else{
+        $(document).on("click", ".generate-button-shortcode", function(e){
+            e.preventDefault();
+            $("#button-shortcode-dialog").dialog("open"); 
+            $("#page-mask").css({"opacity":1, "pointer-events": "auto"});
+        });
+    }
+   
     $('.generate-button-shortcode').click(function(e){
         e.preventDefault();
         $("#button-shortcode-dialog").dialog("open"); 

updater.php

@@ -62,7 +62,11 @@ class Custom_visual_builder_button_updater {
         if( property_exists( $transient, 'checked') ) { // Check if transient has a checked property
           if( $checked =  $transient->checked ) { // Did WordPress check for updates?
             $this->get_repository_info(); // Get the repo info
+            if( is_array($this->github_response) && !empty($this->github_response['tag_name']) && !empty($checked[$this->basename]) ) { // Check response
                $out_of_date = version_compare( $this->github_response['tag_name'], $checked[$this->basename], 'gt' ); // Check if we're out of date
+            } else {
+              $out_of_date = false;
+            }
             if( $out_of_date ) {
               $new_files = $this->github_response['zipball_url']; // Get the ZIP
               $slug = current( explode('/', $this->basename ) ); // Create valid slug