Item14548: implement $registrationdate token

foswiki · Dec 1, 2017 · 80fe67e · 80fe67e
1 parent 215bcec
commit 80fe67e
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 4 deletions.
diff --git a/TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm b/TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm
@@ -581,7 +581,7 @@ sub userExists {
     ASSERT($cUID) if DEBUG;
 
     # Do this to avoid a password manager lookup
-    return 1 if $cUID eq $this->{session}->{user};
+    return 1 if $this->{session}->{user} && $cUID eq $this->{session}->{user};
 
     my $loginName = $this->getLoginName($cUID);
     return 0 unless defined($loginName);
@@ -1339,6 +1339,24 @@ sub getEmails {
 
 =begin TML
 
+---++ ObjectMethod getRegistrationDate($name) -> @emailAddress
+
+returns the date this user has registered. 
+
+=cut
+
+sub getRegistrationDate {
+    my ( $this, $cUID ) = @_;
+
+    $this->_loadMapping();
+
+    my $user = $this->getLoginName($cUID);
+
+    return $this->{L2D}{$user};
+}
+
+=begin TML
+
 ---++ ObjectMethod setEmails($cUID, @emails) -> boolean
 
 Set the email address(es) for the given user.
@@ -1606,7 +1624,7 @@ sub validateRegistrationField {
 
 # TODO: and probably flawed in light of multiple cUIDs mapping to one wikiname
 sub _cacheUser {
-    my ( $this, $wikiname, $login ) = @_;
+    my ( $this, $wikiname, $login, $date ) = @_;
     ASSERT($wikiname) if DEBUG;
 
     $login ||= $wikiname;
@@ -1624,6 +1642,8 @@ sub _cacheUser {
     $this->{U2W}->{$cUID}     = $wikiname;
     $this->{L2U}->{$login}    = $cUID;
     $this->{W2U}->{$wikiname} = $cUID;
+    $this->{L2D}->{$login}    = $date;
+    $this->{W2D}->{$wikiname} = $date;
 
     return $cUID;
 }
@@ -1713,7 +1733,7 @@ sub _loadMapping {
             #   * WikiGuest - guest - 10 Mar 2005
             #   * WikiGuest - 10 Mar 2005
             $text =~
-s/^\s*\* (?:$Foswiki::regex{webNameRegex}\.)?($Foswiki::regex{wikiWordRegex})\s*(?:-\s*(\S+)\s*)?-.*$/(_cacheUser( $this, $1, $2)||'')/gme;
+s/^\s*\* (?:$Foswiki::regex{webNameRegex}\.)?($Foswiki::regex{wikiWordRegex})\s*(?:-\s*(\S+)\s*)?-\s*(.*?)\s*$/(_cacheUser( $this, $1, $2, $3)||'')/gme;
         }
     }
     else {

diff --git a/core/data/System/VarUSERINFO.txt b/core/data/System/VarUSERINFO.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1456368117" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1512148066" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Macros"}%
 ---+ USERINFO -- retrieve details about a user
 ---++ Parameters
@@ -13,6 +13,7 @@ Format tokens that can be used in =format=:
    | =$groups= (*) | Comma separated list of group membership. Currently only expands for users |
    | =$isadmin= (*) | Has admin privileges (expands to =true= or =false=) |
    | =$isgroup= | Is a group (expands to =true= or =false=) | |
+   | =$registrationdate= | date when a user has registered on the site | |
 %T% Tokens flagged '(*)' are considered private and are hidden from other users by default.%BR%
 The [[FormatTokens][standard format tokens]] are also supported.
 ---++ Examples

diff --git a/core/lib/Foswiki/Macros/USERINFO.pm b/core/lib/Foswiki/Macros/USERINFO.pm
@@ -49,6 +49,10 @@ my %USERINFO_tokens = (
 
         return $wikiusername;
     },
+    registrationdate => sub {
+        my ( $this, $user ) = @_;
+        return $this->{users}->getRegistrationDate($user) || "";
+    },
     emails => sub {
         my ( $this, $user ) = @_;
 

diff --git a/core/lib/Foswiki/UserMapping.pm b/core/lib/Foswiki/UserMapping.pm
@@ -464,6 +464,21 @@ sub getEmails {
 
 =begin TML
 
+---++ ObjectMethod getRegistrationDate($name) -> $string
+
+If $name is a cUID, return that user's email addresses. If it is a group,
+return the addresses of everyone in the group.
+
+Duplicates should be removed from the list.
+
+=cut
+
+sub getRegistrationDate {
+    return;
+}
+
+=begin TML
+
 ---++ ObjectMethod setEmails($cUID, @emails)
 
 Set the email address(es) for the given user.

diff --git a/core/lib/Foswiki/Users.pm b/core/lib/Foswiki/Users.pm
@@ -581,6 +581,21 @@ sub getEmails {
 
 =begin TML
 
+---++ ObjectMethod getRegistrationDate($name) -> $string
+
+returns the date this user has registered.
+
+=cut
+
+sub getRegistrationDate {
+    my ( $this, $name ) = @_;
+
+    return unless $name;
+    return $this->_getMapping($name)->getRegistrationDate($name);
+}
+
+=begin TML
+
 ---++ ObjectMethod setEmails($cUID, @emails)
 
 Set the email address(es) for the given user.