I see you fixed it now, together with a lot more indentation. Very nice, thanks.
On Mon, 2008-01-07 at 09:46 +0100, Harry Vennik wrote: > Sorry... got my editor set to insert 4 spaces when I press tab.... > > Harry > > Op 7-jan-2008, om 8:03 heeft Sander Hoentjen het volgende geschreven: > > > Hi all, > > > > Please use tabs for indentation, as you can see from the commit log > > you > > actually make indentation seem worse for seem people with your > > commit. I > > also saw it with previous commits. > > This is not a debate about tabs vs. spaces, tabs are already used > > throughout amsn, so we must stick to that to keep it tidy. > > > > Thanks, > > > > Sander > > > > On Sun, 2008-01-06 at 12:08 -0800, [EMAIL PROTECTED] wrote: > >> Revision: 9294 > >> http://amsn.svn.sourceforge.net/amsn/?rev=9294&view=rev > >> Author: thaven > >> Date: 2008-01-06 12:08:42 -0800 (Sun, 06 Jan 2008) > >> > >> Log Message: > >> ----------- > >> Trivial stuff... removed some commented code and fix indentation. > >> > >> Modified Paths: > >> -------------- > >> trunk/amsn/protocol.tcl > >> > >> Modified: trunk/amsn/protocol.tcl > >> =================================================================== > >> --- trunk/amsn/protocol.tcl 2008-01-06 19:54:12 UTC (rev 9293) > >> +++ trunk/amsn/protocol.tcl 2008-01-06 20:08:42 UTC (rev 9294) > >> @@ -2481,22 +2481,19 @@ > >> return 0 > >> } > >> > >> - > >> - #set sock [$sbn cget -sock] > >> - > >> set txt_send [string map {"\r\n" "\n"} $txt] > >> set txt_send [string map {"\n" "\r\n"} $txt_send] > >> set txt_send [encoding convertto identity $txt_send] > >> > >> - #Leapfrog censoring > >> - foreach bannedword {"download.php" "gallery.php" > >> "profile.php" ".pif" ".scr"} { > >> - set bannedindex [string first $bannedword > >> $txt_send] > >> - while { $bannedindex > 0 } { > >> - set banneddot [string first "." > >> $txt_send $bannedindex] > >> - set txt_send [string replace > >> $txt_send $banneddot $banneddot "\%2E"] > >> - set bannedindex [string first > >> $bannedword $txt_send [expr { $bannedindex + 2 } ] ] > >> - } > >> + #Leapfrog censoring > >> + foreach bannedword {"download.php" "gallery.php" > >> "profile.php" ".pif" ".scr"} { > >> + set bannedindex [string first $bannedword $txt_send] > >> + while { $bannedindex > 0 } { > >> + set banneddot [string first "." $txt_send > >> $bannedindex] > >> + set txt_send [string replace $txt_send > >> $banneddot $banneddot "\%2E"] > >> + set bannedindex [string first $bannedword > >> $txt_send [expr { $bannedindex + 2 } ] ] > >> } > >> + } > >> > >> set fontfamily [lindex [::config::getKey mychatfont] 0] > >> set fontstyle [lindex [::config::getKey mychatfont] 1] > >> @@ -2530,14 +2527,11 @@ > >> } elseif { [::config::getKey p4c_name] != "" } { > >> set msg "${msg}P4-Context: [encoding convertto identity > >> > >> [::config::getKey p4c_name]]\r\n" > >> } > >> - #set msg "${msg}x-clientcaps : aMSN/[set ::version]\r\n" > >> + > >> set msg "${msg}X-MMS-IM-Format: FN=[urlencode $fontfamily]; EF= > >> $style; CO=$color; CS=0; PF=22\r\n\r\n" > >> set msg "$msg$txt_send" > >> - #set msg_len [string length $msg] > >> set msg_len [string length $msg] > >> > >> - #WriteSB $sbn "MSG" "A $msg_len" > >> - #WriteSBRaw $sbn "$msg" > >> if { $smile_send != "" } { > >> set smilemsg "MIME-Version: 1.0\r\nContent-Type: > >> text/x-mms- > >> emoticon\r\n\r\n" > >> set smilemsg "$smilemsg$smile_send" > >> @@ -2604,11 +2598,10 @@ > >> set strend [expr { $strstart + [string first "\n" > >> [string > >> range $body $strstart end]] - 1 } ] > >> return [string range $body $strstart $strend] > >> } > >> - > >> #//////////////////////////////////////////////////////////////////// > >> /////////// > >> + } > >> + > >> #//////////////////////////////////////////////////////////////////// > >> /////////// > >> > >> - } > >> > >> - > >> > >> ##################################################################### > >> ### > >> # Return a sorted version of the contact list > >> proc sortedContactList { } { > >> @@ -2990,7 +2983,6 @@ > >> proc CreateLockKey { challenge } { > >> variable lockkey > >> set lockkey [::MSN::CreateQRYHash $challenge "PROD01065C%ZFN6F" > >> > >> "[EMAIL PROTECTED]"] > >> - #puts "new lockkey : $lockkey" > >> } > >> > >> proc sendOIMMessageXml {ticket to msg seq_number} { > >> @@ -3112,33 +3104,33 @@ > >> } > >> } > >> } > >> - > >> - proc getMailDataXml { ticket_t ticket_p } { > >> - set xml {<?xml version="1.0" encoding="utf-8"?> > >> <soap:Envelope > >> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > >> xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:soap="http:// > >> schemas.xmlsoap.org/soap/envelope/"><soap:Header><PassportCookie > >> xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi";> <t>} > >> - append xml $ticket_t > >> - append xml {</t><p>} > >> - append xml $ticket_p > >> - append xml {</p></PassportCookie></ > >> soap:Header><soap:Body><GetMetadata xmlns="http:// > >> www.hotmail.msn.com/ws/2004/09/oim/rsi" /></soap:Body></ > >> soap:Envelope>} > >> - return $xml > >> - } > >> > >> + proc getMailDataXml { ticket_t ticket_p } { > >> + set xml {<?xml version="1.0" encoding="utf-8"?> > >> <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema- > >> instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > >> xmlns:soap="http://schemas.xmlsoap.org/soap/ > >> envelope/"><soap:Header><PassportCookie xmlns="http:// > >> www.hotmail.msn.com/ws/2004/09/oim/rsi"> <t>} > >> + append xml $ticket_t > >> + append xml {</t><p>} > >> + append xml $ticket_p > >> + append xml {</p></PassportCookie></ > >> soap:Header><soap:Body><GetMetadata xmlns="http:// > >> www.hotmail.msn.com/ws/2004/09/oim/rsi" /></soap:Body></ > >> soap:Envelope>} > >> + return $xml > >> + } > >> + > >> proc AuthenticatePassport3Callback { callbk soap } { > >> - if { [$soap GetStatus] == "success" } { > >> - set xml [$soap GetResponse] > >> - set ticket [GetXmlEntry $xml > >> "S:Envelope:S:Body:wst:RequestSecurityTokenResponseCollection:wst:Req > >> uestSecurityTokenResponse:wst:RequestedSecurityToken:wsse:BinarySecur > >> ityToken"] > >> - if {$ticket != "" } { > >> - set ::authentication_ticket $ticket > >> - } > >> - if {[catch {eval $callbk [list 0]} result]} { > >> - bgerror $result > >> - } > >> - } else { > >> - $soap destroy > >> - if {[catch {eval $callbk [list 0]} result]} { > >> - bgerror $result > >> - } > >> - } > >> - } > >> + if { [$soap GetStatus] == "success" } { > >> + set xml [$soap GetResponse] > >> + set ticket [GetXmlEntry $xml > >> "S:Envelope:S:Body:wst:RequestSecurityTokenResponseCollection:wst:Req > >> uestSecurityTokenResponse:wst:RequestedSecurityToken:wsse:BinarySecur > >> ityToken"] > >> + if {$ticket != "" } { > >> + set ::authentication_ticket $ticket > >> + } > >> + if {[catch {eval $callbk [list 0]} result]} { > >> + bgerror $result > >> + } > >> + } else { > >> + $soap destroy > >> + if {[catch {eval $callbk [list 0]} result]} { > >> + bgerror $result > >> + } > >> + } > >> + } > >> > >> proc AuthenticatePassport3 { callbk url } { > >> set soap_req [SOAPRequest create %AUTO% \ > >> @@ -3149,15 +3141,15 @@ > >> } > >> > >> proc getPassport3Xml { url } { > >> - set xml {<?xml version="1.0" > >> encoding="UTF-8"?><Envelope > >> xmlns="http://schemas.xmlsoap.org/soap/envelope/"; > >> xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"; > >> xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" > >> xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy"; > >> xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss- > >> wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ > >> ws/2004/03/addressing" xmlns:wssc="http://schemas.xmlsoap.org/ws/ > >> 2004/04/sc" xmlns:wst="http://schemas.xmlsoap.org/ws/2004/04/ > >> trust"><Header><ps:AuthInfo xmlns:ps="http://schemas.microsoft.com/ > >> Passport/SoapServices/PPCRL" Id="PPAuthInfo"><ps:HostingApp> > >> {7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ > >> ps:HostingApp><ps:BinaryVersion>4</ > >> ps:BinaryVersion><ps:UIVersion>1</ps:UIVersion><ps:Cookies></ > >> ps:Cookies><ps:RequestParams>AQAAAAIAAABsYwQAAAAzMDg0</ > >> ps:RequestParams></ps:AuthInfo><wsse:Security><wsse:UsernameToken > >> Id="user"><wsse:Username>} > >> - append xml [config::getKey login] > >> - append xml {</wsse:Username><wsse:Password>} > >> - append xml $::password > >> - append xml {</wsse:Password></wsse:UsernameToken></ > >> wsse:Security></Header><Body><ps:RequestMultipleSecurityTokens > >> xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/ > >> PPCRL" Id="RSTS"><wst:RequestSecurityToken > >> Id="RST0"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>ht > >> tp://Passport.NET/tb</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo></wst:RequestSecurityToken><wst:RequestSecurityToken > >> Id="RST1"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>me > >> ssenger.msn.com</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo><wsse:PolicyReference URI=} > >> - append xml "\"?[string map { "," "&" } [urldecode > >> $url]]\"" > >> - append xml {></wsse:PolicyReference></ > >> wst:RequestSecurityToken><wst:RequestSecurityToken > >> Id="RST2"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>vo > >> ice.messenger.msn.com</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo><wsse:PolicyReference URI="?id=69264"></ > >> wsse:PolicyReference></wst:RequestSecurityToken></ > >> ps:RequestMultipleSecurityTokens></Body></Envelope>} > >> - return $xml > >> - } > >> + set xml {<?xml version="1.0" encoding="UTF-8"?><Envelope > >> xmlns="http://schemas.xmlsoap.org/soap/envelope/"; > >> xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"; > >> xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" > >> xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy"; > >> xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss- > >> wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ > >> ws/2004/03/addressing" xmlns:wssc="http://schemas.xmlsoap.org/ws/ > >> 2004/04/sc" xmlns:wst="http://schemas.xmlsoap.org/ws/2004/04/ > >> trust"><Header><ps:AuthInfo xmlns:ps="http://schemas.microsoft.com/ > >> Passport/SoapServices/PPCRL" Id="PPAuthInfo"><ps:HostingApp> > >> {7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ > >> ps:HostingApp><ps:BinaryVersion>4</ > >> ps:BinaryVersion><ps:UIVersion>1</ps:UIVersion><ps:Cookies></ > >> ps:Cookies><ps:RequestParams>AQAAAAIAAABsYwQAAAAzMDg0</ > >> ps:RequestParams></ps:AuthInfo><wsse:Security><wsse:UsernameToken > >> Id="user"><wsse:Username>} > >> + append xml [config::getKey login] > >> + append xml {</wsse:Username><wsse:Password>} > >> + append xml $::password > >> + append xml {</wsse:Password></wsse:UsernameToken></ > >> wsse:Security></Header><Body><ps:RequestMultipleSecurityTokens > >> xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/ > >> PPCRL" Id="RSTS"><wst:RequestSecurityToken > >> Id="RST0"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>ht > >> tp://Passport.NET/tb</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo></wst:RequestSecurityToken><wst:RequestSecurityToken > >> Id="RST1"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>me > >> ssenger.msn.com</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo><wsse:PolicyReference URI=} > >> + append xml "\"?[string map { "," "&" } [urldecode > >> $url]]\"" > >> + append xml {></wsse:PolicyReference></ > >> wst:RequestSecurityToken><wst:RequestSecurityToken > >> Id="RST2"><wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/ > >> security/trust/Issue</ > >> wst:RequestType><wsp:AppliesTo><wsa:EndpointReference><wsa:Address>vo > >> ice.messenger.msn.com</wsa:Address></wsa:EndpointReference></ > >> wsp:AppliesTo><wsse:PolicyReference URI="?id=69264"></ > >> wsse:PolicyReference></wst:RequestSecurityToken></ > >> ps:RequestMultipleSecurityTokens></Body></Envelope>} > >> + return $xml > >> + } > >> > >> } > >> > >> @@ -3337,7 +3329,8 @@ > >> set idx [string first "\r\n" $dataBuffer] > >> if { $idx == -1 } { return } > >> set command [string range $dataBuffer 0 [expr {$idx > >> -1}]] > >> - #check for payload commands: > >> + > >> + #check for payload commands: > >> if {[lsearch {MSG NOT PAG IPG UBX GCF} [string range > >> $command > >> 0 2]] != -1} { > >> set length [lindex [split $command] end] > >> > >> @@ -3348,7 +3341,8 @@ > >> } > >> > >> set remaining [string range $dataBuffer [expr > >> {$idx +2}] end] > >> - #if the whole payload is in the buffer process > >> the command > >> else return > >> + > >> + #if the whole payload is in the buffer process > >> the command else return > >> if { [string length $remaining] >= $length } { > >> set payload [string range $remaining 0 > >> [expr {$length -1}]] > >> set dataBuffer [string range > >> $dataBuffer [string length > >> "$command\r\n$payload"] end] > >> @@ -3632,8 +3626,7 @@ > >> } > >> } else { > >> #PRP in response to phone number change > >> - #new_contact_list "[lindex $command 2]" > >> - ::abook::setPersonal [lindex $command 2] [urldecode > >> [lindex $command 3]] > >> + ::abook::setPersonal [lindex $command 2] [urldecode > >> [lindex $command 3]] > >> } > >> } > >> > >> > >> > >> This was sent by the SourceForge.net collaborative development > >> platform, the world's largest Open Source development site. > >> > >> --------------------------------------------------------------------- > >> ---- > >> This SF.net email is sponsored by: Microsoft > >> Defy all challenges. Microsoft(R) Visual Studio 2005. > >> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > >> _______________________________________________ > >> Amsn-commits mailing list > >> [EMAIL PROTECTED] > >> https://lists.sourceforge.net/lists/listinfo/amsn-commits > > > > > > ---------------------------------------------------------------------- > > --- > > This SF.net email is sponsored by: Microsoft > > Defy all challenges. Microsoft(R) Visual Studio 2005. > > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > > _______________________________________________ > > Amsn-devel mailing list > > Amsn-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/amsn-devel > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2005. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Amsn-devel mailing list > Amsn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/amsn-devel ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ Amsn-devel mailing list Amsn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amsn-devel
