Changeset 1875313
- Timestamp:
- 05/16/2018 10:06:02 AM (8 years ago)
- Location:
- reve-secure
- Files:
-
- 6 edited
-
tags/1.0.0/inc/ReveSecureUtility.php (modified) (1 diff)
-
tags/1.0.0/inc/RevesecureSettingsMenu.php (modified) (3 diffs)
-
tags/1.0.0/templates/admin.php (modified) (1 diff)
-
trunk/inc/ReveSecureUtility.php (modified) (1 diff)
-
trunk/inc/RevesecureSettingsMenu.php (modified) (3 diffs)
-
trunk/templates/admin.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
reve-secure/tags/1.0.0/inc/ReveSecureUtility.php
r1875164 r1875313 4 4 5 5 6 static function getHextoBin($hexstr){ 7 $n = strlen($hexstr); 8 $sbin=""; 9 $i=0; 10 while($i<$n) 11 { 12 $a =substr($hexstr,$i,2); 13 $c = pack("H*",$a); 14 if ($i==0){$sbin=$c;} 15 else {$sbin.=$c;} 16 $i+=2; 17 } 18 return $sbin; 19 } 20 6 21 static function getHeaders($protocol, $host,$method, $path, $date, $api_key, $secret_key, $post_data){ 7 22 $data = $date . "\n" . $method . "\n" . $host . "\n" . $path . "\n" . $post_data; 8 $accesstoken = $api_key . ":" . hash_hmac('sha256', $data, hex2bin($secret_key));;23 $accesstoken = $api_key . ":" . hash_hmac('sha256', $data, self::getHextoBin($secret_key));; 9 24 $headers = array( 10 25 'Authorization' => 'Basic '. base64_encode($accesstoken), -
reve-secure/tags/1.0.0/inc/RevesecureSettingsMenu.php
r1875207 r1875313 339 339 340 340 function get_user_info_callback(){ 341 error_log("user info called"); 341 342 $nonce_check = check_ajax_referer( 'revesecure-nonce', 'security', true ); 342 343 if(!$nonce_check){ … … 344 345 } 345 346 $user = wp_get_current_user(); 346 $username = get_user_meta ( $user->ID)['Rsecure_Username'][0]; 347 $user_meta = get_user_meta ( $user->ID); 348 $username = $user_meta['Rsecure_Username'][0]; 347 349 $api_key = get_option('Rsecure_Api_Key'); 348 350 $secret_key = get_option('Rsecure_Secret_Key'); … … 359 361 $ip = $this->get_client_ip(); 360 362 $user = wp_get_current_user(); 361 $user_name = get_user_meta ( $user->ID)['Rsecure_Username'][0]; 363 $user_meta = get_user_meta ( $user->ID); 364 $user_name = $user_meta['Rsecure_Username'][0]; 362 365 $api_key = get_option('Rsecure_Api_Key'); 363 366 $secret_key = get_option('Rsecure_Secret_Key'); -
reve-secure/tags/1.0.0/templates/admin.php
r1875164 r1875313 94 94 $counter = 1; 95 95 foreach($users as $user){ 96 $roles = implode (", ", get_userdata ( $user->ID)->roles); 97 $status_state = isset(get_user_meta ( $user->ID)['Rsecure_Status'][0]); 98 $revesecure_username_state = isset(get_user_meta ( $user->ID)['Rsecure_Username'][0]); 99 $revesecure_activated_state = isset(get_user_meta ( $user->ID)['Rsecure_Activated'][0]); 96 $user_data = get_userdata ( $user->ID); 97 $roles = implode (", ", $user_data->roles); 98 $user_meta = get_user_meta ( $user->ID); 99 $status_state = isset($user_meta['Rsecure_Status'][0]); 100 $revesecure_username_state = isset($user_meta['Rsecure_Username'][0]); 101 $revesecure_activated_state = isset($user_meta['Rsecure_Activated'][0]); 100 102 $color_class = (!$status_state || !$revesecure_username_state || !$revesecure_activated_state) ? "tableRed" : ""; 101 $status = (!$status_state) ? "" : ( get_user_meta ( $user->ID)['Rsecure_Status'][0] == "true") ? "checked" : "";102 $username = (!$revesecure_username_state) ? "" : get_user_meta ( $user->ID)['Rsecure_Username'][0];103 $status = (!$status_state) ? "" : ($user_meta['Rsecure_Status'][0] == "true") ? "checked" : ""; 104 $username = (!$revesecure_username_state) ? "" : $user_meta['Rsecure_Username'][0]; 103 105 echo " 104 106 <tr class='$color_class'> -
reve-secure/trunk/inc/ReveSecureUtility.php
r1875161 r1875313 4 4 5 5 6 static function getHextoBin($hexstr){ 7 $n = strlen($hexstr); 8 $sbin=""; 9 $i=0; 10 while($i<$n) 11 { 12 $a =substr($hexstr,$i,2); 13 $c = pack("H*",$a); 14 if ($i==0){$sbin=$c;} 15 else {$sbin.=$c;} 16 $i+=2; 17 } 18 return $sbin; 19 } 20 6 21 static function getHeaders($protocol, $host,$method, $path, $date, $api_key, $secret_key, $post_data){ 7 22 $data = $date . "\n" . $method . "\n" . $host . "\n" . $path . "\n" . $post_data; 8 $accesstoken = $api_key . ":" . hash_hmac('sha256', $data, hex2bin($secret_key));;23 $accesstoken = $api_key . ":" . hash_hmac('sha256', $data, self::getHextoBin($secret_key));; 9 24 $headers = array( 10 25 'Authorization' => 'Basic '. base64_encode($accesstoken), -
reve-secure/trunk/inc/RevesecureSettingsMenu.php
r1875207 r1875313 339 339 340 340 function get_user_info_callback(){ 341 error_log("user info called"); 341 342 $nonce_check = check_ajax_referer( 'revesecure-nonce', 'security', true ); 342 343 if(!$nonce_check){ … … 344 345 } 345 346 $user = wp_get_current_user(); 346 $username = get_user_meta ( $user->ID)['Rsecure_Username'][0]; 347 $user_meta = get_user_meta ( $user->ID); 348 $username = $user_meta['Rsecure_Username'][0]; 347 349 $api_key = get_option('Rsecure_Api_Key'); 348 350 $secret_key = get_option('Rsecure_Secret_Key'); … … 359 361 $ip = $this->get_client_ip(); 360 362 $user = wp_get_current_user(); 361 $user_name = get_user_meta ( $user->ID)['Rsecure_Username'][0]; 363 $user_meta = get_user_meta ( $user->ID); 364 $user_name = $user_meta['Rsecure_Username'][0]; 362 365 $api_key = get_option('Rsecure_Api_Key'); 363 366 $secret_key = get_option('Rsecure_Secret_Key'); -
reve-secure/trunk/templates/admin.php
r1875161 r1875313 94 94 $counter = 1; 95 95 foreach($users as $user){ 96 $roles = implode (", ", get_userdata ( $user->ID)->roles); 97 $status_state = isset(get_user_meta ( $user->ID)['Rsecure_Status'][0]); 98 $revesecure_username_state = isset(get_user_meta ( $user->ID)['Rsecure_Username'][0]); 99 $revesecure_activated_state = isset(get_user_meta ( $user->ID)['Rsecure_Activated'][0]); 96 $user_data = get_userdata ( $user->ID); 97 $roles = implode (", ", $user_data->roles); 98 $user_meta = get_user_meta ( $user->ID); 99 $status_state = isset($user_meta['Rsecure_Status'][0]); 100 $revesecure_username_state = isset($user_meta['Rsecure_Username'][0]); 101 $revesecure_activated_state = isset($user_meta['Rsecure_Activated'][0]); 100 102 $color_class = (!$status_state || !$revesecure_username_state || !$revesecure_activated_state) ? "tableRed" : ""; 101 $status = (!$status_state) ? "" : ( get_user_meta ( $user->ID)['Rsecure_Status'][0] == "true") ? "checked" : "";102 $username = (!$revesecure_username_state) ? "" : get_user_meta ( $user->ID)['Rsecure_Username'][0];103 $status = (!$status_state) ? "" : ($user_meta['Rsecure_Status'][0] == "true") ? "checked" : ""; 104 $username = (!$revesecure_username_state) ? "" : $user_meta['Rsecure_Username'][0]; 103 105 echo " 104 106 <tr class='$color_class'>
Note: See TracChangeset
for help on using the changeset viewer.