2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Fixes lp:1255359 Translation strings with single quotes break some SQL queries

Additional fix for submit buttons where the value needs to be double quoted
This commit is contained in:
Adam Zammit
2013-11-27 12:21:37 +11:00
parent e5feb27daa
commit f5acc307a1
9 changed files with 19 additions and 19 deletions

View File

@@ -209,7 +209,7 @@ if (isset($_GET['appointment_id']) && isset($_GET['case_id']))
array_unshift($ops,array('value'=>0,'description'=>T_("Any operator"),'selected'=>$selected));
display_chooser($ops,"require_operator_id","require_operator_id",false,false,false,false);
print "<input type='hidden' value='$appointment_id' id='appointment_id' name='appointment_id'/>";
print "<div><input type='submit' value='" . TQ_("Edit appointment") . "'/></div>";
print "<div><input type='submit' value=\"" . T_("Edit appointment") . "\"/></div>";
print "</form></p>";
print "<p><a href='?'>" . T_("Cancel edit") . "</a></p>";

View File

@@ -382,7 +382,7 @@ else if (isset($_GET['delete']))
print "<p>" . T_("Please confirm you wish to delete the questionnaire") . "</p>";
print "<form method='post' action='?'>";
print "<p><input type='submit' name='submit' value='" . TQ_("Delete this questionnaire") . "'/>";
print "<p><input type='submit' name='submit' value=\"" . T_("Delete this questionnaire") . "\"/>";
print "<input type='hidden' name='questionnaire_id' value='$questionnaire_id'/></p>";
print "</form>";
}

View File

@@ -211,11 +211,11 @@ if ($questionnaire_id != false)
{
print "<form action='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' method='post'><p>" . T_("Copy quotas for this sample to (No error/duplicate checking): ");
display_chooser($ss,"copy_sample_import_id","copy_sample_import_id",false,false,false,false);
print "<input type='submit' id='submit' value='" . TQ_("Copy") . "'/></p></form>";
print "<input type='submit' id='submit' value=\"" . T_("Copy") . "\"/></p></form>";
print "<form action='?questionnaire_id=$questionnaire_id&amp;sample_import_id=$sample_import_id' method='post'><p>" . T_("Copy quotas for this sample to (No error/duplicate checking) with adjusting: ");
display_chooser($ss,"copy_sample_import_id_with_adjustment","copy_sample_import_id_with_adjustment",false,false,false,false);
print "<input type='submit' id='submit' value='" . TQ_("Copy adjustments") . "'/></p></form>";
print "<input type='submit' id='submit' value=\"" . T_("Copy adjustments") . "\"/></p></form>";
}
}

View File

@@ -114,7 +114,7 @@ if ($questionnaire_id)
print "<form action='?' method='get'><p><textarea name='report' id='report' rows='15' cols='80'></textarea></p>";
print "<p><input type='hidden' name='questionnaire_id' id='questionnaire_id' value='$questionnaire_id'/>";
print "<input type='hidden' name='shift_id' id='shift_id' value='$shift_id'/>";
print "<input type='submit' name='submit' id='submit' value='" . TQ_("Add report") . "'/>";
print "<input type='submit' name='submit' id='submit' value=\"" . T_("Add report") . "\"/>";
print "</p></form>";
}
else if (isset($_GET['report']))
@@ -160,7 +160,7 @@ if ($questionnaire_id)
print "<p><input type='hidden' name='questionnaire_id' id='questionnaire_id' value='$questionnaire_id'/>";
print "<input type='hidden' name='shift_id' id='shift_id' value='$shift_id'/>";
print "<input type='hidden' name='shift_report_id' id='shift_report_id' value='$shift_report_id'/>";
print "<input type='submit' name='submit' id='submit' value='" . TQ_("Modify report") . "'/>";
print "<input type='submit' name='submit' id='submit' value=\"" . T_("Modify report") . "\"/>";
print "</p></form>";
}
}

View File

@@ -303,7 +303,7 @@ switch($state)
print "<form action='?' method='post'><div>";
print "<p>" . T_("Number to call:") . " {$r['phone']} - {$r['description']}</p>";
print "</div><div><input type='hidden' id='contact_phone' name='contact_phone' value='{$r['contact_phone_id']}'/><input type='submit' value='Call' name='submit' id='submit'/></div></form>";
print "</div><div><input type='hidden' id='contact_phone' name='contact_phone' value='{$r['contact_phone_id']}'/><input type='submit' value=\"" . T_("Call") . "\" name='submit' id='submit'/></div></form>";
}
else
print "<div>" . T_("Your VoIP extension is not enabled. Please close this window and enable VoIP by clicking once on the red button that says 'VoIP Off'") . "</div>";
@@ -374,7 +374,7 @@ switch($state)
{
print "<option value='{$r['contact_phone_id']}'>{$r['phone']} - {$r['description']}</option>";
}
print "</select></div><div><input type='submit' value='Call' name='submit' id='submit'/></div></form>";
print "</select></div><div><input type='submit' value=\"" . T_("Call") . "\" name='submit' id='submit'/></div></form>";
}
else
print "<div>" . T_("Your VoIP extension is not enabled. Please close this window and enable VoIP by clicking once on the red button that says 'VoIP Off'") . "</div>";
@@ -428,27 +428,27 @@ switch($state)
print "<div><a href='?newstate=3'>" . T_("Call Answered") . "</a></div>";
print "<form action='?' method='post'>";
display_outcomes(0,$call_attempt_id,$case_id);
print "<div><input type='submit' value='" . TQ_("Hangup") . "' name='submit' id='submit'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Hangup") . "\" name='submit' id='submit'/></div></form>";
break;
case 2: //ringing
print "<div class='status'>" . T_("Ringing") . "</div>";
print "<div><a href='?newstate=3'>" . T_("Call Answered") . "</a></div>";
print "<form action='?' method='post'>";
display_outcomes(0,$call_attempt_id,$case_id);
print "<div><input type='submit' value='" . TQ_("Hangup") . "' name='submit' id='submit'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Hangup") . "\" name='submit' id='submit'/></div></form>";
break;
case 3: //answered
print "<div class='status'>" . T_("Answered") . "</div>";
print "<div><a href='?newstate=2'>" . T_("Not Answered") . "</a></div>";
print "<form action='?' method='post'>";
display_outcomes(1,$call_attempt_id,$case_id);
print "<div><input type='submit' value='" . TQ_("Hangup") . "' name='submit' id='submit'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Hangup") . "\" name='submit' id='submit'/></div></form>";
break;
case 4: //requires coding
print "<div class='status'>" . T_("Requires coding") . "</div>";
print "<form action='?' method='post'>";
display_outcomes(false,$call_attempt_id,$case_id);
print "<div><input type='submit' value='" . TQ_("Assign outcome") . "' name='submit' id='submit'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></div></form>";
break;
case 5: //done -- shouldn't come here as should be coded + done
default:

View File

@@ -340,7 +340,7 @@ switch($state)
print "<form action='?' method='post'><div>";
print "<p>" . T_("Number to call:") . " {$r['phone']} - {$r['description']}</p>";
print "</div><div><input type='hidden' id='contact_phone' name='contact_phone' value='{$r['contact_phone_id']}'/><input type='submit' value='Call' name='submit' id='submit'/></div></form>";
print "</div><div><input type='hidden' id='contact_phone' name='contact_phone' value='{$r['contact_phone_id']}'/><input type='submit' value=\"" . T_("Call") . "\" name='submit' id='submit'/></div></form>";
}
else
print "<div>" . T_("Your VoIP extension is not enabled. Please close this window and enable VoIP by clicking once on the red button that says 'VoIP Off'") . "</div>";
@@ -411,7 +411,7 @@ switch($state)
{
print "<option value='{$r['contact_phone_id']}'>{$r['phone']} - {$r['description']}</option>";
}
print "</select></div><div><input type='submit' value='Call' name='submit' id='submit'/></div></form>";
print "</select></div><div><input type='submit' value=\"" . T_("Call") . "\" name='submit' id='submit'/></div></form>";
}
else
print "<div>" . T_("Your VoIP extension is not enabled. Please close this window and enable VoIP by clicking once on the red button that says 'VoIP Off'") . "</div>";
@@ -467,7 +467,7 @@ switch($state)
print "<div class='status'>" . T_("Requires coding") . "</div>";
print "<form action='?' method='post'>";
display_outcomes(false,$call_attempt_id,$case_id);
print "<div><input type='submit' value='" . TQ_("Assign outcome") . "' name='submit' id='submit'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></div></form>";
break;
case 5: //done -- shouldn't come here as should be coded + done
default:

View File

@@ -339,9 +339,9 @@ if ($sc == 1)
print "<div><label for='email'>" . T_("Email") . "</label><input type='text' value='{$rs['email']}' name='email' id='email'/></div>";
if (!isset($_GET['interface2']))
{
print "<div><input type='submit' value='" . TQ_("Send invitation") . "' name='submit' id='submit'/></div>";
print "<div><input type='submit' value=\"" . T_("Send invitation") . "\" name='submit' id='submit'/></div>";
}
print "<div><input type='submit' value='" . TQ_("Send invitation and Hang up") . "' name='submith' id='submith'/></div></form>";
print "<div><input type='submit' value=\"" . T_("Send invitation and Hang up") . "\" name='submith' id='submith'/></div></form>";
}
else
{

View File

@@ -91,7 +91,7 @@ if (isset($_GET['respondent_id']) && $_GET['respondent_id'] == 0)
?>
<form method="post" action="?">
<?php display_respondent_form(false,$case_id); ?>
<div><input type='submit' name='submit' id='submit' value='<?php echo TQ_("Add respondent"); ?>'/></div>
<div><input type='submit' name='submit' id='submit' value="<?php echo T_("Add respondent"); ?>"/></div>
</form>
<div><a href="?"><?php echo T_("Go back"); ?></a></div>

View File

@@ -87,7 +87,7 @@ if ($chatenabled && operator_chat_enabled($operator_id))
print "<div style='display:none' id='statusavailable'>" . T_("Supervisor is available") . "</div>";
print "<div id='statusunavailable'>" . T_("Supervisor not available") . "</div>";
print "<div id='chatbox'><label for='chattext'>" . T_("Message") . ":</label><input type='text' id='chattext'/> <input type='submit' id='chatclick' value='" . TQ_("Send") . "'/></div>";
print "<div id='chatbox'><label for='chattext'>" . T_("Message") . ":</label><input type='text' id='chattext'/> <input type='submit' id='chatclick' value=\"" . T_("Send") . "\"/></div>";
//table for chat messages
print "<table class='tclass' id='chattable'><tbody><tr><th>" . T_("From") . "</th><th>" . T_("Message") . "</th></tr></tbody></table>";