[Weberp-svn] SF.net SVN: weberp:[7938] trunk

[<tim...@us...>]

Revision: 7938
          http://weberp.svn.sourceforge.net/weberp/?rev=7938&view=rev
Author:   tim_schofield
Date:     2011-08-24 20:27:23 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Use ENT_QUOTES,UTF-8 for html_entity_decode() function

Modified Paths:
--------------
    trunk/PO_Header.php
    trunk/Z_poEditLangHeader.php
    trunk/includes/htmlMimeMail.php

Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php	2011-08-24 20:26:05 UTC (rev 7937)
+++ trunk/PO_Header.php	2011-08-24 20:27:23 UTC (rev 7938)
@@ -88,7 +88,7 @@
 
 		if ($_POST['Status'] == 'Authorised') {
 			if ($AuthorityLevel > $OrderTotal) {
-				$_SESSION['PO'.$identifier]->StatComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,UTF-8);
+				$_SESSION['PO'.$identifier]->StatComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
 				$_SESSION['PO'.$identifier]->AllowPrintPO=1;
 			} else {
 				$OKToUpdateStatus=0;
@@ -101,7 +101,7 @@
 
 		if ($_POST['Status'] == 'Completed') {
 			if ($AuthorityLevel > $OrderTotal) {
-				$_SESSION['PO'.$identifier]->StatComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Completed by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,UTF-8);
+				$_SESSION['PO'.$identifier]->StatComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Completed by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
 				$_SESSION['PO'.$identifier]->AllowPrintPO=1;
 			} else {
 				$OKToUpdateStatus=0;
@@ -842,9 +842,9 @@
 
 	echo '<tr><td>' . _('Status Comment') . ':</td>
 						<td><input type="text" name="StatusComments" size="50" /></td></tr>
-					<tr><td colspan="2"><b>' .  html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,UTF-8) .'</b></td></tr>';
+					<tr><td colspan="2"><b>' .  html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,'UTF-8') .'</b></td></tr>';
 	//need to use single quotes as double quotes inside the string of StatusComments
-	echo "<input type='hidden' name='StatusCommentsComplete' value='" . addslashes(html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,UTF-8)) ."' />";
+	echo "<input type='hidden' name='StatusCommentsComplete' value='" . addslashes(html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,'UTF-8')) ."' />";
 	echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td>';
 
 	echo '</tr></table></td>';

Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php	2011-08-24 20:26:05 UTC (rev 7937)
+++ trunk/Z_poEditLangHeader.php	2011-08-24 20:27:23 UTC (rev 7938)
@@ -39,7 +39,7 @@
 	$fpOut = fopen($PathToNewLanguage, 'w');
 
 	for ($i=1; $i<=17; $i++) {
-		$Result = fputs($fpOut, stripslashes(html_entity_decode($_POST['Header_'.$i],ENT_QUOTES,UTF-8))."\n");
+		$Result = fputs($fpOut, stripslashes(html_entity_decode($_POST['Header_'.$i],ENT_QUOTES,'UTF-8'))."\n");
 	}
 
 	prnMsg (_('Writing the rest of the language file') . '.....<br />', 'info', ' ');

Modified: trunk/includes/htmlMimeMail.php
===================================================================
--- trunk/includes/htmlMimeMail.php	2011-08-24 20:26:05 UTC (rev 7937)
+++ trunk/includes/htmlMimeMail.php	2011-08-24 20:27:23 UTC (rev 7938)
@@ -141,8 +141,8 @@
 		$this->smtp_params['port'] = $_SESSION['SMTPSettings']['port'];
 		$this->smtp_params['helo'] = $_SESSION['SMTPSettings']['heloaddress'];
 		$this->smtp_params['auth'] = $_SESSION['SMTPSettings']['auth'];
-		$this->smtp_params['user'] = html_entity_decode($_SESSION['SMTPSettings']['username']);
-		$this->smtp_params['pass'] = html_entity_decode($_SESSION['SMTPSettings']['password']);
+		$this->smtp_params['user'] = html_entity_decode($_SESSION['SMTPSettings']['username'],ENT_QUOTES,UTF-8);
+		$this->smtp_params['pass'] = html_entity_decode($_SESSION['SMTPSettings']['password'],ENT_QUOTES,UTF-8);
 
 		/**
         * Make sure the MIME version header is first.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.