[interchange-cvs] interchange - pajamian modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Fri Jul 6 07:48:19 EDT 2007


User:      pajamian
Date:      2007-07-06 11:48:19 GMT
Modified:  .        WHATSNEW-5.5
Modified:  dist/lib/UI/pages/admin customer_mailing.html
Log:
Scrapped a useless test in customer_mailing.html for the following reasons:

* The test accessed the wrong variable name (MAIL_MAX_DIRECT instead of
  MAILING_MAX_DIRECT).

* The default was 5 when it should have been 50.

* The array that was tested against will always have 0 elements at the time of
  the test because it is populated after the test, so unless the
  MAIL_MAX_DIRECT variable was set to a negative value the test would always
  pass.

* The functionality of this test block is redundant anyways, as there is a
  similar test further up in the file that actualy works properly.

Revision  Changes    Path
1.38      +2 -0      interchange/WHATSNEW-5.5


rev 1.38, prev_rev 1.37
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- WHATSNEW-5.5	6 Jul 2007 10:08:58 -0000	1.37
+++ WHATSNEW-5.5	6 Jul 2007 11:48:19 -0000	1.38
@@ -128,6 +128,8 @@
 
 * Fix page banner in menu editor.
 
+* Tidied up some code in customer_mailing.html
+
 Standard demo
 -------------
 



1.11      +1 -6      interchange/dist/lib/UI/pages/admin/customer_mailing.html


rev 1.11, prev_rev 1.10
Index: customer_mailing.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/customer_mailing.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- customer_mailing.html	23 Apr 2005 18:10:07 -0000	1.10
+++ customer_mailing.html	6 Jul 2007 11:48:19 -0000	1.11
@@ -369,11 +369,6 @@
 
 		return if ! @messages;
 		if($CGI->{direct_send}) {
-			my $max = $Variable->{MAIL_MAX_DIRECT} || 5;
-			if( scalar(@out) > $max ) {
-				my $msg = errmsg("Too many addresses for direct send, max %s!", $max);
-				return "<blockquote class=cerror>$max</blockquote>";
-			}
 			my $s = $Scratch->{sent_ids} ||= {};
 			for(@messages) {
 				my ($u, $b) = @$_;
@@ -441,4 +436,4 @@
 <!-- ----- END REAL STUFF ----- -->
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: customer_mailing.html,v 1.10 2005/04/23 18:10:07 pvinci Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: customer_mailing.html,v 1.11 2007/07/06 11:48:19 pajamian Exp $ -->








More information about the interchange-cvs mailing list