diff --git a/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile b/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile index 5c9eb0ca..e05eb1a2 100644 --- a/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile +++ b/wrenchboard/email/ACCOUNT/member_refer_individual.mailfile @@ -68,7 +68,7 @@ Dear {{firstname}}, -   {{send_firstname}} {{send_lastname}} invites you to explore {{site_name}}!. Unlock the power of your skills and social networks—start earning today!" +   {{send_firstname}} {{send_lastname}} invites you to explore {{site_name}}!. Unlock the power of your skills and social networks. Start earning today! diff --git a/www-api/app/Controllers/WrenchUserContacts.php b/www-api/app/Controllers/WrenchUserContacts.php index c715c68e..ed4cd3f2 100644 --- a/www-api/app/Controllers/WrenchUserContacts.php +++ b/www-api/app/Controllers/WrenchUserContacts.php @@ -36,37 +36,44 @@ class WrenchUserContacts extends BaseController if (isset($in["uid"]) && $in["uid"] !='' ){ $in["member_uid"]=$in["uid"]; } + $member_uid = str_replace("-", "_", $in["uid"]); $time_to_save = false; - $endpoint = "CONTACTS_IMPORT_ACTION-". $in["uid"]; + $endpoint = "CONTACTS_IMPORT_ACTION-". $member_uid; + $outC = $this->getCache($endpoint); // try find in cache if ( $in["mmode"] == 0 ){ $this->deleteCache($endpoint); - $this->saveCache($endpoint,$in,1300); + $this->saveCache($endpoint,$in,5300); + } else { $outC = $this->getCache($endpoint); // try find in cache $outArr = $outC; // unserialize( $outC ); - log_message('critical', "CACHE READ ***** WrenchUserContacts::usersContacts() ----**> ".$outArr["raw_contacts"]); - $in["raw_contacts"] = $in["raw_contacts"].$outC["raw_contacts"]; + $in["raw_contacts"] =$outC["raw_contacts"].$in["raw_contacts"]; // expand raw contents + // log_message('critical', "Merged Raw Contents ".$outArr["raw_contacts"]); $this->deleteCache($endpoint); $this->saveCache($endpoint,$in,5300); + /* Determine if this is the last Fire process events save to the backend database; */ - if ($in["csize"] + $in["mmode"] >= $in["pcount"]){ - $time_to_save = true; - } +// if ($in["csize"] + $in["mmode"] >= $in["pcount"]){ +// $time_to_save = true; +// } } + if ($in["csize"] + $in["mmode"] >= $in["pcount"]){ + $time_to_save = true; + } ///=== cache game gere if($time_to_save){ $in["raw_contacts"] = serialize($in['raw_contacts']); - $ret = $this->wrenchboard->wrenchboard_api($in, $out); - $out['internal_return'] = $ret; +// $ret = $this->wrenchboard->wrenchboard_api($in, $out); +// $out['internal_return'] = $ret; } else{ $out["status_msg"] = "Received and cached";