diff --git a/ajax.php b/ajax.php index 11f8362a..b4a02ce7 100644 --- a/ajax.php +++ b/ajax.php @@ -94,7 +94,7 @@ if (!isset($_REQUEST['f']) || empty($_REQUEST['f'])) { - header('Content-type: text/xml'); + header('Content-type: text/xml; charset=' . AJAX_ENCODING); echo '', "\n"; echo( "\n" . @@ -125,7 +125,7 @@ if (!is_readable($filename)) { - header('Content-type: text/xml'); + header('Content-type: text/xml; charset=' . AJAX_ENCODING); echo '', "\n"; echo( "\n" . diff --git a/ajax/getDataItemJobOrders.php b/ajax/getDataItemJobOrders.php index f39ce37a..837f7a3b 100755 --- a/ajax/getDataItemJobOrders.php +++ b/ajax/getDataItemJobOrders.php @@ -92,9 +92,9 @@ $output .= " \n" . " " . $jobOrdersArray[$rowIndex]['jobOrderID'] . "\n" . - " " . htmlspecialchars($jobOrdersArray[$rowIndex]['title']) . "\n" . - " " . htmlspecialchars($jobOrdersArray[$rowIndex]['companyName']) . "\n" . - " " . htmlspecialchars($jobOrdersArray[$rowIndex]['isAssigned']) . "\n" . + " " . htmlspecialchars($jobOrdersArray[$rowIndex]['title'], ENT_COMPAT, AJAX_ENCODING) . "\n" . + " " . htmlspecialchars($jobOrdersArray[$rowIndex]['companyName'], ENT_COMPAT, AJAX_ENCODING) . "\n" . + " " . htmlspecialchars($jobOrdersArray[$rowIndex]['isAssigned'], ENT_COMPAT, AJAX_ENCODING) . "\n" . " \n"; } diff --git a/lib/AJAXInterface.php b/lib/AJAXInterface.php index 4dc50abc..fc22b077 100755 --- a/lib/AJAXInterface.php +++ b/lib/AJAXInterface.php @@ -46,7 +46,7 @@ class AJAXInterface */ public function outputXMLPage($xmlString) { - header('Content-type: text/xml'); + header('Content-type: text/xml; charset=' . AJAX_ENCODING); echo '', "\n"; echo $xmlString;