ClickFunnels - Version 2.0.6

Version Description

Download this release

Release Info

Developer clickfunnels.com
Plugin Icon 128x128 ClickFunnels
Version 2.0.6
Comparing to
See all releases

Code changes from version 2.0.5 to 2.0.6

Files changed (5) hide show
  1. CF_API.php +6 -2
  2. clickfunnels.php +15 -11
  3. css/admin.css +0 -2
  4. footer.php +15 -15
  5. readme.txt +5 -1
CF_API.php CHANGED
@@ -73,11 +73,15 @@ public function get_page_html( $funnel_id, $pagekey = 0, $meta = "", $title = ""
73
  $favicon_js = '$("link[rel=\'icon\']").attr(\'href\',\''.$favicon.'\');';
74
  }
75
 
 
 
 
 
76
  $newHTML = '<!DOCTYPE html>
77
  <html>
78
  <head>
79
  <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
80
- '.$$favicon_url.'
81
  <meta name="nodo-proxy" content="html">
82
  <!-- Meta Data -->
83
  <title>'.urldecode($title).'</title>
@@ -89,7 +93,7 @@ $newHTML = '<!DOCTYPE html>
89
  <meta content="'.urldecode($title).'" property="og:title">
90
  <meta content="'.urldecode($desc).'" property="og:description">
91
  <meta content="'.$social.'" property="og:image">
92
- <meta property="og:url" content="'.$slug.'">
93
  <meta property="og:type" content="website">
94
  <!-- WordPress Only Tracking Code -->
95
  '.$tracking.'
73
  $favicon_js = '$("link[rel=\'icon\']").attr(\'href\',\''.$favicon.'\');';
74
  }
75
 
76
+ $og_url_content = $slug;
77
+ if(is_front_page()):
78
+ $og_url_content = get_home_url();
79
+ endif;
80
  $newHTML = '<!DOCTYPE html>
81
  <html>
82
  <head>
83
  <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
84
+ '.$favicon_url.'
85
  <meta name="nodo-proxy" content="html">
86
  <!-- Meta Data -->
87
  <title>'.urldecode($title).'</title>
93
  <meta content="'.urldecode($title).'" property="og:title">
94
  <meta content="'.urldecode($desc).'" property="og:description">
95
  <meta content="'.$social.'" property="og:image">
96
+ <meta property="og:url" content="'.$og_url_content.'">
97
  <meta property="og:type" content="website">
98
  <!-- WordPress Only Tracking Code -->
99
  '.$tracking.'
clickfunnels.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: ClickFunnels
4
  * Plugin URI: https://www.clickfunnels.com
5
  * Description: Connect to your ClickFunnels account with simple authorization key and show any ClickFunnels page as your homepage or as 404 error pages or simply choose any of your pages and make clean URLs to your ClickFunnels pages. Don't have an account? <a target="_blank" href="https://www.clickfunnels.com">Sign up for your 2 week <em>free</em> trial now.</a>
6
- * Version: 2.0.5
7
  * Author: Etison, LLC
8
  * Author URI: https://www.clickfunnels.com
9
  */
@@ -391,7 +391,7 @@ class ClickFunnels {
391
  }
392
  public function get_page( $page_slug ) {
393
  $cf_options = get_option( "cf_options" );
394
- return $cf_options['pages'][$page_slug];
395
  }
396
  public function is_page( $page_slug ) {
397
  $cf_options = get_option( "cf_options" );
@@ -407,11 +407,11 @@ class ClickFunnels {
407
  }
408
  public function get_home() {
409
  $cf_options = get_option( "cf_options" );
410
- return $cf_options['home'];
411
  }
412
  public function is_home( $post_id ) {
413
  $cf_options = get_option( "cf_options" );
414
- if ( $cf_options['home']['post_id'] == $post_id )
415
  return true;
416
  return false;
417
  }
@@ -427,7 +427,7 @@ class ClickFunnels {
427
  }
428
  public function is_404( $post_id ) {
429
  $cf_options = get_option( "cf_options" );
430
- if ( $cf_options['404']['post_id'] == $post_id )
431
  return true;
432
  return false;
433
  }
@@ -504,7 +504,10 @@ class ClickFunnels {
504
  $original_cf_type = "p";
505
  if ( $original_cf_type == "p" ) {
506
  $data['cf_type'] = 'p';
507
- $data['cf_page'] = $this->get_page( $slug );
 
 
 
508
  $data['cf_slug'] = $slug;
509
  }
510
  if ( $this->is_home( $id ) ) {
@@ -595,7 +598,7 @@ class ClickFunnels {
595
  array(
596
  'labels' => $labels,
597
  'public' => true,
598
- 'menu_icon' => plugins_url( )."/clickfunnels/icon.png",
599
  'has_archive' => true,
600
  'supports' => array( '' ),
601
  'rewrite' => array( 'slug' => 'clickfunnels' ),
@@ -850,6 +853,7 @@ function clickfunnels_clickoptin( $atts ) {
850
  $subdomain = $a['subdomain'] . '.clickfunnels.com';
851
  }
852
 
 
853
 
854
  return "<div id='clickoptin_cf_wrapper_".$a['id']."' class='clickoptin_".$a['theme_style']."'>
855
  <input type='text' id='clickoptin_cf_email_".$a['id']."' placeholder='".$placeholder."' class='clickoptin_".$a['input_icon']."' />
@@ -858,7 +862,7 @@ function clickfunnels_clickoptin( $atts ) {
858
  <script>
859
  if (!window.jQuery) {
860
  var jq = document.createElement('script'); jq.type = 'text/javascript';
861
- jq.src = 'wp-content/plugins/clickfunnels/jquery.js';
862
  document.getElementsByTagName('head')[0].appendChild(jq);
863
  var jQueries = jQuery.noConflict();
864
 
@@ -882,7 +886,7 @@ function clickfunnels_clickoptin( $atts ) {
882
  }
883
  else {
884
  var jq = document.createElement('script'); jq.type = 'text/javascript';
885
- jq.src = 'wp-content/plugins/clickfunnels/jquery.js';
886
  document.getElementsByTagName('head')[0].appendChild(jq);
887
  var $ = jQuery.noConflict();
888
 
@@ -1060,7 +1064,7 @@ register_activation_hook( __FILE__, 'clickfunnels_plugin_activated' );
1060
  add_action('all_admin_notices', 'clickfunnels_edit_page_settings');
1061
  function clickfunnels_edit_page_settings() {
1062
  $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
1063
- if ($_GET['post_type'] == 'clickfunnels' && strpos($url,'edit.php') !== false && !$_GET['page']) {
1064
  ?>
1065
  <script>
1066
  jQuery(function() {
@@ -1078,7 +1082,7 @@ function clickfunnels_edit_page_settings() {
1078
  add_action('all_admin_notices', 'clickfunnels_check_meta_data');
1079
  function clickfunnels_check_meta_data() {
1080
  $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
1081
- if ($_GET['post_type'] == 'clickfunnels' && strpos($url,'edit.php') !== false && !$_GET['page']) {
1082
  ?>
1083
  <style>#cf_metaupdate { width: 75px; font-size: 11px; color: #777; } #cf_thepage { width: 100px;}</style>
1084
  <script>
3
  * Plugin Name: ClickFunnels
4
  * Plugin URI: https://www.clickfunnels.com
5
  * Description: Connect to your ClickFunnels account with simple authorization key and show any ClickFunnels page as your homepage or as 404 error pages or simply choose any of your pages and make clean URLs to your ClickFunnels pages. Don't have an account? <a target="_blank" href="https://www.clickfunnels.com">Sign up for your 2 week <em>free</em> trial now.</a>
6
+ * Version: 2.0.6
7
  * Author: Etison, LLC
8
  * Author URI: https://www.clickfunnels.com
9
  */
391
  }
392
  public function get_page( $page_slug ) {
393
  $cf_options = get_option( "cf_options" );
394
+ return (isset($cf_options['pages'][$page_slug])) ? $cf_options['pages'][$page_slug] : array();
395
  }
396
  public function is_page( $page_slug ) {
397
  $cf_options = get_option( "cf_options" );
407
  }
408
  public function get_home() {
409
  $cf_options = get_option( "cf_options" );
410
+ return (isset($cf_options['home'])) ? $cf_options['home'] : array();
411
  }
412
  public function is_home( $post_id ) {
413
  $cf_options = get_option( "cf_options" );
414
+ if ( isset($cf_options['home']['post_id']) and $cf_options['home']['post_id'] == $post_id )
415
  return true;
416
  return false;
417
  }
427
  }
428
  public function is_404( $post_id ) {
429
  $cf_options = get_option( "cf_options" );
430
+ if ( isset($cf_options['404']['post_id']) and $cf_options['404']['post_id'] == $post_id )
431
  return true;
432
  return false;
433
  }
504
  $original_cf_type = "p";
505
  if ( $original_cf_type == "p" ) {
506
  $data['cf_type'] = 'p';
507
+ $data['cf_page'] = '';
508
+ if($this->is_page($slug)):
509
+ $data['cf_page'] = $this->get_page( $slug );
510
+ endif;
511
  $data['cf_slug'] = $slug;
512
  }
513
  if ( $this->is_home( $id ) ) {
598
  array(
599
  'labels' => $labels,
600
  'public' => true,
601
+ 'menu_icon' => plugins_url( 'icon.png', __FILE__ ),
602
  'has_archive' => true,
603
  'supports' => array( '' ),
604
  'rewrite' => array( 'slug' => 'clickfunnels' ),
853
  $subdomain = $a['subdomain'] . '.clickfunnels.com';
854
  }
855
 
856
+ $js_file_url = plugins_url( 'jquery.js', __FILE__ );
857
 
858
  return "<div id='clickoptin_cf_wrapper_".$a['id']."' class='clickoptin_".$a['theme_style']."'>
859
  <input type='text' id='clickoptin_cf_email_".$a['id']."' placeholder='".$placeholder."' class='clickoptin_".$a['input_icon']."' />
862
  <script>
863
  if (!window.jQuery) {
864
  var jq = document.createElement('script'); jq.type = 'text/javascript';
865
+ jq.src = '" . $js_file_url . "';
866
  document.getElementsByTagName('head')[0].appendChild(jq);
867
  var jQueries = jQuery.noConflict();
868
 
886
  }
887
  else {
888
  var jq = document.createElement('script'); jq.type = 'text/javascript';
889
+ jq.src = '" . $js_file_url . "';
890
  document.getElementsByTagName('head')[0].appendChild(jq);
891
  var $ = jQuery.noConflict();
892
 
1064
  add_action('all_admin_notices', 'clickfunnels_edit_page_settings');
1065
  function clickfunnels_edit_page_settings() {
1066
  $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
1067
+ if (isset($_GET['post_type']) and $_GET['post_type'] == 'clickfunnels' && strpos($url,'edit.php') !== false && !isset($_GET['page'])) {
1068
  ?>
1069
  <script>
1070
  jQuery(function() {
1082
  add_action('all_admin_notices', 'clickfunnels_check_meta_data');
1083
  function clickfunnels_check_meta_data() {
1084
  $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
1085
+ if (isset($_GET['post_type']) and $_GET['post_type'] == 'clickfunnels' && strpos($url,'edit.php') !== false && !isset($_GET['page'])) {
1086
  ?>
1087
  <style>#cf_metaupdate { width: 75px; font-size: 11px; color: #777; } #cf_thepage { width: 100px;}</style>
1088
  <script>
css/admin.css CHANGED
@@ -348,8 +348,6 @@
348
  display: none;
349
  }
350
  input.input-xlarge {
351
- padding: 7px !important;
352
- padding: 10px !important;
353
  height: 27px;
354
  }
355
  #app_sidebar {
348
  display: none;
349
  }
350
  input.input-xlarge {
 
 
351
  height: 27px;
352
  }
353
  #app_sidebar {
footer.php CHANGED
@@ -1,22 +1,22 @@
1
  <div class="copyrightInfo">
2
- <p><strong style="float: right;font-weight: 600;font-size: 11px;text-align: right;">Running Version 2.0.5</strong> Copyright 2015+ &copy; Eitson, LLC</p>
3
  </div>
4
  <style>
5
  .copyrightInfo {
6
- width: 740px;
7
- padding: 10px 20px;
8
- padding-top: 0;
9
- float: left;
10
- background: #F6F9FB;
11
- /* box-shadow: 2px 2px 2px #DDEBF5; */
12
- border-bottom-left-radius: 4px;
13
- border-bottom-right-radius: 4px;
14
- /* border: 1px solid #F6F9FB; */
15
- border: 1px solid #E4E2E2;
16
- border-top: none;
17
- color: #074E81;
18
- margin-left: -1px;
19
- font-size: 11px;
20
  }
21
  .copyrightInfo p {
22
  font-size: 11px;
1
  <div class="copyrightInfo">
2
+ <p><strong style="float: right;font-weight: 600;font-size: 11px;text-align: right;">Running Version 2.0.6</strong> Copyright 2015+ &copy; Eitson, LLC</p>
3
  </div>
4
  <style>
5
  .copyrightInfo {
6
+ width: 740px;
7
+ padding: 10px 20px;
8
+ padding-top: 0;
9
+ float: left;
10
+ background: #F6F9FB;
11
+ /* box-shadow: 2px 2px 2px #DDEBF5; */
12
+ border-bottom-left-radius: 4px;
13
+ border-bottom-right-radius: 4px;
14
+ /* border: 1px solid #F6F9FB; */
15
+ border: 1px solid #E4E2E2;
16
+ border-top: none;
17
+ color: #074E81;
18
+ margin-left: -1px;
19
+ font-size: 11px;
20
  }
21
  .copyrightInfo p {
22
  font-size: 11px;
readme.txt CHANGED
@@ -6,7 +6,7 @@ Author URI: https://profiles.wordpress.org/clickfunnelscom
6
  Tags: landing pages, clickfunnels, funnels, sales funnel, optin, internet marketing
7
  Requires at least: 3.0
8
  Tested up to: 4.4.1
9
- Stable tag: 2.0.5
10
 
11
  Connect your ClickFunnels pages to your WordPress blog. Create custom pages, set as homepage or 404 page with easy setup.
12
 
@@ -100,6 +100,10 @@ By re-selecting the page it will ping the server which should refresh your page.
100
 
101
  Stay current with the latest version of the plugin:
102
 
 
 
 
 
103
  = Version 2.0.5 =
104
 
105
  * Redirect fixes
6
  Tags: landing pages, clickfunnels, funnels, sales funnel, optin, internet marketing
7
  Requires at least: 3.0
8
  Tested up to: 4.4.1
9
+ Stable tag: 2.0.6
10
 
11
  Connect your ClickFunnels pages to your WordPress blog. Create custom pages, set as homepage or 404 page with easy setup.
12
 
100
 
101
  Stay current with the latest version of the plugin:
102
 
103
+ = Version 2.0.6 =
104
+
105
+ * Warnings, Offset fixes
106
+
107
  = Version 2.0.5 =
108
 
109
  * Redirect fixes