Got rid of all pv() functions, now consistently uses p() to print variables safely.

diff --git a/mod/survey/edit_form.html b/mod/survey/edit_form.html
index 00e8afeb41a797dd3c05f16667241760b014e939..df51f89cd74d463346315de937dbaaf2ecf62129 100644 (file)
--- a/mod/survey/edit_form.html
+++ b/mod/survey/edit_form.html
@@ -5,43 +5,43 @@
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/surveytype.html", "info", "Survey type") ?>:</td>
     <td><? print get_template_name($survey->template) ?>
-        <input type="hidden" name=template value="<? pv($survey->template) ?>">
+        <input type="hidden" name=template value="<? p($survey->template) ?>">
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/name.html", "info", "Survey name") ?>:</td>
-    <td><input type="text" name="name" size=40 value="<? pv($survey->name) ?>">
+    <td><input type="text" name="name" size=40 value="<? p($survey->name) ?>">
     <? formerr($err["name"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/password.html", "info", "Password") ?>:</td>
-    <td><input type="text" name="password" size=20 value="<? pv($survey->password) ?>">
+    <td><input type="text" name="password" size=20 value="<? p($survey->password) ?>">
     <? formerr($err["password"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/days.html", "info", "Available Days") ?>:</td>
-    <td><input type="text" name="days" size=3 value="<? pv($survey->days) ?>">
+    <td><input type="text" name="days" size=3 value="<? p($survey->days) ?>">
     <? formerr($err["days"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/url.html", "info", "Course URL") ?>:</td>
-    <td><input type="text" name="url" size=50 value="<? pv($survey->url) ?>">
+    <td><input type="text" name="url" size=50 value="<? p($survey->url) ?>">
     <? formerr($err["url"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/intro.html", "info", "Introduction") ?>:</td>
-    <td><textarea name=intro rows=15 cols=50 wrap=virtual><? pv($survey->intro) ?></textarea>
+    <td><textarea name=intro rows=15 cols=50 wrap=virtual><? p($survey->intro) ?></textarea>
     </td>
 </tr>
 <tr>
     <td></td>
     <td>
        <table><tr><td valign=top>
-           <input type="hidden" name=id value="<? pv($survey->id) ?>">
+           <input type="hidden" name=id value="<? p($survey->id) ?>">
         <input type="hidden" name=edit value="update">
            <? if ($survey->status == "editing") { ?>
                   <input type="submit" value="Save changes">
@@ -50,7 +50,7 @@
                <td valign=top>
            <? if (get_responses_for_survey($survey->id) == 0) { ?>
                <FORM name="delete" method="post" action="edit.php">
-       <input type="hidden" name=id value="<? pv($survey->id) ?>">
+       <input type="hidden" name=id value="<? p($survey->id) ?>">
         <input type="hidden" name=edit value="delete">
                <input type="submit" value="Delete this survey">
                </FORM>

diff --git a/mod/survey/edit_form.phtml b/mod/survey/edit_form.phtml
index a0e5ebc57bcf1b4e260ebd38386dd7ff5033a451..50ed637360d8e05439ddbf030429285187b8b233 100644 (file)
--- a/mod/survey/edit_form.phtml
+++ b/mod/survey/edit_form.phtml
@@ -9,43 +9,43 @@
 <tr valign=top>
     <td><P>Survey type:</td>
     <td><? print get_template_name($survey->template) ?>
-        <input type="hidden" name=template value="<? pv($survey->template) ?>">
+        <input type="hidden" name=template value="<? p($survey->template) ?>">
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/name.phtml", "info", "Survey name") ?>:</td>
-    <td><input type="text" name="name" size=40 value="<? pv($survey->name) ?>">
+    <td><input type="text" name="name" size=40 value="<? p($survey->name) ?>">
     <? formerr($err["name"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/password.phtml", "info", "Password") ?>:</td>
-    <td><input type="text" name="password" size=20 value="<? pv($survey->password) ?>">
+    <td><input type="text" name="password" size=20 value="<? p($survey->password) ?>">
     <? formerr($err["password"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/days.phtml", "info", "Available Days") ?>:</td>
-    <td><input type="text" name="days" size=3 value="<? pv($survey->days) ?>">
+    <td><input type="text" name="days" size=3 value="<? p($survey->days) ?>">
     <? formerr($err["days"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/url.phtml", "info", "Course URL") ?>:</td>
-    <td><input type="text" name="url" size=50 value="<? pv($survey->url) ?>">
+    <td><input type="text" name="url" size=50 value="<? p($survey->url) ?>">
     <? formerr($err["url"]) ?>
     </td>
 </tr>
 <tr valign=top>
     <td><P><? link_to_popup_window("/mod/survey/docs/intro.phtml", "info", "Introduction") ?>:</td>
-    <td><textarea name=intro rows=15 cols=50 wrap=hard><? pv($survey->intro) ?></textarea>
+    <td><textarea name=intro rows=15 cols=50 wrap=hard><? p($survey->intro) ?></textarea>
     </td>
 </tr>
 <tr>
     <td></td>
     <td>
        <table><tr><td valign=top>
-           <input type="hidden" name=id value="<? pv($survey->id) ?>">
+           <input type="hidden" name=id value="<? p($survey->id) ?>">
         <input type="hidden" name=edit value="update">
            <? if ($survey->status == "editing") { ?>
                   <input type="submit" value="Save changes">
@@ -54,7 +54,7 @@
                <td valign=top>
            <? if (get_responses_for_survey($survey->id) == 0) { ?>
                <FORM name="delete" method="post" action="edit.php">
-       <input type="hidden" name=id value="<? pv($survey->id) ?>">
+       <input type="hidden" name=id value="<? p($survey->id) ?>">
         <input type="hidden" name=edit value="delete">
                <input type="submit" value="Delete this survey">
                </FORM>

diff --git a/mod/survey/login_form.html b/mod/survey/login_form.html
index 871a890373a146e30ed3f0c4387c961f5d824999..a2d53413464754f8d8d6b6c03c5e2daf7aea4aae 100644 (file)
--- a/mod/survey/login_form.html
+++ b/mod/survey/login_form.html
@@ -9,35 +9,35 @@
           <tr> \r
             <td><P>Survey Password:<BR>(from your teacher)</td>\r
             <td valign=top> \r
-              <input type="password" name="password" size=20 value="<? pv($frm["password"]) ?>" >\r
+              <input type="password" name="password" size=20 value="<? p($frm["password"]) ?>" >\r
                          <? formerr($err["password"]) ?>\r
             </td>\r
                  </tr>\r
           <tr> \r
             <td><P>Your first name:</td>\r
             <td valign=top> \r
-              <input type="text" name="firstname" size=20 value="<? pv($frm["firstname"]) ?>">\r
+              <input type="text" name="firstname" size=20 value="<? p($frm["firstname"]) ?>">\r
                          <? formerr($err["firstname"]) ?>\r
             </td>\r
           </tr>\r
           <tr> \r
             <td><P>Your last name:</td>\r
             <td valign=top> \r
-              <input type="text" name="lastname" size=20 value="<? pv($frm["lastname"]) ?>">\r
+              <input type="text" name="lastname" size=20 value="<? p($frm["lastname"]) ?>">\r
                          <? formerr($err["lastname"]) ?>\r
             </td>\r
           </tr>\r
           <tr> \r
             <td><P>Your email address:</td>\r
             <td valign=top> \r
-              <input type="text" name="email" size=20 value="<? pv($frm["email"]) ?>">\r
+              <input type="text" name="email" size=20 value="<? p($frm["email"]) ?>">\r
                          <? formerr($err["email"]) ?>\r
             </td>\r
           </tr>\r
           <tr> \r
             <td><P>Student ID Number:<BR>(optional)</td>\r
             <td valign=top> \r
-              <input type="text" name="idnumber" size=20 value="<? pv($frm["idnumber"]) ?>">\r
+              <input type="text" name="idnumber" size=20 value="<? p($frm["idnumber"]) ?>">\r
                          <? formerr($err["idnumber"]) ?>\r
             </td>\r
           </tr>\r