Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work in Progress (Can use some input/help to push this forward) #11

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Work in Progress (Can use some input/help to push this forward) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6c0bcd
1st commit
pgroot91 Sep 22, 2020
7ead1fd
Update socialify.php
pgroot91 Sep 22, 2020
05ad3c2
Update socialify.php
pgroot91 Sep 22, 2020
25b208d
Update socialify.php
pgroot91 Sep 22, 2020
a0ea070
Update socialify.php
pgroot91 Sep 22, 2020
795dcb3
Update socialify.php
pgroot91 Sep 22, 2020
709f8ca
Added button condition
pgroot91 Sep 23, 2020
9117ef7
Update FacebookLogin.php
pgroot91 Sep 23, 2020
3a5c0a7
Update socialify.php
pgroot91 Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion includes/FacebookLogin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,6 @@ public static function add_setting_secret()
}
}

FacebookLogin::init();
FacebookLogin::init();

?>
69 changes: 63 additions & 6 deletions socialify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public static function init()

add_action('init', [__CLASS__, 'add_endpoint']);

add_action( 'plugins_loaded', [__CLASS__, 'socialify_textdomain']);

add_action( 'show_user_profile', [__CLASS__, 'socialify_user_profile_settings']);
add_action( 'edit_user_profile', [__CLASS__, 'socialify_user_profile_settings']);

add_filter( "plugin_action_links_" . self::$plugin_basename, [__CLASS__, 'add_settings_url_to_plugins_list'] );

add_action('admin_menu', function(){
Expand Down Expand Up @@ -164,6 +169,7 @@ public static function start_auth()

catch(\Exception $e){
error_log('Socialify: Oops, we ran into an issue! ' . $e->getMessage());

wp_redirect(site_url());
exit;
}
Expand Down Expand Up @@ -202,7 +208,7 @@ public static function user_handler($process_data)
return false;
}

$auth_id_meta_key = 'socialify_' . $process_data['provider'] . '_id_' . $user_data->identifier;
$auth_id_meta_key = 'socialify_' . $process_data['provider'] . '_id';
update_user_meta($user->ID, $auth_id_meta_key, $user_data->identifier);

self::auth_user($user);
Expand All @@ -212,7 +218,7 @@ public static function user_handler($process_data)

public static function get_connected_user($identifier = '', $provider = ''){

$auth_id_meta_key = 'socialify_' . $provider . '_id_' . $identifier;
$auth_id_meta_key = 'socialify_' . $provider . '_id';
$users = get_users(array(
'meta_key' => $auth_id_meta_key,
'meta_value' => $identifier,
Expand All @@ -236,11 +242,15 @@ public static function add_user($userProfile){
}

$user_data = [
'user_login' => self::generate_new_userlogin(),
//'user_login' => self::generate_new_userlogin(),
'user_pass' => wp_generate_password( 11, false ),
'user_email' => sanitize_email($userProfile->email),
];

if( ! empty($userProfile->firstName) && ! empty($userProfile->lastName) ){
$user_data['user_login'] = sanitize_text_field($userProfile->firstName) . ' ' . sanitize_text_field($userProfile->lastName);
}

if( ! empty($userProfile->firstName) ){
$user_data['first_name'] = sanitize_text_field($userProfile->firstName);
}
Expand All @@ -257,14 +267,14 @@ public static function add_user($userProfile){
return false;
}

if(!$user = get_user_by('id', $user_id)){
if( ! $user = get_user_by('id', $user_id)){
return false;
}

return $user;
}
}

public static function generate_new_userlogin(){
public static function generate_new_userlogin(){
$users_ids = get_users('fields=ID&number=3&orderby=registered&order=DESC');
$last_id = max($users_ids);
$new_id = $last_id + 1;
Expand Down Expand Up @@ -319,6 +329,53 @@ public static function add_endpoint()
}
}

public static function socialify_textdomain() {
load_plugin_textdomain( 'socialify', FALSE, basename( dirname( __FILE__ ) ) . '/languages/' );
}

public static function socialify_user_profile_settings( $user ) {
if ( FacebookLogin::is_active() || GoogleLogin::is_active() == true ) {
?>
<h3><?php esc_html_e( 'Single Sign-On Settings', 'socialify' ); ?></h3>
<p><?= __('Connect your account and authorize your desired provider(s) for easy access to this website.', 'socialify'); ?></p>

<table class="form-table">
<?php if ( FacebookLogin::is_active() == true ) { ?>
<tr>
<th><label for="facebook_sso"><?php esc_html_e( 'Facebook', 'socialify' ); ?></label></th>
<td>
<?php
$user = get_user_by('id', get_current_user_id());
$meta_f = get_user_meta($user->ID, 'socialify_facebook_id', true);
if( is_user_logged_in() && !empty($meta_f) ) { ?>
<button type="button" name="facebook_sso" value="logout" id="facebook_sso" class="button hide-if-no-js"><?= __('Disconnect', 'socialify'); ?></button><p style="display: inline; min-height: 30px; padding:10px; line-height: 2.15384615;"><?= __('your Facebook account.', 'socialify'); ?></p>
<?php } else { ?>
<button type="button" name="facebook_sso" value="login" id="facebook_sso" class="button hide-if-no-js"><?= __('Connect', 'socialify'); ?></button><p style="display: inline; min-height: 30px; padding:10px; line-height: 2.15384615;"><?= __('your Facebook account.', 'socialify'); ?></p>
<?php } ?>
</td>
</tr>
<?php }

if ( GoogleLogin::is_active() == true ) { ?>
<tr>
<th><label for="google_sso"><?php esc_html_e( 'Google', 'socialify' ); ?></label></th>
<td>
<?php
$user = get_user_by('id', get_current_user_id());
$meta_g = get_user_meta($user->ID, 'socialify_google_id', true);
if( is_user_logged_in() && !empty($meta_g) ) { ?>
<button type="button" name="google_sso" value="logout" id="google_sso"class="button hide-if-no-js"><?= __('Disconnect', 'socialify'); ?></button><p style="display: inline; min-height: 30px; padding:10px; line-height: 2.15384615;"><?= __('your Google account.', 'socialify'); ?></p>
<?php } else { ?>
<button type="button" name="google_sso" value="login" id="google_sso" class="button hide-if-no-js"><?= __('Connect', 'socialify'); ?></button><p style="display: inline; min-height: 30px; padding:10px; line-height: 2.15384615;"><?= __('your Google account.', 'socialify'); ?></p>
<?php } ?>
</td>
</tr>
<?php } ?>
</table>
<?php
}
}

}

General::init();