Skip to content

Update __WinHttpHTML5FormAttribs for Au3Check #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update __WinHttpHTML5FormAttribs for Au3Check #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions WinHttp.au3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,11 +2135,11 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
; "name:whatever", "Xcoord,Ycoord"
; "id:whatever", "Xcoord,Ycoord"
; "whatever", "Xcoord,Ycoord" ;<- same as "id:whatever"
Local $aSpl, $iSubmitHTML5 = 0, $iInpSubm, $sImgAppx = "."
Local $aSpl, $iSubmitHTML5 = 0, $iInpSubm, $sImgAppx = ".", $sInpNme, $sType, $iX = 0, $iY = 0, $aStrSplit
For $k = 1 To $iNumParams
$aSpl = StringSplit($aFlds[$k], ":", 2)
If $aSpl[0] = "type" And ($aSpl[1] = "submit" Or $aSpl[1] = "image") Then
Local $iSubmIndex = $aDtas[$k], $iSubmCur = 0, $iImgCur = 0, $sType, $sInpNme
Local $iSubmIndex = $aDtas[$k], $iSubmCur = 0, $iImgCur = 0
If $aSpl[1] = "image" Then
$iSubmIndex = Int($aDtas[$k])
EndIf
Expand All @@ -2159,7 +2159,6 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
$sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
If $sInpNme Then $sInpNme &= $sImgAppx
$aInput[$iInpSubm] = 'type="image" formaction="' & __WinHttpAttribVal($aInput[$iInpSubm], "formaction") & '" formenctype="' & __WinHttpAttribVal($aInput[$iInpSubm], "formenctype") & '" formmethod="' & __WinHttpAttribVal($aInput[$iInpSubm], "formmethod") & '"'
Local $iX = 0, $iY = 0
$iX = Int(StringRegExpReplace($aDtas[$k], "(\d+)\h*(\d+),(\d+)", "$2", 1))
$iY = Int(StringRegExpReplace($aDtas[$k], "(\d+)\h*(\d+),(\d+)", "$3", 1))
ReDim $aInput[UBound($aInput) + 2]
Expand All @@ -2171,7 +2170,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
EndSwitch
Next
ElseIf $aSpl[0] = "name" Then
Local $sInpNme = $aSpl[1], $sType
$sInpNme = $aSpl[1]
For $i = 0 To UBound($aInput) - 1 ; for all input elements
$sType = __WinHttpAttribVal($aInput[$i], "type")
If $sType = "submit" Then
Expand All @@ -2184,7 +2183,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
If __WinHttpAttribVal($aInput[$i], "name") = $sInpNme And $aDtas[$k] Then
$iSubmitHTML5 = 1
$iInpSubm = $i
Local $aStrSplit = StringSplit($aDtas[$k], ",", 3), $iX = 0, $iY = 0
$aStrSplit = StringSplit($aDtas[$k], ",", 3)
If Not @error Then
$iX = Int($aStrSplit[0])
$iY = Int($aStrSplit[1])
Expand All @@ -2199,7 +2198,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
EndIf
Next
Else ; id
Local $sInpId, $sType
Local $sInpId
If @error Then
$sInpId = $aSpl[0]
ElseIf $aSpl[0] = "id" Then
Expand All @@ -2217,9 +2216,9 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
If __WinHttpAttribVal($aInput[$i], "id") = $sInpId And $aDtas[$k] Then
$iSubmitHTML5 = 1
$iInpSubm = $i
Local $sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
$sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
If $sInpNme Then $sInpNme &= $sImgAppx
Local $aStrSplit = StringSplit($aDtas[$k], ",", 3), $iX = 0, $iY = 0
$aStrSplit = StringSplit($aDtas[$k], ",", 3)
If Not @error Then
$iX = Int($aStrSplit[0])
$iY = Int($aStrSplit[1])
Expand Down