Style

horde · Dec 7, 2016 · 675e595 · 675e595
1 parent 06872b1
commit 675e595
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 21 deletions.
diff --git a/imp/lib/Prefs/Special/SmimePrivateKey.php b/imp/lib/Prefs/Special/SmimePrivateKey.php
@@ -49,38 +49,79 @@ public function display(Horde_Core_Prefs_Ui $ui)
         } else {
             $smime_url = IMP_Basic_Smime::url();
 
-            $view->has_key = ($prefs->getValue('smime_public_key') && $prefs->getValue('smime_private_key'));
+            $view->has_key = $prefs->getValue('smime_public_key') &&
+                $prefs->getValue('smime_private_key');
 
             if ($view->has_key) {
                 $smime = $injector->getInstance('IMP_Smime');
                 $cert = $smime->parseCert($smime->getPersonalPublicKey());
                 if (!empty($cert['validity']['notafter'])) {
                     $expired = new Horde_Date($cert['validity']['notafter']);
                     if ($expired->before(time())) {
-                        $view->expiredate = $expired->strftime($prefs->getValue('date_format'));
-                        $view->expiretime = $expired->strftime($prefs->getValue('time_format'));
+                        $view->expiredate = $expired->strftime(
+                            $prefs->getValue('date_format')
+                        );
+                        $view->expiretime = $expired->strftime(
+                            $prefs->getValue('time_format')
+                        );
                     }
                 }
 
-                $view->viewpublic = Horde::link($smime_url->copy()->add('actionID', 'view_personal_public_key'), _("View Personal Public Certificate"), null, 'view_key');
-                $view->infopublic = Horde::link($smime_url->copy()->add('actionID', 'info_personal_public_key'), _("Information on Personal Public Certificate"), null, 'info_key');
+                $view->viewpublic = $smime_url->copy()
+                    ->add('actionID', 'view_personal_public_key')
+                    ->link(array(
+                        'title' => _("View Personal Public Certificate"),
+                        'target' => 'view_key'
+                    ))
+                    . _("View") . '</a>';
+                $view->infopublic = $smime_url->copy()
+                    ->add('actionID', 'info_personal_public_key')
+                    ->link(array(
+                        'title' => _("Information on Personal Public Certificate"),
+                        'target' => 'info_key'
+                    ))
+                    . _("Details") . '</a>';
 
                 if ($smime->getPassphrase()) {
-                    $view->passphrase = Horde::link($ui->selfUrl(array(
+                    $view->passphrase = $ui->selfUrl(array(
                         'special' => true,
                         'token' => true
-                    ))->add('unset_smime_passphrase', 1), _("Unload Passphrase")) . _("Unload Passphrase");
+                    ))
+                    ->add('unset_smime_passphrase', 1)
+                    ->link(array(
+                        'title' => _("Unload Passphrase")
+                    ))
+                    . _("Unload Passphrase") . '</a>';
                 } else {
-                    $imple = $injector->getInstance('Horde_Core_Factory_Imple')->create('IMP_Ajax_Imple_PassphraseDialog', array(
-                        'params' => array(
-                            'reload' => $ui->selfUrl()->setRaw(true)
-                        ),
-                        'type' => 'smimePersonal'
-                    ));
-                    $view->passphrase = Horde::link('#', _("Enter Passphrase"), null, null, null, null, null, array('id' => $imple->getDomId())) . _("Enter Passphrase");
+                    $imple = $injector->getInstance('Horde_Core_Factory_Imple')
+                        ->create(
+                            'IMP_Ajax_Imple_PassphraseDialog',
+                            array(
+                                'params' => array(
+                                    'reload' => $ui->selfUrl()->setRaw(true)
+                                ),
+                                'type' => 'smimePersonal'
+                            )
+                        );
+                    $view->passphrase = Horde::link(
+                        '#',
+                        _("Enter Passphrase"),
+                        null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        array('id' => $imple->getDomId())
+                    ) . _("Enter Passphrase");
                 }
 
-                $view->viewprivate = Horde::link($smime_url->copy()->add('actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key');
+                $view->viewprivate = $smime_url->copy()
+                    ->add('actionID', 'view_personal_private_key')
+                    ->link(array(
+                        'title' => _("View Personal Private Key"),
+                        'target' => 'view_key'
+                    ))
+                    . _("View") . '</a>';
                 $page_output->addInlineScript(array(
                     '$("delete_smime_personal").observe("click", function(e) { if (!window.confirm(' . json_encode(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) . ')) { e.stop(); } })'
                 ), true);
@@ -103,10 +144,16 @@ public function update(Horde_Core_Prefs_Ui $ui)
 
         if (isset($ui->vars->delete_smime_personal)) {
             $injector->getInstance('IMP_Smime')->deletePersonalKeys();
-            $notification->push(_("Personal S/MIME keys deleted successfully."), 'horde.success');
+            $notification->push(
+                _("Personal S/MIME keys deleted successfully."),
+                'horde.success'
+            );
         } elseif (isset($ui->vars->unset_smime_passphrase)) {
             $injector->getInstance('IMP_Smime')->unsetPassphrase();
-            $notification->push(_("S/MIME passphrase successfully unloaded."), 'horde.success');
+            $notification->push(
+                _("S/MIME passphrase successfully unloaded."),
+                'horde.success'
+            );
         }
 
         return false;

diff --git a/imp/templates/prefs/smimeprivatekey.html.php b/imp/templates/prefs/smimeprivatekey.html.php
@@ -21,17 +21,17 @@
      <?php echo _("Your Public Certificate") ?>:
     </td>
     <td>
-     [<?php echo $this->viewpublic ?><?php echo _("View") ?></a>]
-     [<?php echo $this->infopublic ?><?php echo _("Details") ?></a>]
+     [<?php echo $this->viewpublic ?>]
+     [<?php echo $this->infopublic ?>]
     </td>
    </tr>
    <tr>
     <td>
      <?php echo _("Your Private Certificate") ?>:
     </td>
     <td>
-     [<?php echo $this->passphrase ?></a>]
-     [<?php echo $this->viewprivate ?><?php echo _("View") ?></a>]
+     [<?php echo $this->passphrase ?>]
+     [<?php echo $this->viewprivate ?>]
     </td>
    </tr>
   </table>