WordPress.org
Get WordPress

Plugin Directory

Changeset 1658970


Ignore:
Timestamp:
05/17/2017 12:01:00 AM (9 years ago)
Author:
Infusionsoft
Message:

Fix Contact Form 7 Plugin Conflict

Location:
infusionsoft-official-opt-in-forms/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • infusionsoft-official-opt-in-forms/trunk/changelog.txt

    r1656253 r1658970  
     1version 1.0.4
     2- Fixes contact 7 forms plugin conflict
     3
    14version 1.0.3
    25- Optinid is no longer removed on form edit

  • infusionsoft-official-opt-in-forms/trunk/includes/classes/integrations/class.infusionsoft-infusionsoft.php

    r1647443 r1658970  
    4848            $infusion_app = new InfusionsoftWordPressSDK();
    4949            $infusion_app->cfgCon( $app_id, $api_key, 'throw' );
    50         } catch ( iSDKException $e ) {
     50        } catch ( InfusionsoftWordPressSDKException $e ) {
    5151            $error_message = $e->getMessage();
    5252        }
    … …  
    7373            $infusion_app = new InfusionsoftWordPressSDK();
    7474            $infusion_app->cfgCon( $app_id, $api_key, 'throw' );
    75         } catch ( iSDKException $e ) {
     75        } catch ( InfusionsoftWordPressSDKException $e ) {
    7676            $error_message = $e->getMessage();
    7777        }
    … …  
    100100            $infusion_app = new InfusionsoftWordPressSDK();
    101101            $infusion_app->cfgCon( $app_id, $api_key, 'throw' );
    102         } catch ( iSDKException $e ) {
     102        } catch ( InfusionsoftWordPressSDKException $e ) {
    103103            $error_message = $e->getMessage();
    104104        }
    … …  
    142142            $infusion_app->cfgCon( $app_id, $api_key, 'throw' );
    143143            $infusion_app->dsGetSetting( 'application', 'enabled' );
    144         } catch ( iSDKException $e ) {
     144        } catch ( InfusionsoftWordPressSDKException $e ) {
    145145            $error_message = $e->getMessage();
    146146        }

  • infusionsoft-official-opt-in-forms/trunk/infusionsoft.php

    r1656253 r1658970  
    33 * Plugin Name: Infusionsoft Official Opt-in Forms
    44 * Plugin URI: https://www.infusionsoft.com
    5  * Version: 1.0.3
     5 * Version: 1.0.4
    66 * Description: Infusionsoft Official Opt-in Forms
    77 * Author: Infusionsoft

  • infusionsoft-official-opt-in-forms/trunk/readme.txt

    r1656253 r1658970  
    44Requires at least: 3.5
    55Tested up to: 4.7
    6 Stable tag: 1.0.3
     6Stable tag: 1.0.4
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    8080
    8181== Changelog ==
     82= 1.0.4 =
     83* Fixes Contact 7 Forms Conflict
     84
     85= 1.0.3 =
     86* Optinid is no longer removed on form edit
    8287
    8388= 1.0.2 =
    … …  
    100105
    101106== Upgrade Notice ==
     107= 1.0.4 =
     108Fixes Contact 7 Forms Conflict
     109
    102110= 1.0.3 =
    103111Optinid is no longer removed on form edit

  • infusionsoft-official-opt-in-forms/trunk/subscription/infusionsoft/InfusionsoftWordPressSDK.php

    r1647443 r1658970  
    1313}
    1414
    15 class iSDKException extends Exception {
     15class InfusionsoftWordPressSDKException extends Exception {
    1616}
    1717
    … …  
    3232     *
    3333     * @return bool
    34      * @throws iSDKException
     34     * @throws InfusionsoftWordPressSDKException
    3535     */
    3636    public function cfgCon( $name, $key = "", $dbOn = "on" ) {
    … …  
    7979     *
    8080     * @return bool
    81      * @throws iSDKException
     81     * @throws InfusionsoftWordPressSDKException
    8282     */
    8383    public function vendorCon( $name, $user, $pass, $key = "", $dbOn = "on" ) {
    … …  
    9999                    $this->client = new xmlrpc_client( "https://" . $details[ $name ][1] . ".mortgageprocrm.com/api/xmlrpc" );
    100100                } else {
    101                     throw new iSDKException( "Invalid application name: \"" . $name . "\"" );
     101                    throw new InfusionsoftWordPressSDKException( "Invalid application name: \"" . $name . "\"" );
    102102                }
    103103            } else {
    104                 throw new iSDKException( "Application Does Not Exist: \"" . $name . "\"" );
     104                throw new InfusionsoftWordPressSDKException( "Application Does Not Exist: \"" . $name . "\"" );
    105105            }
    106106            $this->key = $details[ $name ][3];
    … …  
    126126        try {
    127127            $connected = $this->dsGetSetting( "Application", "enabled" );
    128         } catch ( iSDKException $e ) {
    129             throw new iSDKException( "Connection Failed" );
     128        } catch ( InfusionsoftWordPressSDKException $e ) {
     129            throw new InfusionsoftWordPressSDKException( "Connection Failed" );
    130130        }
    131131
    … …  
    157157     *
    158158     * @return int|mixed|string
    159      * @throws iSDKException
     159     * @throws InfusionsoftWordPressSDKException
    160160     */
    161161    public function methodCaller( $service, $callArray ) {
    … …  
    207207                return "ERROR: " . $result->faultCode() . " - " . $result->faultString();
    208208            } elseif ( $this->debug == "throw" ) {
    209                 throw new iSDKException( $result->faultString(), $result->faultCode() );
     209                throw new InfusionsoftWordPressSDKException( $result->faultString(), $result->faultCode() );
    210210            } elseif ( $this->debug == "off" ) {
    211211                //ignore!

  • infusionsoft-official-opt-in-forms/trunk/subscription/infusionsoft/class.infusion_infusionsoft.php

    r1647443 r1658970  
    3333            $infusion_app = new iSDK();
    3434            $infusion_app->cfgCon( $this->app_id, $this->api_key, 'throw' );
    35         } catch ( iSDKException $e ) {
     35        } catch ( InfusionsoftWordPressSDKException $e ) {
    3636            $error_message = $e->getMessage();
    3737        }
    … …  
    9898            $infusion_app = new iSDK();
    9999            $infusion_app->cfgCon( $this->app_id, $this->api_key, 'throw' );
    100         } catch ( iSDKException $e ) {
     100        } catch ( InfusionsoftWordPressSDKException $e ) {
    101101            $error_message = $e->getMessage();
    102102        }
    … …  
    136136        $infusion_app = new InfusionsoftWordPressSDK();
    137137        $infusion_app->cfgCon( $app_id, $api_key, 'off' );
    138     } catch ( iSDKException $e ) {
     138    } catch ( InfusionsoftWordPressSDKException $e ) {
    139139        $error_message = $e->getMessage();
    140140    }
    … …  
    196196        $infusion_app = new InfusionsoftWordPressSDK();
    197197        $infusion_app->cfgCon( $app_id, $api_key, 'throw' );
    198     } catch ( iSDKException $e ) {
     198    } catch ( InfusionsoftWordPressSDKException $e ) {
    199199        $error_message = $e->getMessage();
    200200    }
Note: See TracChangeset for help on using the changeset viewer.