From 9df03c38aa824c20963fcc90f5410f3db412b9d7 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 4 Nov 2009 17:41:47 +0100
Subject: [PATCH] fix _status_description_time and jCard

---
 world/net/jabber/mixin_render.c | 3 ++-
 world/net/jabber/user.c         | 1 +
 world/net/library/profiles.html | 2 +-
 world/net/library/profiles.i    | 2 --
 world/net/library/profiles.pl   | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/world/net/jabber/mixin_render.c b/world/net/jabber/mixin_render.c
index 79c1376..865c872 100644
--- a/world/net/jabber/mixin_render.c
+++ b/world/net/jabber/mixin_render.c
@@ -9,7 +9,8 @@ int msg(string source, string mc, string data,
 	    mapping vars, int showingLog, string target) {
     mixed t;
 
-    switch (mc){
+    switch (mc) {
+    case "_status_description_time":
     case "_status_person_away":
     case "_status_person_present": 
     case "_status_person_present_implied": 
diff --git a/world/net/jabber/user.c b/world/net/jabber/user.c
index a0e7ef2..01a8c9c 100644
--- a/world/net/jabber/user.c
+++ b/world/net/jabber/user.c
@@ -129,6 +129,7 @@ msg(source, mc, data, mapping vars, showingLog) {
 	mc = "_notice_place_leave";
     }
     switch (mc) {
+    case "_status_description_time":
     case "_status_person_present":
     case "_status_person_present_implied":
     case "_status_person_absent":
diff --git a/world/net/library/profiles.html b/world/net/library/profiles.html
index 62a1556..6d5854c 100644
--- a/world/net/library/profiles.html
+++ b/world/net/library/profiles.html
@@ -71,7 +71,7 @@
 <tr><td>_flag_uniform_verbatim</td><td>verbatimuniform</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_flag_visibility</td><td>visibility</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_gender</td><td>sex</td><td>gender</td><td></td><td></td><td></td><td>gender</td></tr>
-<tr><td>_identification</td><td>id</td><td>psyc_id</td><td></td><td>PSYCID</td><td></td><td>psycID</td></tr>
+<tr><td>_identification</td><td>id</td><td>psyc_id</td><td></td><td></td><td></td><td>psycID</td></tr>
 <tr><td>_identification_other</td><td>otherid</td><td></td><td></td><td></td><td></td><td></td></tr>
 <tr><td>_identification_scheme_AIM</td><td>aimid</td><td>aim_id</td><td></td><td></td><td></td><td>aimChatID</td></tr>
 <tr><td>_identification_scheme_ICQ</td><td>icqid</td><td>icq_id</td><td></td><td></td><td></td><td>icqChatID</td></tr>
diff --git a/world/net/library/profiles.i b/world/net/library/profiles.i
index b523ad2..aa33926 100644
--- a/world/net/library/profiles.i
+++ b/world/net/library/profiles.i
@@ -94,7 +94,6 @@ volatile mapping psyc2jCard = ([
              "_affiliation" : "<ORG><ORGNAME>%s</ORGNAME></ORG>",
               "_date_birth" : "<BDAY>%s</BDAY>",
       "_description_public" : "<DESC>%s</DESC>",
-          "_identification" : "<PSYCID>%s</PSYCID>",
   "_identification_scheme_XMPP" : "<JABBERID>%s</JABBERID>",
   "_identification_scheme_mailto" : "<EMAIL><USERID>%s</USERID></EMAIL>",
              "_name_family" : "<N><FAMILY>%s</FAMILY></N>",
@@ -133,7 +132,6 @@ volatile mapping jCard2psyc = ([
      "TEL/NUMBER" : "_contact_telephone",
            "BDAY" : "_date_birth",
            "DESC" : "_description_public",
-         "PSYCID" : "_identification",
        "JABBERID" : "_identification_scheme_XMPP",
    "EMAIL/USERID" : "_identification_scheme_mailto",
        "N/FAMILY" : "_name_family",
diff --git a/world/net/library/profiles.pl b/world/net/library/profiles.pl
index 7ecfbb8..3e00cd0 100644
--- a/world/net/library/profiles.pl
+++ b/world/net/library/profiles.pl
@@ -377,7 +377,8 @@ FOAF	icqChatID
 
 PSYC	_identification
 jProf	psyc_id
-jCard	PSYCID
+# I'm afraid adding a PSYCID field will not be well-recepted by some apps
+#jCard	PSYCID
 FOAF	psycID
 
 PSYC	_identification_other