* harbour/src/compiler/harbour.y
* harbour/src/compiler/harbour.yyh
* harbour/src/compiler/harbour.yyc
! pacified compile time error when ... is used as parameter in _HB_MEMBRER
declaration. TODO: Remove or fix this strong typing grammar rules.
* harbour/src/debug/dbgtwin.prg
* harbour/src/debug/dbgtmenu.prg
* harbour/src/debug/tbrwtext.prg
* harbour/src/debug/debugger.prg
* harbour/src/debug/dbgtinp.prg
* harbour/src/rtl/tbcolumn.prg
* harbour/src/rtl/listbox.prg
* harbour/src/rtl/pushbtn.prg
* harbour/src/rtl/treport.prg
* harbour/src/rtl/radiogrp.prg
* harbour/src/rtl/tthreadx.prg
* harbour/src/rtl/checkbox.prg
* harbour/src/rtl/tsymbol.prg
* harbour/src/rtl/teditor.prg
* harbour/src/rtl/tmenuitm.prg
* harbour/src/rtl/tbrowse.prg
* harbour/contrib/hbmysql/tmysql.prg
* harbour/contrib/xhb/stream.prg
* harbour/contrib/xhb/trpccli.prg
* harbour/contrib/xhb/hblognet.prg
* harbour/contrib/xhb/tfile.prg
* harbour/contrib/xhb/tframe.prg
* harbour/contrib/xhb/htjlist.prg
* harbour/contrib/xhb/hblog.prg
* harbour/contrib/xhb/trpc.prg
* harbour/contrib/xhb/thtm.prg
* harbour/contrib/xhb/tcgi.prg
* harbour/contrib/xhb/ttable.prg
* harbour/contrib/xhb/txml.prg
* harbour/contrib/xhb/hjwindow.prg
* harbour/contrib/xhb/htmutil.prg
* harbour/contrib/hbodbc/todbc.prg
* harbour/contrib/hbfbird/tfirebrd.prg
* harbour/contrib/xpp/tthreadx.prg
* harbour/contrib/hbpgsql/tpostgre.prg
* harbour/contrib/hbgd/gdchart.prg
* harbour/contrib/hbgd/gdimage.prg
* harbour/contrib/hbgd/gdbar.prg
* harbour/contrib/hbgd/gdbarcod.prg
* harbour/contrib/hbmisc/twirler.prg
* harbour/contrib/hbtip/thtml.prg
* harbour/contrib/hbtip/cgi.prg
* harbour/contrib/hbtip/httpcli.prg
* harbour/contrib/hbtip/smtpcli.prg
* harbour/contrib/hbtip/client.prg
* harbour/contrib/hbtip/ftpcli.prg
* harbour/contrib/hbtip/mail.prg
* harbour/contrib/hbtip/popcli.prg
* harbour/contrib/hbwin/win_tprn.prg
* harbour/contrib/hbbtree/tbtree.prg
* harbour/utils/hbformat/hbformat.prg
! fixed class method declarations to be synced with method implementations
All of the above missdeclarations were detected by compilation with:
HB_USER_PRGFLAGS=-DHB_CLS_PARAMS_ERR
Few years ago in hbclass.ch I defined PP rules to force strict method
declarations but I had to disable them due to problems with old PP.
I defined HB_CLS_NO_PARAMS_ERR and left this note in hbclass.ch:
> I have to enable this definition by default until we will not fix
> preprocessor. [druzus]
Current PP code works correctly so we can remove it and activate this
code. Anyhow as above commit shows a lot of code has been created with
wrong declarations. I fixed Harbour core code (except HBQT, HBXBP and
GTWVG - I hope Pritpal or Viktor will fix it) but setting
HB_CLS_PARAMS_ERR as default will exploit a lot of similar problems in
user code so I would like the hear other developers' opinions about it.
290 lines
7.6 KiB
Plaintext
290 lines
7.6 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* xHarbour Project source code:
|
|
* TIP Class oriented Internet protocol library
|
|
*
|
|
* Copyright 2003 Giancarlo Niccolai <gian@niccolai.ws>
|
|
* Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) (SSL support)
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
/* 2007-04-12, Hannes Ziegler <hz AT knowlexbase.com>
|
|
Added method :sendMail()
|
|
*/
|
|
|
|
#include "hbclass.ch"
|
|
|
|
#include "common.ch"
|
|
|
|
#include "tip.ch"
|
|
|
|
CREATE CLASS tIPClientSMTP FROM tIPClient
|
|
|
|
METHOD New( oUrl, bTrace, oCredentials )
|
|
METHOD Open( cUrl, lTLS )
|
|
METHOD Close()
|
|
METHOD Write( cData, nLen, bCommit )
|
|
METHOD Mail( cFrom )
|
|
METHOD Rcpt( cTo )
|
|
METHOD Data( cData )
|
|
METHOD Commit()
|
|
METHOD Quit()
|
|
METHOD GetOK()
|
|
METHOD SendMail( oTIpMail )
|
|
|
|
/* Methods for smtp server that require login */
|
|
METHOD OpenSecure( cUrl, lTLS )
|
|
METHOD Auth( cUser, cPass ) // Auth by login method
|
|
METHOD AuthPlain( cUser, cPass ) // Auth by plain method
|
|
METHOD ServerSuportSecure( lAuthPlain, lAuthLogin )
|
|
|
|
HIDDEN:
|
|
|
|
VAR isAuth INIT .F.
|
|
|
|
ENDCLASS
|
|
|
|
METHOD New( oUrl, bTrace, oCredentials ) CLASS tIPClientSMTP
|
|
|
|
LOCAL oLog
|
|
|
|
IF ISLOGICAL( bTrace ) .AND. bTrace
|
|
oLog := tIPLog():New( "smtp" )
|
|
bTrace := {| cMsg | iif( PCount() > 0, oLog:Add( cMsg ), oLog:Close() ) }
|
|
ENDIF
|
|
|
|
::super:New( oUrl, bTrace, oCredentials )
|
|
|
|
::nDefaultPort := iif( ::oUrl:cProto == "smtps", 465, 25 )
|
|
::nConnTimeout := 50000
|
|
::nAccessMode := TIP_WO // a write only
|
|
|
|
RETURN Self
|
|
|
|
METHOD Open( cUrl, lTLS ) CLASS tIPClientSMTP
|
|
|
|
IF ! ::super:Open( cUrl )
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
IF ! ::GetOk()
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
DEFAULT lTLS TO .F.
|
|
|
|
IF lTLS
|
|
::InetSendall( ::SocketCon, "STARTTLS" + ::cCRLF )
|
|
IF ::GetOk()
|
|
::EnableTLS( .T. )
|
|
ENDIF
|
|
ENDIF
|
|
|
|
::InetSendall( ::SocketCon, "HELO " + iif( Empty( ::oUrl:cUserid ), "tipClientSMTP", ::oUrl:cUserid ) + ::cCRLF )
|
|
|
|
RETURN ::GetOk()
|
|
|
|
METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP
|
|
|
|
IF ! ::super:Open( cUrl )
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
IF ! ::GetOk()
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
DEFAULT lTLS TO .F.
|
|
|
|
IF lTLS
|
|
::InetSendall( ::SocketCon, "STARTTLS" + ::cCRLF )
|
|
IF ::GetOk()
|
|
::EnableTLS( .T. )
|
|
ENDIF
|
|
ENDIF
|
|
|
|
::InetSendall( ::SocketCon, "EHLO " + iif( Empty( ::oUrl:cUserid ), "tipClientSMTP", ::oUrl:cUserid ) + ::cCRLF )
|
|
|
|
RETURN ::GetOk()
|
|
|
|
METHOD GetOk() CLASS tIPClientSMTP
|
|
|
|
::cReply := ::InetRecvLine( ::SocketCon,, 512 )
|
|
IF ::InetErrorCode( ::SocketCon ) != 0 .OR. ! ISCHARACTER( ::cReply ) .OR. Left( ::cReply, 1 ) == "5"
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
RETURN .T.
|
|
|
|
METHOD Close() CLASS tIPClientSMTP
|
|
::InetTimeOut( ::SocketCon )
|
|
::Quit()
|
|
RETURN ::super:Close()
|
|
|
|
METHOD Commit() CLASS tIPClientSMTP
|
|
::InetSendall( ::SocketCon, ::cCRLF + "." + ::cCRLF )
|
|
RETURN ::GetOk()
|
|
|
|
METHOD Quit() CLASS tIPClientSMTP
|
|
::InetSendall( ::SocketCon, "QUIT" + ::cCRLF )
|
|
::isAuth := .F.
|
|
RETURN ::GetOk()
|
|
|
|
METHOD Mail( cFrom ) CLASS tIPClientSMTP
|
|
::InetSendall( ::SocketCon, "MAIL FROM: <" + cFrom + ">" + ::cCRLF )
|
|
RETURN ::GetOk()
|
|
|
|
METHOD Rcpt( cTo ) CLASS tIPClientSMTP
|
|
::InetSendall( ::SocketCon, "RCPT TO: <" + cTo + ">" + ::cCRLF )
|
|
RETURN ::GetOk()
|
|
|
|
METHOD Data( cData ) CLASS tIPClientSMTP
|
|
::InetSendall( ::SocketCon, "DATA" + ::cCRLF )
|
|
IF ! ::GetOk()
|
|
RETURN .F.
|
|
ENDIF
|
|
::InetSendall(::SocketCon, cData + ::cCRLF + "." + ::cCRLF )
|
|
RETURN ::GetOk()
|
|
|
|
METHOD Auth( cUser, cPass ) CLASS tIPClientSMTP
|
|
|
|
::InetSendall( ::SocketCon, "AUTH LOGIN" + ::cCRLF )
|
|
IF ::GetOk()
|
|
::InetSendall( ::SocketCon, hb_base64Encode( StrTran( cUser, "&at;", "@" ) ) + ::cCRLF )
|
|
IF ::GetOk()
|
|
::InetSendall( ::SocketCon, hb_base64Encode( cPass ) + ::cCRLF )
|
|
IF ::GetOk()
|
|
RETURN ::isAuth := .T.
|
|
ENDIF
|
|
ENDIF
|
|
ENDIF
|
|
|
|
RETURN ::isAuth := .F.
|
|
|
|
METHOD AuthPlain( cUser, cPass ) CLASS tIPClientSMTP
|
|
|
|
::InetSendall( ::SocketCon, "AUTH PLAIN" + hb_base64Encode( Chr( 0 ) + cUser + Chr( 0 ) + cPass ) + ::cCRLF )
|
|
|
|
RETURN ::isAuth := ::GetOk()
|
|
|
|
METHOD Write( cData, nLen, bCommit ) CLASS tIPClientSMTP
|
|
LOCAL cRcpt
|
|
|
|
IF ! ::bInitialized
|
|
|
|
IF Empty( ::oUrl:cFile ) // GD user id not needed if we did not auth
|
|
RETURN -1
|
|
ENDIF
|
|
|
|
IF ! ::Mail( ::oUrl:cUserid )
|
|
RETURN -1
|
|
ENDIF
|
|
|
|
FOR EACH cRcpt IN hb_regexSplit( ",", ::oUrl:cFile )
|
|
IF ! ::Rcpt( cRcpt )
|
|
RETURN -1
|
|
ENDIF
|
|
NEXT
|
|
|
|
::InetSendall( ::SocketCon, "DATA" + ::cCRLF )
|
|
IF ! ::GetOk()
|
|
RETURN -1
|
|
ENDIF
|
|
::bInitialized := .T.
|
|
ENDIF
|
|
|
|
::nLastWrite := ::super:Write( cData, nLen, bCommit )
|
|
|
|
RETURN ::nLastWrite
|
|
|
|
METHOD ServerSuportSecure( /* @ */ lAuthPlain, /* @ */ lAuthLogin ) CLASS tIPClientSMTP
|
|
|
|
lAuthLogin := .F.
|
|
lAuthPlain := .F.
|
|
|
|
IF ::OpenSecure()
|
|
DO WHILE .T.
|
|
::GetOk()
|
|
IF ::cReply == NIL
|
|
EXIT
|
|
ELSEIF "LOGIN" $ ::cReply
|
|
lAuthLogin := .T.
|
|
ELSEIF "PLAIN" $ ::cReply
|
|
lAuthPlain := .T.
|
|
ENDIF
|
|
ENDDO
|
|
::Close()
|
|
ENDIF
|
|
|
|
RETURN lAuthLogin .OR. lAuthPlain
|
|
|
|
METHOD SendMail( oTIpMail ) CLASS TIpClientSmtp
|
|
LOCAL cTo
|
|
|
|
IF ! ::isOpen
|
|
RETURN .F.
|
|
ENDIF
|
|
|
|
IF ! ::isAuth
|
|
::Auth( ::oUrl:cUserId, ::oUrl:cPassword )
|
|
IF ! ::isAuth
|
|
RETURN .F.
|
|
ENDIF
|
|
ENDIF
|
|
|
|
::mail( oTIpMail:getFieldPart( "From" ) )
|
|
|
|
cTo := oTIpMail:getFieldPart( "To" )
|
|
cTo := StrTran( cTo, hb_inetCRLF() )
|
|
cTo := StrTran( cTo, Chr( 9 ) )
|
|
cTo := StrTran( cTo, Chr( 32 ) )
|
|
|
|
FOR EACH cTo IN hb_regexSplit( ",", cTo )
|
|
::rcpt( cTo )
|
|
NEXT
|
|
|
|
RETURN ::data( oTIpMail:toString() )
|