Changeset 2621271

Timestamp:

10/28/2021 09:09:48 AM (4 years ago)

Author:

atomchat

Message:

new release

Location:

atomchat/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/atomchat-admin.php (modified) (4 diffs)
• atomchat.php (modified) (2 diffs)
• includes/atomchat_cloud.php (modified) (2 diffs)
• includes/atomchat_requesthandler.php (modified) (6 diffs)
• js/atomchat-admin.js (modified) (2 diffs)

atomchat/trunk/README.txt

@@ -5 +5 @@
 Requires PHP: 5.6
 Tested up to: 5.7
-Stable tag: 1.0.8
+Stable tag: 1.0.9
 License: GNU General Public License v2.0 or later
 
@@ -164 +164 @@
 = 1.0.8 = 
 * Miscellaneous bug fixes
+
+= 1.0.9 = 
+* Added Username setting
+* Added role configuration for PremiumPress

atomchat/trunk/admin/atomchat-admin.php

@@ -6 +6 @@
 wp_enqueue_script("atomchat-clipboard", dirname(dirname(dirname(dirname(plugin_dir_url( __FILE__ ))))).'/wp-includes/js/clipboard.min.js');
 
-$isBuddyPressActive = '';
+$isBuddyPressActive = $show_username = $show_nickname = $show_displayname = $show_fname_lname = '';
 if(!is_plugin_active('buddypress/bp-loader.php') && !is_plugin_active('buddyboss-platform/bp-loader.php')){
     $isBuddyPressActive = 'style="display:none;"';
@@ -13 +13 @@
 if(!is_plugin_active('mycred/mycred.php')){
     $isMyCredActive = 'style="display:none;"';
+}
+
+switch (get_option("show_name_in_chat")) {
+    case 'username':
+        $show_username = "checked=checked";
+        break;
+    case 'nickname':
+        $show_nickname = "checked=checked";
+        break;
+    case 'fname_lname':
+        $show_fname_lname = "checked=checked";
+        break;
+    case 'display_name':
+        $show_displayname = "checked=checked";
+        break;
+    default:
+        $show_fname_lname = "checked=checked";
+        break;
 }
 
@@ -24 +42 @@
         <ul class="tab-links" id = "submenu">
             <li data-rel="atomchat_adminpanel" class="active menus"><a href="#atomchat_adminpanel">Admin Panel</a></li>
-            <li data-rel="atomchat_layoutsettings" class="menus"><a href="#atomchat_layoutsettings">Layout Settings</a></li>
+            <li data-rel="atomchat_layoutsettings" class="menus"><a href="#atomchat_layoutsettings">General Settings</a></li>
             <li data-rel="atomchat_settings" class="menus"><a href="#atomchat_settings" <?php echo esc_attr($isBuddyPressActive); ?>>BuddyPress/BuddyBoss Settings</a></li>
             <li data-rel="atomchat_auth" class="menus auth"><a href="#atomchat_auth">Authentication Settings</a></li>
@@ -67 +85 @@
                         <td valign="top" style="padding-top: 30px;">
                             <input type = "checkbox" class="show_docked_layout_on_all_pages" value="show_docked_layout_on_all_pages" name="show_docked_layout_on_all_pages" <?php if(get_option('show_docked_layout_on_all_pages') === 'true') echo 'checked="checked"';?> /> Yes
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p class="atomchat-go-para">Display user's name in chat as </p>
+
+                            <input type="radio" id="name1" class="show_name_in_chat" name="chat_username" value="username" <?php echo $show_username?>>
+                            <label for="name1">Username</label><br><br>
+                            <input type="radio" id="name2" class="show_name_in_chat" name="chat_username" value="nickname" <?php echo $show_nickname?>>
+                            <label for="name2">Nickname</label><br><br>
+                            <input type="radio" id="name3" class="show_name_in_chat" name="chat_username" value="fname_lname" <?php echo $show_fname_lname?>>
+                            <label for="name3">First name + Last name</label><br><br>
+                            <input type="radio" id="name4" class="show_name_in_chat" name="chat_username" value="display_name" <?php echo $show_displayname?>>
+                            <label for="name4">Display name</label><br><br>
+
+                            <p><b>Note: </b>If selected name is not set for any user then Username will be displayed as the name of the user in chat</p>
                         </td>
                     </tr>

atomchat/trunk/atomchat.php

@@ -4 +4 @@
 * Plugin Name: AtomChat
 * Description: Voice, video & text chat for your WordPress site
-* Version: 1.0.8
+* Version: 1.0.9
 * Author: AtomChat
 * Author URI: https://www.atomchat.com/
@@ -134 +134 @@
         delete_option('atomchat_api_key');
         delete_option('show_docked_layout_on_all_pages');
+        delete_option('show_name_in_chat');
     }
 }

atomchat/trunk/includes/atomchat_cloud.php

@@ -106 +106 @@
         global $role,$user_info;
 
-        $link = $avatar = $user_id = $user_name = $userRole = $friends = '';
+        $link = $avatar = $user_id = $user_name = $userRole = $friends = $user_fullname = '';
 
         if(is_user_logged_in()) {
             $user_id = $current_user->ID;
+            $show_name_in_chat_as = !empty(get_option("show_name_in_chat"))?get_option("show_name_in_chat"):'fname_lname';
             /* Start: Check if first name and last name both are available then assign it as username */
             if(!empty(get_user_meta( $user_id, 'first_name', true )) && !empty(get_user_meta( $user_id, 'last_name', true ))){
                 $first_name = get_user_meta( $user_id, 'first_name', true );
                 $last_name = get_user_meta( $user_id, 'last_name', true );
-                $user_name = $first_name.' '.$last_name;
-                $display_name = $first_name.' '.$last_name;
+                $user_fullname = $first_name.' '.$last_name;
             }
             /* End: Check if first name and last name both are available then assign it as username */
+
+            /* Start: Set name of the user as per setting */
+            switch ($show_name_in_chat_as) {
+                case 'username':
+                    $user_name = $display_name = $current_user->user_login;
+                    break;
+                case 'nickname':
+                    if(function_exists('get_the_author_meta')){
+                        $user_name = $display_name = get_the_author_meta( 'nickname', $user_id );
+                    }
+                    break;
+                case 'fname_lname':
+                    $user_name = $display_name = $user_fullname;
+                    break;
+                case 'display_name':
+                    $user_name = $display_name = $current_user->display_name;
+                    break;
+                default:
+                    $user_name = $display_name = $user_fullname;
+                    break;
+            }
+            /* End: Set name of the user as per setting */
+
+            /* If name is not set as per setting then assign username as name */
             if(empty($user_name)){
                 $user_name = $current_user->user_login;
             }
             if(empty($display_name)){
-                $display_name = $current_user->display_name;
+                $display_name = $current_user->user_login;
             }
 
@@ -201 +225 @@
             $role = $current_user->membership_level->name;
         }
-        
+
         // To get MemberPres Plugin Membership
         if(is_user_logged_in() && class_exists('MeprUser')){
             $u = new MeprUser($current_user->ID);
             $role = $u->get_active_subscription_titles();
+        }
+
+        //To get PremiumPress Membership
+        if(is_user_logged_in() && isset(get_user_meta($current_user->ID)['ppt_subscription_key'])){
+            $ppt_subscription_key = get_user_meta($current_user->ID)['ppt_subscription_key'][0];
+            $role = _ppt('mem'.$ppt_subscription_key.'_name');
         }
 

atomchat/trunk/includes/atomchat_requesthandler.php

@@ -66 +66 @@
             }
             /*** cms details end ***/
-            
+
             /*** cloud status start ***/
             $atomchat_cloud_active = (is_object($licensedata) && property_exists($licensedata, 'cloud') && !empty($licensedata->cloud)) ? 1 : 0 ;
@@ -102 +102 @@
 }
 
-if( !function_exists( 'atomchat_friend_ajax' ) ) { 
+if( !function_exists( 'atomchat_friend_ajax' ) ) {
     function atomchat_friend_ajax() {
         $response = array();
@@ -125 +125 @@
 }
 
-if( !function_exists( 'atomchat_mycred_setting' ) ) { 
+if( !function_exists( 'atomchat_mycred_setting' ) ) {
     function atomchat_mycred_setting() {
         $response = array();
@@ -150 +150 @@
 }
 
-if( !function_exists( 'atomchat_update_credeits' ) ) { 
+if( !function_exists( 'atomchat_update_credeits' ) ) {
     function atomchat_update_credeits(){
         $data = array();
@@ -172 +172 @@
 }
 
-if( !function_exists( 'atomchat_update_auth_ajax' ) ) { 
+if( !function_exists( 'atomchat_update_auth_ajax' ) ) {
     function atomchat_update_auth_ajax() {
         $response = array();
@@ -185 +185 @@
 }
 
-if( !function_exists( 'atomchat_update_layout_ajax' ) ) { 
+if( !function_exists( 'atomchat_update_layout_ajax' ) ) {
     function atomchat_update_layout_ajax() {
         $response = array();
         $show_docked_layout_on_all_pages = (!empty($_POST['show_docked_layout_on_all_pages']) && is_string($_POST['show_docked_layout_on_all_pages'])) ? sanitize_text_field($_POST['show_docked_layout_on_all_pages']) : '';
+        $show_name_in_chat = (!empty($_POST['show_name_in_chat']) && is_string($_POST['show_name_in_chat'])) ? sanitize_text_field($_POST['show_name_in_chat']) : '';
         update_option( 'show_docked_layout_on_all_pages' , $show_docked_layout_on_all_pages);
+        update_option( 'show_name_in_chat' , $show_name_in_chat);
         header('Content-Type: application/json');
         echo json_encode(array('success' => 'layout settings updated successfully'));

atomchat/trunk/js/atomchat-admin.js

@@ -161 +161 @@
         show_docked_layout_on_all_pages = jQuery("input.show_docked_layout_on_all_pages[type=checkbox]:checked").val();
 
+        show_name_in_chat = jQuery("input.show_name_in_chat[name=chat_username]:checked").val();
+
         if(show_docked_layout_on_all_pages == '' || typeof(show_docked_layout_on_all_pages) == 'undefined'){
             show_docked_layout_on_all_pages = "false";
@@ -170 +172 @@
             'action': 'atomchat_action',
             'api': 'atomchat_update_layout_ajax',
-            'show_docked_layout_on_all_pages': show_docked_layout_on_all_pages
+            'show_docked_layout_on_all_pages': show_docked_layout_on_all_pages,
+            'show_name_in_chat': show_name_in_chat
         }