diff --git a/CHANGELOG b/CHANGELOG index 77e9883..7efb95b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,8 @@ -Version 1.14 - Oct. 30, 2015 +Version 1.14.1 - Nov. 2, 2015 +Ignore possible deadlock warning +Only display the let users in button when there are guests waiting to be let in +Fix filter and ignore feature if they have multiple values + Added support for sqlite and PostgreSQL database engines Replaced deprecated HTML with CSS for HTML5 compatibility Show Topic on login and don't prepend "Topic:" diff --git a/chat.php b/chat.php index 7c7fab1..3cd84b6 100755 --- a/chat.php +++ b/chat.php @@ -522,17 +522,13 @@ function send_backup(){ } if(isSet($_REQUEST['filter'])){ $result=$db->query("SELECT filtermatch, filterreplace, allowinpm, regex, kick FROM $C[prefix]filter;"); - $result->bindColumn(1, $filter['match']); - $result->bindColumn(2, $filter['replace']); - $result->bindColumn(3, $filter['allowinpm']); - $result->bindColumn(4, $filter['regex']); - $result->bindColumn(5, $filter['kick']); - while($result->fetch(PDO::FETCH_BOUND)) $code['filters'][]=$filter; + while($filter=$result->fetch(PDO::FETCH_ASSOC)){ + $code['filters'][]=array('match'=>$filter['filtermatch'], 'replace'=>$filter['filterreplace'], 'allowinpm'=>$filter['allowinpm'], 'regex'=>$filter['regex'], 'kick'=>$filter['kick']); + } $result=$db->query("SELECT filtermatch, filterreplace, regex FROM $C[prefix]linkfilter;"); - $result->bindColumn(1, $filter['match']); - $result->bindColumn(2, $filter['replace']); - $result->bindColumn(3, $filter['regex']); - while($result->fetch(PDO::FETCH_BOUND)) $code['linkfilters'][]=$filter; + while($filter=$result->fetch(PDO::FETCH_ASSOC)){ + $code['linkfilters'][]=array('match'=>$filter['filtermatch'], 'replace'=>$filter['filterreplace'], 'regex'=>$filter['regex']); + } } if(isSet($_REQUEST['members'])){ $result=$db->query("SELECT nickname, passhash, status, refresh, bgcolour, boxwidth, boxheight, notesboxwidth, notesboxheight, regedby, lastlogin, timestamps, embed, incognito, style FROM $C[prefix]members;"); @@ -863,13 +859,9 @@ function send_filter($arg=''){ if(!$C['memcached'] || $memcached->getResultCode()!==Memcached::RES_SUCCESS){ $filters=array(); $result=$db->query("SELECT id, filtermatch, filterreplace, allowinpm, regex, kick FROM $C[prefix]filter;"); - $result->bindColumn(1, $filter['id']); - $result->bindColumn(2, $filter['match']); - $result->bindColumn(3, $filter['replace']); - $result->bindColumn(4, $filter['allowinpm']); - $result->bindColumn(5, $filter['regex']); - $result->bindColumn(6, $filter['kick']); - while($result->fetch(PDO::FETCH_BOUND)) $filters[]=$filter; + while($filter=$result->fetch(PDO::FETCH_ASSOC)){ + $filters[]=array('id'=>$filter['id'], 'match'=>$filter['filtermatch'], 'replace'=>$filter['filterreplace'], 'allowinpm'=>$filter['allowinpm'], 'regex'=>$filter['regex'], 'kick'=>$filter['kick']); + } if($C['memcached']) $memcached->set("$C[dbname]-$C[prefix]filter", $filters); } foreach($filters as $filter){ @@ -921,11 +913,9 @@ function send_linkfilter($arg=''){ if(!$C['memcached'] || $memcached->getResultCode()!==Memcached::RES_SUCCESS){ $filters=array(); $result=$db->query("SELECT id, filtermatch, filterreplace, regex FROM $C[prefix]linkfilter;"); - $result->bindColumn(1, $filter['id']); - $result->bindColumn(2, $filter['match']); - $result->bindColumn(3, $filter['replace']); - $result->bindColumn(4, $filter['regex']); - while($result->fetch(PDO::FETCH_BOUND)) $filters[]=$filter; + while($filter=$result->fetch(PDO::FETCH_ASSOC)){ + $filters[]=array('id'=>$filter['id'], 'match'=>$filter['filtermatch'], 'replace'=>$filter['filterreplace'], 'regex'=>$filter['regex']); + } if($C['memcached']) $memcached->set("$C[dbname]-$C[prefix]linkfilter", $filters); } foreach($filters as $filter){ @@ -1450,9 +1440,11 @@ function print_chatters(){ if($U['status']>=5 && get_setting('guestaccess')==3){ $result=$db->query("SELECT COUNT(*) FROM $C[prefix]sessions WHERE entry=0 AND status=1;"); $temp=$result->fetch(PDO::FETCH_NUM); - if($temp[0]>0) echo '