Class object issue fixed

Author: codehaveli

codehaveli-bitly-url-shortener.php

@@ -21,10 +21,6 @@
 define( 'WBITLY_BASENAME', plugin_basename( __FILE__ ) );
 define( 'WBITLY_SETTINGS_URL', admin_url( 'tools.php?page=wbitly' ) );
 
-// https://raventools.com/marketing-reports/google-analytics/url-builder/?utm_source=Social%20Network&utm_medium=link&utm_campaign=Bitly&utm_term=Term&utm_content=Content
-
-
-
 
 /**
  * Load Admin Assets
@@ -63,4 +59,6 @@
  */
 
 
-require_once 'inc/wbitly-wp-functions.php';
+require_once 'inc/wbitly-wp-functions.php';
+
+

inc/wbitly-integration.php

@@ -6,7 +6,7 @@
  * @Last Modified by:   Codehaveli
  * @Website: www.codehaveli.com
  * @Email: hello@codehaveli.com
- * @Last Modified time: 2020-06-30 19:03:04
+ * @Last Modified time: 2020-08-27 13:44:51
  */
 
 
@@ -22,7 +22,7 @@ function wbitly_generate_shorten_url($permalink){
    if ( ! class_exists( 'WbitlyURLSettings' ) ) {
       return;
     }
-     global $wbitly_settings;
+     $wbitly_settings = new WbitlyURLSettings();
 
      $permalink      =  apply_filters( 'wbitly_url_before_process', $permalink );
      $access_token   =  $wbitly_settings->get_wbitly_access_token();
@@ -122,7 +122,7 @@ function wbitly_shorten_url ($permalink) {
 
 
 
-    global $wbitly_settings;
+    $wbitly_settings = new WbitlyURLSettings();
 
     $access_token =  $wbitly_settings->get_wbitly_access_token();
     $guid         =  $wbitly_settings->get_wbitly_guid();

inc/wbitly-settings.php

@@ -6,12 +6,13 @@
  * @Last Modified by:   Codehaveli
  * @Website: www.codehaveli.com
  * @Email: hello@codehaveli.com
- * @Last Modified time: 2020-08-20 09:27:42
+ * @Last Modified time: 2020-08-27 13:51:35
  */
 
 
 
 class WbitlyURLSettings {
+
 	private $bitly_url_options;
 
 	public function __construct() {
@@ -358,7 +359,7 @@ public function add_wbitly_social_share_button() {
 
 		$wbitly_social_share = '';
 
-	    if($this->bitly_url_options['wbitly_socal_share']){
+	    if(isset($this->bitly_url_options['wbitly_socal_share'])){
 	    	$wbitly_social_share =  $this->bitly_url_options['wbitly_socal_share'] == "enable" ? "checked" : '';   	
 	    }
 
@@ -416,18 +417,15 @@ public function get_wbitly_socal_share_status(){
 		return $wbitly_socal_share === "enable" ? true : false;
 	}
 
+}
 
 
 
+ $wbitly_settings = new WbitlyURLSettings();
 
 
 
 
-}
-if ( is_admin() )
-	$wbitly_settings = new WbitlyURLSettings();
-
-
 
 
 

inc/wbitly-util.php

@@ -6,7 +6,7 @@
  * @Last Modified by:   Codehaveli
  * @Website: www.codehaveli.com
  * @Email: hello@codehaveli.com
- * @Last Modified time: 2020-06-29 17:26:28
+ * @Last Modified time: 2020-08-27 13:36:38
  */
 
 
@@ -50,8 +50,8 @@ function wbitly_remove_http($url) {
 
 function get_wbitly_headers(){
 
-	$bitly_settings      =  new WbitlyURLSettings();
-    $access_token   	 =  $bitly_settings->get_wbitly_access_token();
+	$wbitly_settings = new WbitlyURLSettings();
+    $access_token   	 =  $wbitly_settings->get_wbitly_access_token();
 
 	$headers = array (
         "Host"          => "api-ssl.bitly.com",

templates/share.php

@@ -1,6 +1,8 @@
 <?php
 
-   $bitly_url = get_wbitly_short_url($post_id);
+global $post_id;
+
+$bitly_url = get_wbitly_short_url($post_id);
 
 ?>