Actually show Node ID in QR (fixes #471)

auto/gui.files.go

@@ -73,7 +73,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["favicon.png"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d6b5be436d2e8f7fc0a4d6f2eb00777c3cc64760f01cee132d990cb0c0f309b939327ef3e6a5bddadc1b63c924c4f2f617ffb5b25f97e69bb6918d877f301dab6e452a95455aa2a49e5bd67276f8f2f7f397b4d663af00f3edb7be6389f8d46e458440bc9a7334d368e37c9f3ed9d97e47b7a25c6e448c829a1a10735422df938d6422ab2a118237ac6c8f1db3797e7a747ef2edf9e5f9009f7d9e610c11dfa3e31e014914c3179cdbc2179a7181113788d2ba2442c5d465ce13102b75371cd64c83c325e4063e4a7d34b47e985cf1096cf5d162a6c8e6ae242e99891898801251e1a1c7e3c3d7efde6e2b5697ef899e340afb073c4a7e1747fc0c20109a70e8da2fd815a842e341f4ecd23177b247c9fc9fdc1455a72aca53f20ae4f95da1f60255fd0ab018264d43bf88c90bd80694adc19958ae9fd41ac27ce5f0779c14cebc8611f627ebd3ff87fcebb43e7580411d57cec33000b2db210de3a7dbdcfbc292bbc17d280ed0fae399b4742ea42d539f7f46cdf63d74006c7dc6c41c7b9e6d477944b7db6bf33dcae01f29872258f3417610156ad1a8df54cc85a0d9f875730703e500c8ab51b6bc25d8434936cb23f98d06bbc1d4640c883cff005cdb5cf0e322292dfc9cd0d8ef31b18df37d0d2c6e6ededdec8d6ca1ab0c0c64268a5258d46ae52a3ec6e18f070084f06091ec80d6ac6981e540148a0c19c2e965436f7442f22e8b1661f35b6644a08190b6f416ecc252111f53cc0de190bad45b04bfeb21d7dfc26299b00859c090db8bfd82583ef987fcd34772979c36236d822d9832d72286168b688a2a17280f5f9c482b8fdccfccc76b6c8ec39fcbd80bf97f0f775d67cb98973db2d80bd466bb1ffbf0a0d04544e79e86811ed929de1d72c28d51d22699c408442451464b311ad9f58e88b2df29308a90bbfa01494005901248f41a2399380e21c30ccc0549aa0200728781e8ab477a08d546979805c5d2fc5d1692f9d00afb4976690bda5901b4b33c85e4685b1901e939676a1082bfdf2c55454c8bc4bb6bf29f355e18901e37c9db35724144761dd450e0675715d6d802bed84c219c7a0af74d694796cd8db41f6b6a8555e848ef9711066ef785c453e85b1e421481173c6be70af523c40eaac9201ee4ff923631ca3d18175f2823175afa6129531b62224a03f1d6f3c7ff16a8b3c7fb98dff7636bf295350528fc76a97bc28743ea5cf4ef491bccc9fa7847c0e8f9fa78f6fabfd02360b871e059d56e1739f4d00dbed9cd14bdddbd9ce1f1bcea73e9f22fdb193df74d32a25703a47d4e98b63419ef100153a0d758324c0f495bd369f71cd1c2333f8ea1c746049f7cc99a5fecbeded46485e4d8dd9fe3f0725d68585375401f57da744c556849297ff6fc03c4ec946403f2634fdcbabbf441f373300895c810110819a00963eb04f8ad297552664f467e07d300334a1249b06084cb21a6714369c0e77b3bae4cf4014095a660c733e89664069054245a013624e70a8c692d12b8526822fe075c92229e01d1f5870a460f2065b63cef5ac08d1f2931a923f8fb2c715224820533a2ab7193bee8d8c08829130b256c2677ba68758e4f1ebaaadf1fa1aa65a63671cec8da0dc4ea16088914b1181484982360c3e0be975668ad06b2cb13fa886d24b8f4d68ec83c500e099a9c7a7d4ccfb768633182440100b0ac4914919ce8d203de5369cb1047b0f70e3c1342d41fd36204aba38b93a78e7ec3cffab3100883550062f9e83796078d45e8f0e48660fec19f64a81cdb8078ad6f9087370b97d3b01c59a41ebbf0351a1e8a0d19030e00e921a694f62bfd08f943a854b23d859c78d0d8123c3c18488a329a825761a4ec43064f3027d4c45307ab5081303c2de6426e25887690378097ff98858fbc4da9a60c55e650d6d6c961b281261ea2fa2199a5724bb72dc19bb96f01b4783b4d75fb240650a22070232132a9840587ee55c533f86ff4c2ae08afdc1cd4db1bb5843e9dbdbc1c13bfb149890dc7c91d4fee2b64c64d3d0c892a040c991cfcb744dfae2491179621e967b4b13c2fc6950ad077c3d9da2a18c8a28b92942a9f4f1e0b5c7b545f0c397e118e8b137ce581d445c23b5c6f0474bede78c92b51bb0302e2169ba7190a15a1c43d0aee72c1238869d0337f3bcca8855bb70e87904c1c1f42fe422a98a189789da8511ca472f8c802a736629d3811582ecc2272324bfe61e8acd0a58c3eca12fac7657bd5077c5b403ed14dcddc8c8fb53f18344cfb50b9b19cc45a7270f4943358b3532702fa4c564d289b1057737fac144afa9d43dd97002d5671df89c5b880f49413a16713f94616a97da6141a4175dd283309720bd378afd66ed99972496015ec0f462cd819699dcd647fbe15b2e95064360be4544e82f0878eff390f0090999cb94a272f10d49684ae65486685825b6466eaae084f80ce04ff8f434c4293c53d30038371c4ac8f84ee08145509c5d0be54007e613f3df499a2dcf08d5ba486bcfd4da9bbd28cc69a53a269a30487904fc4ee6310f2cb0170719edda1b40fbacaaf0a3c2105ece3038853488a5b1a6c88c2a32660cfc0d7a8d81aa58833d08b6aa0bce1abce10d73738704310e4382189aa5492513ae0203a30c7ab8378acaecd1893e3aa8152ba5879d82c6890a8a360a89c09f4c2ca34f2ac95513a2c6523e48db847f1c340c66f941e9b670939bd665e160d3d807431a78b9c2fa25264fe1e18bf9f46cfc6db281d6373a579b3984468178b54c1e1cf49ba301e11ed23b698133b55c321229bab9c1578eb16003af86a72760189b21845b46b58589ee0ffefe0868576ccea55257aa073541089b44af52cd987625cb0de8e0d348a5065d0436190619ff54ea6f6a0de243e8d8e73cf4d84734486be07b58ca45838b582a016d6e6fbb60e5724072f704c9a9c04b7467969c179aea382778238675433c03e2cc670cecef38bc0a8d35fbce5ed42decfeb014b06284eed285bd580b964b43ab9a2f92ab6e683518a0029b38a805071331ee6888908d9b1b847bc6a40bec43a7acc0f25f6c3663b732e6dc6be4e866b44fa1f227c4b9ada4e2d8d84730ff95c5bcaa3f13c94ff54e51e4ca529e4a2fc9c4b8d65a9f79b55ab11a156a16741b992abe422a61dae45e69c98d08341355a79198e652d9568485b3eed90f86b673e6cb668f822f00b09734ec95222249e0a2a0cde07dafb54fa3f64eaddf5f1b417344c4c28e7e7f6b6ade43874fb8642ed26fad7ea7966d007e9bff6b42c9df863cbca63e6fe39ede6449ac5a47f169175d5e4b29d6244b731f1e932da6be1877b9c37f833ad46f0a76dc0711a606fab7dc678afc4ea83fa70bf5260ec64cdeded6f437d78061d2fc16698175b4d006d698871499efe8f1c83b134117757f14eec311d747e0f7435b03ea0991d6f545ec3918f4f005ed0ad6bd05a7efedc4387aebd0b7bd3e6d51532138b796fe0764bb1c001273f47c73Line truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec3dfb5be43692bfe7afd0f4e6017bb81b6626b37b04d8e331d990c70c1f309bcbe5cbeda7b6d5dd0ab6e591647a7a09fbb75f95e4f7a3eda661606ff303b46dc9a552a9aa545592ca7bcf4ede1e5ffe74f69acc74e01f7cb2f7cc713e198dc8b18816924f679a6c1c6f92e7db3b2fc9b7f44a8cc991905342430f6a845af271ac855464433146f48c91e3b76f2ecf4f8fde5dbe3dbf2013eeb3cd21823bf47d62c029229962f29a7943f24e312226f01a57448958ba8cb8c263046ea7e29ac9907964bc80c6c80fa7978ed20b9f212c9fbb2c54d81cd5c485d231231311034a3c34387c7f7afcfacdc56bd3fcf013c7815e61e7884fc3e9fe808503124e1d1a45fb03b5085d683e9c9a472ef648f83e93fb838bb4e4584b7f405c9f2ab53fc04abea0570304c9a877f009217b01d394b8332a15d3fb83584f9c3f0ff28299d691c3dec7fc7a7ff0dfcebb43e7580411d57cec33000b2db210de3a7dbdcfbc292bbc17d280ed0fae399b4742ea42d539f7f46cdf63d74006c7dc6c41c7b9e6d477944b7db6bf33dcae01f29872258f3417610156ad1a8df54cc85a0d9f875730703e500c8ab51b6bc25d8434936cb23f98d06bbc1d4640c8834ff005cdb5cf0e322292dfc8cd0d8ef31b18df37d0d2c6e6ededdec8d6ca1ab0c0c64268a5258d46ae52a3ec6e18f070084f06091ec80d6ac6981e540148a0c19c2e965436f7442f22e8b1661f34b6644a08190b6f416ecc252111f53cc0de190bad45b04bfeb41d7df82a299b00859c090db8bfd825836f987fcd34772979c36236d822d9832d72286168b688a2a17280f5f9c482b8fdc4fccc76b6c8ec39fcbd80bf97f0f765d67cb98973db2d80bd466bb1ff1f8506022aa73c74b48876c9cef04b1694ea0e91344e2042a1220ab2d988d60f2cf4c516f94184d4855f500a4a80ac0092c720d19c4940710e1866602a4d509003143c0f45da3bd046aab43c40aeae97e2e8b4974e8057da4b33c8de52c88da519642fa3c258488f494bbb5084957ef9622a2a64de25db5f95f9aaf0c48071beccd92b128aa3b0ee220783bab8ae36c0957642e18c63d0573a6bca3c36eced207b5bd42a2f42c7fc3808b3773cae229fc258f210a48839635fb857291e207556c900f7a7fc91318ed1e8c03a79c198ba575389ca185b1112d09f8e379ebf78b5459ebfdcc67f3b9b5f952928a9c763b54b5e143a9fd26727fa405ee6cf53423e87c7cfd3c7b7d57e019b85438f824eabf0b9cf2680ed76cee8a5eeed6ce78f0de7539f4f91fed8c9afba699512389d23eaf4c5b120cf78800a9d86ba411260faca5e9bcfb8668e91197c750e3ab0a47be6cc52ffe5f6762324afa6c66cff9f8312ebc2c21baa80fabe53a2622b42c9cbff15308f53b211d00f094dfff4ea4fd187cd0c402257600044a02680a50fec93a2f465950919fd11781fcc004d28c9a6010293acc619850da7c3ddac2ef9231045829619c39c4fa219505a815011e88498131caab164f44aa189e00b785db2480a78c707161c2998bcc1d698733d2b42b4fca486e48fa3ec71850812c8948eca6dc68e7b23238260248cac95f0c99ee9211679fcba6a6bbcbe86a9d6d819077b2328b753281862e45244205292a00d83cf427a9d9922f41a4bec0faaa1f4d263131afb6031007866eaf12935f3be9de10c060910c48202716452867323484fb90d672cc1de03dc78304d4b50bf0d88922e4eae0ede393bcfff6c0c00620d94c18be7601e181eb5d7a30392d9037b86bd526033ee81a2753ec01c5c6edf4e40b166d0fa6f4054283a6834240cb883a446da93d82ff423a54ee1d20876d6716343e0c8703021e2680a6a899d8613310cd9bc401f53118c5e2dc2c480b037998938d661da005ec25f3e22d63eb1b62658b15759431b9be5068a4498fa8b6886e615c9ae1c77c6ae25fcc6d120edf5e72c509982c88180cc840a2610965f39d7d48fe13f930ab8627f707353ec2ed650faf67670f0ce3e052624379f25b53fbb2d13d93434b224285072e4f3325d93be7852449e9887e5ded284307f1854eb015f4fa76828a3224a6e8a502a7d3c78ed716d117cff7938067aec8d33560711d748ad31fcd152fb39a364ed062c8c4b489a6e1c64a816c710b4eb398b048e61e7c0cd3caf3262d52e1c7a1e417030fd0bb948aa22c665a2766184f2d10b23a0ca9c59ca74608520bbf0c908c9afb98762b302d6307be80babdd552fd45d31ed403b05773732f2fe547c2fd173edc2660673d1e9c943d250cd628d0cdc0b69319974626cc1dd8d7e30d16b2a754f369c40f559073ee716e24352908e45dc0f6598daa5765810e94597f420cc2548ef8d62bf597be6258965801730bd5873a06526b7f5d17ef89a4ba5c110986f1111fa0b02defb3c247c4242e632a5a85c7c45129a923995211a5689ad919b2a38213e03f8133e3d0d710acfd43400ce0d871232be137860111467d74239d081f9c4fc779266cb3342b52ed2da33b5f6662f0a735aa98e89260c521e01bf9379cc030becc54146bbf606d03eab2afca8308497330c4e210d6269ac2932a38a8c19037f835e63a02ad6600f82adea82b3066f78c3dcdc21418cc3902086666952c984abc0c028831eee8da2327b74a28f0e6ac54ae961a7a071a282a28d4222f02713cbe8a34a72d584a8b1940fd236e11f060d83597e50ba2ddce4a6755938d834f6c190065eaeb07e89c95378f8623e3d1b7f9b6ca0f58dced5660ea151205e2d930707fde66840b887f44e5ae04c2d978c448a6e6ef095632cd8c0abe1e90918c66608e196516d61a2fb83bfdf03da159b73a9d495ea414d10c226d1ab5433a65dc972033af83452a94117814d8641c63f94fa9b5a83f8103af6290f3df6010dd21af81e9672d1e022964a409bdbdb2e58b91c90dc3d41722af012dd9925e785a63ace09de8861dd10cf8038f31903fb3b0eaf4263cdbeb317750bbb3f2c05ac18a1bb74612fd682e5d2d0aae68be4aa1b5a0d06a8c0260e6ac1c1448c3b1a2264e3e606e19e31e902fbd0292bb0fc679bcdd8ad8c39f71a39ba19ed53a8fc11716e2ba93836f611cc7f6531afeacf44f253bd5314b9b294a7d24b3231aeb5d6675ead56ac46859a05dd46a68aaf904a9836b9575a722302cd44d56924a6b954b61561e1ac7bf683a1ed9cf9b2d9a3e00b00ec250d7ba5884812b828683378df6bedd3a8bd53ebf7d746d01c11b1b0a3df5f9b9af7d0e1132e998bf45babdfa9651b80dfe6ff9c50f297210fafa9cfdbb8a7375912abd6517cda4597d7528a35c9d2dc87c7648ba92fc65deef05fa10ef59b821df74184a981fe35f79922bf11eacfe942bd89833193b7b735fdcd35609834bf455a601d2db48135e62145e63b7a3cf2ce44d045ddef85fb70c4f511f8fdd0d6807a42a4757d117b0e063d7c41bb82756fc1e97b3b318ede3af46daf4f5bd45408ceada5ff01d92e0780c41c3ddfdc284dLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["index.html"] = bs

cmd/syncthing/gui.go

@@ -526,8 +526,8 @@ func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
 }
 
 func getQR(w http.ResponseWriter, r *http.Request) {
-	r.ParseForm()
-	text := r.FormValue("text")
+	var qs = r.URL.Query()
+	var text = qs.Get("text")
 	code, err := qr.Encode(text, qr.M)
 	if err != nil {
 		http.Error(w, "Invalid", 500)

gui/index.html

@@ -404,7 +404,7 @@
 
   <modal id="idqr" large="yes" status="info" close="yes" icon="qrcode" title="{{'Node Identification' | translate}} &mdash; {{nodeName(thisNode())}}">
     <div class="well well-sm text-monospace text-center">{{myID}}</div>
-    <img ng-if="myID" class="center-block img-thumbnail" src="qr/{{myID}}"/>
+    <img ng-if="myID" class="center-block img-thumbnail" src="qr/?text={{myID}}"/>
   </modal>
 
   <!-- Node editor modal -->