[Tikiwiki-cvs] tiki messu-broadcast.php, 1.19.2.3, 1.19.2.4 messu-compose.php, 1.18.2.12, 1.18.2.13

[<mo...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14466

Modified Files:
      Tag: BRANCH-1-9
	messu-broadcast.php messu-compose.php 
Log Message:
[FIX] usermessages: when sender email was not setup, user email was used for mail sending. added a check on user preference email_is_public to avoid privacy leak. also cleaned up some unused methods

Index: messu-broadcast.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/messu-broadcast.php,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -d -r1.19.2.3 -r1.19.2.4
--- messu-broadcast.php	27 Feb 2005 18:52:43 -0000	1.19.2.3
+++ messu-broadcast.php	25 Jan 2007 01:51:58 -0000	1.19.2.4
@@ -97,8 +97,8 @@
 
 	foreach ($all_users as $a_user) {
 		if (!empty($a_user)) {
-			if ($messulib->user_exists($a_user)) {
-				if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y')) {
+			if ($userlib->user_exists($a_user)) {
+				if ($tikilib->get_user_preference($a_user, 'allowMsgs', 'y')) {
 					$users[] = $a_user;
 				} else {
 					// TODO: needs translation as soon as there is a solution for strings with embedded variables

Index: messu-compose.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/messu-compose.php,v
retrieving revision 1.18.2.12
retrieving revision 1.18.2.13
diff -u -d -r1.18.2.12 -r1.18.2.13
--- messu-compose.php	12 Aug 2006 18:06:09 -0000	1.18.2.12
+++ messu-compose.php	25 Jan 2007 01:51:58 -0000	1.18.2.13
@@ -108,9 +108,9 @@
 
 	foreach ($arr_to as $a_user) {
 		if (!empty($a_user)) {
-			if ($messulib->user_exists($a_user)) {
+			if ($userlib->user_exists($a_user)) {
 				// mail only to users with activated message feature
-				if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
+				if ($tikilib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
 					// only send mail if nox mailbox size is defined or not reached yet
 					if (($messulib->count_messages($a_user)<$messu_mailbox_size) || ($messu_mailbox_size==0)) {
 						$users[] = $a_user;
@@ -128,9 +128,9 @@
 
 	foreach ($arr_cc as $a_user) {
 		if (!empty($a_user)) {
-			if ($messulib->user_exists($a_user)) {
+			if ($userlib->user_exists($a_user)) {
 				// mail only to users with activated message feature
-				if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
+				if ($tikilib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
 					// only send mail if nox mailbox size is defined or not reached yet
 					if (($messulib->count_messages($a_user)<$messu_mailbox_size) || ($messu_mailbox_size==0)) {
 						$users[] = $a_user;
@@ -148,9 +148,9 @@
 
 	foreach ($arr_bcc as $a_user) {
 		if (!empty($a_user)) {
-			if ($messulib->user_exists($a_user)) {
+			if ($userlib->user_exists($a_user)) {
 				// mail only to users with activated message feature
-				if ($messulib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
+				if ($tikilib->get_user_preference($a_user, 'allowMsgs', 'y') == 'y') {
 					// only send mail if nox mailbox size is defined or not reached yet
 					if (($messulib->count_messages($a_user)<$messu_mailbox_size) || ($messu_mailbox_size==0)) {
 						$users[] = $a_user;
@@ -200,7 +200,7 @@
 
 	$smarty->assign('message', $message);
 }
-$allowMsgs = $messulib->get_user_preference($user, 'allowMsgs', 'y');
+$allowMsgs = $tikilib->get_user_preference($user, 'allowMsgs', 'y');
 $smarty->assign('allowMsgs', $allowMsgs);
 
 $section = 'user_messages';