s.probst/webapp-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request #26: restore-signature not needed when replace-signature is used

Browse Source 
Merge in KSC/webapp-tools from why-martijn-why to master

* commit '2a3a4157296115a1d0a98b22599f3d55db4ff48a':
  restore-signature not needed when replace-signature is used
This commit is contained in:
Martijn Alberts 2021-01-21 15:10:53 +01:00
commit 90471e39e0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp_admin/webapp_admin.py
View File

@ -64,7 +64,7 @@ def opt_args(print_help=None):
group = OptionGroup(parser, "Signature", "")
group.add_option("--backup-signature", dest="backup_signature", action="store_true", help="Backup signature")
group.add_option("--restore-signature", dest="restore_signature", action="store", help="Restore signature (need file name)")
group.add_option("--replace-signature", dest="replace_signature", action="store_true", help="Replace existing signature, file layout must be: username_signature-name_signatureid.html")
group.add_option("--replace-signature", dest="replace_signature", action="store", help="Replace existing signature, file layout must be: username_signature-name_signatureid.html")
group.add_option("--default-signature", dest="default_signature", action="store_true", help="Set signature as default one")
parser.add_option_group(group)
@ -636,7 +636,9 @@ def main():
if options.backup_signature:
backup_signature(user, options.location)
if options.restore_signature:
restore_signature(user, options.restore_signature, options.replace_signature, options.default_signature)
restore_signature(user, options.restore_signature, False, options.default_signature)
if options.replace_signature:
restore_signature(user, options.replace_signature, True, options.default_signature)
# Advanced injection option
if options.add_option: