'; $content .= ''; $content .= ''; - $site_friends = array(); - $friend_count = 0; - foreach ($friends as $friend) { - $friend_bio = $friend['identities']->identity; - //drupal_set_message('friend: ' . $friend_bio->UID) ; - if (_gigya_get_uid_by_gid($friend_bio->UID)) { - $site_friends[] = $friend_bio; - $friend_count++; - } - } + $friend_count = count($friends); + $rows = $friend_count / 5; $tail = $friend_count % 5; - $rowcount = 1; $colcount = 0; - foreach ($site_friends as $site_friend) { + foreach ($friends as $friend) { + $site_friend = $friend['identities']->identity; $colcount++; if (isset($site_friend->thumbnailURL)) $friend_photo = $site_friend->thumbnailURL; @@ -1456,7 +1097,7 @@ $friend_photo = $site_friend->photoURL; else $friend_photo = $base_url .'/'. drupal_get_path('module', 'gigya') .'/silhouette.gif'; - $friend_link = l($site_friend->nickname, 'user/'. _gigya_get_uid_by_gid($site_friend->UID)); + $friend_link = l($site_friend->nickname, 'user/'. $site_friend->UID); $content .= ''; if (($colcount * $rowcount) == $friend_count) { $remainer = 5 - $colcount; @@ -1525,14 +1166,14 @@ function gigya_preprocess_block(&$vars) { if ( $vars['block']->subject == t('User login') ) { - if ( variable_get('remove_user_login_title', FALSE) ) { - $vars['block']->subject = ''; + if ( variable_get('remove_user_login_title', FALSE) ) { + $vars['block']->subject = ''; } - else { - if ( variable_get('gigya_login_surpress_login',FALSE) ) { - $vars['block']->subject = 'Login using social networks'; - } - } + else { + if ( variable_get('gigya_login_surpress_login',FALSE) ) { + $vars['block']->subject = 'Login using social networks'; + } + } } else { if ( $vars['block']->subject == '' ) { @@ -1557,10 +1198,8 @@ return $output; } - - /** - * Theme funciton for gigya_notify_friends + * Theme function for gigya_notify_friends */ function theme_gigya_notify_friends($title, $subj = '', $msg = '') { //disable providers who don't have friends abilities @@ -1601,39 +1240,261 @@ return $output; } +function gigya_footer($main=0) { + module_load_include('inc', 'gigya', 'gigya.admin'); + return ''; +} -function gigya_enter_user($drupalUserID,$origAction) { - global $base_url; - - $currUser = user_load($drupalUserID); - if ( $currUser ) { - $values = array( - 'name' => $currUser->name , - 'pass' => $currUser->pass, - 'mail' => $currUser->mail, - ); - - // Valid login. - global $user; - $user = $currUser; - user_authenticate_finalize($values); - $dest = variable_get('gigya_login_uiconfig_urlredirect', 'user'); - drupal_goto($dest); - } - else { - drupal_set_message('Failed loading user id ' . $drupalUserID , 'error'); - } - - drupal_goto($base_root); +function gigya_link_accounts(){ + $form = array( + '#theme' => 'gigya_link_accounts' + ); + $form['link_accounts']['name'] = array('#type' => 'textfield', + '#title' => t('Username'), + '#size' => 60, + '#maxlength' => USERNAME_MAX_LENGTH, + '#required' => TRUE, + ); + $form['link_accounts']['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'Drupal'))); + $form['link_accounts']['pass'] = array('#type' => 'password', + '#title' => t('Password'), + '#description' => t('Enter the password that accompanies your username.'), + '#required' => TRUE, + ); + $form['#validate'] = user_login_default_validators(); + $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'), '#weight' => 2); + return $form; } -function gigya_footer($main=0) { - module_load_include('inc', 'gigya', 'gigya.admin'); - return ''; -} +function gigya_populate_fields($loginProvider){ + return (strtolower($loginProvider) != 'facebook' || variable_get('gigya_enable_facebook_population',FALSE)); +} +function theme_gigya_link_accounts($form){ + $output = '

Or log in to link your existing account to this social network

'; + + $output .= drupal_render($form); + + return $output; +} +function theme_gigya_register($bio, $registration_form, $link_accounts_form){ + //the bio variable is a gigya User object as documented here: http://wiki.gigya.com/030_Gigya_Socialize_API_2.0/030_API_reference/Objects/User_object + $output = '

Complete your registration

You have been authenticated via '. $bio['loginProvider'] .'. Please complete your registration below.

'; + $output .= $registration_form . $link_accounts_form; + return $output; +} +class GigyaUser{ + public $uid; + private $userinfo; + + public function __construct($gigya_uid){ + $this->uid = $gigya_uid; + } + + public function GetUserInfo($refresh = false){ + if(!empty($this->userinfo) && !$refresh) return $this->userinfo; + return gigya_getUserInfo($this->uid); + } + + public function PublishUserAction($content){ + if(!$this->HasCapability('Actions')) return false; + return gigya_publish_user_action($this->uid,$content); + } + + public static function Load(&$account){ + $account->gigya = new GigyaUser($account->uid); + } + + public function Logout(){ + /* + * redirect to a logout URL where javascript will be added to the page + * I don't like doing this on a separate page -- it's kinda fragile -- but it's the best + * I can figure out for now since the session gets destroyed by the user_logout function + */ + $_REQUEST['destination'] = urlencode('socialize-logout?destination='. $_REQUEST['destination']); + } + + public function GetFriends(){ + return gigya_getFriendsInfo($this->uid); + } + + public function GetCapabilities() { + if ($bio = $this->GetUserInfo()) { + $capabilities = split(', ', $bio['capabilities']); + array_walk($capabilities, '_gigya_trim_value'); + return $capabilities; + } + else { + return array(); + } + } + + public function HasCapability($capability){ + $capabilities = $this->GetCapabilities(); + return array_search('Actions', $capabilities); + } + + public function MapExtendedProfileFields($edit){ + //map whatever extended profile fields we can that weren't on the registration form + $bio = $this->GetUserInfo(); + if(gigya_populate_fields($bio['loginProvider']) && variable_get(GIGYA_POPULATE_NON_REG_PROFILE_FIELDS,FALSE)){ + if ( module_exists('profile') ) { + $temp_edit = array(); + if ($profile_categories = profile_categories()) { + foreach ($profile_categories as $category) { + $result = _profile_get_fields($category['name']); + while ($field = db_fetch_object($result)) { + //only attempt to set this variable if we've mapped it and it isn't already set elsewhere + if (variable_get('gigya_profile_'. $field->name, '') != '0' && !isset($edit[$field->name])) { + $bio_assoc = variable_get('gigya_profile_'. $field->name, ''); + $temp_edit[$field->name] = $bio[$bio_assoc]; + } + } + //this could potentially cause conflicts with other modules not expecting that this will be called; disable mapping of extended profile fields if this causes a problem -- could probably replace with profile_save_profile but haven't fully investigated + user_save($account,$temp_edit,$category['name']); + } + } + } + } + } + + public function LinkAccounts($uid){ + return gigya_linkAccountsRest($this->uid,$uid); + } + + public function SetStatus($status){ + return gigya_setStatus($this->uid,$status); + } + + public function Unlink(){ + gigya_unlinkAccounts($this->uid,$this->uid); + return true; + } + + public static function UserFromUrl(){ + if (!empty($_GET['signature']) && !empty($_GET['timestamp']) && !empty($_GET['UID'])) { + //first, verify signature + $localkey = _gigya_verify_signature($_GET['timestamp'], $_GET['UID'], variable_get('gigya_SecretKey', FALSE)); + if ($localkey != $_GET['signature']) { + drupal_set_message(t('Unable to authenticate. Gigya signature does not match.'), 'error'); + if ($user->uid == 1) { + drupal_set_message(t('Signature is %gigya, Site sig is %site.', array('%gigya' => $form_values['signature'], '%site' => $localkey)), 'error'); + } + return false; + } + else{ + return new GigyaUser($_GET['UID']); + } + } + else{ + return false; + } + } +} +function gigya_shareUI_js($currObj,$objType,$objID,$currUrl) { + global $base_url; + /*$xxx = gigya_printObject('',$currObj); + drupal_set_message('nodeeee= ' . $xxx);*/ + if ( t('comment')==$objType) { + // Setting the Title"; + $current_title = $currObj->title; + if (empty($current_title)) { + $current_title = drupal_get_title(); + if (empty($current_title)) { + $current_title = 'A Drupal site item'; + } + } + + // Setting the description"; + if ( empty($currObj->teaser) ) { + $currBody = $currObj->body; + } + else { + $currBody = $currObj->teaser; + } + + $currAction = 'commented on item: '; + } + else { + $current_title = drupal_get_title(); + if (empty($current_title)) { + $current_title = 'A Drupal site item'; + } + $currBody = ''; + + $currAction = 'viewed'; + } + $current_title = str_replace('039;','\\\'',$current_title); + $current_title = str_replace("'",'\'',$current_title); + $currBody = strip_tags($currBody); + $currBody = str_replace('039;','\\\'',$currBody); + $currBody = str_replace("\r",' ',$currBody); + $currBody = str_replace("\n",' ',$currBody); + $currBody = str_replace("'",'\'',$currBody); + + // Constructing a UserAction Object; Constructor receives an Action Template string + $shareUI_js .= "var act = new gigya.services.socialize.UserAction('{actor} {action}'); "; + + // Setting the {action} in the Action Template String + $shareUI_js .= "act.setActionName('$currAction'); " ; + + // Setting the User Message; + $currUserMsg = empty($_SESSION['shareUI_default_message'])?'Enter your message here':$_SESSION['shareUI_default_message']; + $shareUI_js .= "act.setUserMessage('$currUserMsg'); "; + $shareUI_js .= 'act.setTitle("' . $current_title . '");'; + + // Setting the Link Back + $shareUI_js .= "act.setLinkBack('$currUrl'); "; + + // Setting the Description + $shareUI_js .= 'act.setDescription("' . $currBody . '");'; + + $currImg =''; + if ( $currObj->images ) { + $currImages = $currObj->images; + if ($currImages['preview']) { + $currImg = $currImages['preview']; + } + else { + if ($currImages['thumbnail']) { + $currImg = $currImages['thumbnail']; + } + } + if ( $currImg != '' ) { + // Adding a Media Item (image) + $shareUI_js .= "var img = {"; + $shareUI_js .= " src: '$base_url/$currImg',"; + $shareUI_js .= " href: '$currUrl',"; + $shareUI_js .= " type: 'image'"; + $shareUI_js .= " }; "; + $shareUI_js .= " act.addMediaItem(img); "; + } + } + /* + // Adding a Media Item (video) + $shareUI_js .= "var video = {"; + $shareUI_js .= " src: 'http://www.youtube.com/watch?v=GaNjCal26CM',"; + $shareUI_js .= " previewImageURL: '$base_url/$currImg',"; + $shareUI_js .= " type: 'flash'"; + $shareUI_js .= " }; "; + $shareUI_js .= " act.addMediaItem(video); "; + + */ + // Adding an Action Link + $shareUI_js .= "act.addActionLink('Check out the site', '$base_url'); "; + $shareUI_js .= "var shareUI_params= {};"; + $shareUI_js .= "shareUI_params.showEditLink='false'; "; + $shareUI_js .= 'shareUI_params.userAction=act; '; + // $shareUI_js .= "shareUI_params.showCaption='true'"; + // $shareUI_js .= "shareUI_params.captionText='This is my Caption';"; + + // Publishing the User Action + $shareUI_js .= "gigya.services.socialize.showShareUI(Drupal.settings.gigya.conf, shareUI_params); "; + return 'Drupal.behaviors.gigya_init = function(context){'. $shareUI_js .'}'; +} \ No newline at end of file Index: gigya.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.inc,v retrieving revision 1.1.2.21 diff -u -r1.1.2.21 gigya.inc --- gigya.inc 24 Dec 2009 12:15:24 -0000 1.1.2.21 +++ gigya.inc 1 Feb 2010 08:47:03 -0000 @@ -1,5 +1,5 @@ uid == 1) { - drupal_set_message(t('Signature is %gigya, Site sig is %site.', array('%gigya' => $form_values['signature'], '%site' => $localkey)), 'error'); - } - - return 'Unable to authenticate. Gigya signature does not match.'; - } - - //check to see if the gigya_user is linked to a drupal user - if ($drupal_uid = _gigya_get_uid_by_gid($form_values['gigya_uid'])) { - - $user = user_load($drupal_uid); - $userLoggedStr='gigya_' . $drupal_uid . '_logged'; - $_SESSION[$userLoggedStr] = TRUE; - $_gigya_uid = $form_values['gigya_uid']; - user_authenticate_finalize($form_values); - $_SESSION['gigya_uid'] = $form_values['gigya_uid']; - drupal_goto($dest); - } - else { //otherwise, lets give them a registration page - $output .= drupal_get_form('user_register'); - return $output; - } -} - -/** - * Storage function to link the gigya GID+Provider to a drupal username - * - * @param array &$edit contains the uid, gigya_uid, and a provider to be stored - */ -function gigya_save_profile($edit) { - if (!$edit['uid'] || $edit['gigya_uid'] == '') { - return; - } - //print_r("Socialize ID:" . $_SESSION['gigya_uid']); - if (!isset($edit['loginProvider'])) { - $bio = gigya_getUserInfo($_SESSION['gigya_uid']); - //print_r($bio); - $edit['loginProvider'] = $bio['loginProvider']; - } - if($edit['loginProvider'] && $edit['uid'] && $edit['gigya_uid']) { - db_query("UPDATE {gigya} SET uid = %d, gigya_uid = '%s', loginProvider = '%s' WHERE uid = %d", $edit['uid'], $edit['gigya_uid'], $edit['loginProvider'], $edit['uid']); - if (!db_affected_rows()) { - db_query("INSERT INTO {gigya} (uid, gigya_uid, loginProvider) VALUES (%d, '%s', '%s')", $edit['uid'], $edit['gigya_uid'], $edit['loginProvider']); - } - return TRUE; - } else { - drupal_set_message("Error saving your socialize profile info. Please contact the system administrator",'error'); - return FALSE; - } -} - function gigya_delete_profile($uid) { - if($gid = _gigya_get_gid_by_uid($uid)){ - db_query("DELETE FROM {gigya} WHERE uid = %d", $uid); - gigya_unlinkAccounts($gid,$uid); - } - else{ - gigya_unlinkAccounts($uid,$uid); - } - return TRUE; + gigya_unlinkAccounts($uid,$uid); + return TRUE; } - - - function gigya_get_loginprovider($uid) { - - if($login_provider = db_result(db_query("SELECT loginProvider FROM {gigya} WHERE uid = %d",$uid))) - return $login_provider; return false; } -function gigya_avatar_status($uid) { - $res = db_result("SELECT use_avatar, avatar_timestamp FROM {gigya} WHERE uid=%d",$uid); - while($data = db_fetch_array($res)) { - if(!$data['use_avatar']) { - return FALSE; - } - return $data; - } -} function gigya_avatar_check($uid) { $bio = gigya_getUserInfo($uid); @@ -178,15 +82,16 @@ return $services; } -function gigya_status_form($account = NULL) { +function gigya_status_form($account = NULL) { + global $user; drupal_add_js(drupal_get_path('module', 'gigya') .'/gigya_updatestatus.js', 'module'); - + if (empty($account)) { global $user; $account = $user; } - if ($capabilities = _gigya_getUserCapabilities($_SESSION['gigya_uid'])) { + if ($capabilities = $user->gigya->GetCapabilities()) { if (array_search('Status', $capabilities)) { $form = array(); $form['status'] = array( @@ -203,22 +108,21 @@ $services = array( 'facebook' => 'Facebook', 'myspace' => 'MySpace', - 'twitter' => 'Twitter', + 'twitter' => 'Twitter', 'google' => 'Google', 'yahoo' => 'Yahoo', 'aol' => 'AOL', - 'blogger' => 'Blogger', + 'blogger' => 'blogger', 'wordpress' => 'WordPress', - 'typepad' => 'Typepad', - 'liveJournal' => 'LiveJournal', - 'hyves' => 'Hyves' , - 'veriSign' =>'VeriSign' + 'typepad' => 'typepad', + 'liveJournal' => 'liveJournal', + 'hyves' => 'hyves' , + 'veriSign' =>'veriSign' ); return $services; } - function gigya_get_network_displayName($networkName) { $networks = gigya_get_networks(); if ( array_key_exists($networkName,$networks)) { @@ -246,23 +150,8 @@ ); } -/** - * Internal gigya function to get the Gigya User id when the drupal uid is known - * @param integer $uid The drupal user id - * @return integer gigya user id if it exists in the link table - */ -function _gigya_get_gid_by_uid($uid) { - - if ($gid = db_result(db_query("SELECT gigya_uid FROM {gigya} WHERE uid = %d", $uid))) { - return $gid; - } - else { - return FALSE; - } -} function _gigya_getUserCapabilities($uid) { - if (empty($uid)) { return; } @@ -276,50 +165,7 @@ } } -/** - * Internal gigya function to get the Gigya User id when the drupal uid is known - * @param integer $uid The drupal user id - * @return integer gigya user id if it exists in the link table - */ -function _gigya_get_linked_networks($uid) { - - $network = array(); - //TODO: REST API call here - $res = db_query("SELECT gigya_uid,loginProvider FROM {gigya} WHERE uid = %d", $uid); - while ($gid = db_fetch_array($res)) { - $network[$gid['loginProvider']] = $gid['gigya_uid']; - } - return $network; -} - -/** - * Internal gigya function to get the drupal user id when the gigya uid is known - * @param integer $uid The gigya user id - * @return integer drupal user id if it exists in the link table - */ -function _gigya_get_uid_by_gid($gid) { - - if ($uid = db_result(db_query("SELECT uid FROM {gigya} WHERE gigya_uid = '%s'", $gid))) { - return $uid; - } - else { - return FALSE; - } -} -/** - * Internal gigya function to get the drupal user id when the gigya uid is known - * @param integer $uid The gigya user id - * @return integer drupal user id if it exists in the link table - */ -function _gigya_network_lookup($gid) { - if ($provider = db_result(db_query("SELECT loginProvider FROM {gigya} WHERE gigya_uid = '%s'", $gid))) { - return $provider; - } - else { - return FALSE; - } -} function _gigya_trim_value(&$value) { $value = trim($value); @@ -335,6 +181,18 @@ * @param string $uid The gigya GID being passed to/from gigya * @param string $privatekey The private key set in the admin settings. Fetch the key from the gigya socialize site */ + +function gigya_verify_signature($timestamp,$uid,$signature){ + $secret = variable_get('gigya_SecretKey', FALSE); + $localkey = _gigya_verify_signature($timestamp, $uid, $secret); + if($localkey == $signature){ + return $uid; + } + else{ + return false; + } +} + function _gigya_verify_signature($timestamp, $uid, $privatekey) { $ch1data = $timestamp .'_'. $uid; @@ -393,7 +251,7 @@ * If it shows the user logged out, thats good, if it returns an error then our keys are most likely bad */ function gigya_validate($update = FALSE) { - + $origValidateState = variable_get("gigya_validate", FALSE); $gigya_params = gigya_load_params(); $gigya_params['uid'] = 'admin'; $signature = _gigya_calc_signature(variable_get('gigya_SecretKey', FALSE), 'GET', 'getUserInfo', $gigya_params); @@ -417,19 +275,13 @@ } return FALSE; } - - - if ($_SESSION['validation_msg_not_required']) { - unset($_SESSION['validation_msg_not_required']); - return TRUE; - } - - if(!$update) { - drupal_set_message("Gigya validated properly. This site is authorized to use Gigya services"); - variable_set("gigya_validate", TRUE); + if ( !$origValidateState || variable_get("need_validation_msg", FALSE)) { + drupal_set_message($eee . " Gigya validated properly. This site is authorized to use Gigya services"); + variable_set("need_validation_msg", TRUE); } - - return TRUE; + variable_set($eee . "gigya_validate", TRUE); + + return TRUE; } /** @@ -440,20 +292,12 @@ * Fetch information about users following a given socialize account. */ function gigya_getUserInfo($gigya_uid) { - global $user; - if (empty($gigya_uid)) { return FALSE; } - $gigya_params = gigya_load_params(); - if ( $user && ($user->uid)>0 ) { - $gigya_params['uid'] = $gigya_uid; - } - else { - return FALSE; - } - + $gigya_params['uid'] = $gigya_uid; + $signature = _gigya_calc_signature(variable_get('gigya_SecretKey', FALSE), 'GET', 'getUserInfo', $gigya_params); $url = "http://". variable_get('gigya_api_url', 'socialize.api.gigya.com') ."/socialize.getUserInfo". "?timestamp=". drupal_urlencode($gigya_params['timestamp']) . @@ -462,35 +306,23 @@ "&sig=". drupal_urlencode($signature) . "&uid=". urlencode($gigya_params['uid']); //for some reason drupal_urlencode doesn't take out slashes $headers = array('Content-type' => 'application/x-www-form-urlencoded'); - - + $results = drupal_http_request($url, $headers, 'GET'); - - //print_r($results); - if (_gigya_request_failure($results)) { + if (_gigya_request_failure($results)) { + watchdog('gigya', 'gigya_getUserInfo failure'); return FALSE; } return _gigya_convert_xml_to_array($results->data); } function gigya_getFriendsInfo($gigya_uid) { - global $user; - if (!$gigya_uid) { return FALSE; } - $gigya_params = gigya_load_params(); - - if ( $user && ($user->uid)>0 ) { - $gigya_params['uid'] = $gigya_uid; - } - else { - return FALSE; - } - - + $gigya_params['uid'] = $gigya_uid; + $signature = _gigya_calc_signature(variable_get('gigya_SecretKey', FALSE), 'GET', 'getFriendsInfo', $gigya_params); $url = "http://". variable_get('gigya_api_url', 'socialize.api.gigya.com') ."/socialize.getFriendsInfo". "?apiKey=". drupal_urlencode($gigya_params['apiKey']) . @@ -500,6 +332,7 @@ "&uid=". urlencode($gigya_params['uid']); $headers = array('Content-type' => 'application/x-www-form-urlencoded'); $results = drupal_http_request($url, $headers, 'GET'); + if (_gigya_request_failure($results)) { return FALSE; } @@ -525,7 +358,6 @@ if (_gigya_request_failure($results)) { return FALSE; } - return _gigya_convert_xml_to_array($results->data); } @@ -542,11 +374,9 @@ "&sig=". drupal_urlencode($signature) . "&uid=". urlencode($gigya_params['uid']) . "&userAction=". rawurlencode($gigya_params['userAction']); - $headers = array('Content-type' => 'application/x-www-form-urlencoded'); $results = drupal_http_request($url, $headers, 'GET'); - if (_gigya_request_failure($results)) { return FALSE; } @@ -558,10 +388,9 @@ * Create a linkage in Gigya Socialize between the current Drupal user and gigya user (Drupal uid<->Gigya uid) */ function gigya_linkAccountsRest($gigya_uid,$drupalUid) { - - if (empty($gigya_uid)) + if (empty($gigya_uid) || empty($drupalUid)) { return FALSE; - + } $gigya_params = gigya_load_params(); $gigya_params['uid'] = $gigya_uid; $gigya_params['siteUID'] = $drupalUid; @@ -579,11 +408,6 @@ if (_gigya_request_failure($results)) { return FALSE; } - - /* The following is added so that notifyLogin will NOT be activated */ - $userLoggedStr='gigya_' . $drupalUid . '_logged'; - $_SESSION[$userLoggedStr] = TRUE; - return _gigya_convert_xml_to_array($results->data); } @@ -591,10 +415,9 @@ * Break the linkage in Gigya Socialize between the current Drupal user and gigya user (Drupal uid != Gigya uid) */ function gigya_unlinkAccounts($gigya_uid,$drupalUid) { - if (empty($gigya_uid)) + if (empty($gigya_uid)) { return FALSE; - - + } $gigya_params = gigya_load_params(); $gigya_params['uid'] = $gigya_uid; $gigya_params['siteUID'] = $drupalUid; @@ -632,9 +455,6 @@ function _gigya_calc_signature($secretkey, $httpmethod, $apimethod, $parameters) { require_once("OAuth.inc"); $req = OAuthRequest::from_request($httpmethod, 'http://socialize.api.gigya.com/socialize.'. $apimethod, $parameters); - //print_r("Base String.... "); - //print_r($req->get_signature_base_string()); - //print_r("

"); return base64_encode(hash_hmac('sha1', $req->get_signature_base_string(), base64_decode($secretkey), TRUE)); } @@ -658,8 +478,7 @@ $xxx = gigya_printObject('results ', $results); watchdog('gigya', '_gigya_request_failure ' . $xxx); } - - + switch ($code) { //see if there is a issue with the request on the http level case 302: watchdog('gigya', $errorcode . ' Missing Schema. ' . $errormsg); @@ -704,8 +523,8 @@ return TRUE; case 500: // 500 Internal Server Error: we did something wrong. Please post to the group about it and the Gigya team will investigate. - watchdog('gigya', $errorcode . ' Internal Server Error. ' . $errormsg); - if ( !(stripos($errormsg,'Pending'))) { + watchdog('gigya', $errorcode . ' Internal Server Error. ' . $errormsg); + if ( !(strpos($errormsg,'Data Pending'))) { drupal_set_message('Gigya Socialize Error: code(' . $errorcode . ') Internal Server Error. ' . $errormsg,'error'); } @@ -741,68 +560,3 @@ $xml = new SimpleXMLElement($data); return get_object_vars($xml); } - -/** - * Checks if the user exists in users table - * @param $currUserID - * @return TRUE if the user exists - */ -function gigya_user_exists_in_drupal($currGigyaUID) { - if ( is_numeric($currGigyaUID)) { - $currentDrupalUID = db_result(db_query("SELECT uid FROM {users} WHERE uid = '%s'", $currGigyaUID)); - if ( $currentDrupalUID ) { - drupal_set_message('user ' . $currentDrupalUID . ' is in Drupal'); - return TRUE; - } - } - - return FALSE; -} - -/** - * Checks if the user exists in gigya table - * @param $currUserID - * @return TRUE if the user exists in in gigya table - */ -function gigya_user_exists_in_gigya_table($currGigyaUID) { - $currentDrupalUID = db_result(db_query("SELECT uid FROM {gigya} WHERE gigya_uid = '%s'", $currGigyaUID)); - if ( $currentDrupalUID ) { - drupal_set_message('user :' . $currGigyaUID .' is in gigya table, drupal uid=' . $currentDrupalUID); - return TRUE; - } - drupal_set_message($currGigyaUID . ' does not exist in gigya table'); - return FALSE; -} - -/** - * Adds the user to gigya table - * @param $currGigyaUID - * @param $currentDrupalUID - * - */ -function gigya_add_user_to_gigya_table($currGigyaUID,$currentDrupalUID,$loginProvider=' ') { - db_query("UPDATE {gigya} SET uid = %d, gigya_uid = '%s', loginProvider='%s' WHERE gigya_uid = '%s'",$currentDrupalUID,'' . $currentDrupalUID, $loginProvider,$currGigyaUID); - if (!db_affected_rows()) { - db_query("INSERT INTO {gigya} (uid, gigya_uid, loginProvider) VALUES (%d, '%s', '%s')", $currentDrupalUID, $currentDrupalUID, $loginProvider); - } -} - - -function gigya_username_exists_in_drupal($userName) { - if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE LOWER(name) = LOWER('%s')", $userName)) > 0) { - drupal_set_message(t('The name %name is already taken.', array('%name' =>$userName)), 'error'); - return TRUE; - } - return FALSE; -} - -function gigya_mail_exists_in_drupal($mail) { - if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE LOWER(mail) = LOWER('%s')", $mail)) > 0) { - drupal_set_message(t('The e-mail address %email is already registered.', array('%email' =>$mail)), 'error'); - return TRUE; - } - return FALSE; -} - - - Index: gigya.js =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.js,v retrieving revision 1.1.2.8 diff -u -r1.1.2.8 gigya.js --- gigya.js 24 Dec 2009 12:15:24 -0000 1.1.2.8 +++ gigya.js 1 Feb 2010 08:47:03 -0000 @@ -146,16 +146,25 @@ return str; } -/** - * Callback for the gigya.notifyLogin function - * In production, this function may not be needed. Sends an alert if the user logged in. - */ -Drupal.gigya.notifyLogin_callback = function(response) { - if ( response['status'] == 'OK' ) { - window.location = Drupal.settings.gigya.login_redirect; +Drupal.gigya.linkAccounts_callback = function(response) { + + if ( response['status'] == 'OK' ) { + $.get(Drupal.settings.basePath + 'socialize-ajax/link-accounts-complete'); + } + else { + alert(response['statusMessage']); + } +}; + + +Drupal.gigya.notifyLogin_callback = function(response) { + //alert('notify login'); + if ( response['status'] == 'OK' ) { + //window.location = Drupal.settings.gigya.login_redirect; + //alert('notify login succeeded'); } else { - alert("Unable to log you in. Please contact the system administrator\n"); + alert(response['statusMessage']); } }; @@ -278,11 +287,21 @@ //popupElement.setAttribute('destination','index.php'); popupElement.setAttribute('class','popups-form popups-processed'); popupElement.textContent="setStatus"; - parent.path='http://assaf.com/drupal'; + parent.path=url; Popups.openPath(popupElement,Popups.options,parent); - ///Popups.message('Titles','here we go!'); + //Popups.message('Titles','here we go!'); }; Drupal.gigya.SetStatusPopup_onClose = function(response) { + //alert('dfgdfgdf'); Popups.close(); }; + +Drupal.gigya.init_response = function(response){ + if(response['user']['UID'] != Drupal.settings.gigya.notify_login_params.siteUID){ + gigya.services.socialize.notifyLogin(Drupal.settings.gigya.conf, Drupal.settings.gigya.notify_login_params); + } + else{ + //alert(response['user']['UID']); + } +} Index: gigya.install =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.install,v retrieving revision 1.1.2.17 diff -u -r1.1.2.17 gigya.install --- gigya.install 24 Dec 2009 12:15:24 -0000 1.1.2.17 +++ gigya.install 1 Feb 2010 08:47:03 -0000 @@ -1,5 +1,5 @@ name, ''); + if (!empty($bio_assoc)) { + variable_set('gigya_bio_'. $bio_assoc, $arr_name); + } + } + } + + $items[] = array('success' => TRUE, 'query' => 'Migrated mapping variables of core profile fields.'); + return $items; +} + +/** * //don't really need this at all.... since we store the user picture in the user table function gigya_update_6001() { Index: gigya_updatestatus.js =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya_updatestatus.js,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 gigya_updatestatus.js --- gigya_updatestatus.js 24 Dec 2009 12:15:24 -0000 1.1.2.3 +++ gigya_updatestatus.js 1 Feb 2010 08:47:03 -0000 @@ -1,6 +1,5 @@ - // update status javascript. We want to limit to 140 characters -Drupal.behaviors.gigya_updateStatus = function() { +Drupal.behaviors.gigya_updateStatus = function() { $("#gigya-textfield").keyup(function() { var charsLeft = (140 - $(this).val().length); var descDiv = $(this).parent().parent().parent().children(".description"); Index: gigya.behaviors.js =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.behaviors.js,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 gigya.behaviors.js --- gigya.behaviors.js 31 Jul 2009 02:25:10 -0000 1.1.2.2 +++ gigya.behaviors.js 1 Feb 2010 08:47:03 -0000 @@ -2,6 +2,16 @@ $('.friends-ui:not(.gigya_notifyFriends-processed)', context).addClass('gigya_notifyFriends-processed').each( function () { gigya.services.socialize.getUserInfo(Drupal.settings.gigya.conf, {callback:Drupal.gigya.notifyFriends_callback}); - gigya.services.socialize.addEventHandlers(Drupal.settings.gigya.conf, { onConnect:Drupal.gigya.notifyFriends_callback, onDisconnect:Drupal.gigya.notifyFriends_callback }); + gigya.services.socialize.addEventHandlers(Drupal.settings.gigya.conf, {onConnect:Drupal.gigya.notifyFriends_callback, onDisconnect:Drupal.gigya.notifyFriends_callback }); }); }; + +Drupal.behaviors.gigya_init = function(context){ + if(Drupal.settings.gigya.notify_login_params != undefined){ + //let the server know that notifylogin was attempted so that it doesn't run it again -- + //the timeout exists because of the amount of time it seems to take for php to finish writing the session data from the previous page request + setTimeout("$.get(Drupal.settings.basePath + 'socialize-ajax/notify-login')",1000); + Drupal.settings.gigya.notify_login_params.callback = Drupal.gigya.notifyLogin_callback; + gigya.services.socialize.getUserInfo(Drupal.settings.gigya.conf,{callback: Drupal.gigya.init_response}); + } +} Index: gigya.admin.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.admin.inc,v retrieving revision 1.1.2.20 diff -u -r1.1.2.20 gigya.admin.inc --- gigya.admin.inc 24 Dec 2009 12:15:24 -0000 1.1.2.20 +++ gigya.admin.inc 1 Feb 2010 08:47:03 -0000 @@ -1,5 +1,5 @@ to you. I enjoy it and think you will like it.'); define('GIGYA_DEFAULT_SHARE_LINK_TITLE', 'Share with friends'); +define('GIGYA_DEFAULT_SHARE_UI_LINK_TITLE', 'Share UI title'); +define('GIGYA_DEFAULT_SHARE_UI_SUBJECT', 'Share UI: A site recommendation for you'); +define('GIGYA_DEFAULT_SHARE_UI_MESSAGE', 'Share UI: I wanted to recommend this site
to you. I enjoy it and think you will like it.'); define('GIGYA_DEFAULT_LOGINUI_FBCONNECT', FALSE); /** * @@ -82,7 +86,7 @@ '#description' => t('Keys needed for connecting to the Gigya Socialize service.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - '#weight' => -4, + '#weight' => -400, ); $form['keys']['gigya_APIKey'] = array( '#type' => 'textfield', @@ -90,7 +94,7 @@ '#description' => t('Specify the gigya API key for this domain'), '#default_value' => variable_get('gigya_APIKey', ''), '#required' => TRUE, - '#weight' => -10, + '#weight' => -300, ); $form['keys']['gigya_SecretKey'] = array( '#type' => 'textfield', @@ -98,7 +102,7 @@ '#description' => t('Specify the gigya Secret (Base64 encoded) key for this domain'), '#default_value' => variable_get('gigya_SecretKey', ''), '#required' => TRUE, - '#weight' => -9, + '#weight' => -200, ); $form['gigya_selected_networks'] = array( @@ -106,11 +110,12 @@ '#title' => t('Networks available to socialize'), '#default_value' => variable_get('gigya_selected_networks', array()), '#options' => gigya_get_networks(), - '#required' => TRUE, + '#required' => TRUE, '#description' => t('Select the networks this site should be allowed to connect to via socialize'), - '#weight' => -3, + '#weight' => -100, ); + /* $form['posting'] = array( '#type' => 'fieldset', '#title' => t('Socialize status update options'), @@ -136,19 +141,52 @@ '#description' => t('The given text will be posted to your social networks. You can use !url, !url-alias, !tinyurl, !title, and !user as replacement text.'), '#default_value' => variable_get('gigya_default_format', 'New post: !title !tinyurl'), ); + + */ + + $form['share_ui'] = array( + '#type' => 'fieldset', + '#title' => t('Share UI settings'), + '#description' => t('Set which node types will have the Share UI functionality enabled.'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#weight' => -10, + ); + + + $form['share_ui']['gigya_share_ui_link_title'] = array( + '#type' => 'textfield', + '#title' => t('Link text for "Share UI"'), + '#default_value' => variable_get('gigya_share_ui_link_title', GIGYA_DEFAULT_SHARE_UI_LINK_TITLE), + ); + + $form['share_ui']['gigya_share_ui_types'] = array( + '#type' => 'checkboxes', + '#title' => t('Node types for "Share UI"'), + '#options' => node_get_types('names'), + '#default_value' => variable_get('gigya_share_types', array('story' => 'story', 'blog' => 'blog')), + ); + $form['share_ui']['gigya_share_ui_message'] = array( + '#type' => 'textarea', + '#title' => t('Suggested message for "Share UI"'), + '#default_value' => variable_get('gigya_share_ui_message', GIGYA_DEFAULT_SHARE_UI_MESSAGE), + ); + /* $form['sharing'] = array( '#type' => 'fieldset', '#title' => t('Share with a friend settings'), '#description' => t('Set which node types will have the Share with Friends functionality enabled.'), '#collapsible' => TRUE, '#collapsed' => TRUE, - '#weight' => -2, + '#weight' => -5, ); + $form['sharing']['gigya_share_link_title'] = array( '#type' => 'textfield', '#title' => t('Link text for "share with friends"'), '#default_value' => variable_get('gigya_share_link_title', GIGYA_DEFAULT_SHARE_LINK_TITLE), ); + $form['sharing']['gigya_share_types'] = array( '#type' => 'checkboxes', '#title' => t('Node types for "Share with a friend"'), @@ -160,6 +198,8 @@ '#title' => t('Suggested message for "Share with a friend"'), '#default_value' => variable_get('gigya_share_message', GIGYA_DEFAULT_SHARE_MESSAGE), ); + + */ $form['login_uiconfig'] = array( '#type' => 'fieldset', '#title' => t('Parameters for Login UIConfig'), @@ -336,8 +376,7 @@ '#title' => t('Friends UI URL title'), '#default_value' => variable_get('gigya_friends_uiconfig_link_title', GIGYA_DEFAULT_FRIENDSUI_LINKTITLE), '#description' => t('Leave blank to echo the raw url, otherwise put some text like "view site".'), - ); - + ); $form['friends_uiconfig']['gigya_friends_uiconfig_width'] = array( '#type' => 'textfield', '#title' => t('UI Box Width'), @@ -551,54 +590,89 @@ '#description' => t('Checking this option allows users to connect their user picture to their drupal profile picture'), ); } - + // Start filling the mapping part + $fields = array(); if (module_exists('profile')) { - $form['profile'] = array( - '#type' => 'fieldset', - '#title' => t('Gigya <=> Drupal Profile Mappings'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, + $form['profile'][GIGYA_POPULATE_NON_REG_PROFILE_FIELDS] = array( + '#type' => 'checkbox', + '#title' => t('Map non-registration profile fields.'), + '#description' => t('(You will have to save the configuration to see the change). Normally you can only map fields that are visible on your registration form. Enabling this will allow you to map any of your profile fields. Please note that this can cause unexpected behavior with some configurations. Disable it if you are having problems.'), + '#default_value' => variable_get(GIGYA_POPULATE_NON_REG_PROFILE_FIELDS,FALSE), + '#weight' => -20, ); + // Gather profile fields (profile module) if ($profile_categories = profile_categories()) { $profile_fields = array(); $category_names = array(); foreach ($profile_categories as $category) { $category_names[$category['name']] = $category['name']; - $profiles = profile_form_profile(NULL, NULL, $category['name'], TRUE); + $profiles = profile_form_profile(NULL, NULL, $category['name'], !variable_get(GIGYA_POPULATE_NON_REG_PROFILE_FIELDS,TRUE)); if ($profiles && $profiles[$category['name']]) { foreach ($profiles[$category['name']] as $field_name => $profile) { if (is_array($profile)) { - $form['profile']['gigya_profile_'. $field_name] = array( - '#type' => 'select', - '#title' => $profile['#title'], - '#options' => array_merge(array(0 => ''), _gigya_get_profile_fields()), - '#default_value' => variable_get('gigya_profile_'. $field_name, ''), - ); + $fields[] = $field_name; } } } } } - else { - //drupal_set_message(t("Although the profile module is enabled, You currently have no profile categories created")); + else { + drupal_set_message(t("Although the profile module is enabled, You currently have no profile categories created")); + } + } + // Gather content profile fields + elseif (module_exists('content') && module_exists('content_profile')) { + $profile_types = content_profile_get_types('names'); + if (!empty($profile_types)) { + foreach ($profile_types as $type => $name) { + $typeinfo = content_types($type); + $fields = array_merge($fields, array_keys($typeinfo['fields'])); + } } } else { - $form['from'] = array( + $form['bio_mapping'] = array( '#type' => 'item', - '#title' => t('Profile Module Disabled'), - '#value' => t('If you wish to map profile settings to gigya settings, please enable the profile module'), + '#title' => t('Profile Modules Disabled'), + '#value' => t('If you wish to map profile settings to gigya settings, please enable the Profile module and/or the Content Profile module'), ); + } + if (!empty($fields)) { + // Build the mapping list + $form['bio_mapping'] = array( + '#type' => 'fieldset', + '#title' => t('Gigya <=> Drupal Profile Mappings'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, ); + foreach (_gigya_get_profile_fields() as $field_key => $field_name) { + if ($field_name != 'email') { + $form['bio_mapping']['gigya_bio_'. $field_name] = array( + '#type' => 'select', + '#title' => $field_name, + '#options' => array_combine($fields, $fields), + '#default_value' => variable_get('gigya_bio_'. $field_name, ''), + ); + } + if ($field_name == 'gender') { + $form['bio_mapping']['gigya_bio_gender'] = array_merge($form['bio_mapping']['gigya_bio_gender'], + array('#description' => t('Gender CCK field must have keys "m" and "f". Labels can be whatever needed'))); + } + if ($field_name == 'nickname') { + $form['bio_mapping']['gigya_bio_nickname'] = array_merge($form['bio_mapping']['gigya_bio_nickname'], + array('#description' => t('You may want to map this to "username"'))); + } + if (strpos($field_name, 'birth') !== false) { + $form['bio_mapping']['gigya_bio_'. $field_name] = array_merge($form['bio_mapping']['gigya_bio_'. $field_name], + array('#description' => t('You may map month, day, year to the same date CCK field'))); + } + } } - $form['Facebook fields Population'] = array( '#type' => 'fieldset', '#title' => t('Facebook fields Population'), '#collapsible' => TRUE, '#collapsed' => FALSE ); - - $form['Facebook fields Population'][GIGYA_ENABLE_FACEBOOK_POPULATION] = array( '#type' => 'checkbox', '#title' => t('Enable Facebook fields population'), @@ -613,7 +687,6 @@ '#collapsible' => TRUE, '#collapsed' => TRUE ); - $form[versionInfo]['gigya_socialize_module_version'] = array( '#type' => 'item', '#value' => t('Current module version: ' . GIGYA_MODULE_VERSION), @@ -636,4 +709,5 @@ $form_state['values']['gigya_connect_uiconfig_color_background'] = 'Transparent'; variable_set(GIGYA_ENABLE_FACEBOOK_POPULATION,$form_state['values'][GIGYA_ENABLE_FACEBOOK_POPULATION]); + variable_set(GIGYA_POPULATE_NON_REG_PROFILE_FIELDS,$form_state['values'][GIGYA_POPULATE_NON_REG_PROFILE_FIELDS]); } \ No newline at end of file Index: gigya.info =================================================================== RCS file: /cvs/drupal/contributions/modules/gigya/Attic/gigya.info,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 gigya.info --- gigya.info 26 Nov 2009 15:09:22 -0000 1.1.2.4 +++ gigya.info 1 Feb 2010 08:47:03 -0000 @@ -1,9 +1,5 @@ ; $Id name = Gigya Socialize description = "Allows sites to utilize the Gigya Socialize API for authentication and social network updates." -dependencies[] = popups core = 6.x php = 5.2 - - -

'. $friend_link .'