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

change to popen for python 2.6 support

Browse Source
This commit is contained in:
robing 2016-10-24 12:29:01 +00:00
parent 4d8b0b77c9
commit 04bfd40c11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Inject Files/inject-files.py
View File

@ -19,8 +19,8 @@ PR_EC_WEBACCESS_SETTINGS_JSON = PROP_TAG(PT_STRING8, PR_EC_BASE + 0x72)
def encode(value): def encode(value):
output = subprocess.check_output(["php", "deencode.php", "encode", value]) proc = subprocess.Popen(["php", "deencode.php", "encode", value], stdout=subprocess.PIPE)
return output.strip() return proc.communicate()[0]
def opt_args(): def opt_args():
@ -117,7 +117,7 @@ def files(options):
encode(configfile['setting']['server_address']), configfile['setting']['server_ssl'], encode(configfile['setting']['server_address']), configfile['setting']['server_ssl'],
encode('d4cacda458a2a26c301f2b7d75ada530'), configfile['setting']['use_zarafa_credentials'], encode('d4cacda458a2a26c301f2b7d75ada530'), configfile['setting']['use_zarafa_credentials'],
encode(username), encode(configfile['setting']['default_password']), encode(username), encode(configfile['setting']['default_password']),
encode('443'), configfile['setting']['name'], id, configfile['setting']['type']) encode(configfile['setting']['server_port']), configfile['setting']['name'], id, configfile['setting']['type'])
num += 1 num += 1
filesjson += ''' filesjson += '''