Changeset 15824 for tags

Timestamp:

01/04/12 06:24:16 (5 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2709

Location:

tags/7.0

Files:

• inc/classes/BxDolMailBox.php (modified) (4 diffs)
• templates/base/scripts/BxBaseMailBox.php (modified) (2 diffs)

tags/7.0/inc/classes/BxDolMailBox.php

@@ -787 +787 @@
            * @return         : signaling information with Html ;
            */
-          function sendMessage( $sMessageSubject, $sMessageBody, $vRecipientID, &$aComposeSettings )
+          function sendMessage( $sMessageSubject, $sMessageBody, $vRecipientID, &$aComposeSettings, $isSimulateSending = false )
           {
                $sMessageSubject = process_db_input($sMessageSubject, BX_TAGS_STRIP);
@@ -795 +795 @@
                $sCopyMessage = $GLOBALS['MySQL']->unescape ($sMessageBody);
 
-               if(!$sMessageSubject || !$sMessageBody) {
+               if(!$isSimulateSending && (!$sMessageSubject || !$sMessageBody)) {
                     $this -> iSendMessageStatusCode = BX_MAILBOX_SEND_FAILED;
                     return MsgBox( _t('_please_fill_next_fields_first') );
@@ -874 +874 @@
 
                 // chek membership level;
-                if(!$this -> isSendMessageAlowed($this -> aMailBoxSettings['member_id'], true) ) {
+                if(!$this -> isSendMessageAlowed($this -> aMailBoxSettings['member_id'], $isSimulateSending ? false : true) ) {
                     $sReturnMessage = MsgBox( _t('_FAILED_TO_SEND_MESSAGE_MEMBERSHIP_DISALLOW') );
                     $this -> iSendMessageStatusCode = BX_MAILBOX_SEND_FAILED_MEMBERSHIP_DISALLOW;
@@ -881 +881 @@
 
                 // ** allow to send message ;
-                if ( $bAllowToSend )
+                if ( !$isSimulateSending && $bAllowToSend )
                 {
                     $sQuery = 

tags/7.0/templates/base/scripts/BxBaseMailBox.php

@@ -104 +104 @@
                 ? getProfileInfo($this -> aMailBoxSettings['recipient_id']) 
                 : null;
+
+            // check if send message is allowed
+            $aComposeSettings = array();
+            $sErrMsg = $this->sendMessage('', '', $aMemberInfo ? $aMemberInfo['ID'] : 0, $aComposeSettings, true);
+            if ($sErrMsg)
+                return $sErrMsg;
 
             $aLanguageKeys     = array
@@ -1491 +1497 @@
             $iRecipientID = (int) $iRecipientID;
 
+            // check if send message is allowed
+            $aComposeSettings = array();
+            $sErrMsg = $this->sendMessage('', '', $iRecipientID, $aComposeSettings, true);
+            if ($sErrMsg)
+                return $sErrMsg;
+
             // init some needed variables ;
             $sOutputHtml     = '';