Changeset 108

Show
Ignore:
Timestamp:
05/28/07 11:34:20 (2 years ago)
Author:
sven
Message:

mailblogger fix domain->singleaddress change

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mailblogger/lib.php

    r66 r108  
    2121    NB: SSL unlikely to work on Windows 
    2222     
    23     $CFG->mailblogger_maildomain - Used in To address detection and in user blurb 
    2423    $CFG->mailblogger_disablecron - optional, defaults to false; 
    2524    $CFG->mailblogger_imaprejectedmailbox - optional, if not set, rejected messages are deleted. can not be the same as $CFG->mailblogger_imapmailbox 
    2625    $CFG->mailblogger_imapposteddmailbox - optional, if not set, posted messages are deleted. can not be the same as $CFG->mailblogger_imapmailbox 
     26    $CFG->mailblogger_maildomain - Used in To address detection and in user blurb - NOT CURRENTLY USED 
    2727     
    2828*/ 
    …… 
    4646        } else { 
    4747            $CFG->mailblogger_maildomain = ''; 
     48        } 
     49         
     50        if (!empty($CFG->mailblogger_toaddress)) { 
     51            $CFG->mailblogger_toaddress = trim($CFG->mailblogger_toaddress); 
     52        } else { 
     53            $CFG->mailblogger_toaddress = ''; 
    4854        } 
    4955         
    …… 
    518524        $userpin = user_flag_get('mailblogger_pin', $userid); 
    519525        $username = user_info('username', $userid);  
    520         if ($username && $userpin && $CFG->mailblogger_maildomain) { 
    521             $blurb .= '<br />' . sprintf(__gettext("To blog by phone/mail, send your post to %s with %s as your subject line."), $CFG->mailblogger_toaddress, $username . $userpin . '@' . $CFG->mailblogger_maildomain); 
     526        if ($username && $userpin && $CFG->mailblogger_toaddress) { 
     527            $blurb .= '<br />' . sprintf(__gettext("To blog by phone/mail, send your post to %s with %s as your subject line."), $CFG->mailblogger_toaddress, $username . $userpin); 
    522528        } 
    523529