From: <pdo...@us...> - 2008-10-07 08:59:02
|
Revision: 13297 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13297&view=rev Author: pdontthink Date: 2008-10-07 08:56:21 +0000 (Tue, 07 Oct 2008) Log Message: ----------- Don't run full address thru htmlspecialchars when it gets urlencoded anyway; compose.php doesn't expect it. Thanks to Scott Haneda for reporting. Modified Paths: -------------- trunk/squirrelmail/templates/util_addressbook.php Modified: trunk/squirrelmail/templates/util_addressbook.php =================================================================== --- trunk/squirrelmail/templates/util_addressbook.php 2008-10-07 04:48:50 UTC (rev 13296) +++ trunk/squirrelmail/templates/util_addressbook.php 2008-10-07 08:56:21 UTC (rev 13297) @@ -21,7 +21,7 @@ */ function composeLink ($row) { return makeComposeLink('src/compose.php?send_to=' . - rawurlencode($row['FullAddress']), + rawurlencode($row['RawFullAddress']), htmlspecialchars($row['Email'])); } @@ -41,16 +41,17 @@ $contacts = array(); while(list($undef,$row) = each($addresses)) { $contact = array ( - 'FirstName' => htmlspecialchars($row['firstname']), - 'LastName' => htmlspecialchars($row['lastname']), - 'FullName' => htmlspecialchars($row['name']), - 'NickName' => htmlspecialchars($row['nickname']), - 'Email' => htmlspecialchars($row['email']), - 'FullAddress' => htmlspecialchars(AddressBook::full_address($row)), - 'Info' => htmlspecialchars($row['label']), - 'Extra' => (isset($row['extra']) ? $row['extra'] : NULL), - 'Source' => htmlspecialchars($row['source']), - 'JSEmail' => htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES), + 'FirstName' => htmlspecialchars($row['firstname']), + 'LastName' => htmlspecialchars($row['lastname']), + 'FullName' => htmlspecialchars($row['name']), + 'NickName' => htmlspecialchars($row['nickname']), + 'Email' => htmlspecialchars($row['email']), + 'FullAddress' => htmlspecialchars(AddressBook::full_address($row)), + 'RawFullAddress' => AddressBook::full_address($row), + 'Info' => htmlspecialchars($row['label']), + 'Extra' => (isset($row['extra']) ? $row['extra'] : NULL), + 'Source' => htmlspecialchars($row['source']), + 'JSEmail' => htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES), ); $contacts[] = $contact; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |