summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-03-21 01:26:52 +0100
committerBenny Baumann <BenBE@geshi.org>2014-03-21 01:26:52 +0100
commit75439b2e684bf1fd58a112cfd57779d104e78d78 (patch)
tree5ba7290efc5f64d893d6f0d25726b644ffd36fa6 /scripts
parentd9f88e530a728c631f31ed01e113b084fb596c7b (diff)
parentea9f9d8d7f0b8f196161333384da2b814ac973fe (diff)
downloadcacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.tar.gz
cacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.tar.xz
cacert-devel-75439b2e684bf1fd58a112cfd57779d104e78d78.zip
Merge branch 'bug-1184' into testserver-stable
Diffstat (limited to 'scripts')
-rw-r--r--scripts/gpgfillmissingemail.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gpgfillmissingemail.php b/scripts/gpgfillmissingemail.php
index f328876..39f9d8f 100644
--- a/scripts/gpgfillmissingemail.php
+++ b/scripts/gpgfillmissingemail.php
@@ -18,7 +18,7 @@
require_once("../includes/mysql.php"); //general.php");
//include "../includes/general.php";
-function hex2bin($data)
+function gpg_hex2bin($data)
{
while(strstr($data, "\\x"))
{
@@ -69,7 +69,7 @@ echo "Found:\n";
if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match))
{
//echo "Found: ".$match[1];
- $mail = trim(hex2bin($match[1]));
+ $mail = trim(gpg_hex2bin($match[1]));
echo "EMail: *$mail**\n";