chat time fixes

chat/refreshmessages.php

@@ -17,7 +17,7 @@ if( $result = $db->query("SELECT * FROM
                          (SELECT id, timestamp, user, avatar, message
                           FROM chatpack_log ORDER BY id DESC LIMIT 125)
                           ORDER BY id ASC") )
-{   
+{
     $newmessages = array();
 
     while( $row = $result->fetchArray() )
@@ -27,16 +27,17 @@ if( $result = $db->query("SELECT * FROM
         $user = $row["user"];
         $avatar = $row["avatar"];
         $message = $row["message"];
-        
+
         $timenow = time();
         $messagetime = date("h:iA", intval($timestamp));
         $messagedate = date("m-d", intval($timestamp));
+        $messagenewtime = date("Y-m-d H:i:s", intval($timestamp));
         $message = utf8_encode($message);
-        
+
         $msgstr = "";  // message components
 
         if( strlen($user) > 0 && strlen($message) > 0 )
-        {  
+        {
             // catch emoticon
 
             $emoticon = false;
@@ -63,12 +64,12 @@ if( $result = $db->query("SELECT * FROM
                 $ending = substr($imagename, $endingpos+1);
                 $originalimg = $originalname . "." . $ending;
             }
-            
+
             if( !$emoticon && !$image )
             {
                 $message = decryptmessage($message);
             }
-            
+
             // catch URLs
 
             /*$message = str_replace("https://", "http://", $message);
@@ -91,7 +92,7 @@ if( $result = $db->query("SELECT * FROM
                                     "<span style=\"color: #d89334;\"><strong>$1</strong></span>", $message);
 
             // user online avatar
-            
+
             //$avatar = "<img class=\"avatarimg\" id=\"$timestamp\" src=\"" . $avatar . "\">";
 
             // unique message key
@@ -101,9 +102,9 @@ if( $result = $db->query("SELECT * FROM
 
             // show user avatar and message
             if($user == $currentuser){
-                $msgstr = $msgstr . "<p class=\"avatarandtext\" id=\"$messagekey\"><li><img src=\"$avatar\" id=\"$timestamp\" class=\"img-circle user-avatar $user\" alt=\"$user\"><div class=\"chat-panel blue-bg messagelike\" id=\"$id\"><div class=\"chat-heading clearfix\"><h4 class=\"pull-left zero-m\">$user</h4><p class=\"pull-right\"><i class=\"fa fa-clock-o\"></i>$messagedate $messagetime </p></div><div class=\"chat-body\">$message</div><span class=\"readed\"><i class=\"fa fa-heart red\" id=\"like$id\"></i></span></div></li></p>";//class="chat-inverted"
+                $msgstr = $msgstr . "<p class=\"avatarandtext\" id=\"$messagekey\"><li><img src=\"$avatar\" id=\"$timestamp\" class=\"img-circle user-avatar $user\" alt=\"$user\"><div class=\"chat-panel blue-bg messagelike\" id=\"$id\"><div class=\"chat-heading clearfix\"><h4 class=\"pull-left zero-m\">$user</h4><p class=\"pull-right\"><i class=\"fa fa-clock-o\"></i><timestamp time=\"$messagenewtime\" class=\"chat-timestamp\">$messagenewtime</timestamp></p></div><div class=\"chat-body\">$message</div></div></li></p>";//class="chat-inverted"
             }else{
-                $msgstr = $msgstr . "<p class=\"avatarandtext\" id=\"$messagekey\"><li class=\"chat-inverted\"><img src=\"$avatar\" id=\"$timestamp\" class=\"img-circle user-avatar $user\" alt=\"$user\"><div class=\"chat-panel red-bg messagelike\" id=\"$id\"><div class=\"chat-heading clearfix\"><h4 class=\"pull-left zero-m\">$user</h4><p class=\"pull-right\"><i class=\"fa fa-clock-o\"></i>$messagedate $messagetime </p></div><div class=\"chat-body\">$message</div><span class=\"readed\"><i class=\"fa fa-heart red liked\" id=\"like$id\"></i></span></div></li></p>";//class="chat-inverted"
+                $msgstr = $msgstr . "<p class=\"avatarandtext\" id=\"$messagekey\"><li class=\"chat-inverted\"><img src=\"$avatar\" id=\"$timestamp\" class=\"img-circle user-avatar $user\" alt=\"$user\"><div class=\"chat-panel red-bg messagelike\" id=\"$id\"><div class=\"chat-heading clearfix\"><h4 class=\"pull-left zero-m\">$user</h4><p class=\"pull-right\"><i class=\"fa fa-clock-o\"></i><timestamp time=\"$messagenewtime\" class=\"chat-timestamp\">$messagenewtime</timestamp></p></div><div class=\"chat-body\">$message</div></div></li></p>";//class="chat-inverted"
             }
 
             array_push($newmessages, $msgstr);
@@ -126,7 +127,7 @@ function decryptmessage($msg)
     $initvector = "aC92eG1PdGhuMXN6";
     $decryptedmessage = openssl_decrypt($msg, "AES-256-CBC", $key, 0, $initvector);
     $decryptedmessage = utf8_encode($decryptedmessage);
-    
+
     return $decryptedmessage;
 }
 
@@ -151,4 +152,4 @@ else
     }
 }
 
-?>
+?>

chatjs.php

@@ -319,13 +319,13 @@ $(document).ready(function()
 
 
     // allowed characters in username
-
+	/*
     $("#username").keyup(function()
     {
         var text = $(this).val();
         $(this).val(text.replace(/[^a-zA-Z0-9 ]/g, ""));
     });
-
+	*/
     // enter username
 
     var user = "";
@@ -398,94 +398,6 @@ $(document).ready(function()
         }
     });
 
-    // log emoticon
-
-    $(".emoticonimg").click(function()
-    {
-        var emoticonselected = $(this);
-        emoticonselected.hide();
-        var emoticonid = $(this).attr("id");
-        var data = "messagedata=" + "specialchar" + emoticonid + "###" + user + "###" + avatar;
-
-        $.ajax
-        ({
-            type: "POST",
-            url: "chat/logmessage.php",
-            data: data,
-            cache: false,
-            success: function(result)
-            {
-                emoticonselected.show();
-            }
-        });
-    });
-
-    // show upload form
-
-    $("#showuploadform").click(function()
-    {
-        $("#showuploadform").hide();
-        $("#showemoticons").show();
-        $("#uploadform").show();
-        $("#emoticons").hide();
-        $("#loadingwrapper").hide();
-
-        var r = Math.floor((Math.random() * 14) + 1);
-        var randomemoticon = "chat/img/emoticon" + r + ".png";
-        $("#showemoticonsimg").attr("src", randomemoticon);
-
-        refresh();  // also use as manual content refresh
-    });
-
-    // upload image
-
-    $("#form").submit(function(event)
-    {
-        event.preventDefault();
-
-        $("#uploadform").hide();
-        $("#showemoticons").hide();
-        $("#loadingwrapper").show();
-
-        var filedata = $("#uploadimage").prop("files")[0];
-        var formdata = new FormData();
-        formdata.append("image", filedata);
-        var datavars = user + "###" + avatar;
-        formdata.append("datavars", datavars);
-
-        $.ajax
-        ({
-            type: "POST",
-            url: "chat/uploadimage.php",
-            cache: false,
-            contentType: false,
-            processData: false,
-            data: formdata,
-            success: function(result)
-            {
-                $("#uploadimage").val("");
-                $("#showuploadform").show();
-                $("#showemoticons").hide();
-                $("#uploadform").hide();
-                $("#loadingwrapper").hide();
-                $("#content").show();
-                $("#emoticons").show();
-            }
-        });
-    });
-
-    // show emoticons
-
-    $("#showemoticons").click(function()
-    {
-        $("#showuploadform").show();
-        $("#showemoticons").hide();
-        $("#uploadform").hide();
-        $("#loadingwrapper").hide();
-        $("#content").show();
-        $("#emoticons").show();
-    });
-
     // refresh content
 
     var content = $("#messages");
@@ -644,48 +556,12 @@ $(document).ready(function()
                                         }
                                     }
 
-                                    // refresh eventlisteners of messages to set likes
-
-                                    $(".messagelike").unbind().click(function()
-                                    {
-                                        if( this.innerHTML.indexOf("target=") == -1 &&
-                                            this.innerHTML.indexOf("_blank") == -1 )
-                                        {
-                                            likemessage(this.id);
-                                        }
-                                    });
                                 });
                             }
                         }
                     }
 
-                    // get and show likes
-
-                    $.ajax
-                    ({
-                        url: "chat/getlikes.php",
-                        cache: false,
-                        success: function(result)
-                        {
-                            var likesandunlikes = result.split("#");
-                            var likedmessages = likesandunlikes[0];
-                            var unlikedmessages = likesandunlikes[1];
-                            var likes = JSON.parse(likedmessages);
-                            var unlikes = JSON.parse(unlikedmessages);
-
-                            for( var i=0; i<likes.length; i++ )
-                            {
-                                var likeid = "#like" + likes[i];
-                                $(likeid).show();
-                            }
 
-                            for( var i=0; i<unlikes.length; i++ )
-                            {
-                                var unlikeid = "#like" + unlikes[i];
-                                $(unlikeid).hide();
-                            }
-                        }
-                    });
 
                     // hide intro
 
@@ -798,21 +674,6 @@ $(document).ready(function()
         }
     }
 
-    // like message
-
-    function likemessage(messageid)
-    {
-        var data = "messageid=" + messageid;
-
-        $.ajax
-        ({
-            type: "POST",
-            url: "chat/setlike.php",
-            data: data,
-            cache: false
-        });
-    }
-
     // update which users are typing
 
     function istyping(u, t)