[phpBT-dev] CVS: phpbt bug.php,1.20,1.21 include.php,1.23,1.24 query.php,1.12,1.13

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv27902

Modified Files:
	bug.php include.php query.php 
Log Message:
Add an option for masking email addresses

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bug.php	2001/08/09 13:21:58	1.20
+++ bug.php	2001/08/09 22:17:02	1.21
@@ -48,7 +48,7 @@
 			'field' => stripslashes($row['ChangedField']),
 			'oldvalue' => stripslashes($row['OldValue']),
 			'newvalue' => stripslashes($row['NewValue']),
-			'createdby' => stripslashes($row['Email']),
+			'createdby' => stripslashes(maskemail($row['Email'])),
 			'date' => date(DATEFORMAT.' '.TIMEFORMAT, $row['CreatedDate'])
 			));
 		$t->parse('rows', 'row', true);
@@ -369,8 +369,8 @@
 		'priority' => build_select('priority',$row['Priority']),
 		'status' => $row['Status'],
 		'resolution' => $row['Resolution'],
-		'owner' => $row['Owner'] ? "to <a href='mailto:{$row['Owner']}'>{$row['Owner']}</a>" : '',
-		'reporter' => $row['Reporter'],
+		'owner' => maskemail($row['Owner']),
+		'reporter' => maskemail($row['Reporter']),
 		'createddate' => date(DATEFORMAT,$row['CreatedDate']),
 		'createdtime' => date(TIMEFORMAT,$row['CreatedDate']),
 		'lastmodifieddate' => $row['LastModifiedDate'],
@@ -417,7 +417,7 @@
 				'bgcolor' => (++$i % 2 == 0) ? '#dddddd' : '#ffffff',
 				'rdescription' => eregi_replace('(bug)[[:space:]]*(#?)([0-9]+)',
 					"\\1 <a href='$me?op=show&bugid=\\3'>\\2\\3</a>",nl2br($row['Text'])),
-				'rreporter' => $row['Email'],
+				'rreporter' => maskemail($row['Email']),
 				'rcreateddate' => date(TIMEFORMAT,$row['CreatedDate']).' on '.
 					date(DATEFORMAT,$row['CreatedDate'])
 				));

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- include.php	2001/08/09 13:03:03	1.23
+++ include.php	2001/08/09 22:17:02	1.24
@@ -33,6 +33,7 @@
 define ('THEME','default/'); // Which set of templates to use
 define ('USE_JPGRAPH',0); // Whether to show images or not
 define ('JPGRAPH_PATH', '/home/bcurtis/public_html/jp/'); // If it's not in the include path
+define ('MASKEMAIL', 1); // Should email addresses be plainly visible?
 
 require PHPLIBPATH.'db_mysql.inc';
 require PHPLIBPATH.'ct_sql.inc';
@@ -401,6 +402,16 @@
 /// (From zend.com user russIndr)
 function valid_email($email) {		 
 	return eregi('^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$', $email); 
+}
+
+///
+/// If the constant is set do a little email masking to make harvesting a little harder
+function maskemail($email) {
+	if (MASKEMAIL) {
+		return str_replace('@', ' at ', str_replace('.', ' dot ', $email));
+	} else {
+		return $email;
+	}
 }
 
 // Begin every page with a page_open

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- query.php	2001/08/09 12:54:47	1.12
+++ query.php	2001/08/09 22:17:02	1.13
@@ -216,8 +216,8 @@
 			'priority' => $select['priority'][$row['Priority']],
 			'status' => $row['Status'],
 			'assignedto' => $row['AssignedTo'],
-			'reporter' => $row['Reporter'],
-			'owner' => $row['Owner'],
+			'reporter' => maskemail($row['Reporter']),
+			'owner' => maskemail($row['Owner']),
 			'createddate' => date(DATEFORMAT,$row['CreatedDate']),
 			'project' => $row['Project'],
 			'component' => $row['Component'],