summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2014-02-28 08:52:13 +0100
committerINOPIAE <inopiae@cacert.org>2014-02-28 08:52:13 +0100
commit3a90b15174698b6b17ffb9ca183472ea1cfec3e1 (patch)
tree63047fdb95f1bad525a99cf77d879033d0668ff1
parent64f46c5e376072f239edd6084e049295c536a6f3 (diff)
downloadcacert-devel-3a90b15174698b6b17ffb9ca183472ea1cfec3e1.tar.gz
cacert-devel-3a90b15174698b6b17ffb9ca183472ea1cfec3e1.tar.xz
cacert-devel-3a90b15174698b6b17ffb9ca183472ea1cfec3e1.zip
bug 649: changed name of function get_user_id_from_mail to get_user_id_from_email and corrected trim function call
-rw-r--r--includes/notary.inc.php4
-rw-r--r--www/wot.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 0da855f..2a64b7c 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1127,8 +1127,8 @@
}
//user function
- function get_user_id_from_mail($email){
- $email = trim(mysql_real_escape_string($email));
+ function get_user_id_from_email($email){
+ $email = mysql_real_escape_string(trim($email));
$res = query_init ("select `id` from `users` where `email` = '" . $email . "'");
$row = query_getnextrow($res);
diff --git a/www/wot.php b/www/wot.php
index 8085749..5b82d23 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -576,7 +576,7 @@ $iecho= "c";
$id = 0;
$email = trim(mysql_real_escape_string($_REQUEST['email']));
$reason = trim(mysql_real_escape_string($_REQUEST['reason']));
- $uid = get_user_id_from_mail($email);
+ $uid = get_user_id_from_email($email);
if ($uid == 0) {
show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information."));
exit;