From b2a27c03a43f1fa71d5fc733d7c732d133f737dd Mon Sep 17 00:00:00 2001 From: Jaime Perez Crespo <jaime.perez@uninett.no> Date: Wed, 5 Aug 2015 14:49:37 +0200 Subject: [PATCH] Remove unused attribute mappings for social networks. Reformat mapping definition files. --- attributemap/facebook2name.php | 29 +++++++++++++---------------- attributemap/linkedin2name.php | 25 ++++++++++++------------- attributemap/myspace2name.php | 22 ++++++++++------------ attributemap/twitter2name.php | 21 +++++++++------------ attributemap/windowslive2name.php | 20 +++++++++----------- 5 files changed, 53 insertions(+), 64 deletions(-) diff --git a/attributemap/facebook2name.php b/attributemap/facebook2name.php index eb3f7a165..5867ea7ed 100644 --- a/attributemap/facebook2name.php +++ b/attributemap/facebook2name.php @@ -1,21 +1,18 @@ <?php $attributemap = array( - // Generated Facebook Attributes - 'facebook_user' => 'eduPersonPrincipalName', // username OR uid @ facebook.com - 'facebook_targetedID' => 'eduPersonTargetedID', // http://facebook.com!uid - 'facebook_cn' => 'cn', // duplicate of displayName + // Generated Facebook Attributes + 'facebook_user' => 'eduPersonPrincipalName', // username OR uid @ facebook.com + 'facebook_targetedID' => 'eduPersonTargetedID', // http://facebook.com!uid + 'facebook_cn' => 'cn', // duplicate of displayName - // Attributes Returned by Facebook - 'facebook.first_name' => 'givenName', - 'facebook.last_name' => 'sn', - 'facebook.name' => 'displayName', // or 'cn' - 'facebook.email' => 'mail', - //'facebook.pic' => 'jpegPhoto', // URL not image data - //'facebook.pic_square' => 'jpegPhoto', // URL not image data - 'facebook.username' => 'uid', // facebook username (maybe blank) - //'facebook.uid' => 'uid', // numeric facebook user id - 'facebook.profile_url' => 'labeledURI', - 'facebook.locale' => 'preferredLanguage', - 'facebook.about_me' => 'description', + // Attributes Returned by Facebook + 'facebook.first_name' => 'givenName', + 'facebook.last_name' => 'sn', + 'facebook.name' => 'displayName', // or 'cn' + 'facebook.email' => 'mail', + 'facebook.username' => 'uid', // facebook username (maybe blank) + 'facebook.profile_url' => 'labeledURI', + 'facebook.locale' => 'preferredLanguage', + 'facebook.about_me' => 'description', ); diff --git a/attributemap/linkedin2name.php b/attributemap/linkedin2name.php index 0d3a43303..97231dd4b 100644 --- a/attributemap/linkedin2name.php +++ b/attributemap/linkedin2name.php @@ -1,19 +1,18 @@ <?php $attributemap = array( - // See http://developer.linkedin.com/docs/DOC-1061 for LinkedIn Profile fields. - // NB: JSON response requires the conversion of field names from hyphened to camelCase. - // For instance, first-name becomes firstName. + // See http://developer.linkedin.com/docs/DOC-1061 for LinkedIn Profile fields. + // NB: JSON response requires the conversion of field names from hyphened to camelCase. + // For instance, first-name becomes firstName. - // Generated LinkedIn Attributes - 'linkedin_user' => 'eduPersonPrincipalName', // id @ linkedin.com - 'linkedin_targetedID' => 'eduPersonTargetedID', // http://linkedin.com!id + // Generated LinkedIn Attributes + 'linkedin_user' => 'eduPersonPrincipalName', // id @ linkedin.com + 'linkedin_targetedID' => 'eduPersonTargetedID', // http://linkedin.com!id - // Attributes Returned by LinkedIn - 'linkedin.firstName' => 'givenName', - 'linkedin.lastName' => 'sn', - 'linkedin.id' => 'uid', // alpha + mixed case user id - //'linkedin.pictureUrl' => 'jpegPhoto', // URL not image data - 'linkedin.headline' => 'title', - 'linkedin.summary' => 'description', + // Attributes Returned by LinkedIn + 'linkedin.firstName' => 'givenName', + 'linkedin.lastName' => 'sn', + 'linkedin.id' => 'uid', // alpha + mixed case user id + 'linkedin.headline' => 'title', + 'linkedin.summary' => 'description', ); diff --git a/attributemap/myspace2name.php b/attributemap/myspace2name.php index dbc52d4b8..6111f61d0 100644 --- a/attributemap/myspace2name.php +++ b/attributemap/myspace2name.php @@ -1,18 +1,16 @@ <?php $attributemap = array( - // See http://developerwiki.myspace.com/index.php?title=People_API for attributes + // See http://developerwiki.myspace.com/index.php?title=People_API for attributes - // Generated MySpace Attributes - 'myspace_user' => 'eduPersonPrincipalName', // username OR uid @ myspace.com - 'myspace_targetedID' => 'eduPersonTargetedID', // http://myspace.com!uid - 'myspace_username' => 'uid', // myspace username (maybe numeric uid) - //'myspace_uid' => 'uid', // numeric myspace user id + // Generated MySpace Attributes + 'myspace_user' => 'eduPersonPrincipalName', // username OR uid @ myspace.com + 'myspace_targetedID' => 'eduPersonTargetedID', // http://myspace.com!uid + 'myspace_username' => 'uid', // myspace username (maybe numeric uid) - // Attributes Returned by MySpace - 'myspace.name.givenName' => 'givenName', - 'myspace.name.familyName' => 'sn', - 'myspace.displayName' => 'displayName', - //'myspace.thumbnailUrl' => 'jpegPhoto', // URL not image data - 'myspace.profileUrl' => 'labeledURI', + // Attributes Returned by MySpace + 'myspace.name.givenName' => 'givenName', + 'myspace.name.familyName' => 'sn', + 'myspace.displayName' => 'displayName', + 'myspace.profileUrl' => 'labeledURI', ); diff --git a/attributemap/twitter2name.php b/attributemap/twitter2name.php index 605b5613e..27c9e755a 100644 --- a/attributemap/twitter2name.php +++ b/attributemap/twitter2name.php @@ -1,17 +1,14 @@ <?php $attributemap = array( - // Generated Twitter Attributes - 'twitter_screen_n_realm' => 'eduPersonPrincipalName', // screen_name@twitter.com - //'twitter_at_screen_name' => 'eduPersonPrincipalName', // legacy @twitter format - 'twitter_targetedID' => 'eduPersonTargetedID', // http://twitter.com!id_str + // Generated Twitter Attributes + 'twitter_screen_n_realm' => 'eduPersonPrincipalName', // screen_name@twitter.com + 'twitter_targetedID' => 'eduPersonTargetedID', // http://twitter.com!id_str - // Attributes Returned by Twitter - 'twitter.screen_name' => 'uid', // equivalent to twitter username without leading @ - //'twitter.id_str' => 'uid', // persistent numeric twitter user id - 'twitter.name' => 'displayName', - 'twitter.url' => 'labeledURI', - 'twitter.lang' => 'preferredLanguage', - //'twitter.profile_image_url' => 'jpegPhoto', - 'twitter.description' => 'description', + // Attributes Returned by Twitter + 'twitter.screen_name' => 'uid', // equivalent to twitter username without leading @ + 'twitter.name' => 'displayName', + 'twitter.url' => 'labeledURI', + 'twitter.lang' => 'preferredLanguage', + 'twitter.description' => 'description', ); diff --git a/attributemap/windowslive2name.php b/attributemap/windowslive2name.php index f43d0f99a..e0821f16d 100644 --- a/attributemap/windowslive2name.php +++ b/attributemap/windowslive2name.php @@ -1,16 +1,14 @@ <?php $attributemap = array( - // Generated Windows Live ID Attributes - 'windowslive_user' => 'eduPersonPrincipalName', // uid @ windowslive.com - 'windowslive_targetedID' => 'eduPersonTargetedID', // http://windowslive.com!uid - 'windowslive_uid' => 'uid', // windows live id - 'windowslive_mail' => 'mail', - - // Attributes Returned by Windows Live ID - 'windowslive.FirstName' => 'givenName', - 'windowslive.LastName' => 'sn', - 'windowslive.Location' => 'l', - //'windowslive.ThumbnailImageLink'=> 'jpegPhoto', // URL not image data + // Generated Windows Live ID Attributes + 'windowslive_user' => 'eduPersonPrincipalName', // uid @ windowslive.com + 'windowslive_targetedID' => 'eduPersonTargetedID', // http://windowslive.com!uid + 'windowslive_uid' => 'uid', // windows live id + 'windowslive_mail' => 'mail', + // Attributes Returned by Windows Live ID + 'windowslive.FirstName' => 'givenName', + 'windowslive.LastName' => 'sn', + 'windowslive.Location' => 'l', ); -- GitLab