[Svn] r3929 - in trunk/plugins/enigma/lib: . Crypt/GPG

trac at roundcube.net trac at roundcube.net
Tue Aug 31 09:06:46 CEST 2010


Author: alec
Date: 2010-08-31 02:06:36 -0500 (Tue, 31 Aug 2010)
New Revision: 3929

Modified:
   trunk/plugins/enigma/lib/Crypt/GPG/VerifyStatusHandler.php
   trunk/plugins/enigma/lib/enigma_ui.php
Log:
- updated Crypt_GPG package + some small fixes


Modified: trunk/plugins/enigma/lib/Crypt/GPG/VerifyStatusHandler.php
===================================================================
--- trunk/plugins/enigma/lib/Crypt/GPG/VerifyStatusHandler.php	2010-08-30 18:18:21 UTC (rev 3928)
+++ trunk/plugins/enigma/lib/Crypt/GPG/VerifyStatusHandler.php	2010-08-31 07:06:36 UTC (rev 3929)
@@ -31,7 +31,7 @@
  * @author    Michael Gauthier <mike at silverorange.com>
  * @copyright 2008 silverorange
  * @license   http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
- * @version   CVS: $Id: VerifyStatusHandler.php 302810 2010-08-26 15:30:17Z gauthierm $
+ * @version   CVS: $Id: VerifyStatusHandler.php 302908 2010-08-31 03:56:54Z gauthierm $
  * @link      http://pear.php.net/package/Crypt_GPG
  * @link      http://www.gnupg.org/
  */
@@ -137,6 +137,32 @@
             $this->signatures[$this->index] = $signature;
             break;
 
+        case 'ERRSIG':
+            $signature = new Crypt_GPG_Signature();
+
+            // if there was a signature id, set it on the new signature
+            if ($this->signatureId != '') {
+                $signature->setId($this->signatureId);
+                $this->signatureId = '';
+            }
+
+            // Detect whether fingerprint or key id was returned and set
+            // signature values appropriately. Key ids are strings of either
+            // 16 or 8 hexadecimal characters. Fingerprints are strings of 40
+            // hexadecimal characters. The key id is the last 16 characters of
+            // the key fingerprint.
+            if (strlen($tokens[1]) > 16) {
+                $signature->setKeyFingerprint($tokens[1]);
+                $signature->setKeyId(substr($tokens[1], -16));
+            } else {
+                $signature->setKeyId($tokens[1]);
+            }
+
+            $this->index++;
+            $this->signatures[$this->index] = $signature;
+
+            break;
+
         case 'VALIDSIG':
             if (!array_key_exists($this->index, $this->signatures)) {
                 break;

Modified: trunk/plugins/enigma/lib/enigma_ui.php
===================================================================
--- trunk/plugins/enigma/lib/enigma_ui.php	2010-08-30 18:18:21 UTC (rev 3928)
+++ trunk/plugins/enigma/lib/enigma_ui.php	2010-08-31 07:06:36 UTC (rev 3929)
@@ -232,7 +232,7 @@
     /**
      * Returns text representation of list records counter
      */
-    private function get_rowcount_text($all, $curr_count, $page)
+    private function get_rowcount_text($all=0, $curr_count=0, $page=1)
     {
         $pagesize = $this->rc->config->get('pagesize', 100);
         $first = ($page - 1) * $pagesize;

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list