[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/class.crypto.inc.php, 1.20.4.7
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/class.crypto.inc.php, 1.20.4.7 |
|
Date: |
Sat, 6 Nov 2004 16:34:26 +0100 |
Update of /phpgwapi/inc
Modified Files:
Branch: Version-0_9_16-branch
class.crypto.inc.php
date: 2004/11/06 15:34:26; author: powerstat; state: Exp; lines: +18 -18
Log Message:
Bugfixes HTML; makes it a bit more W3C conform;
see patch #3503
=====================================================================
Index: phpgwapi/inc/class.crypto.inc.php
diff -u phpgwapi/inc/class.crypto.inc.php:1.20.4.6
phpgwapi/inc/class.crypto.inc.php:1.20.4.7
--- phpgwapi/inc/class.crypto.inc.php:1.20.4.6 Sat Sep 4 06:01:54 2004
+++ phpgwapi/inc/class.crypto.inc.php Sat Nov 6 15:34:26 2004
@@ -54,8 +54,8 @@
if($this->debug)
{
- echo '<br>crypto: algorithm=' .
$this->algo;
- echo '<br>crypto: mode =' .
$this->mode;
+ echo '<br />crypto: algorithm=' .
$this->algo;
+ echo '<br />crypto: mode =' .
$this->mode;
}
$this->enabled = True;
@@ -122,14 +122,14 @@
{
if($this->debug)
{
- echo '<br>' . time() . ' crypto->encrypt()
unencrypted data: ---->>>>' . $data . "\n";
+ echo '<br />' . time() . ' crypto->encrypt()
unencrypted data: ---->>>>' . $data . "\n";
}
if(is_array($data) || is_object($data))
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() found an "' . gettype($data) . '". Serializing...' . "\n";
+ echo '<br />' . time() . '
crypto->encrypt() found an "' . gettype($data) . '". Serializing...' . "\n";
}
$data = serialize($data);
$_obj = True;
@@ -138,7 +138,7 @@
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() found "' . gettype($data) . '". No serialization...' . "\n";
+ echo '<br />' . time() . '
crypto->encrypt() found "' . gettype($data) . '". No serialization...' . "\n";
}
}
@@ -149,14 +149,14 @@
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() adding slashes' . "\n";
+ echo '<br />' . time() . '
crypto->encrypt() adding slashes' . "\n";
}
$data = addslashes($data);
}
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() data: ---->>>>' . $data;
+ echo '<br />' . time() . '
crypto->encrypt() data: ---->>>>' . $data;
}
switch ($this->mcrypt_version)
@@ -174,7 +174,7 @@
$encrypteddata = bin2hex($encrypteddata);
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() crypted data: ---->>>>' . $encrypteddata;
+ echo '<br />' . time() . '
crypto->encrypt() crypted data: ---->>>>' . $encrypteddata;
}
return $encrypteddata;
}
@@ -183,7 +183,7 @@
/* No mcrypt == insecure ! */
if($this->debug)
{
- echo '<br>' . time() . '
crypto->encrypt() crypted data: ---->>>>' . $data;
+ echo '<br />' . time() . '
crypto->encrypt() crypted data: ---->>>>' . $data;
}
return $data;
}
@@ -193,7 +193,7 @@
{
if($this->debug)
{
- echo '<br>' . time() . ' crypto->decrypt()
crypted data: ---->>>>' . $encrypteddata;
+ echo '<br />' . time() . ' crypto->decrypt()
crypted data: ---->>>>' . $encrypteddata;
}
/* Disable all encryption if the admin didn't set it up
*/
if ($this->enabled)
@@ -214,14 +214,14 @@
if($this->debug)
{
- echo '<br>' . time() . '
crypto->decrypt() decrypted data: ---->>>>' . $data;
+ echo '<br />' . time() . '
crypto->decrypt() decrypted data: ---->>>>' . $data;
}
$test = stripslashes($data);
if(@unserialize($test))
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->decrypt() stripping slashes' . "\n";
+ echo '<br />' . time() . '
crypto->decrypt() stripping slashes' . "\n";
}
$data = $test;
}
@@ -229,7 +229,7 @@
if($this->debug)
{
- echo '<br>' . time() . '
crypto->decrypt() data: ---->>>>' . $data . "\n";
+ echo '<br />' . time() . '
crypto->decrypt() data: ---->>>>' . $data . "\n";
}
}
else
@@ -243,8 +243,8 @@
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->decrypt() found serialized "' . gettype($newdata) . '".
Unserializing...' . "\n";
- echo '<br>' . time() . '
crypto->decrypt() returning: '; _debug_array($newdata);
+ echo '<br />' . time() . '
crypto->decrypt() found serialized "' . gettype($newdata) . '".
Unserializing...' . "\n";
+ echo '<br />' . time() . '
crypto->decrypt() returning: '; _debug_array($newdata);
}
return $newdata;
}
@@ -252,8 +252,8 @@
{
if($this->debug)
{
- echo '<br>' . time() . '
crypto->decrypt() found UNserialized "' . gettype($data) . '". No
unserialization...' . "\n";
- echo '<br>' . time() . '
crypto->decrypt() returning: ' . $data;
+ echo '<br />' . time() . '
crypto->decrypt() found UNserialized "' . gettype($data) . '". No
unserialization...' . "\n";
+ echo '<br />' . time() . '
crypto->decrypt() returning: ' . $data;
}
return $data;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc/class.crypto.inc.php, 1.20.4.7,
nomail <=