2008-04-21 15:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* source/rtl/tbrowse.prg
     ! Added some new lines to XPP methods.

   * contrib/hbtip/thtml.prg
   * contrib/hbtip/popcln.prg
   * contrib/hbtip/sendmail.prg
   * contrib/hbtip/cgi.prg
   * contrib/hbtip/url.prg
   * contrib/hbtip/mail.prg
   * contrib/hbtip/ftpcln.prg
     ! Fixed ambigous "=" and "!=" to "==" or ":=" 
       or "!( == )" contructs.
       Someone pls verify if these fixes are right in 
       the broader context.
This commit is contained in:
Viktor Szakats
2008-04-21 13:57:31 +00:00
parent 026c5720f3
commit 5fe9c01ff3
9 changed files with 49 additions and 21 deletions

View File

@@ -8,6 +8,22 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-04-21 15:54 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/tbrowse.prg
! Added some new lines to XPP methods.
* contrib/hbtip/thtml.prg
* contrib/hbtip/popcln.prg
* contrib/hbtip/sendmail.prg
* contrib/hbtip/cgi.prg
* contrib/hbtip/url.prg
* contrib/hbtip/mail.prg
* contrib/hbtip/ftpcln.prg
! Fixed ambigous "=" and "!=" to "==" or ":="
or "!( == )" contructs.
Someone pls verify if these fixes are right in
the broader context.
2008-04-21 15:02 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* common.mak
* include/hbextern.ch

View File

@@ -463,7 +463,7 @@ STATIC FUNCTION HtmlTag( xVal, cKey, cDefault )
cVal := cDefault
endif
if '' != cVal
if !( cVal == '' )
cVal := '<' + cKey + '>' + cVal + '</' + cKey + '>'
endif

View File

@@ -383,7 +383,7 @@ RETURN .T.
METHOD List( cSpec ) CLASS tIPClientFTP
LOCAL cStr
IF cSpec=nil
IF cSpec == nil
cSpec := ''
ELSE
cSpec := ' ' + cSpec

View File

@@ -336,9 +336,13 @@ METHOD ToString() CLASS TipMail
FOR i := 1 TO Len( ::hHeaders )
cElem := Lower(hb_HKeyAt( ::hHeaders, i ))
IF cElem != "return-path" .and. cElem != "delivered-to" .and.;
cElem != "date" .and. cElem != "from" .and.;
cElem != "to" .and. cElem != "subject" .and. cElem !="mime-version"
IF !( cElem == "return-path" ) .and. ;
!( cElem == "delivered-to" ) .and.;
!( cElem == "date" ) .and. ;
!( cElem == "from" ) .and.;
!( cElem == "to" ) .and. ;
!( cElem == "subject" ) .and. ;
!( cElem == "mime-version" )
cRet += hb_HKeyAt( ::hHeaders, i ) + ": " +;
hb_HValueAt( ::hHeaders, i ) + e"\r\n"
ENDIF

View File

@@ -133,7 +133,7 @@ METHOD GetOk() CLASS tIPClientPOP
LOCAL nLen
::cReply := ::InetRecvLine( ::SocketCon, @nLen, 128 )
IF ::InetErrorCode( ::SocketCon ) != 0 .or. SubStr( ::cReply, 1, 1 ) != '+'
IF ::InetErrorCode( ::SocketCon ) != 0 .or. !( SubStr( ::cReply, 1, 1 ) == '+' )
RETURN .F.
ENDIF
RETURN .T.
@@ -193,9 +193,9 @@ METHOD Top( nMsgId ) CLASS tIPClientPOP
ENDIF
cRet := ""
DO WHILE cStr != "." .and. ::InetErrorCode( ::SocketCon ) == 0
DO WHILE !( cStr == "." ) .and. ::InetErrorCode( ::SocketCon ) == 0
cStr := ::InetRecvLine( ::SocketCon, @nPos, 256 )
IF cStr != "."
IF !( cStr == "." )
cRet += cStr + ::cCRLF
ELSE
::bEof := .T.
@@ -221,9 +221,9 @@ METHOD List() CLASS tIPClientPOP
ENDIF
cRet := ""
DO WHILE cStr != "." .and. ::InetErrorCode( ::SocketCon ) == 0
DO WHILE !( cStr == "." ) .and. ::InetErrorCode( ::SocketCon ) == 0
cStr := ::InetRecvLine( ::SocketCon, @nPos, 256 )
IF cStr != "."
IF !( cStr == "." )
cRet += cStr + ::cCRLF
ELSE
::bEof := .T.
@@ -262,9 +262,9 @@ METHOD UIDL( nMsgId ) CLASS tIPClientPOP
ELSE
cRet := ""
DO WHILE cStr != "." .and. ::InetErrorCode( ::SocketCon ) == 0
DO WHILE !( cStr == "." ) .and. ::InetErrorCode( ::SocketCon ) == 0
cStr := ::InetRecvLine( ::SocketCon, @nPos, 256 )
IF cStr != "."
IF !( cStr == "." )
cRet += cStr + ::cCRLF
ELSE
::bEof := .T.

View File

@@ -106,7 +106,7 @@ FUNCTION HB_SendMail( cServer, nPort, cFrom, aTo, aCC, aBCC, cBody, cSubject, aF
IF !( (".htm" $ Lower( cBody ) .OR. ".html" $ Lower( cBody ) ) .AND. File(cBody) )
IF Right(cBody,2) != HB_OSNewLine()
IF !( Right( cBody, 2 ) == HB_OSNewLine() )
cBody += HB_OsNewLine()
ENDIF

View File

@@ -440,7 +440,7 @@ RETURN Self
METHOD MatchCriteria( oFound ) CLASS THtmlIteratorScan
LOCAL xData
IF ::cName != NIL .and. ( Lower(::cName) != Lower(oFound:htmlTagName) )
IF ::cName != NIL .and. !( Lower(::cName) == Lower(oFound:htmlTagName) )
RETURN .F.
ENDIF

View File

@@ -168,7 +168,7 @@ METHOD BuildAddress() CLASS tURL
ENDIF
ENDIF
IF Len( ::cPath ) == 0 .or. Right( ::cPath, 1 ) != "/"
IF Len( ::cPath ) == 0 .or. !( Right( ::cPath, 1 ) == "/" )
::cPath += "/"
ENDIF
@@ -188,7 +188,7 @@ RETURN cRet
METHOD BuildQuery( ) CLASS tURL
LOCAL cLine
IF Len( ::cPath ) == 0 .or. Right( ::cPath, 1 ) != "/"
IF Len( ::cPath ) == 0 .or. !( Right( ::cPath, 1 ) == "/" )
::cPath += "/"
ENDIF
@@ -216,8 +216,8 @@ METHOD AddGetForm( cPostData )
cData += cTmp + "&"
NEXT
cData := Left( cData, Len( cData ) - 1 )
elseIF HB_IsArray( cPostData )
y:=Len(cPostData)
ELSEIF HB_IsArray( cPostData )
y := Len(cPostData)
FOR nI := 1 TO y
cTmp := cPostData[ nI ,1]
cTmp := hb_cStr( cTmp )
@@ -229,14 +229,14 @@ METHOD AddGetForm( cPostData )
cTmp := AllTrim( cTmp )
cTmp := TipEncoderUrl_Encode( cTmp )
cData += cTmp
IF nI!=y
cData+="&"
IF nI != y
cData += "&"
ENDIF
NEXT
ELSEIF HB_IsString( cPostData )
cData := cPostData
Endif
ENDIF
IF !empty(cData)
cRet := ::cQuery+=if(empty(::cQuery),'','&')+cData

View File

@@ -2380,6 +2380,10 @@ METHOD nRight( nRight ) CLASS TBROWSE
METHOD viewArea() CLASS TBROWSE
IF ::nConfigure != 0
::doConfigure()
ENDIF
// TOFIX
RETURN { ::n_Top + ::nHeadHeight + iif( ::lHeadSep, 1, 0 ),;
@@ -2393,6 +2397,10 @@ METHOD viewArea() CLASS TBROWSE
non-freezed column. Xbase++ compatible method. */
METHOD firstScrCol() CLASS TBROWSE
IF ::nConfigure != 0
::doConfigure()
ENDIF
// TOFIX
RETURN iif( ::leftVisible == 0, 0, ::aColData[ ::leftVisible ][ _TBCI_COLPOS ] )