[dev] Bugs in imp/fetchmailprefs.php (patch)

[Jan Kuipers]

This message is in MIME format.

---------------------- multipart/mixed attachment
There are two bugs in fetchmailprefs:
1. When you have only 1 account, this account can't be deleted.
2. When editing this account, a second account with the same name is added.

This patch solves this problems (it's a reversal of some changes made earlier)

-- 
Jan Kuipers
Systeembeheer Lauwers College
---------------------- multipart/mixed attachment
SW5kZXg6IGZldGNobWFpbHByZWZzLnBocAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvcmVwb3NpdG9y
eS9pbXAvZmV0Y2htYWlscHJlZnMucGhwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEwCmRpZmYg
LXUgLXIxLjEwIGZldGNobWFpbHByZWZzLnBocAotLS0gZmV0Y2htYWlscHJlZnMucGhwCTEyIEp1
bCAyMDAyIDE3OjA4OjU3IC0wMDAwCTEuMTAKKysrIGZldGNobWFpbHByZWZzLnBocAkyMiBKdWwg
MjAwMiAwNzoyOTo0MyAtMDAwMApAQCAtNDYsMTUgKzQ2LDE4IEBACiAgICAgYnJlYWs7CiAKIGNh
c2UgQUNDT1VOVF9TQVZFOgotICAgIGlmICghKCRlZGl0X2FjY291bnQgPSBIb3JkZTo6Z2V0Rm9y
bURhdGEoJ2VkaXRfYWNjb3VudCcpKSkgewotICAgICAgICRlZGl0X2FjY291bnQgPSAkYWNjb3Vu
dC0+YWRkKCk7CisgICAgJGVkaXRfYWNjb3VudCA9IEhvcmRlOjpnZXRGb3JtRGF0YSgnZWRpdF9h
Y2NvdW50Jyk7CisgICAgJGlkID0gSG9yZGU6OmdldEZvcm1EYXRhKCdpZCcpOworCisgICAgaWYg
KCFpc3NldCgkZWRpdF9hY2NvdW50KSB8fCAkZWRpdF9hY2NvdW50ID09ICcnKSB7CisgICAgICAg
ICRlZGl0X2FjY291bnQgPSAkYWNjb3VudC0+YWRkKCk7CiAgICAgfQogCi0gICAgaWYgKCgkaWQg
PSBIb3JkZTo6Z2V0Rm9ybURhdGEoJ2lkJykpKSB7Ci0gICAgICAgJGFjY291bnQtPnNldFZhbHVl
KCdpZCcsICRpZCwgJGVkaXRfYWNjb3VudCk7CisgICAgaWYgKGlzc2V0KCRpZCkgJiYgIWVtcHR5
KCRpZCkpIHsKKyAgICAgICAgJGFjY291bnQtPnNldFZhbHVlKCdpZCcsICRpZCwgJGVkaXRfYWNj
b3VudCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAkYWNjb3VudC0+c2V0VmFsdWUoJ2lkJywgXygi
VW5uYW1lZCIpLCAkZWRpdF9hY2NvdW50KTsKLSAgICAgICAkaWQgPSBfKCJVbm5hbWVkIik7Cisg
ICAgICAgICRhY2NvdW50LT5zZXRWYWx1ZSgnaWQnLCBfKCJVbm5hbWVkIiksICRlZGl0X2FjY291
bnQpOworICAgICAgICAkaWQgPSBfKCJVbm5hbWVkIik7CiAgICAgfQogCiAgICAgJGFjY291bnQt
PnNldFZhbHVlKCdwcm90b2NvbCcsIEhvcmRlOjpnZXRGb3JtRGF0YSgncHJvdG9jb2wnKSwgJGVk
aXRfYWNjb3VudCk7CkBAIC03Myw3ICs3Niw4IEBACiAgICAgYnJlYWs7CiAKIGNhc2UgQUNDT1VO
VF9ERUxFVEU6Ci0gICAgaWYgKCgkdG9fZGVsZXRlID0gSG9yZGU6OmdldEZvcm1EYXRhKCdlZGl0
X2FjY291bnQnKSkpIHsKKyAgICAkdG9fZGVsZXRlID0gSG9yZGU6OmdldEZvcm1EYXRhKCdlZGl0
X2FjY291bnQnKTsKKyAgICBpZiAoaXNzZXQoJHRvX2RlbGV0ZSkpIHsKICAgICAgICAgJGRlbGV0
ZWRfYWNjb3VudCA9ICRhY2NvdW50LT5kZWxldGUoJHRvX2RlbGV0ZSk7CiAgICAgICAgICRub3Rp
ZmljYXRpb24tPnB1c2goc3ByaW50ZihfKCJUaGUgYWNjb3VudCBcIiVzXCIgaGFzIGJlZW4gZGVs
ZXRlZC4iKSwgJGRlbGV0ZWRfYWNjb3VudFswXVsnaWQnXSksICdob3JkZS5zdWNjZXNzJyk7CiAg
ICAgfSBlbHNlIHsK

---------------------- multipart/mixed attachment--