mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-24 22:32:07 +01:00
formatting, globals
This commit is contained in:
Miles Lott
parent
2f0bed436e
commit
81833f8843
@ -29,26 +29,25 @@
|
||||
|
||||
class send
|
||||
{
|
||||
var $err = array("code","msg","desc");
|
||||
var $err = array('code','msg','desc');
|
||||
var $to_res = array();
|
||||
|
||||
function send()
|
||||
{
|
||||
$this->err["code"] = " ";
|
||||
$this->err["msg"] = " ";
|
||||
$this->err["desc"] = " ";
|
||||
$this->err['code'] = ' ';
|
||||
$this->err['msg'] = ' ';
|
||||
$this->err['desc'] = ' ';
|
||||
}
|
||||
|
||||
function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='')
|
||||
{
|
||||
global $phpgw_info, $phpgw, $attach_sig;
|
||||
if ($from == '')
|
||||
{
|
||||
$from = $phpgw_info['user']['fullname'].' <'.$phpgw_info['user']['preferences']['email']['address'].'>';
|
||||
$from = $GLOBALS['phpgw_info']['user']['fullname'].' <'.$GLOBALS['phpgw_info']['user']['preferences']['email']['address'].'>';
|
||||
}
|
||||
if ($sender == '')
|
||||
{
|
||||
$sender = $phpgw_info['user']['fullname'].' <'.$phpgw_info['user']['preferences']['email']['address'].'>';
|
||||
$sender = $GLOBALS['phpgw_info']['user']['fullname'].' <'.$GLOBALS['phpgw_info']['user']['preferences']['email']['address'].'>';
|
||||
}
|
||||
|
||||
if ($service == "email")
|
||||
@ -60,7 +59,7 @@
|
||||
{
|
||||
$header .= 'Sender: '.$sender."\n";
|
||||
}
|
||||
$header .= 'Reply-To: '.$phpgw_info['user']['preferences']['email']['address']."\n";
|
||||
$header .= 'Reply-To: '.$GLOBALS['phpgw_info']['user']['preferences']['email']['address']."\n";
|
||||
$header .= 'To: '.$to."\n";
|
||||
if (!empty($cc))
|
||||
{
|
||||
@ -77,10 +76,10 @@
|
||||
$header .= 'X-Mailer: phpGroupWare (http://www.phpgroupware.org)'."\n";
|
||||
|
||||
/* // moved to email/send_message.php
|
||||
if ($phpgw_info['user']['preferences']['email']['email_sig'] && $attach_sig)
|
||||
if ($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'] && $attach_sig)
|
||||
{
|
||||
//$body .= "\n-----\n".$phpgw_info['user']['preferences']['email']['email_sig'];
|
||||
$get_sig = $this->sig_html_to_text($phpgw_info['user']['preferences']['email']['email_sig']);
|
||||
//$body .= "\n-----\n".$GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'];
|
||||
$get_sig = $this->sig_html_to_text($GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig']);
|
||||
$body .= "\n-----\n" .$get_sig;
|
||||
}
|
||||
*/
|
||||
@ -93,7 +92,8 @@
|
||||
. ' boundary="Message-Boundary"'."\n\n"
|
||||
. '--Message-Boundary'."\n"
|
||||
. 'Content-type: text/plain; charset=US-ASCII'."\n";
|
||||
// if (!empty($msgtype)) {
|
||||
// if (!empty($msgtype))
|
||||
// {
|
||||
// $header .= "Content-type: text/plain; phpgw-type=".$msgtype."\n";
|
||||
// }
|
||||
|
||||
@ -114,11 +114,11 @@
|
||||
$header .= 'Content-Disposition: inline'."\n"
|
||||
. 'Content-description: Mail message body'."\n";
|
||||
}
|
||||
if ($phpgw_info['user']['preferences']['email']['mail_server_type'] == 'imap' && $phpgw_info['user']['apps']['email'] && is_object($phpgw->msg))
|
||||
if ($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'] == 'imap' && $GLOBALS['phpgw_info']['user']['apps']['email'] && is_object($GLOBALS['phpgw']->msg))
|
||||
{
|
||||
$stream = $phpgw->msg->login('Sent');
|
||||
$phpgw->msg->append($stream, 'Sent', $header, $body, "\\Seen");
|
||||
$phpgw->msg->close($stream);
|
||||
$stream = $GLOBALS['phpgw']->msg->login('Sent');
|
||||
$GLOBALS['phpgw']->msg->append($stream, 'Sent', $header, $body, "\\Seen");
|
||||
$GLOBALS['phpgw']->msg->close($stream);
|
||||
}
|
||||
if (strlen($cc)>1)
|
||||
{
|
||||
@ -144,27 +144,27 @@
|
||||
|
||||
function socket2msg($socket)
|
||||
{
|
||||
$followme = "-";
|
||||
$this->err["msg"] = "";
|
||||
$followme = '-';
|
||||
$this->err['msg'] = '';
|
||||
do
|
||||
{
|
||||
$rmsg = fgets($socket,255);
|
||||
// echo "< $rmsg<BR>\n";
|
||||
$this->err["code"] = substr($rmsg,0,3);
|
||||
$this->err['code'] = substr($rmsg,0,3);
|
||||
$followme = substr($rmsg,3,1);
|
||||
$this->err["msg"] = substr($rmsg,4);
|
||||
$this->err['msg'] = substr($rmsg,4);
|
||||
if (substr($this->err["code"],0,1) != 2 && substr($this->err["code"],0,1) != 3)
|
||||
{
|
||||
$rc = fclose($socket);
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if ($followme = " ")
|
||||
if ($followme = ' ')
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
while ($followme = "-");
|
||||
return true;
|
||||
while ($followme = '-');
|
||||
return True;
|
||||
}
|
||||
|
||||
function msg2socket($socket,$message)
|
||||
@ -175,13 +175,13 @@
|
||||
$rc = fputs($socket,"$message");
|
||||
if (!$rc)
|
||||
{
|
||||
$this->err["code"] = "420";
|
||||
$this->err["msg"] = "lost connection";
|
||||
$this->err["desc"] = "Lost connection to smtp server.";
|
||||
$this->err['code'] = '420';
|
||||
$this->err['msg'] = 'lost connection';
|
||||
$this->err['desc'] = 'Lost connection to smtp server.';
|
||||
$rc = fclose($socket);
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
return true;
|
||||
return True;
|
||||
}
|
||||
|
||||
function put2socket($socket,$message)
|
||||
@ -208,20 +208,20 @@
|
||||
// line not terminated
|
||||
$msg = chop($msg)."\r\n";
|
||||
}
|
||||
$pos = strpos($msg,"."); // escape leading periods
|
||||
$pos = strpos($msg,'.'); // escape leading periods
|
||||
if (is_int($pos) && !$pos)
|
||||
{
|
||||
$msg = "." . $msg;
|
||||
$msg = '.' . $msg;
|
||||
}
|
||||
if (!$this->msg2socket($socket,$msg))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
$pos = strpos($message,"\n");
|
||||
}
|
||||
while (strlen($message)>0);
|
||||
}
|
||||
return true;
|
||||
return True;
|
||||
}
|
||||
|
||||
function check_header($subject,$header)
|
||||
@ -241,15 +241,18 @@
|
||||
// found after a new line
|
||||
return $header;
|
||||
}
|
||||
$pos = strpos($theader,"subject:");
|
||||
$pos = strpos($theader,'subject:');
|
||||
if (is_int($pos) && !$pos)
|
||||
{
|
||||
// found at start
|
||||
return $header;
|
||||
}
|
||||
$pos = substr($subject,"\n");
|
||||
if (!is_int($pos)) $subject .= "\n";
|
||||
$subject = "Subject: " .$subject;
|
||||
if (!is_int($pos))
|
||||
{
|
||||
$subject .= "\n";
|
||||
}
|
||||
$subject = 'Subject: ' .$subject;
|
||||
$header .= $subject;
|
||||
return $header;
|
||||
}
|
||||
@ -267,24 +270,22 @@
|
||||
|
||||
function smail($to,$subject,$message,$header)
|
||||
{
|
||||
global $phpgw_info;
|
||||
|
||||
$fromuser = $phpgw_info["user"]["preferences"]["email"]["address"];
|
||||
$mymachine = $phpgw_info["server"]["hostname"];
|
||||
$fromuser = $GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
|
||||
$mymachine = $GLOBALS['phpgw_info']['server']['hostname'];
|
||||
// error code and message of failed connection
|
||||
$errcode = "";
|
||||
$errmsg = "";
|
||||
$errcode = '';
|
||||
$errmsg = '';
|
||||
// timeout in secs
|
||||
$timeout = 5;
|
||||
|
||||
// now we try to open the socket and check, if any smtp server responds
|
||||
$socket = fsockopen($phpgw_info["server"]["smtp_server"],$phpgw_info["server"]["smtp_port"],$errcode,$errmsg,$timeout);
|
||||
$socket = fsockopen($GLOBALS['phpgw_info']['server']['smtp_server'],$GLOBALS['phpgw_info']['server']['smtp_port'],$errcode,$errmsg,$timeout);
|
||||
if (!$socket)
|
||||
{
|
||||
$this->err["code"] = "420";
|
||||
$this->err["msg"] = "$errcode:$errmsg";
|
||||
$this->err["desc"] = "Connection to ".$phpgw_info["server"]["smtp_server"].":".$phpgw_info["server"]["smtp_port"]." failed - could not open socket.";
|
||||
return false;
|
||||
$this->err['code'] = '420';
|
||||
$this->err['msg'] = $errcode . ':' . $errmsg;
|
||||
$this->err['desc'] = 'Connection to '.$GLOBALS['phpgw_info']['server']['smtp_server'].':'.$GLOBALS['phpgw_info']['server']['smtp_port'].' failed - could not open socket.';
|
||||
return False;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -298,12 +299,12 @@
|
||||
"\$src = \$this->msg2socket(\$socket,\"MAIL FROM:<\$fromuser>\r\n\");",
|
||||
"\$rrc = \$this->socket2msg(\$socket);"
|
||||
);
|
||||
for ($src=true,$rrc=true,$i=0; $i<count($cmds);$i++)
|
||||
for ($src=True,$rrc=True,$i=0; $i<count($cmds);$i++)
|
||||
{
|
||||
eval ($cmds[$i]);
|
||||
if (!$src || !$rrc)
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
}
|
||||
|
||||
@ -315,17 +316,17 @@
|
||||
$src = $this->msg2socket($socket,'RCPT TO:<'.$toaddr[$i].">\r\n");
|
||||
$rrc = $this->socket2msg($socket);
|
||||
// for lateron validation
|
||||
$this->to_res[$i][addr] = $toaddr[$i];
|
||||
$this->to_res[$i][code] = $this->err["code"];
|
||||
$this->to_res[$i][msg] = $this->err["msg"];
|
||||
$this->to_res[$i][desc] = $this->err["desc"];
|
||||
$this->to_res[$i]['addr'] = $toaddr[$i];
|
||||
$this->to_res[$i]['code'] = $this->err['code'];
|
||||
$this->to_res[$i]['msg'] = $this->err['msg'];
|
||||
$this->to_res[$i]['desc'] = $this->err['desc'];
|
||||
}
|
||||
|
||||
//now we have to make sure that at least one $to-address was accepted
|
||||
$stop = 1;
|
||||
for ($i=0;$i<count($this->to_res);$i++)
|
||||
{
|
||||
$rc = substr($this->to_res[$i][code],0,1);
|
||||
$rc = substr($this->to_res[$i]['code'],0,1);
|
||||
if ($rc == 2)
|
||||
{
|
||||
// at least to this address we can deliver
|
||||
@ -335,55 +336,53 @@
|
||||
if ($stop)
|
||||
{
|
||||
// no address found we can deliver to
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
|
||||
// now we can go to deliver the message!
|
||||
if (!$this->msg2socket($socket,"DATA\r\n"))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if (!$this->socket2msg($socket))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if ($header != "")
|
||||
{
|
||||
$header = $this->check_header($subject,$header);
|
||||
if (!$this->put2socket($socket,$header))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if (!$this->put2socket($socket,"\r\n"))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
}
|
||||
$message = chop($message);
|
||||
$message .= "\n";
|
||||
if (!$this->put2socket($socket,$message))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if (!$this->msg2socket($socket,".\r\n"))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if (!$this->socket2msg($socket))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
if (!$this->msg2socket($socket,"QUIT\r\n"))
|
||||
{
|
||||
return false;
|
||||
return False;
|
||||
}
|
||||
do
|
||||
{
|
||||
$closing = $this->socket2msg($socket);
|
||||
}
|
||||
while ($closing);
|
||||
return true;
|
||||
}
|
||||
|
||||
// end of class
|
||||
return True;
|
||||
}
|
||||
} /* end of class */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user