484 args.add((key, value)) |
484 args.add((key, value)) |
485 |
485 |
486 # extract the forms |
486 # extract the forms |
487 from Helpviewer.JavaScriptResources import parseForms_js |
487 from Helpviewer.JavaScriptResources import parseForms_js |
488 lst = webPage.mainFrame().evaluateJavaScript(parseForms_js) |
488 lst = webPage.mainFrame().evaluateJavaScript(parseForms_js) |
489 for map in lst: |
489 for formMap in lst: |
490 formHasPasswords = False |
490 formHasPasswords = False |
491 formName = map["name"] |
491 formName = formMap["name"] |
492 formIndex = map["index"] |
492 formIndex = formMap["index"] |
493 if isinstance(formIndex, float) and formIndex.is_integer(): |
493 if isinstance(formIndex, float) and formIndex.is_integer(): |
494 formIndex = int(formIndex) |
494 formIndex = int(formIndex) |
495 elements = map["elements"] |
495 elements = formMap["elements"] |
496 formElements = set() |
496 formElements = set() |
497 formElementTypes = {} |
497 formElementTypes = {} |
498 deadElements = set() |
498 deadElements = set() |
499 for elementMap in elements: |
499 for elementMap in elements: |
500 try: |
500 try: |
635 count = 0 |
635 count = 0 |
636 |
636 |
637 for key in self.__logins: |
637 for key in self.__logins: |
638 progress.setValue(count) |
638 progress.setValue(count) |
639 QCoreApplication.processEvents() |
639 QCoreApplication.processEvents() |
640 username, hash = self.__logins[key] |
640 username, oldPwHash = self.__logins[key] |
641 pwHash = Utilities.crypto.pwRecode(hash, oldPassword, newPassword) |
641 newPwHash = Utilities.crypto.pwRecode(oldPwHash, oldPassword, |
642 self.__logins[key] = (username, pwHash) |
642 newPassword) |
|
643 self.__logins[key] = (username, newPwHash) |
643 count += 1 |
644 count += 1 |
644 |
645 |
645 progress.setValue(len(self.__logins)) |
646 progress.setValue(len(self.__logins)) |
646 QCoreApplication.processEvents() |
647 QCoreApplication.processEvents() |
647 self.changed.emit() |
648 self.changed.emit() |