Changeset 26619
- Timestamp:
- Jan 11, 2014, 2:11:21 PM (10 years ago)
- Location:
- extensions/oAuth
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/oAuth/auth.php
r26608 r26619 22 22 if ($provider == 'Persona') 23 23 { 24 if (!verify_ephemeral_key(@$_POST['key']) | empty($_POST['assertion']))24 if (!verify_ephemeral_key(@$_POST['key']) || empty($_POST['assertion'])) 25 25 { 26 26 header('HTTP/1.1 403 Forbidden'); … … 63 63 // check is already registered 64 64 $query = ' 65 SELECT id FROM ' . USERS_TABLE . '65 SELECT user_id FROM ' . USER_INFOS_TABLE . ' 66 66 WHERE oauth_id = "' . implode('---', $oauth_id) . '" 67 67 ;'; -
extensions/oAuth/include/functions.inc.php
r26608 r26619 62 62 function get_oauth_id($user_id) 63 63 { 64 global $conf;65 66 64 $query = ' 67 SELECT oauth_id FROM ' . USER S_TABLE . '68 WHERE ' . $conf['user_fields']['id'] . '= ' . $user_id . '65 SELECT oauth_id FROM ' . USER_INFOS_TABLE . ' 66 WHERE user_id = ' . $user_id . ' 69 67 AND oauth_id != "" 70 68 ;'; -
extensions/oAuth/include/public_events.inc.php
r26608 r26619 28 28 29 29 $query = ' 30 SELECT oauth_id FROM ' . USERS_TABLE . ' 30 SELECT oauth_id 31 FROM ' . USER_INFOS_TABLE . ' AS i 32 INNER JOIN ' . USERS_TABLE . ' AS u 33 ON i.user_id = u.' . $conf['user_fields']['id'] . ' 31 34 WHERE ' . $conf['user_fields']['username'] . ' = "' . pwg_db_real_escape_string($username) . '" 32 35 AND oauth_id != "" … … 125 128 // update oauth field 126 129 $query = ' 127 UPDATE ' . USER S_TABLE . '130 UPDATE ' . USER_INFOS_TABLE . ' 128 131 SET oauth_id = "' . $oauth_id . '" 129 WHERE ' . $conf['user_fields']['id'] . '= ' . $user_id . '132 WHERE user_id = ' . $user_id . ' 130 133 ;'; 131 134 pwg_query($query); -
extensions/oAuth/main.inc.php
r26605 r26619 30 30 } 31 31 32 // force getuserdata() to retrieve 'oauth_id' field33 $conf['user_fields']['oauth_id'] = 'oauth_id';34 35 32 36 33 add_event_handler('init', 'oauth_init'); … … 39 36 { 40 37 add_event_handler('get_admin_plugin_menu_links', 'oauth_admin_plugin_menu_links'); 38 39 add_event_handler('user_list_columns', 'oauth_user_list_columns'); 40 add_event_handler('after_render_user_list', 'oauth_user_list_render'); 41 42 add_event_handler('loc_begin_admin_page', 'oauth_user_list'); 43 44 include_once(OAUTH_PATH . 'include/admin_events.inc.php'); 41 45 } 42 46 else if (!empty($hybridauth_conf) and function_exists('curl_init')) … … 101 105 // } 102 106 // } 103 104 // pwg_unset_session_var('persona_logout');105 107 } 106 107 function oauth_admin_plugin_menu_links($menu)108 {109 $menu[] = array(110 'NAME' => 'Social Connect',111 'URL' => OAUTH_ADMIN,112 );113 return $menu;114 } -
extensions/oAuth/maintain.inc.php
r26604 r26619 32 32 } 33 33 34 $result = pwg_query('SHOW COLUMNS FROM `' . USER_INFOS_TABLE . '` LIKE "oauth_id";'); 35 if (!pwg_db_num_rows($result)) 36 { 37 pwg_query('ALTER TABLE `' . USER_INFOS_TABLE . '` ADD `oauth_id` VARCHAR(255) DEFAULT NULL;'); 38 } 39 40 // move field from users table to user_infos 34 41 $result = pwg_query('SHOW COLUMNS FROM `' . USERS_TABLE . '` LIKE "oauth_id";'); 35 if (!pwg_db_num_rows($result)) 36 { 37 pwg_query('ALTER TABLE `' . USERS_TABLE . '` ADD `oauth_id` VARCHAR(255) DEFAULT NULL;'); 42 if (pwg_db_num_rows($result)) 43 { 44 $query = ' 45 UPDATE `' . USER_INFOS_TABLE . '` AS i 46 SET oauth_id = ( 47 SELECT oauth_id 48 FROM `' . USERS_TABLE . '` AS u 49 WHERE u.'.$conf['user_fields']['id'].' = i.user_id 50 ) 51 ;'; 52 pwg_query($query); 53 54 pwg_query('ALTER TABLE `' . USERS_TABLE . '` DROP `oauth_id`;'); 38 55 } 39 56 … … 76 93 conf_delete_param('oauth'); 77 94 78 pwg_query('ALTER TABLE `'. USER S_TABLE .'` DROP `oauth_id`;');95 pwg_query('ALTER TABLE `'. USER_INFOS_TABLE .'` DROP `oauth_id`;'); 79 96 80 97 @unlink($this->file);
Note: See TracChangeset
for help on using the changeset viewer.