Changeset 810955

Timestamp:

11/26/2013 06:29:22 PM (12 years ago)

Author:

sreedoap

Message:

PilotPress 1.6.0g

Location:

pilotpress/trunk

Files:

• pilotpress.php (modified) (8 diffs)
• readme.txt (modified) (2 diffs)

pilotpress/trunk/pilotpress.php

@@ -4 +4 @@
 Plugin URI: http://officeautopilot.com/
 Description: OfficeAutoPilot / Ontraport WordPress integration plugin.
-Version: 1.6.0f
+Version: 1.6.0g
 Author: Ontraport Inc.
 Author URI: http://officeautopilot.com/
@@ -21 +21 @@
     class PilotPress {
 
-        const VERSION = "1.6.0f";
+        const VERSION = "1.6.0g";
         const WP_MIN = "3.0.0";
         const NSPACE = "_pilotpress_";
@@ -159 +159 @@
                             self::$url_mrcss = "https://forms.ontraport.com/v2.4/include/minify/?g=moonrayCSS";
                         }
+
+                        // for debugging
+                        if(is_file(ABSPATH . "/pp_debug_include.php"))
+                        {
+                            include_once(ABSPATH . "/pp_debug_include.php");
+                        }
                     }
 
@@ -686 +692 @@
         /* please load scripts here vs. printing. it's so much healthier */
         function load_scripts() {
+            wp_enqueue_script("jquery");
             wp_register_script("mr_tracking", self::$url_tjs);
             wp_enqueue_script("mr_tracking");
-            wp_enqueue_script("jquery");
         }
 
@@ -705 +711 @@
         /* except this one. */
         function tracking() {
-            echo "<script>_mri = \"".$this->get_setting('tracking','oap')."\";_mr_domain = \"reed.ontraport.net\"; mrtracking();</script>";
+            echo "<script>_mri = \"".$this->get_setting('tracking','oap')."\";_mr_domain = \"" . $this->get_setting('tracking_url', 'oap') . "\"; mrtracking();</script>";
         }
     
@@ -857 +863 @@
         function get_insert_video_html(){
             if(isset($_POST["video_id"])) {
-                $api_result = $this->api_call("get_video", array("video_id" => $_POST["video_id"], "width" => '480', "height" => "320", "player" => $_POST["use_player"], "autoplay" => $_POST["use_autoplay"], "viral" => $_POST["use_viral"]));
+                $api_result = $this->api_call("get_video", array(
+                    "video_id" => $_POST["video_id"],
+                    "width" => '480',
+                    "height" => "320",
+                    "player" => $_POST["use_player"],
+                    "autoplay" => $_POST["use_autoplay"],
+                    "viral" => $_POST["use_viral"],
+                    "omit_flowplayerjs" => ($_POST["omit_flowplayerjs"] == "true" ? true : false)
+                ));
                 echo $api_result["code"];
                 die;
@@ -996 +1010 @@
                     var autoplay = $('#autoplay_'+the_video_id).val();
                     var viral = $('#viral_'+the_video_id).val();
-
-                    $.post("<?php echo $this->homepage_url; ?>/wp-admin/admin-ajax.php", { action: "pp_insert_video", video_id: the_video_id, use_viral: viral, use_player: player, use_autoplay: autoplay, 'cookie': encodeURIComponent(document.cookie) },
+                    var omit_flowplayerjs = false;
+
+                    if($("textarea.wp-editor-area", top.document).val().indexOf("clientvids/flowplayer") !== -1) {
+                        omit_flowplayerjs = true;
+                    }
+
+                    $.post("<?php echo $this->homepage_url; ?>/wp-admin/admin-ajax.php", { action: "pp_insert_video", video_id: the_video_id, use_viral: viral, use_player: player, use_autoplay: autoplay, 'cookie': encodeURIComponent(document.cookie), "omit_flowplayerjs": omit_flowplayerjs },
                      function(str){                     
                         var ed;
@@ -1352 +1371 @@
                             $cookie_domain = COOKIE_DOMAIN;
                         }
+
+                        setcookie("contact_id", $api_result["contact_id"], (time() + 2419200), COOKIEPATH, $cookie_domain, false);
                                                 
                         $user_id = $user->ID;

pilotpress/trunk/readme.txt

@@ -62 +62 @@
 == Changelog ==
 
+= 1.6.0g =
+* Fixed an issue where inserting multiple videos into one page could break flowplayer functionality.
+
 = 1.6.0f =
 * Fixed a bug introduced in 1.6.0e where logging out would result in an HTTP 500 error.
@@ -108 +111 @@
 == Upgrade Notice ==
 
+= 1.6.0g =
+* Fixed an issue where inserting multiple videos into one page could break flowplayer functionality.
+
 = 1.6.0f =
 * Fixed a bug introduced in 1.6.0e where logging out would result in an HTTP 500 error.