Changeset 2674554

Timestamp:

02/07/2022 06:44:30 PM (4 years ago)

Author:

msolution

Message:

1.0.1

Location:

mchat

Files:

• assets/icon-128x128.gif (added)
• assets/icon-256x256.gif (added)
• trunk/assets/js/common.js (modified) (7 diffs)
• trunk/includes/templates/admin/wpmchat_main.php (modified) (1 diff)
• trunk/includes/templates/front/wpmchat_inbox.php (modified) (1 diff)
• trunk/includes/wp_mchat.php (modified) (2 diffs)
• trunk/includes/wp_mchat_front.php (modified) (9 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/wp_mchat.php (modified) (1 diff)

mchat/trunk/assets/js/common.js

@@ -134 +134 @@
                 response_html = JSON.parse(response.html);
                 if( ! response_html.err ) {
+                    if( ! $("#wpmchat_messages").is(':visible') ) {
+                        $("#wpmchat_inbox_collapse").click();
+                    }
                     $("#wpmchat_mesg_list").html('');
                     $("#wpmchat_wrapper_message").fadeIn();
@@ -153 +156 @@
                     }
                 } else {
-                    console.log('Error '+response_html.err);
+                    alert(response_html.err);
                 }
                 $("#wpmchat_mesg_list").animate({ scrollTop: $('#wpmchat_mesg_list').prop("scrollHeight")}, 1000);
@@ -159 +162 @@
             else
             {
-                console.log('Error '+response.err+': '+response.msg);
+                alert('Error '+response.err+': '+response.msg);
             }
         }, 'json' );
@@ -218 +221 @@
     });
 
-    $("body").on('click', "#wpmchat_wrapper_inbox > h3", function(event){
+    $("body").on('click', "#wpmchat_inbox_collapse", function(event){
         if( $("#wpmchat_messages").is(':visible') ) {
             $("#wpmchat_messages").slideUp();
@@ -226 +229 @@
         else {
             $("#wpmchat_messages").slideDown();
-            $("#wpmchat_wrapper_inbox").css('height', '350px');
+            $("#wpmchat_wrapper_inbox").css('height', '400px');
             $("#wpmchat_inbox_collapse").removeClass( 'dashicons-arrow-up-alt2' ).addClass( 'dashicons-arrow-down-alt2' );
         }
+    });
+
+    $("#wpmchat_wrapper_inbox > h3").on( 'click', function(event) {
+        $("#wpmchat_inbox_collapse").click();
     });
 
@@ -287 +294 @@
                 response_html = JSON.parse(response.html);
                 $("#wpmchat_inbox_updated").val(response_html.updated);
-                if( response_html.play_a_sound == 'yes' )
+                if( response_html.play_a_sound == 'yes' ) {
                     $("#chatAudio")[0].play();
-
+                }
                 inbox = response_html.inbox;
                 if( inbox && inbox.length >= 1 ) {
                     /* check this */
+                    if( ! $("#wpmchat_messages").is(':visible') ) {
+                        $("#wpmchat_inbox_collapse").click();
+                    }
                     $("#wpmchat_inbox_list").html('');
                     inbox.forEach( function(item){
@@ -325 +335 @@
         myajax.fail( function(err){ console.log( 'Error '+err.status+': '+err.statusText+': call: '+data.action );});
     }
-    setInterval( function(){mchat_heartbeat()}, 10000 );
+    if( wpmchat_ajax_object.wpuser == 1 ) {
+        setInterval( function(){mchat_heartbeat()}, ( 20 * 1000 ) );
+    }
+    else {
+        console.log('not logged in');
+    }
 });
 }

mchat/trunk/includes/templates/admin/wpmchat_main.php

@@ -239 +239 @@
         </div>
 
-      </form>
       <hr class="clear" />
 

mchat/trunk/includes/templates/front/wpmchat_inbox.php

@@ -13 +13 @@
 $wpmchat_settings = get_option( 'wpmchat_settings' );
 
-$branding = '<div id="wpmchat_branding">'.sprintf( __('Powered by %sMChat Plugin%s', 'wpmchat_lang' ), '<a href="https://wordpress.org/plugins/mchat/" target="_blank">', '</a>' ).'</div>';
+$branding = '<div id="wpmchat_branding">'.sprintf( __('Powered by %sMChat Plugin%s', 'wpmchat_lang' ), '<a href="https://www.m-solutions.co.in/" target="_blank">', '</a>' ).'</div>';
 if( $wpmchat_settings['branding'] != 1 )
     $branding = '';

mchat/trunk/includes/wp_mchat.php

@@ -18 +18 @@
         define( "WPMCHAT_URL"               , esc_url( plugins_url( '', WPMCHAT_FILE ) ).'/');
 
-        define( "WPMCHAT_VER"               , "1.0.0"                       );
+        define( "WPMCHAT_VER"               , "1.0.1"                       );
         define( "WPMCHAT_DEBUG"             , false                     );
 
@@ -81 +81 @@
         if( ! $wpmchat_ver = get_option ("wpmchat_ver") )
             update_option ("wpmchat_ver", WPMCHAT_VER);
+
+        if( version_compare( $wpmchat_ver, WPMCHAT_VER ) != 0 )
+            update_option ("wpmchat_ver", WPMCHAT_VER);
     }
 

mchat/trunk/includes/wp_mchat_front.php

@@ -66 +66 @@
         wp_enqueue_script( 'wpmchat-common'     , WPMCHAT_URL.'assets/js/common.js' , array('jquery') );
         $params = array(
-            'wpmchat_url' => WPMCHAT_URL,
-            'ajaxurl' => admin_url('admin-ajax.php'),
-            'ajax_nonce' => wp_create_nonce( 'wpmchat_ajax' ),
+            'wpmchat_url'   => WPMCHAT_URL,
+            'ajaxurl'       => admin_url('admin-ajax.php'),
+            'wpuser'        => (is_user_logged_in()?"1":"0"),
+            'ajax_nonce'    => wp_create_nonce( 'wpmchat_ajax' ),
         );
         wp_localize_script( 'wpmchat-common', 'wpmchat_ajax_object', $params );
@@ -182 +183 @@
 
         if( ! empty( $user_id ) && $user_id == get_current_user_id() ) {
-            return json_encode( array( 'err'=> sprintf( __('Error %d: Something went wrong, plesase refresh page and try again = ','wpmchat_lang' ), __LINE__ ) ) );
+            return json_encode( array( 'err'=> sprintf( __('Error %d: Cant Chat with your self','wpmchat_lang' ), __LINE__ ) ) );
         }
 
@@ -281 +282 @@
     function wpmchat_user_can( $user_id )
     {
+        if( ! is_user_logged_in() ) 
+            return false; 
+
         $wpmchat_settings = get_option( 'wpmchat_settings' );
 
         $roles = get_userdata( $user_id )->roles;
 
-        $ret = array_intersect( $wpmchat_settings['role_list'], $roles );
-
+        $ret = [];
+        if( ! empty( $roles ) && is_array( $roles ) && ! empty( $wpmchat_settings['role_list'] ) && is_array( $wpmchat_settings['role_list'] ) ) {
+            $ret = array_intersect( $wpmchat_settings['role_list'], $roles );
+        }
         $ret = apply_filters( 'wpmchat_user_can', (!! $ret), $user_id );
 
@@ -384 +390 @@
         $ret['inbox'] = [];
         $ret['msgs'] = [];
+        $ret['play_a_sound'] = 'no';
 
         //last_message for this user//
@@ -395 +402 @@
                             LIMIT 1");
 
+        if( ! empty( $last_message ) )
+            $last_message = strtotime( $last_message );
+        else
+            $last_message = current_time('timestamp');
+
         //get inbox - whole of it//
-        if( strtotime( $last_message ) > $inbox_updated ){
+        if( $last_message > $inbox_updated ) {
             $xx = $this->get_latest_inbox();
             $xx = json_decode( $xx, true );
@@ -404 +416 @@
 
         // get messages, only latest //
-        if( $chat_id > 0 && strtotime( $last_message ) > $inbox_updated ){
+        if( $chat_id > 0 && $last_message > $inbox_updated ){
             $chat_msgs = $wpdb->get_results("SELECT * FROM `". WPMCHAT_CHAT_MESG_TABLE . "` WHERE chat_id=".$chat_id." AND posted > '".date("Y-m-d H:i:s", $inbox_updated )."' ORDER BY posted LIMIT ".WPMCHAT_FRONT_PER_PAGE );
             $arr2 = [];
@@ -429 +441 @@
         $ret['chatid'] = $chat_id;
         $ret['userid'] = $user_id;
-        $ret['updated'] = current_time('timestamp');
+        $ret['updated'] = $last_message;
         return json_encode( $ret );
     }
@@ -498 +510 @@
 
         //if the current_user can do this action//
-        if( ! $this->wpmchat_user_can( get_current_user_id() ) )
-            return false;
+        if( ! $this->wpmchat_user_can( get_current_user_id() ) ) {
+            $out = array();
+            $out['msg'] = __('You are not authorized to use this chat.','wpmchat_lang');
+            $out['err'] = __LINE__;
+            header( "Content-Type: application/json" );
+            echo json_encode( $out );
+            die();
+        }
 
         $html = '';
@@ -563 +581 @@
         return wp_kses_post($html);
     }
+
+    function log( $function, $line, $str )
+    {
+        $str = "\n[".current_time('mysql')."] ".$function.":".$line.": ".$str;
+        file_put_contents( __DIR__.'/log.txt', $str, FILE_APPEND );
+    }
 }
 endif;

mchat/trunk/readme.txt

@@ -4 +4 @@
 Tags: chat, plugin, ajax chat, ajax chat plugn, chat plugin, pure ajax chat, one to one chat, one 2 one chat, shortcode, wordpress chat, wordpress plugin, instant message, messaging, communication, contact, message
 Requires at least: 5.0
-Tested up to: 5.8.2
-Requires PHP: 7.4
-Stable tag: 1.0.0
+Tested up to: 5.9
+Requires PHP: 7.4.2
+Stable tag: trunk
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 
 = List of features: =
-
-* MChat Plugins provides a shortcode which can be placed on any post or pages or author pages, which enables a logged in user to have a direct chat with him.
+* No hidden costs, its Free!
+* MChat Plugin provides a shortcode which can be placed on any post or pages or author pages, which enables a logged in user to have a direct chat with the profile owner.
 * **Easy installation**: MChat can be installed using a single shortcode [MCHAT user_id=X], where X is the user_id of the person a logged in user want to chat with. It can also be added to theme files using the do_shortcode function. Check Plugins settings page for more.
 * **Multiple chat** installations can be embedded on the same page. Shortcode can be added to individual author pages.
-* **Fully Ajax**: MChats adds No HTML to the page, and there for does not slow down the page load in any way. MChat loads completely via Ajax.
+* **Fully Ajax**: MChat Plugin adds No HTML to the page, and there for does not slow down the page load in any way. MChat loads completely via Ajax.
 * **Customizable Appearance** MChat provides easy customization for colors. Just set the colors in the admin section, and see your MChat blend with the theme.
-* **Role Base Access** Mchat Provides Role based access. Only registered users with the given roles can use the chat system.
+* **Role Base Access** MChat Provides Role based access. Only registered users with the given roles can use the chat system.
 * **New Message Alert** Users hear a sound when they get a new chat message. 
 * **Email alerts** Users get email alerts when they receive a chat message.
@@ -42 +42 @@
 
 = Will this Slow down my site?
-
 No MChat is a purely Ajax loaded plugin on the front end. It loads up after your site has loaded.
 MChat adds no HTML to your site, and there by does not effect load times of your site.
 
 = How do i customize MChat to match with my theme?
-
 Goto wp-admin > MChat settings page > Appearance and choose colors as per your theme, and enjoy!
 
-= Is MChatPlugin translatable =
+= Is MChat Plugin translatable =
 Yes.
+
+= My question is not listed here!
+Drop a note on WordPress Support forums, and we'll get right back to you.
 
 = Support =
@@ -68 +69 @@
 * Initial release;
 
+= 1.0.1 Monday, February 7, 2022 4:00 PM =
+* Minor Bugs;
+* Checked for WordPress 5.9
+
 == Upgrade Notice ==
 = Updating =

mchat/trunk/wp_mchat.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: MChat User Chat 
-Plugin URI: https://wordpress.org/plugins/mchat/
+Plugin Name: MChat
+Plugin URI: http://www.M-Solutions.co.in
 Description: MChat Plugin allowing WordPress user a one to one chat! Allows your users to chat with Admin, create more leads.
-Version: 1.0.0
+Version: 1.0.1
 Author: MSolution
 Author URI: http://www.M-solutions.co.in/