[Xrms-cvs] xrms/rss activities.php,1.8,1.9

[360team.ca <gop...@us...>]

Update of /cvsroot/xrms/xrms/rss
In directory vz-cvs-3.sog:/tmp/cvs-serv3427

Modified Files:
	activities.php 
Log Message:
FIXED Bug Artifact #1585901  Added htmlentities() conversion to the company_name and author fields.
Also, removed overzealous conversion of the '&' sign in the activity_title and activity_description.

Index: activities.php
===================================================================
RCS file: /cvsroot/xrms/xrms/rss/activities.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** activities.php	5 Apr 2006 01:21:51 -0000	1.8
--- activities.php	10 Mar 2011 14:58:06 -0000	1.9
***************
*** 219,224 ****
  	while (!$rst->EOF) {
  		$activity_id = $rst->fields['activity_id'];
! 		$activity_title = str_replace("&", "&", htmlentities($rst->fields['activity_title'], ENT_COMPAT, 'UTF-8'));
! 		$activity_description = str_replace("&", "&", htmlentities($rst->fields['activity_description'], ENT_COMPAT, 'UTF-8'));
  		$activity_status = $rst->fields['activity_status'];
  		$ends_at = $rst->fields['ends_at'];
--- 219,224 ----
  	while (!$rst->EOF) {
  		$activity_id = $rst->fields['activity_id'];
! 		$activity_title = htmlentities($rst->fields['activity_title'], ENT_COMPAT, 'UTF-8');
! 		$activity_description = htmlentities($rst->fields['activity_description'], ENT_COMPAT, 'UTF-8');
  		$activity_status = $rst->fields['activity_status'];
  		$ends_at = $rst->fields['ends_at'];
***************
*** 226,231 ****
  		$last_modified_f = date("r", strtotime($last_modified_at));
  		$pub_date = date("r", strtotime($last_modified_at));
! 		$company_name = $rst->fields['company_name'];
! 		$author = $rst->fields['author'];
  		$description = "<p><b>$company_name</b></p>" . $activity_description;
  		$items_text .= "      <item>\n";
--- 226,231 ----
  		$last_modified_f = date("r", strtotime($last_modified_at));
  		$pub_date = date("r", strtotime($last_modified_at));
! 		$company_name = htmlentities($rst->fields['company_name'], ENT_COMPAT, 'UTF-8');
! 		$author = htmlentities($rst->fields['author'], ENT_COMPAT, 'UTF-8');
  		$description = "&lt;p&gt;&lt;b&gt;$company_name&lt;/b&gt;&lt;/p&gt;" . $activity_description;
  		$items_text .= "      <item>\n";
***************
*** 275,278 ****
--- 275,282 ----
  /**
   * $Log$
+  * Revision 1.9  2011/03/10 14:58:06  gopherit
+  * FIXED Bug Artifact #1585901  Added htmlentities() conversion to the company_name and author fields.
+  * Also, removed overzealous conversion of the '&' sign in the activity_title and activity_description.
+  *
   * Revision 1.8  2006/04/05 01:21:51  vanmer
   * - ensure last date is provided to rss stream