Changeset 13793 for trunk/administration

Timestamp:

03/16/10 01:57:17 (2 years ago)

Author:

Anton Lesnikov

Message:

1. Ticket #1669 - improvements
2. Ticket #1704 - improvements
3. Ticket #1678

File:

• trunk/administration/notifies.php (modified) (4 diffs)

trunk/administration/notifies.php

@@ -282 +282 @@
         }
 
+        $iRecipientMembers = (int)$GLOBALS['MySQL']->getOne("SELECT COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Status`<>'Unconfirmed' AND `EmailNotify` = 1 LIMIT 1");
         $aForm = array(
             'form_attrs' => array(
@@ -305 +306 @@
                     'attrs' => array(
                         'onClick' => 'setControlsState();',
-                    )
+                    ),
+                    'info' => _t('_adm_mmail_Send_to_members_info', $iRecipientMembers),
                 ),
                 'sex' => array (
@@ -388 +390 @@
 
         foreach($aSubscribers as $aSubscriber) {
+            if(empty($aSubscriber['user_email']))
+                continue;
+
             $aMessage = $oEmailTemplates->parseTemplate($aSubscriber['template_name'], array(
                 'RealName' => $aSubscriber['user_name'],
@@ -435 +440 @@
         $aMembers = $MySQL->getAll("SELECT `ID` AS `id`, `Email` AS `email` FROM `Profiles` WHERE `Status` <> 'Unconfirmed' AND `EmailNotify` = 1 {$sex_filter_sql} {$age_filter_sql} {$country_filter_sql}");
         foreach($aMembers as $aMember) {
+            if(empty($aMember['email']))
+                continue;
+
             //--- Dynamic membership filter
             $membership_info = getMemberMembershipInfo($aMember['id']);