[dev] [PATCH]S/MIME personal certificate import

[Sergei Turchanov]

Hello,

this patch reorganizes S/MIME personal certficate import to match PGP 
options page. Also explain user why import is not available if 
file_uploads is disabled.

This patch is to be applied after my previous patch "[PATCH] PGP and 
S/MIME public key import setting".

-- 
With best regards,
Sergei Turchanov.

-------------- next part --------------
Index: horde2/imp/templates/smime/smime.inc
===================================================================
RCS file: /repository/imp/templates/smime/smime.inc,v
retrieving revision 1.33
diff -u -r1.33 smime.inc
--- horde2/imp/templates/smime/smime.inc        2 May 2005 20:44:24 -0000       1.33
+++ horde2/imp/templates/smime/smime.inc        4 May 2005 04:37:32 -0000
@@ -43,9 +43,6 @@
 <br class="spacer" />
 <div class="header">
   <ul>
-<?php if ($imp['file_upload'] && (!$prefs->getValue('smime_public_key') || !$prefs->getValue('smime_private_key'))): ?>
-    <li><?php $personal_import_url = Util::addParameter($selfURL, 'actionID', 'import_personal_certs'); echo Horde::link('#', _("Import Personal Certificate"), '', '', 'open_smime_import(\'' . Util::addParameter($selfURL, 'actionID', 'import_personal_certs') . '\'); return false;') . _("Import Personal Certificate"); ?></a></li>
-<?php endif; ?>
     <li><?php echo Help::link('imp', 'smime-overview-personalkey') ?></li>
   </ul>
   <?php echo _("Your S/MIME Public/Private Certificates") ?>
@@ -84,6 +81,16 @@
 
 <?php else: ?>
 <strong><?php echo _("No Personal Certificate Present") ?></strong>
+</div>
+
+<br class="spacer" />
+<div class="nowrap">
+<?php   if ($imp['file_upload']): ?>
+  <?php $personal_import_url = Util::addParameter($selfURL, 'actionID', 'import_personal_certs'); ?>
+  <input type="submit" name="save" class="button" onclick="open_smime_import('<?php echo $personal_import_url ?>'); return false;" value="<?php echo _("Import Personal Certificate") ?>" />
+<?php   else: ?>
+  <font color="red"><?=_("Certificate import is not available. File upload is not enabled in your PHP configuration.")?></font>
+<?php   endif; ?>
 </div>
 <?php endif; ?>