[Phpgroupware-cvs] phpgwapi/inc class.crypto.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/05 04:09:12

Modified files:
        inc            : class.crypto.inc.php 

Log message:
        stop double init, which causes problems with string lengths for keys

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.crypto.inc.php?cvsroot=phpgwapi&r1=1.25&r2=1.26

Patches:
Index: class.crypto.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.crypto.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.crypto.inc.php        30 Aug 2006 14:52:49 -0000      1.25
+++ class.crypto.inc.php        5 Sep 2006 04:09:11 -0000       1.26
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage network
-       * @version $Id: class.crypto.inc.php,v 1.25 2006/08/30 14:52:49 skwashd 
Exp $
+       * @version $Id: class.crypto.inc.php,v 1.26 2006/09/05 04:09:11 skwashd 
Exp $
        */
 
        /**
@@ -41,7 +41,9 @@
                        $key = $vars[0];
                        $iv  = $vars[1];
 
-                       if ($GLOBALS['phpgw_info']['server']['mcrypt_enabled'] 
&& extension_loaded('mcrypt'))
+                       if ($GLOBALS['phpgw_info']['server']['mcrypt_enabled'] 
+                               && extension_loaded('mcrypt')
+                               && !$this->enabled )
                        {
                                $this->algo = MCRYPT_TRIPLEDES;
                                $this->mode = MCRYPT_MODE_CBC;