← Back to branch summary

~cyrenity/zivios/devel

« back to all changes in this revision

Viewing changes to application/modules/mail/controllers/UserController.php

  • Committer: Faraz Khan
  • Date: 2008-09-28 11:38:50 UTC
  • Revision ID: fkhan@zivios.org-20080928113850-ex2mr4apnbsixwou
changing div to 'innermail'. This was not done on earlier revisions causing all screens to fail!

Show diffs side-by-side

added added

removed removed

Lines of Context:
application/modules/mail/controllers/UserController.php
201
201
                else
202
202
                        $blacklist = null;
203
203
 
204
 
                if ($msg = $this->mailPlugin->setProperty("amavisblacklistsender", $blacklist)) {
 
204
                if ($blacklist != null && $msg = $this->mailPlugin->setProperty("amavisblacklistsender", $blacklist)) {
205
205
                        $this->_createPopupReturn(1, $msg);
206
206
                        return;
207
 
                }
 
207
                } else
 
208
            $this->mailPlugin->getParameter('amavisblacklistsender')->nullify();
 
209
        
208
210
 
209
211
                $whitelist = trim(strip_tags($this->json->whitelist));
210
212
                if ($whitelist != "")
212
214
                else
213
215
                        $whitelist = null;
214
216
 
215
 
                if ($msg = $this->mailPlugin->setProperty("amaviswhitelistsender", $whitelist)) {
 
217
                if ($whitelist != null && $msg = $this->mailPlugin->setProperty("amaviswhitelistsender", $whitelist)) {
216
218
                        $this->_createPopupReturn(1, $msg);
217
219
                        return;
218
 
                }
 
220
                } else 
 
221
            $this->mailPlugin->getParameter('amaviswhitelistsender')->nullify();
219
222
 
220
223
                /**
221
224
                 * Set spam properties