Changeset 749537

Timestamp:

08/01/2013 10:47:19 PM (13 years ago)

Author:

sreedoap

Message:

1.6.0f

File:

• pilotpress/trunk/pilotpress.php (modified) (14 diffs)

pilotpress/trunk/pilotpress.php

@@ -4 +4 @@
 Plugin URI: http://officeautopilot.com/
 Description: OfficeAutoPilot / Ontraport WordPress integration plugin.
-Version: 1.6.0e
+Version: 1.6.0f
 Author: Ontraport Inc.
 Author URI: http://officeautopilot.com/
@@ -21 +21 @@
     class PilotPress {
 
-        const VERSION = "1.6.0e";
+        const VERSION = "1.6.0f";
         const WP_MIN = "3.0.0";
         const NSPACE = "_pilotpress_";
@@ -676 +676 @@
                 $customer = $this->get_setting("pilotpress_customer_plr");
                 if(!empty($customer) && $customer != "-1") {
-                    $this->redirect(get_permalink($customer));
+                    self::redirect(get_permalink($customer));
                 } else {
-                    $this->redirect($this->homepage_url);
+                    self::redirect($this->homepage_url);
                 }
                 die;
@@ -1381 +1381 @@
                             
                             unset($_SESSION["redirect_to"]);
-                            $this->redirect($redirect_to);
+                            self::redirect($redirect_to);
                             die;
                         }
@@ -1389 +1389 @@
                             $aff_plr = $this->get_setting("pilotpress_affiliate_plr");
                             if($aff_plr && $aff_plr != "-1") {
-                                $this->redirect(get_permalink($aff_plr));
+                                self::redirect(get_permalink($aff_plr));
                                 die;
                                 exit;
                             } else {                                
-                                $this->redirect(site_url());
+                                self::redirect(site_url());
                                 die;
                             }
@@ -1400 +1400 @@
                             $cust_plr = $this->get_setting("pilotpress_customer_plr");                          
                             if($cust_plr && $cust_plr != "-1") {
-                                $this->redirect(get_permalink($cust_plr));
+                                self::redirect(get_permalink($cust_plr));
                                 die;
                             } else {
-                                $this->redirect(site_url());
+                                self::redirect(site_url());
                                 die;
                             }
@@ -1418 +1418 @@
             if(!empty($referrer) && !strstr($referrer, "wp-login") && !strstr($referrer, "wp-admin") ) {
                 $_SESSION["loginFailed"] = true;
-                $this->redirect($referrer);
+                self::redirect($referrer);
                 die;
             }
@@ -1434 +1434 @@
             {
                 /* notify user of e-mail, end the rest of WP's processing */
-                $this->redirect(site_url() . "/wp-login.php?checkemail=confirm");
+                self::redirect(site_url() . "/wp-login.php?checkemail=confirm");
                 die;
             }
@@ -1456 +1456 @@
                 /* redirect the user to where they logged in from */
                 if(isset($_SESSION["loginURL"]))
-                    $this->redirect($_SESSION["loginURL"]);
+                    self::redirect($_SESSION["loginURL"]);
                 else
-                    $this->redirect(site_url());
+                    self::redirect(site_url());
             }
                     
@@ -1608 +1608 @@
                 if(!empty($redirect)) {
                     if($redirect == "-1") {
-                        $this->redirect(site_url());
+                        self::redirect(site_url());
                     }
                     else if($redirect == "-2") {
@@ -1614 +1614 @@
                             $_SESSION["redirect_to"] = $id;
                         }
-                        $this->redirect(wp_login_url());
+                        self::redirect(wp_login_url());
                     }
                     else {
-                        $this->redirect(get_permalink($redirect));
+                        self::redirect(get_permalink($redirect));
                     }
 
                 } else {
-                    $this->redirect($this->homepage_url);
+                    self::redirect($this->homepage_url);
                 }
             }
@@ -1834 +1834 @@
                         $page_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_pilotpress_system_page' AND meta_value = 'customer_center'", ARRAY_A);
                         if($page_id) {
-                            $this->redirect(get_permalink($page_id));
+                            self::redirect(get_permalink($page_id));
                             die;
                         }
@@ -1841 +1841 @@
                         $page_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_pilotpress_system_page' AND meta_value = 'affiliate_center'", ARRAY_A);
                         if($page_id) {
-                            $this->redirect(get_permalink($page_id));
+                            self::redirect(get_permalink($page_id));
                             die;
                         }
@@ -2097 +2097 @@
         }
 
-        public function redirect($url) {
+        public static function redirect($url) {
             // Workaround for trac bug #21602
             $current_url = $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];