arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Use the smarter name logic in admin/communicaiton.php for shorter code.

Browse Source 
Add URLMAIN, URLLOGIN to the communicaiton as options, still have to
implement them.
This commit is contained in:
dave 2010-01-27 20:24:14 +00:00
parent f05b4ba677
commit 29b95e97ac
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
admin/communication.php
View File

@ -288,6 +288,8 @@ case 'dialog_edit':
<option value="SALUTATION">[SALUTATION]</option> <option value="SALUTATION">[SALUTATION]</option>
<option value="PASSWORD">[PASSWORD]</option> <option value="PASSWORD">[PASSWORD]</option>
<option value="REGNUM">[REGNUM]</option> <option value="REGNUM">[REGNUM]</option>
<option value="URLMAIN">[URLMAIN]</option>
<option value="URLLOGIN">[URLLOGIN]</option>
</select> </select>
</td></tr></table> </td></tr></table>
</td> </td>
@ -657,24 +659,16 @@ case "email_get_list":
"SALUTATION"=>$u['salutation'], "SALUTATION"=>$u['salutation'],
"FIRSTNAME"=>$u['firstname'], "FIRSTNAME"=>$u['firstname'],
"LASTNAME"=>$u['lastname'], "LASTNAME"=>$u['lastname'],
"NAME"=>$u['firstname']." ".$u['lastname'], "NAME"=>$u['name'],
"EMAIL"=>$u['email'], "EMAIL"=>$u['email'],
"ORGANIZATION"=>$u['sponsor']['organization'] "ORGANIZATION"=>$u['sponsor']['organization']
); );
if($u['firstname'] && $u['lastname'])
$toname=$u['firstname']." ".$u['lastname'];
else if($u['firstname'])
$toname=$u['firstname'];
else if($u['lastname'])
$toname=$u['lastname'];
$toemail=$u['email']; if($u['email']) {
if($toemail) {
mysql_query("INSERT INTO emailqueue_recipients (emailqueue_id,toemail,toname,replacements,sent) VALUES ( mysql_query("INSERT INTO emailqueue_recipients (emailqueue_id,toemail,toname,replacements,sent) VALUES (
'$emailqueueid', '$emailqueueid',
'".mysql_real_escape_string($toemail)."', '".mysql_real_escape_string($u['email'])."',
'".mysql_real_escape_string($toname)."', '".mysql_real_escape_string($u['name'])."',
'".json_encode($replacements)."', '".json_encode($replacements)."',
NULL)"); NULL)");
echo mysql_error(); echo mysql_error();
@ -811,18 +805,12 @@ case "email_get_list":
"SALUTATION"=>$u['salutation'], "SALUTATION"=>$u['salutation'],
"FIRSTNAME"=>$u['firstname'], "FIRSTNAME"=>$u['firstname'],
"LASTNAME"=>$u['lastname'], "LASTNAME"=>$u['lastname'],
"NAME"=>$u['firstname']." ".$u['lastname'], "NAME"=>$u['name'],
"EMAIL"=>$u['email'], "EMAIL"=>$u['email'],
"ORGANIZATION"=>$u['sponsor']['organization'] "ORGANIZATION"=>$u['sponsor']['organization']
); );
if($u['firstname'] && $u['lastname']) $toname=$u['name'];
$toname=$u['firstname']." ".$u['lastname'];
else if($u['firstname'])
$toname=$u['firstname'];
else if($u['lastname'])
$toname=$u['lastname'];
$toemail=$u['email']; $toemail=$u['email'];
} }