danwin1210/le-chat-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't display kicked people and fix deadlock warning

Browse Source
This commit is contained in:
Daniel Winzen
2016-01-26 20:04:54 +01:00
parent 8765c104f9
commit 2be93518cb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
chat.php
View File

@ -2175,7 +2175,7 @@ function parse_sessions(){
$countmods=0; $countmods=0;
$P=array(); $P=array();
foreach($lines as $temp){ foreach($lines as $temp){
if($temp['entry']!=0){ if($temp['entry']!=0 && $temp['status']>0){
if(!$temp['incognito']){ if(!$temp['incognito']){
$P[$temp['nickname']]=[$temp['nickname'], $temp['style'], $temp['status']]; $P[$temp['nickname']]=[$temp['nickname'], $temp['style'], $temp['status']];
} }
@ -2826,8 +2826,7 @@ function print_messages($delstatus=''){
$timestamps=false; $timestamps=false;
} }
$expire=time()-60*get_setting('messageexpire'); $expire=time()-60*get_setting('messageexpire');
// ignore possible deadlock warning $db->exec("DELETE FROM $C[prefix]messages WHERE id IN (SELECT * FROM (SELECT id FROM $C[prefix]messages WHERE postdate<$expire) AS t);");
@$db->exec("DELETE FROM $C[prefix]messages WHERE postdate<$expire;");
if(!empty($delstatus)){ if(!empty($delstatus)){
$stmt=$db->prepare("SELECT postdate, id, text FROM $C[prefix]messages WHERE ". $stmt=$db->prepare("SELECT postdate, id, text FROM $C[prefix]messages WHERE ".
"id IN (SELECT * FROM (SELECT id FROM $C[prefix]messages WHERE poststatus=1 ORDER BY id DESC LIMIT $messagelimit) AS t) ". "id IN (SELECT * FROM (SELECT id FROM $C[prefix]messages WHERE poststatus=1 ORDER BY id DESC LIMIT $messagelimit) AS t) ".
@ -3373,7 +3372,7 @@ function load_lang(){
function load_config(){ function load_config(){
global $C; global $C;
$C=array( $C=array(
'version' =>'1.15.1', // Script version 'version' =>'1.15.2', // Script version
'dbversion' =>14, // Database version 'dbversion' =>14, // Database version
'keeplimit' =>3, // Amount of messages to keep in the database (multiplied with max messages displayed) - increase if you have many private messages 'keeplimit' =>3, // Amount of messages to keep in the database (multiplied with max messages displayed) - increase if you have many private messages
'msgencrypted' =>false, // Store messages encrypted in the database to prevent other database users from reading them - true/false - visit the setup page after editing! 'msgencrypted' =>false, // Store messages encrypted in the database to prevent other database users from reading them - true/false - visit the setup page after editing!