Skip to content

Commit

Permalink
Added fields to set per-survey email subjects to the email invite, re…
Browse files Browse the repository at this point in the history 
…mind, confirm and register email messages. Modified various files to allow setting and use of these fields. Added translations to english administration language file. Will add these lines to other languages shortly. Also modified register.php and tokens.php to use $thissurvey variable from getSurveyInfo() function. IMPORTANT NOTE: You need to run the checkfields.php after getting this update to create the new fields in the surveys table.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@1262 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@jcleeland
jcleeland committed Nov 18, 2004
1 parent bcbbe87 commit 1b0709c
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 94 deletions.
4 changes: 4 additions & 0 deletions admin/checkfields.php
View file
Expand Up @@ -127,9 +127,13 @@
$allfields[]=array("{$dbprefix}surveys", "allowregister", "allowregister char(1) default 'N'");
$allfields[]=array("{$dbprefix}surveys", "attribute1", "attribute1 varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "attribute2", "attribute2 varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "email_invite_subj", "email_invite_subj varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "email_invite", "email_invite text");
$allfields[]=array("{$dbprefix}surveys", "email_remind_subj", "email_remind_subj varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "email_remind", "email_remind text");
$allfields[]=array("{$dbprefix}surveys", "email_register_subj", "email_register_subj varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "email_register", "email_register text");
$allfields[]=array("{$dbprefix}surveys", "email_confirm_subj", "email_confirm_subj varchar(255) default NULL");
$allfields[]=array("{$dbprefix}surveys", "email_confirm", "email_confirm text");
$allfields[]=array("{$dbprefix}surveys", "allowsave","allowsave char(1) default 'Y'");
$allfields[]=array("{$dbprefix}surveys", "autonumber_start", "autonumber_start bigint(11) default 0");
Expand Down
26 changes: 21 additions & 5 deletions admin/database.php
View file
Expand Up @@ -571,24 +571,33 @@
$_POST['welcome'] = addcslashes($_POST['welcome'], "'");
$_POST['attribute1'] = addcslashes($_POST['attribute1'], "'");
$_POST['attribute2'] = addcslashes($_POST['attribute2'], "'");
$_POST['email_invite_subj'] = addcslashes($_POST['email_invite_subj'], "'");
$_POST['email_invite'] = addcslashes($_POST['email_invite'], "'");
$_POST['email_remind_subj'] = addcslashes($_POST['email_remind_subj'], "'");
$_POST['email_remind'] = addcslashes($_POST['email_remind'], "'");
$_POST['email_register_subj'] = addcslashes($_POST['email_register_subj'], "'");
$_POST['email_register'] = addcslashes($_POST['email_register'], "'");
$_POST['email_confirm_subj'] = addcslashes($_POST['email_confirm_subj'], "'");
$_POST['email_confirm'] = addcslashes($_POST['email_confirm'], "'");
}
$isquery = "INSERT INTO {$dbprefix}surveys\n"
. "(sid, short_title, description, admin, active, welcome, expires, "
. "adminemail, private, faxto, format, template, url, urldescrip, "
. "language, datestamp, usecookie, notification, allowregister, attribute1, attribute2, "
. "email_invite, email_remind, email_register, email_confirm, allowsave, autoredirect, allowprev)\n"
. "email_invite_subj, email_invite, email_remind_subj, email_remind, "
. "email_register_subj, email_register, email_confirm_subj, email_confirm, "
. "allowsave, autoredirect, allowprev)\n"
. "VALUES ('', '{$_POST['short_title']}', '{$_POST['description']}',\n"
. "'{$_POST['admin']}', 'N', '".str_replace("\n", "<br />", $_POST['welcome'])."',\n"
. "'{$_POST['expires']}', '{$_POST['adminemail']}', '{$_POST['private']}',\n"
. "'{$_POST['faxto']}', '{$_POST['format']}', '{$_POST['template']}', '{$_POST['url']}',\n"
. "'{$_POST['urldescrip']}', '{$_POST['language']}', '{$_POST['datestamp']}',\n"
. "'{$_POST['usecookie']}', '{$_POST['notification']}', '{$_POST['allowregister']}',\n"
. "'{$_POST['attribute1']}', '{$_POST['attribute2']}', '{$_POST['email_invite']}', \n"
. "'{$_POST['email_remind']}', '{$_POST['email_register']}', '{$_POST['email_confirm']}', \n"
. "'{$_POST['attribute1']}', '{$_POST['attribute2']}', '{$_POST['email_invite_subj']}',\n"
. "'{$_POST['email_invite']}', '{$_POST['email_remind_subj']}',\n"
. "'{$_POST['email_remind']}', '{$_POST['email_register_subj']}',\n"
. "'{$_POST['email_register']}', '{$_POST['email_confirm_subj']}',\n"
. "'{$_POST['email_confirm']}', \n"
. "'{$_POST['allowsave']}', '{$_POST['autoredirect']}', '{$_POST['allowprev']}')";
$isresult = mysql_query ($isquery);
if ($isresult)
Expand All @@ -603,6 +612,7 @@
{
$errormsg=_DB_FAIL_NEWSURVEY." - ".mysql_error();
echo "<script type=\"text/javascript\">\n<!--\n alert(\"$errormsg\")\n //-->\n</script>\n";
echo $isquery;
}
}
}
Expand All @@ -617,9 +627,13 @@
$_POST['welcome'] = addcslashes($_POST['welcome'], "'");
$_POST['attribute1'] = addcslashes($_POST['attribute1'], "'");
$_POST['attribute2'] = addcslashes($_POST['attribute2'], "'");
$_POST['email_invite_subj'] = addcslashes($_POST['email_invite_subj'], "'");
$_POST['email_invite'] = addcslashes($_POST['email_invite'], "'");
$_POST['email_remind_subj'] = addcslashes($_POST['email_remind_subj'], "'");
$_POST['email_remind'] = addcslashes($_POST['email_remind'], "'");
$_POST['email_register_subj'] = addcslashes($_POST['email_register_subj'], "'");
$_POST['email_register'] = addcslashes($_POST['email_register'], "'");
$_POST['email_confirm_subj'] = addcslashes($_POST['email_confirm_subj'], "'");
$_POST['email_confirm'] = addcslashes($_POST['email_confirm'], "'");
}
$usquery = "UPDATE {$dbprefix}surveys \n"
Expand All @@ -632,8 +646,10 @@
. "language='{$_POST['language']}', datestamp='{$_POST['datestamp']}',\n"
. "usecookie='{$_POST['usecookie']}', notification='{$_POST['notification']}',\n"
. "allowregister='{$_POST['allowregister']}', attribute1='{$_POST['attribute1']}',\n"
. "attribute2='{$_POST['attribute2']}', email_invite='{$_POST['email_invite']}',\n"
. "email_remind='{$_POST['email_remind']}', email_register='{$_POST['email_register']}',\n"
. "attribute2='{$_POST['attribute2']}', email_invite_subj='{$_POST['email_invite_subj']}',\n"
. "email_invite='{$_POST['email_invite']}', email_remind_subj='{$_POST['email_remind_subj']}',\n"
. "email_remind='{$_POST['email_remind']}', email_register_subj='{$_POST['email_register_subj']}',\n"
. "email_register='{$_POST['email_register']}', email_confirm_subj='{$_POST['email_confirm_subj']}',\n"
. "email_confirm='{$_POST['email_confirm']}', allowsave='{$_POST['allowsave']}',\n"
. "autoredirect='{$_POST['autoredirect']}', allowprev='{$_POST['allowprev']}'\n"
. "WHERE sid={$_POST['sid']}";
Expand Down
28 changes: 28 additions & 0 deletions admin/html.php
View file
Expand Up @@ -1531,14 +1531,26 @@
. "\t\t}\n"
. "\t}\n"
. "--></script>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILINVITE_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_invite_subj' id='email_invite_subj' value='".$esrow['email_invite_subj']."'>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILINVITE_SUBJ))))."\", \"email_invite_subj\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILINVITE."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_invite' id='email_invite'>".$esrow['email_invite']."</textarea>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILINVITE))))."\", \"email_invite\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREMIND_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_remind_subj' id='email_remind_subj' value='".$esrow['email_remind_subj']."'>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILREMIND_SUBJ))))."\", \"email_remind_subj\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREMIND."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_remind' id='email_remind'>".$esrow['email_remind']."</textarea>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILREMIND))))."\", \"email_remind\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILCONFIRM_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_confirm_subj' id='email_confirm_subj' value='".$esrow['email_confirm_subj']."'>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILCONFIRM_SUBJ))))."\", \"email_confirm_subj\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILCONFIRM."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_confirm' id='email_confirm'>".$esrow['email_confirm']."</textarea>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILCONFIRM))))."\", \"email_confirm\")'>\n"
Expand All @@ -1552,6 +1564,10 @@
if ($esrow['allowregister'] != "Y") {$editsurvey .= " selected";}
$editsurvey .= ">"._AD_NO."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREGISTER_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_register_subj' id='email_register_subj' value='".$esrow['email_register_subj']."'>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILREGISTER_SUBJ))))."\", \"email_register_subj\")'>\n"
. "\t</td></tr>\n";
$editsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREGISTER."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_register' id='email_register'>".$esrow['email_register']."</textarea>\n"
. "\t\t<input type='button' $slstyle value='Use Default' onClick='javascript: fillin(\"".str_replace("&quot;", "~quote~", str_replace("\n", "", nl2br(htmlentities(_TC_EMAILREGISTER))))."\", \"email_register\")'>\n"
Expand Down Expand Up @@ -1698,12 +1714,21 @@
. "\t\t\t<option value='Y' selected>"._AD_YES."</option>\n"
. "\t\t\t<option value='N'>"._AD_NO."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILINVITE_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_invite_subj' value='".html_escape(_TC_EMAILINVITE_SUBJ)."'>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILINVITE."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_invite'>"._TC_EMAILINVITE."</textarea>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREMIND_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_remind_subj' value='".html_escape(_TC_EMAILREMIND_SUBJ)."'>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREMIND."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_remind'>"._TC_EMAILREMIND."</textarea>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILCONFIRM_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_confirm_subj' value='".html_escape(_TC_EMAILCONFIRM_SUBJ)."'>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILCONFIRM."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_confirm'>"._TC_EMAILCONFIRM."</textarea>\n"
. "\t</td></tr>\n";
Expand All @@ -1712,6 +1737,9 @@
. "\t\t\t<option value='Y'>"._AD_YES."</option>\n"
. "\t\t\t<option value='N' selected>"._AD_NO."</option>\n"
. "\t\t</select></td>\n\t</tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREGISTER_SUBJ."</b></font></td>\n"
. "\t\t<td><input type='text' $slstyle size='54' name='email_register_subj' value='".html_escape(_TC_EMAILREGISTER_SUBJ)."'>\n"
. "\t</td></tr>\n";
$newsurvey .= "\t<tr><td align='right'>$setfont<b>"._SL_EMAILREGISTER."</b></font></td>\n"
. "\t\t<td><textarea $slstyle2 cols=50 rows=5 name='email_register'>"._TC_EMAILREGISTER."</textarea>\n"
. "\t</td></tr>\n";
Expand Down
10 changes: 9 additions & 1 deletion admin/lang/english/messages.php
View file
Expand Up @@ -154,15 +154,19 @@
define("_SL_NOTIFICATION", "Notification:"); //New with 098rc5
define("_SL_ALLOWREGISTER", "Allow public registration?"); //New with 0.98rc9
define("_SL_ATTRIBUTENAMES", "Token Attribute Names:"); //New with 0.98rc9
define("_SL_EMAILINVITE_SUBJ", "Invitation Email Subject:"); //New with 0.99dev01
define("_SL_EMAILINVITE", "Invitation Email:"); //New with 0.98rc9
define("_SL_EMAILREMIND_SUBJ", "Email Reminder Subject:"); //New with 0.99dev01
define("_SL_EMAILREMIND", "Email Reminder:"); //New with 0.98rc9
define("_SL_EMAILREGISTER_SUBJ", "Public registration Email Subject:"); //New with 0.99dev01
define("_SL_EMAILREGISTER", "Public registration Email:"); //New with 0.98rc9
define("_SL_EMAILCONFIRM_SUBJ", "Confirmation Email Subject"); //New with 0.99dev01
define("_SL_EMAILCONFIRM", "Confirmation Email"); //New with 0.98rc9
define("_SL_REPLACEOK", "This will replace the existing text. Continue?"); //New with 0.98rc9
define("_SL_ALLOWSAVE", "Allow Saves?"); //New with 0.99dev01
define("_SL_AUTONUMBER", "Start ID numbers at:"); //New with 0.99dev01
define("_SL_AUTORELOAD", "Automatically load URL when survey complete?"); //New with 0.99dev01

define("_SL_ALLOWPREV", "Show [<< Prev] button"); //New with 0.99dev01
//groups
define("_GL_TITLE", "Title:");
define("_GL_DESCRIPTION", "Description:");
Expand Down Expand Up @@ -597,13 +601,15 @@
define("_TC_INVITESENTTO", "Invitation Sent To:"); //is followed by token name
define("_TC_REMINDSENTTO", "Reminder Sent To:"); //is followed by token name
define("_TC_UPDATEDB", "Update tokens table with new fields"); //New for 0.98rc7
define("_TC_EMAILINVITE_SUBJ", "Invitation to participate in survey"); //New for 0.99dev01
define("_TC_EMAILINVITE", "Dear {FIRSTNAME},\n\nYou have been invited to participate in a survey.\n\n"
."The survey is titled:\n\"{SURVEYNAME}\"\n\n\"{SURVEYDESCRIPTION}\"\n\n"
."To participate, please click on the link below.\n\nSincerely,\n\n"
."{ADMINNAME} ({ADMINEMAIL})\n\n"
."----------------------------------------------\n"
."Click here to do the survey:\n"
."{SURVEYURL}"); //New for 0.98rc9 - default Email Invitation
define("_TC_EMAILREMIND_SUBJ", "Reminder to participate in survey"); //New for 0.99dev01
define("_TC_EMAILREMIND", "Dear {FIRSTNAME},\n\nRecently we invited you to participate in a survey.\n\n"
."We note that you have not yet completed the survey, and wish to remind you that the survey is still available should you wish to take part.\n\n"
."The survey is titled:\n\"{SURVEYNAME}\"\n\n\"{SURVEYDESCRIPTION}\"\n\n"
Expand All @@ -612,6 +618,7 @@
."----------------------------------------------\n"
."Click here to do the survey:\n"
."{SURVEYURL}"); //New for 0.98rc9 - default Email Reminder
define("_TC_EMAILREGISTER_SUBJ", "Survey Registration Confirmation"); //New for 0.99dev01
define("_TC_EMAILREGISTER", "Dear {FIRSTNAME},\n\n"
."You, or someone using your email address, have registered to "
."participate in an online survey titled {SURVEYNAME}.\n\n"
Expand All @@ -620,6 +627,7 @@
."If you have any questions about this survey, or if you "
."did not register to participate and believe this email "
."is in error, please contact {ADMINNAME} at {ADMINEMAIL}.");//NEW for 0.98rc9
define("_TC_EMAILCONFIRM_SUBJ", "Confirmation of completed survey"); //New for 0.99dev01
define("_TC_EMAILCONFIRM", "Dear {FIRSTNAME},\n\nThis email is to confirm that you have completed the survey titled {SURVEYNAME} "
."and your response has been saved. Thank you for participating.\n\n"
."If you have any further questions about this email, please contact {ADMINNAME} on {ADMINEMAIL}.\n\n"
Expand Down
2 changes: 1 addition & 1 deletion admin/statistics.php
View file
Expand Up @@ -650,7 +650,7 @@ function show(element) {
."<table width='99%' align='center' style='border: 1px solid #555555' cellpadding='1'"
." cellspacing='0' bordercolor='#555555'>\n"
."<tr><td align='center' bgcolor='#555555' height='22'>"
."<input type='image' src='$imagefiles/plus.gif' align='right' onClick='show(\"sqlbuilder\"); hide(\"filtersettings\")'><input type='image' src='$imagefiles/minus.gif' align='right' onClick='hide(\"sqlbuilder\")'>"
."<input type='image' src='$imagefiles/plus.gif' align='right' hspace='0' border='0' onClick='show(\"sqlbuilder\"); hide(\"filtersettings\")'><input type='image' src='$imagefiles/minus.gif' align='right' border='0' onClick='hide(\"sqlbuilder\")' hspace='0'>"
."<font size='2' face='verdana' color='orange'><b>SQL Builder</b>"
."</td></tr>\n"
."<form method='post'>\n";
Expand Down

0 comments on commit 1b0709c

Please sign in to comment.