Skip to content

Commit

Permalink
Merge branch 'release/1.9.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@atwellpub
atwellpub committed Dec 6, 2018
2 parents 5ba733e + d83a885 commit 35a351b
Show file tree
Hide file tree
Showing 6 changed files with 495 additions and 3 deletions.
2 changes: 2 additions & 0 deletions core/automation/automation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ private static function includes() {
include_once('classes/class.lead-profile.php');

include_once('definitions/trigger.inbound_store_lead_post.php');
include_once('definitions/trigger.wpleads_new_lead_insert.php');
include_once('definitions/trigger.wpleads_existing_lead_update.php');
include_once('definitions/trigger.inbound_double_optin_confirm.php');
//include_once('definitions/trigger.page_tracking_event.php');
include_once('definitions/trigger.user_register.php');
Expand Down
5 changes: 5 additions & 0 deletions core/automation/classes/class.definitions.loader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@ public static function process_trigger() {
$trigger = current_filter();
$args = func_get_args();

/*
error_log(print_r($trigger,true));
error_log(print_r($args,true));
*/

/* prevent repeat processing */
foreach (self::$instance->triggers as $hook_name => $trigger_hook) {
if (isset($trigger['action_hook']) && $trigger['action_hook'] == $hook_name) {
Expand Down
2 changes: 1 addition & 1 deletion core/automation/definitions/trigger.inbound_store_lead_post.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static function define_trigger( $triggers ) {
) );

$triggers[self::$trigger] = array (
'label' => __( 'On add/update lead' , 'inbound-pro' ),
'label' => __( 'On Lead Create OR Update' , 'inbound-pro' ),
'description' => __( 'This trigger fires whenever a lead added into the Leads database.' , 'inbound-pro' ),
'action_hook' => self::$trigger,
'arguments' => $arguments,
Expand Down
242 changes: 242 additions & 0 deletions core/automation/definitions/trigger.wpleads_existing_lead_update.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
<?php
/**
* Lead Creation Event
* @name Lead Creation Event
* @description: Fires when a lead object is created for the first time
* @author: Inbound Now
* @contributors: Hudson Atwell
* @package Automation
* @subpackage Triggers
*
*/

class Inbound_Automation_Trigger_wpleads_existing_lead_update {

static $trigger;

/**
* Initialize Class
*/
function __construct() {
self::$trigger = 'wpleads_existing_lead_update';
add_filter( 'inbound_automation_triggers' , array( __CLASS__ , 'define_trigger' ) , 1 , 1);
add_action( 'activate/automation' , array( __CLASS__ , 'create_dummy_event' ) );

/* make sure event is fired when leads are being created manually */
add_action( 'save_post_wp-lead', array( __CLASS__ , 'simulate_new_lead' ) , 10, 3 );
}

/**
* Fire inbound_store_lead_post when a new lead is manually created
*/
public static function simulate_new_lead( $post_id , $post, $update ) {
global $post_id, $post;

$is_new = $post->post_date === $post->post_modified;

/* ignore revisions */
if ( wp_is_post_revision( $post_id )
|| (defined('DOING_AJAX') && DOING_AJAX )
|| ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE )
|| $is_new
) {
return;
}

/* only perform actions on published leads */
if (get_post_status($post_id) != 'publish') {
return;
}

remove_action( 'save_post_wp-lead', array( __CLASS__ , 'simulate_new_lead' ) , 10, 3 );

if ( !isset($post) || $post->post_type != 'wp-lead' ) {
return;
}

$lead = get_post_custom( $post_id );

foreach ( $lead as $key => $value ) {
if (isset($value[0])) {
$lead[$key] = $value[0];
}
}

$lead['id'] = $post_id;
$lead_lists = Inbound_Leads::get_lead_lists_by_lead_id($post_id);
$lead['lead_lists'] = json_encode(array_keys( $lead_lists));
$lead['form_id'] = 'wp-core';
$lead['inbound_form_id'] = 'wp-core';
do_action( 'wpleads_existing_lead_update' , $lead );
}


/**
* Define Trigger
*/
public static function define_trigger( $triggers ) {

/* Set & Extend Trigger Argument Filters */
$arguments = apply_filters('trigger/'.self::$trigger.'/args' , array(
'lead_data' => array(
'id' => 'lead_data',
'label' => __( 'Lead Data' , 'inbound-pro' ),
'callback' => array(
get_class() , 'enrich_lead_data'
)
)
) );

/* Set & Extend Action DB Lookup Filters */
$db_lookup_filters = apply_filters( 'trigger/'.self::$trigger.'/db_filters' , array (
array(
'id' => 'lead_data',
'label' => __( 'Validate Lead Data' , 'inbound-pro' ),
'class_name' => 'Inbound_Automation_Query_Lead'
)
));

/* Set & Extend Available Actions */
$actions = apply_filters('trigger/'.self::$trigger.'/actions' , array(
'send_email' ,
'wait' ,
'relay_data' ,
'add_remove_lead_list',
'add_remove_lead_tag',
'create_user',
'kill_lead_tasks',
) );

$triggers[self::$trigger] = array (
'label' => __( 'On Lead Update' , 'inbound-pro' ),
'description' => __( 'This trigger fires whenever a lead is created for the first time.' , 'inbound-pro' ),
'action_hook' => self::$trigger,
'arguments' => $arguments,
'db_lookup_filters' => $db_lookup_filters,
'actions' => $actions
);

return $triggers;
}

/**
* Filter Lead data and make sure defaults we need are present and remove unneeded elements
* @param $args
* @return array
*/
public static function enrich_lead_data( $args ) {

$new_args = array();
$args['form_name'] = isset($args['form_name']) ? $args['form_name'] : '';
$args['inbound_form_name'] = isset($args['form_name']) ? $args['form_name'] : '';
$args['form_id'] = isset($args['form_id']) ? $args['form_id'] : '';
$args['inbound_form_id'] = isset($args['inbound_form_id']) ? $args['inbound_form_id'] : '';
$args['inbound_form_values'] = isset($args['inbound_form_values']) ? $args['inbound_form_values'] : '';
$args['raw_params'] = isset($args['raw_params']) ? $args['raw_params'] : array();
$args['mapped_params'] = isset($args['mapped_params']) ? $args['mapped_params'] : '';
$args['wp_lead_status'] = isset($args['wp_lead_status']) ? $args['wp_lead_status'] : '';
$args['wpleads_raw_post_data'] = '';

foreach ($args as $arg_key => $arg_value) {

/* encode arrays */
if (is_array($arg_value) || is_numeric($arg_key)) {
$arg_value = json_encode($arg_value);
}

/* account for raw params */
if ($arg_key == 'raw_params') {
/* I've seen both types make it's way in */
if (self::is_json($arg_value)) {
$arg_value_array = json_decode($arg_value,true);
} else {
parse_str($arg_value , $arg_value_array);
}

$arg_value_array = (is_array($arg_value_array)) ? $arg_value_array : array();
foreach ($arg_value_array as $raw_key => $raw_value) {
if (is_array($raw_value)) {
$raw_value = json_encode($raw_value);
}
$new_args[$raw_key] = $raw_value;
}

$new_args['raw_params'] = '[parsed]';
}
/* else may be needed, not sure: account for mapped params */
else if ($arg_key == 'mapped_params') {
parse_str($arg_value , $arg_value_array);
$arg_value_array = (is_array($arg_value_array)) ? $arg_value_array : array();
foreach ($arg_value_array as $mapped_key => $mapped_value) {
if (is_array($mapped_value)) {
$mapped_value = json_encode($mapped_value);
}
$new_args[$mapped_key] = $mapped_value;
}
}

$new_args[$arg_key] = $arg_value;
}

//error_log(print_r($new_args,true));
return $new_args;
}

/**
* Simulate trigger - perform on plugin activation
*/
public static function create_dummy_event() {

parse_str( 'wpleads_first_name=Example%20User&wpleads_email_address=test%40inboundnow.com&country-dropdown=US&wpleads_notes=Please%20contact%20me!%20&inbound_form_n=Auto%20Responder%20Form&inbound_form_lists=108&inbound_form_id=2741&inbound_current_page_url=http%3A%2F%2Finboundsoon.dev%2Fcall-to-action-testing%2F&inbound_notify=YXR3ZWxsLnB1Ymxpc2hpbmdAZ21haWwuY29t' , $raw_params );
parse_str( 'wpleads_first_name=Example%20User&wpleads_email_address=test%40inboundnow.com&wpleads_notes=Please%20contact%20me!%20&inbound_form_lists=108' , $mapped_params );
$pageviews = json_encode( stripslashes('{\"95897\":[\"2015/06/01 20:01:49\"]}' ) , true );
$lead = array (
'user_ID' => 2,
'wordpress_date_time' => '2015-06-01 18:03:31 UTC',
'wpleads_email_address' => '[email protected]',
'wpleads_first_name' => 'Example',
'wpleads_last_name' => 'User',
'page_id' => 95897,
'page_views' => $pageviews,
'raw_params' => $raw_params ,
'mapped_params' => $mapped_params ,
'url_params' => '{}',
'form_id' => 10,
'variation' => 0,
'source' => 'http://www.inboundnow.com/',
'ip_address' => '127.0.0.1',
'lead_lists' => Array (
'0' => 108
),
'post_type' => 'post',
'id' => 97623
);

$inbound_arguments = Inbound_Options_API::get_option( 'inbound_automation' , 'arguments' );
$inbound_arguments = ( is_array($inbound_arguments) ) ? $inbound_arguments : array();
$inbound_arguments[self::$trigger]['lead_data'] = $lead;
Inbound_Options_API::update_option( 'inbound_automation' , 'arguments' , $inbound_arguments );
}

/**
* Check if string is a json string
* @param $string
* @return bool
*/
public static function is_json($string) {

$array = array('{','[');

foreach ($array as $v) {
if (substr($string, 0, 1) === $v) {
return true;
}
}

return false;
}

}

/* Load Trigger */
new Inbound_Automation_Trigger_wpleads_existing_lead_update;
Loading

0 comments on commit 35a351b

Please sign in to comment.