cvs: php4 /ext/imap imap.dsp php_imap.c
| From: | Frank M. Kromann | Date: | Tue, 04 Dec 2001 18:47:32 +0000 |
| Subject: | cvs: php4 /ext/imap imap.dsp php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8421@lists.php.net to get a copy of this message | ||
fmk Tue Dec 4 13:47:32 2001 EDT
Modified files:
/php4/ext/imap imap.dsp php_imap.c
Log:
Enable imap_mail() on win32
Index: php4/ext/imap/imap.dsp
diff -u php4/ext/imap/imap.dsp:1.12 php4/ext/imap/imap.dsp:1.13
--- php4/ext/imap/imap.dsp:1.12 Thu Aug 24 13:48:18 2000
+++ php4/ext/imap/imap.dsp Tue Dec 4 13:47:31 2001
@@ -97,7 +97,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /FR /YX
/FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I
"..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "ZTS" /D
"_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D
"ZTS" /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D
HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -107,7 +107,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug
/machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib winmm.lib
cclient.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll"
/pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"
/libpath:"..\..\..\php_build\IMAP\C-Client"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib winmm.lib
cclient.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll"
/pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "imap - Win32 Release_TS"
@@ -123,7 +123,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD
/c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I
"..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "ZTS" /D
"NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I
"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D
"ZTS" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D
HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /D HAVE_IMAP2001=1 /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -133,7 +133,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib cclient.lib
/nologo /dll /machine:I386 /out:"..\..\Release_TS/php_imap.dll"
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
/libpath:"..\..\..\php_build\IMAP\C-Client"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib cclient.lib
Secur32.lib CertIdl.Lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT"
/out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
!ENDIF
@@ -148,15 +148,31 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\..\win32\imap_sendmail.c
+# End Source File
+# Begin Source File
+
SOURCE=.\php_imap.c
# End Source File
+# Begin Source File
+
+SOURCE=..\..\win32\sendmail.c
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\..\win32\imap_sendmail.h
+# End Source File
+# Begin Source File
+
SOURCE=.\php_imap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\win32\sendmail.h
# End Source File
# End Group
# Begin Source File
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.107 php4/ext/imap/php_imap.c:1.108
--- php4/ext/imap/php_imap.c:1.107 Mon Dec 3 15:54:22 2001
+++ php4/ext/imap/php_imap.c Tue Dec 4 13:47:32 2001
@@ -25,7 +25,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.107 2001/12/03 20:54:22 andi Exp $ */
+/* $Id: php_imap.c,v 1.108 2001/12/04 18:47:32 fmk Exp $ */
#define IMAP41
@@ -52,6 +52,7 @@
#ifdef PHP_WIN32
#include "winsock.h"
+#include "win32/imap_sendmail.h"
MAILSTREAM DEFAULTPROTO;
#endif
@@ -135,11 +136,7 @@
PHP_FE(imap_setacl, NULL)
#endif
-#ifndef PHP_WIN32
PHP_FE(imap_mail, NULL)
-#else
- PHP_FALIAS(imap_mail, warn_not_available, NULL)
-#endif
PHP_FALIAS(imap_header, imap_headerinfo, NULL)
PHP_FALIAS(imap_listmailbox, imap_list, NULL)
@@ -3216,7 +3213,6 @@
/* }}} */
-#ifndef PHP_WIN32
/* {{{ _php_imap_mail
*/
int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc,
char* rpath)
@@ -3229,8 +3225,8 @@
#endif
#ifdef PHP_WIN32
- if (imap_TSendMail(INI_STR("smtp"), &tsm_err, headers, subject, to, message, cc,
bcc, rpath) != SUCCESS) {
- php_error(E_WARNING, GetSMErrorText(tsm_err));
+ if (imap_TSendMail(INI_STR("SMTP"), &tsm_err, headers, subject, to, message, cc,
bcc, rpath) != SUCCESS) {
+ php_error(E_WARNING, "%s", GetSMErrorText(tsm_err));
return 0;
}
#else
@@ -3262,9 +3258,7 @@
return 1;
}
/* }}} */
-#endif
-#ifndef PHP_WIN32
/* {{{ proto int imap_mail(string to, string subject, string message [, string additional_headers
[, string cc [, string bcc [, string rpath]]]])
Send an email message */
PHP_FUNCTION(imap_mail)
@@ -3336,7 +3330,6 @@
}
}
/* }}} */
-#endif
/* {{{ proto array imap_search(int stream_id, string criteria [, long flags])
Return a list of messages matching the given criteria */