antipode.info/com.pogstone.fancytokens
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed warnings

Browse Source
This commit is contained in:
Sarah Gladstone 2016-08-26 10:27:05 -04:00
parent 99838677b7
commit 9488f1a0b3
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
utils/GreetingHelper.php
View File

@ -677,7 +677,7 @@ function process_singles(&$suffixes, &$prefixes, &$values, $greetings_token_name
// print_r($cur_contact); // print_r($cur_contact);
// print "<br>current joint_greeting: ".$cur_contact['contact.joint_greeting']; // print "<br>current joint_greeting: ".$cur_contact['contact.joint_greeting'];
if(! (array_key_exists( $token_joint_casual , $cur_contact) ) ){ if(! (array_key_exists( $token_joint_casual , $cur_contact) ) ){
$cid = $cur_contact[contact_id]; $cid = $cur_contact['contact_id'];
if(strlen($cid_list) > 0 && strlen($cid) >0 ){ if(strlen($cid_list) > 0 && strlen($cid) >0 ){
$cid_list = $cid_list.","; $cid_list = $cid_list.",";
@ -731,11 +731,18 @@ function process_singles(&$suffixes, &$prefixes, &$values, $greetings_token_name
$cur_cid = $contact_dao->id; $cur_cid = $contact_dao->id;
$cur_contact_type = $contact_dao->contact_type; $cur_contact_type = $contact_dao->contact_type;
$prefix_id = $contact_dao->prefix_id ; $prefix_id = $contact_dao->prefix_id ;
if(strlen($prefix_id)> 0){
$prefix_label = $prefixes[$prefix_id]; $prefix_label = $prefixes[$prefix_id];
}else{
$prefix_label = "";
}
$suffix_id = $contact_dao->suffix_id ; $suffix_id = $contact_dao->suffix_id ;
if(strlen( $suffix_id ) > 0 ){
$suffix_label = $suffixes[$suffix_id]; $suffix_label = $suffixes[$suffix_id];
}else{
$suffix_label = "";
}
// deal with genders // deal with genders
$gender_id = $contact_dao->gender_id; $gender_id = $contact_dao->gender_id;
if ($gender_id == 1){ if ($gender_id == 1){
@ -799,10 +806,18 @@ function process_singles(&$suffixes, &$prefixes, &$values, $greetings_token_name
$cur_cid = $contact_dao->id; $cur_cid = $contact_dao->id;
$cur_contact_type = $contact_dao->contact_type; $cur_contact_type = $contact_dao->contact_type;
$prefix_id = $contact_dao->prefix_id ; $prefix_id = $contact_dao->prefix_id ;
$prefix_label = $prefixes[$prefix_id];
if( strlen( $prefix_id ) > 0 ){
$prefix_label = $prefixes[$prefix_id];
}else{
$prefix_label = "";
}
$suffix_id = $contact_dao->suffix_id ; $suffix_id = $contact_dao->suffix_id ;
if( strlen($suffix_id) > 0 ){
$suffix_label = $suffixes[$suffix_id]; $suffix_label = $suffixes[$suffix_id];
}else{
$suffix_label = "";
}
// deal with genders // deal with genders
$gender_id = $contact_dao->gender_id; $gender_id = $contact_dao->gender_id;