diff --git a/chat.php b/chat.php
index 3917eea..f2863a6 100644
--- a/chat.php
+++ b/chat.php
@@ -259,7 +259,7 @@ function route_setup(){
function prepare_stylesheets(bool $init = false){
global $U, $db, $styles;
$styles['fatal_error'] = 'body{background-color:#000000;color:#FF0033}';
- $styles['default'] = 'body,frame{background-color:#000000;color:#FFFFFF;font-size:14px;text-align:center} ';
+ $styles['default'] = 'body,iframe{background-color:#000000;color:#FFFFFF;font-size:14px;text-align:center}';
$styles['default'] .= 'a:visited{color:#B33CB4} a:active{color:#FF0033} a:link{color:#0000FF} #messages{word-wrap:break-word} ';
$styles['default'] .= 'input,select,textarea{color:#FFFFFF;background-color:#000000} .messages a img{width:15%} .messages a:hover img{width:35%} ';
$styles['default'] .= '.error{color:#FF0033;text-align:left} .delbutton{background-color:#660000} .backbutton{background-color:#004400} #exitbutton{background-color:#AA0000} ';
@@ -281,7 +281,7 @@ function prepare_stylesheets(bool $init = false){
}
$styles['default'] .= 's forwards;z-index:2;background-color:#500000;border:2px solid #ff0000} ';
$styles['default'] .= '@keyframes timeout_messages{0%{top:-200%} 99%{top:-200%} 100%{top:0%}} ';
- $styles['default'] .= '.notes textarea{height:80vh;width:80%}';
+ $styles['default'] .= '.notes textarea{height:80vh;width:80%} iframe{width:100%;height:100%;margin:0;padding:0;border:none}';
if($init || ! $db instanceof PDO){
return;
}
@@ -292,7 +292,7 @@ function prepare_stylesheets(bool $init = false){
}else{
$colbg=get_setting('colbg');
}
- $styles['custom'] = preg_replace("/(\r?\n|\r\n?)/u", '', "body,frame{background-color:#$colbg;color:#$coltxt} $css");
+ $styles['custom'] = preg_replace("/(\r?\n|\r\n?)/u", '', "body,iframe{background-color:#$colbg;color:#$coltxt} $css");
}
function print_stylesheet(bool $init = false){
@@ -732,20 +732,16 @@ function restore_backup(array $C){
if(isset($_POST['filter']) && (isset($code['filters']) || isset($code['linkfilters']))){
$db->exec('DELETE FROM ' . PREFIX . 'filter;');
$db->exec('DELETE FROM ' . PREFIX . 'linkfilter;');
- if(!empty($code['filters'])){
- $stmt=$db->prepare('INSERT INTO ' . PREFIX . 'filter (filtermatch, filterreplace, allowinpm, regex, kick, cs) VALUES (?, ?, ?, ?, ?, ?);');
- foreach($code['filters'] as $filter){
- if(!isset($filter['cs'])){
- $filter['cs']=0;
- }
- $stmt->execute([$filter['match'], $filter['replace'], $filter['allowinpm'], $filter['regex'], $filter['kick'], $filter['cs']]);
+ $stmt=$db->prepare('INSERT INTO ' . PREFIX . 'filter (filtermatch, filterreplace, allowinpm, regex, kick, cs) VALUES (?, ?, ?, ?, ?, ?);');
+ foreach($code['filters'] as $filter){
+ if(!isset($filter['cs'])){
+ $filter['cs']=0;
}
+ $stmt->execute([$filter['match'], $filter['replace'], $filter['allowinpm'], $filter['regex'], $filter['kick'], $filter['cs']]);
}
- if(!empty($code['linkfilters'])){
- $stmt=$db->prepare('INSERT INTO ' . PREFIX . 'linkfilter (filtermatch, filterreplace, regex) VALUES (?, ?, ?);');
- foreach($code['linkfilters'] as $filter){
- $stmt->execute([$filter['match'], $filter['replace'], $filter['regex']]);
- }
+ $stmt=$db->prepare('INSERT INTO ' . PREFIX . 'linkfilter (filtermatch, filterreplace, regex) VALUES (?, ?, ?);');
+ foreach($code['linkfilters'] as $filter){
+ $stmt->execute([$filter['match'], $filter['replace'], $filter['regex']]);
}
if(MEMCACHED){
$memcached->delete(DBNAME . '-' . PREFIX . 'filter');
@@ -1425,10 +1421,10 @@ function send_frameset(){
global $I, $U, $db, $language;
prepare_stylesheets();
send_headers();
- echo ''.meta_html();
+ echo ''.meta_html();
echo ''.get_setting('chatname').'';
print_stylesheet();
- echo '';
+ echo '';
if(isset($_POST['sort'])){
if($_POST['sort']==1){
$U['sortupdown']=1;
@@ -1448,39 +1444,47 @@ function send_frameset(){
$stmt->execute([$U['sortupdown'], $U['nocache'], $U['nocache_old'], $U['nickname']]);
}
}
- if($U['sortupdown']){
- $bottom='#bottom';
- }else{
- $bottom='';
- }
if(($U['status']>=5 || ($U['status']>2 && get_count_mods()==0)) && get_setting('enfileupload')>0 && get_setting('enfileupload')<=$U['status']){
- $postheight=120;
+ $postheight='120px';
}else{
- $postheight=100;
+ $postheight='100px';
}
- if((!isset($_POST['sort']) && !$U['sortupdown']) || (isset($_POST['sort']) && $_POST['sort']==0)){
- echo "