Renamed sanitize() => input_filter(), to avoid misunderstanding

[pukiwiki/pukiwiki.git] / mail.php

diff --git a/mail.php b/mail.php
index 49245d3..590c3bb 100644 (file)
--- a/mail.php
+++ b/mail.php
@@ -2,80 +2,81 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: mail.php,v 1.1 2003/09/24 00:37:27 arino Exp $
+// $Id: mail.php,v 1.7 2004/07/17 15:17:48 henoheno Exp $
 //
 
-// POP Before SMTP
-function pop_before_smtp()
+// APOP/POP Before SMTP
+function pop_before_smtp($pop_userid = '', $pop_passwd = '',
+       $pop_server = 'localhost', $pop_port = 110)
 {
-       global $pop_auth_use_apop,$pop_port,$pop_server,$pop_userid,$pop_passwd;
+       $pop_auth_use_apop = TRUE;      // Always try APOP, by default
+       $must_use_apop     = FALSE;     // Always try POP for APOP-disabled server
+       if (isset($GLOBALS['pop_auth_use_apop'])) {
+               // Force APOP only, or POP only
+               $pop_auth_use_apop = $must_use_apop = $GLOBALS['pop_auth_use_apop'];
+       }
 
-       $fp = @fsockopen($pop_server,$pop_port,$errno,$errstr,30);
-       if (!$fp)
-       {
-               return "$errstr ($errno)";
+       // Compat: GLOBALS > function arguments
+       foreach(array('pop_userid', 'pop_passwd', 'pop_server', 'pop_port') as $global) {
+               if(isset($GLOBALS[$global]) && $GLOBALS[$global] !== '')
+                       ${$global} = $GLOBALS[$global];
        }
-       
-       $rc = pop_result($fp);
-       if ($rc !== 0)
-       {
-               return $rc;
+
+       // Check
+       $die = '';
+       foreach(array('pop_userid', 'pop_server', 'pop_port') as $global)
+               if(${$global} == '') $die .= "pop_before_smtp(): \$$global seems blank\n";
+       if ($die) return ($die);
+
+       // Connect
+       $errno = 0; $errstr = '';
+       $fp = @fsockopen($pop_server, $pop_port, $errno, $errstr, 30);
+       if (! $fp) return ("pop_before_smtp(): $errstr ($errno)");
+
+       // Greeting message from server, may include <challenge-string> of APOP
+       $message = fgets($fp, 1024); // 512byte max
+       if (! preg_match('/^\+OK/', $message)) {
+               fclose($fp);
+               return ("pop_before_smtp(): Greeting message seems invalid");
        }
-       
-       // APOP »ØÄê»þ¤ÎÍøÍÑȽÄê
-       if ($pop_auth_use_apop)
-       {
-               // digest Ãê½Ð
-               preg_match("(<.*>)", $buf, $regs);
-               // digest ¤¬Ãê½Ð¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¶¯À©Åª¤Ë POP ¤ËÀÚ¤êÂؤ¨
-               if (empty($regs[0]))
-               {
-                       $pop_auth_use_apop = 0;
+
+       $challenge = array();
+       if ($pop_auth_use_apop &&
+          (preg_match('/<.*>/', $message, $challenge) || $must_use_apop)) {
+               $method = 'APOP'; // APOP auth
+               if (! isset($challenge[0])) {
+                       $response = md5(time()); // Someting worthless but variable
+               } else {
+                       $response = md5($challenge[0] . $pop_passwd);
                }
-       }
-       
-       // APOP ¤Þ¤¿¤Ï POP
-       if ($pop_auth_use_apop)
-       {
-               fputs($fp, "APOP ".$pop_userid." ".md5($regs[0].$pop_passwd)."\r\n");
-               $rc = pop_result($fp);
-               if ($rc !== 0)
-               {
-                       return $rc;
+               fputs($fp, 'APOP ' . $pop_userid . ' ' . $response . "\r\n");
+       } else {
+               $method = 'POP'; // POP auth
+               fputs($fp, 'USER ' . $pop_userid . "\r\n");
+               $message = fgets($fp, 1024); // 512byte max
+               if (! preg_match('/^\+OK/', $message)) {
+                       fclose($fp);
+                       return ("pop_before_smtp(): USER seems invalid");
                }
+               fputs($fp, 'PASS ' . $pop_passwd . "\r\n");
        }
-       else
-       {
-               fputs($fp, "USER ".$pop_userid."\r\n");
-               $rc = pop_result($fp);
-               if ($rc !== 0)
-               {
-                       return $rc;
-               }
-               
-               fputs($fp, "PASS ".$pop_passwd."\r\n");
-               $rc = pop_result($fp);
-               if ($rc !== 0)
-               {
-                       return $rc;
-               }
+
+       $result = fgets($fp, 1024); // 512byte max, auth result
+       $auth   = preg_match('/^\+OK/', $result);
+       if ($auth) {
+               fputs($fp, "STAT\r\n"); // STAT, trigger SMTP relay!
+               $message = fgets($fp, 1024); // 512byte max
        }
 
+       // Disconnect
        fputs($fp, "QUIT\r\n");
+       $message = fgets($fp, 1024); // 512byte max, last "+OK"
        fclose($fp);
-       return 0;
-}
 
-// POP ½èÍý¤Î·ë²ÌȽÄê
-function pop_result($fp)
-{
-       $buf = fgets($fp, 2048);
-       $tok = strtok($buf,' ');
-       if ($tok == '+OK')
-       {
-               return 0;
+       if (! $auth) {
+               return ("pop_before_smtp(): $method authentication failed");
+       } else {
+               return TRUE;    // Success
        }
-       fclose($fp);
-       return substr($buf, strlen($tok) + 1);
 }
 ?>