Changeset 2551221
- Timestamp:
- 06/21/2021 06:48:16 AM (5 years ago)
- Location:
- atomchat/trunk
- Files:
-
- 7 edited
-
README.txt (modified) (2 diffs)
-
admin/atomchat-admin.php (modified) (6 diffs)
-
atomchat-go.php (modified) (1 diff)
-
atomchat.php (modified) (2 diffs)
-
images/atomchat_auth.png (modified) (previous)
-
includes/atomchat_cloud.php (modified) (5 diffs)
-
js/atomchat-admin.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
atomchat/trunk/README.txt
r2548965 r2551221 5 5 Requires PHP: 5.6 6 6 Tested up to: 5.7 7 Stable tag: 1.0. 57 Stable tag: 1.0.6 8 8 License: GNU General Public License v2.0 or later 9 9 … … 146 146 * Added role configuration for Memberpress membership plugin 147 147 148 = 1.0.6 = 149 * Added BuddyBoss Group Sync -
atomchat/trunk/admin/atomchat-admin.php
r2536984 r2551221 1 1 <?php 2 2 3 wp_enqueue_style("atomchat-admin", dirname(plugin_dir_url( __FILE__ )).'/css/atomchat-admin.css'); 3 4 wp_enqueue_script("atomchat-event", dirname(plugin_dir_url( __FILE__ )).'/js/event.js'); … … 6 7 7 8 $isBuddyPressActive = ''; 8 if(!is_plugin_active('buddypress/bp-loader.php') ){9 if(!is_plugin_active('buddypress/bp-loader.php') && !is_plugin_active('buddyboss-platform/bp-loader.php')){ 9 10 $isBuddyPressActive = 'style="display:none;"'; 10 11 } … … 24 25 <li data-rel="atomchat_adminpanel" class="active menus"><a href="#atomchat_adminpanel">Admin Panel</a></li> 25 26 <li data-rel="atomchat_layoutsettings" class="menus"><a href="#atomchat_layoutsettings">Layout Settings</a></li> 26 <li data-rel="atomchat_settings" class="menus"><a href="#atomchat_settings" <?php echo esc_attr($isBuddyPressActive); ?>>BuddyPress Settings</a></li>27 <li data-rel="atomchat_settings" class="menus"><a href="#atomchat_settings" <?php echo esc_attr($isBuddyPressActive); ?>>BuddyPress/BuddyBoss Settings</a></li> 27 28 <li data-rel="atomchat_auth" class="menus auth"><a href="#atomchat_auth">Authentication Settings</a></li> 28 29 <li data-rel="atomchat_MyCred" class="menus"><a href="#atomchat_MyCred" <?php echo esc_attr($isMyCredActive); ?>>MyCred Settings</a></li> … … 79 80 <div id="atomchat_settings" class="tab"> 80 81 <p class="atomchat-go-para"> 81 Extend AtomChat for BuddyPress !82 Extend AtomChat for BuddyPress/BuddyBoss! 82 83 </p> 83 84 <p> 84 We’ve detected that you’re using BuddyPress . Here are some additional settings that you can configure:85 We’ve detected that you’re using BuddyPress/BuddyBoss. Here are some additional settings that you can configure: 85 86 </p> 86 87 <table cellspacing="1" style="margin-top:20px;"> … … 101 102 <td width="550" style="padding-top: 20px;"> 102 103 <p class="atomchat-go-para"> 103 Synchronize BuddyPress Groups with AtomChat104 </p> 105 <p> 106 If you tick this option, we will create equivalent chat groups in AtomChat and add only those users part of your BuddyPress Group to it.104 Synchronize BuddyPress/BuddyBoss Groups with AtomChat 105 </p> 106 <p> 107 If you tick this option, we will create equivalent chat groups in AtomChat and add only those users who are part of your BuddyPress/BuddyBoss Group to it. 107 108 </p> 108 109 <span class="atomchat-go-para"> … … 110 111 </span> 111 112 <span> 112 If you are facing trouble in syncing old Buddy press Groups with AtomChat, Please Deactivate the AtomChat plugin and Activate again.113 If you are facing trouble in syncing old BuddyPress/BuddyBoss Groups with AtomChat, please Deactivate the AtomChat plugin and Activate again. 113 114 </span> 114 115 </td> -
atomchat/trunk/atomchat-go.php
r2544359 r2551221 36 36 37 37 /** Check if buddypress intalled or not **/ 38 if(empty($isCometReady) && is_plugin_active('buddypress/bp-loader.php')){38 if(empty($isCometReady) && (is_plugin_active('buddypress/bp-loader.php') || is_plugin_active('buddyboss-platform/bp-loader.php'))){ 39 39 update_option('atomchat_show_friends', 'true'); 40 40 atomtchatCurlRequestToAPI('updateUserListSetting', array( -
atomchat/trunk/atomchat.php
r2548965 r2551221 4 4 * Plugin Name: AtomChat 5 5 * Description: Voice, video & text chat for your WordPress site 6 * Version: 1.0. 56 * Version: 1.0.6 7 7 * Author: AtomChat 8 8 * Author URI: https://www.atomchat.com/ … … 18 18 19 19 /* Start: To change the default plugin load order to avoid buddypress plugin conflict */ 20 if(is_plugin_active('buddypress/bp-loader.php')){ 21 $currentPluginLoadOrder = get_option('active_plugins'); 22 23 foreach ($currentPluginLoadOrder as $key => $value) { 24 if($value == 'atomchat/atomchat.php'){ 25 unset($currentPluginLoadOrder[$key]); 26 } 27 } 28 end($currentPluginLoadOrder); 29 $key = key($currentPluginLoadOrder); 30 $currentPluginLoadOrder[$key+1] = 'atomchat/atomchat.php'; 31 update_option('active_plugins', $currentPluginLoadOrder); 32 } 20 $currentPluginLoadOrder = get_option('active_plugins'); 21 foreach ($currentPluginLoadOrder as $key => $value) { 22 if($value == 'atomchat/atomchat.php'){ 23 unset($currentPluginLoadOrder[$key]); 24 } 25 } 26 array_push($currentPluginLoadOrder, 'atomchat/atomchat.php'); 27 update_option('active_plugins', $currentPluginLoadOrder); 33 28 /* End: To change the default plugin load order to avoid buddypress plugin conflict */ 34 29 -
atomchat/trunk/includes/atomchat_cloud.php
r2548965 r2551221 154 154 /** Check third party membership plugin for role */ 155 155 $role = membershipRole($role); 156 156 157 if(empty($avatar)){ 157 158 $avatar = ""; … … 200 201 $role = $current_user->membership_level->name; 201 202 } 202 203 203 204 // To get MemberPres Plugin Membership 204 205 if(is_user_logged_in() && class_exists('MeprUser')){ … … 215 216 } 216 217 } 217 218 218 219 219 /** … … 255 255 } 256 256 } 257 258 257 /** Avatar configuration for DSP dating */ 258 259 259 if(function_exists('display_members_photo')){ 260 260 $avatar = get_site_url().'/wp-content/'.display_members_photo($current_user->ID, $imagepath); … … 335 335 add_shortcode('atomchat', 'atomchatGetShortCode'); 336 336 337 if( is_plugin_active('buddypress/bp-loader.php') && ($groupSync === 'true')) {337 if((is_plugin_active('buddypress/bp-loader.php') || is_plugin_active('buddyboss-platform/bp-loader.php')) && ($groupSync === 'true')) { 338 338 add_action('atomchat_buddypress_groups_sync_scheduler', 'atomchat_buddypress_groups_sync'); 339 339 add_action( 'groups_group_create_complete', 'atomchat_buddypress_groups_sync' ); -
atomchat/trunk/js/atomchat-admin.js
r2536984 r2551221 191 191 }); 192 192 /* End: Copying the docked layout shortcode */ 193 193 194 });
Note: See TracChangeset
for help on using the changeset viewer.