diff options
| author | Alex English <cacert@alexenglish.info> | 2014-05-11 19:24:34 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-05-11 19:24:34 +0200 |
| commit | e6841da67c49d86377aa5454f8be3c5f432235eb (patch) | |
| tree | aa50050e51bbde2c7e8c3ce97f93912b52593476 | |
| parent | 24d8235f875f9ecff3198e3f0cf8d450beae1989 (diff) | |
| download | cacert-devel-e6841da67c49d86377aa5454f8be3c5f432235eb.tar.gz cacert-devel-e6841da67c49d86377aa5454f8be3c5f432235eb.tar.xz cacert-devel-e6841da67c49d86377aa5454f8be3c5f432235eb.zip | |
bug 1276: Allow more name variants according to PracticeOnNames when signing a PGP keybug-1276
Signed-off-by: Benny Baumann <BenBE@geshi.org>
| -rw-r--r-- | www/gpg.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/www/gpg.php b/www/gpg.php index 263c1d3..80d8f21 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -63,12 +63,18 @@ if(0) function verifyName($name) { if($name == "") return 0; - if($name == $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']) return 1; - if($name == $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']) return 1; - if($name == $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix']) return 1; - if($name == $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix']) return 1; - return 0; + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname'])) return 1; // John Doe + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname'])) return 1; // John Joseph Doe + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0]." ".$_SESSION['profile']['lname'])) return 1; // John J Doe + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0].". ".$_SESSION['profile']['lname'])) return 1; // John J. Doe + + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; // John Doe Jr. + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John Joseph Doe Jr. + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0]." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John J Doe Jr. + if(!strcasecmp($name, $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname'][0].". ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'])) return 1; //John J. Doe Jr. + + return 0; } function verifyEmail($email) |