holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

S/MIME:

Browse Source 
- Allow user to upload certificate even for readonly account
- Allow user to delete certificate
This commit is contained in:
Hadi Nategh 2017-09-13 16:05:43 +02:00
parent a075fae6a0
commit 1d24707143
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
admin/inc/class.admin_mail.inc.php
View File

@ -893,11 +893,6 @@ class admin_mail
{ {
if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no'; if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no';
} }
if (!empty($content['acc_smime_password']))
{
$readonlys['smime_export_p12'] = false;
}
} }
catch(Api\Exception\NotFound $e) { catch(Api\Exception\NotFound $e) {
if (self::$debug) _egw_log_exception($e); if (self::$debug) _egw_log_exception($e);
@ -1171,6 +1166,25 @@ class admin_mail
} }
} }
} }
// SMIME UPLOAD/DELETE/EXPORT control
$content['hide_smime_upload'] = false;
if (!empty($content['acc_smime_password']))
{
if (!empty($content['smime_delete_p12']) &&
Mail\Credentials::delete (
$content['acc_id'],
$content['called_for'] ? $content['called_for'] : $GLOBALS['egw_info']['user']['account_id'],
Mail\Credentials::SMIME
))
{
unset($content['acc_smime_password'], $content['smimeKeyUpload'], $content['smime_delete_p12']);
$content['hide_smime_upload'] = false;
}
else
{
$content['hide_smime_upload'] = true;
}
}
// disable delete button for new, not yet saved entries, if no delete rights or a non-standard identity selected // disable delete button for new, not yet saved entries, if no delete rights or a non-standard identity selected
$readonlys['button[delete]'] = empty($content['acc_id']) || $readonlys['button[delete]'] = empty($content['acc_id']) ||
@ -1190,7 +1204,8 @@ class admin_mail
$readonlys['button[cancel]'] = false; $readonlys['button[cancel]'] = false;
// allow to edit notification-folders // allow to edit notification-folders
$readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['button[save]'] = $readonlys['button[apply]'] =
$readonlys['notify_folders'] = $readonlys['notify_use_default'] = false; $readonlys['notify_folders'] = $readonlys['notify_use_default'] =
$readonlys['smimeKeyUpload'] = $readonlys['smime_pkcs12_password']= false;
} }
$sel_options['acc_imap_ssl'] = $sel_options['acc_sieve_ssl'] = $sel_options['acc_imap_ssl'] = $sel_options['acc_sieve_ssl'] =

9
admin/templates/default/mailaccount.xet
View File

@ -305,16 +305,19 @@
<buttononly label="Generate Certificate" onclick="app.admin.smime_genCertificate" image="add" background_image="1"/> <buttononly label="Generate Certificate" onclick="app.admin.smime_genCertificate" image="add" background_image="1"/>
</hbox> </hbox>
</row> </row>
<row> <row disabled="@hide_smime_upload">
<description value="Upload your certificate .p12/.pfx file"/> <description value="Upload your certificate .p12/.pfx file"/>
<vbox> <vbox>
<file id="smimeKeyUpload" accept=".p12,.pfx"/> <file id="smimeKeyUpload" accept=".p12,.pfx"/>
<passwd id="smime_pkcs12_password" size="32" maxlength="128" blur="Password to unlock encrypted p12" autocomplete="off"/> <passwd id="smime_pkcs12_password" size="32" maxlength="128" blur="Password to unlock encrypted p12" autocomplete="off"/>
</vbox> </vbox>
</row> </row>
<row> <row disabled="!@hide_smime_upload">
<description value="Current certificate"/> <description value="Current certificate"/>
<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1" readonly="true"/> <hbox>
<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1"/>
<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" background_image="1"/>
</hbox>
</row> </row>
</rows> </rows>
</grid> </grid>