'.get_setting('chatname').'

From abab38e67bd455c370a81a09c6f9e4186d4080ae Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Fri, 2 Sep 2016 13:20:24 +0200 Subject: [PATCH] Allow changing frame sorting --- CHANGELOG | 1 + chat.php | 35 +++++++++++++++++++++++++++++------ lang_de.php | 3 ++- lang_en.php | 3 ++- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 800977c..01fdb38 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Add logout button to session view and allow unbanning kicked sessions Allow changing message sort direction Don't escape CSS (fixes use of html entities) +Allow changing frame sorting Version 1.21 - Aug. 29, 2016 Don't display empty option for system messages in delete messages by name diff --git a/chat.php b/chat.php index a186d4c..797a28d 100644 --- a/chat.php +++ b/chat.php @@ -1329,14 +1329,31 @@ function send_frameset(){ echo "$H[meta_html]"; echo ''.get_setting('chatname').''; print_stylesheet(); - echo ''; - echo ""; - if(get_setting('enablegreeting')){ - echo ""; + echo ''; + if($U['sortupdown']){ + $bottom='#bottom'; }else{ - echo ""; + $bottom=''; + } + if((!isset($_REQUEST['sort']) && !$U['sortupdown']) || (isset($_REQUEST['sort']) && $_REQUEST['sort']==0)){ + echo ''; + echo ""; + if(get_setting('enablegreeting')){ + echo ""; + }else{ + echo ""; + } + echo ""; + }else{ + echo ''; + echo ""; + if(get_setting('enablegreeting')){ + echo ""; + }else{ + echo ""; + } + echo ""; } - echo ""; echo "<body>$I[noframes]$H[backtologin]</body>"; exit; } @@ -1909,6 +1926,12 @@ function send_controls(){ if($U['status']>=3){ echo "<$H[form] target=\"_blank\">$H[commonform]".hidden('action', 'login').submit($I['clone']).''; } + if(!isset($_REQUEST['sort'])){ + $sort=0; + }else{ + $sort=$_REQUEST['sort']; + } + echo "<$H[form] target=\"_parent\">$H[commonform]".hidden('action', 'login').hidden('sort', $sort).submit($I['sortframe']).''; echo "<$H[form] target=\"view\">$H[commonform]".hidden('action', 'help').submit($I['randh']).''; echo "<$H[form] target=\"_parent\">$H[commonform]".hidden('action', 'logout').submit($I['exit'], 'id="exitbutton"').''; echo ''; diff --git a/lang_de.php b/lang_de.php index 3b34be0..78af191 100644 --- a/lang_de.php +++ b/lang_de.php @@ -328,7 +328,7 @@ $T=array( 'fatalerror' => 'Fataler Fehler', 'prevmatch' => 'Ihr regex war folgender', 'matchtoolong' => 'Ihr Match war zu lang. Sie können max. 255 Zeichen benutzen. Versuchen Sie diesen aufzuteilen.', - 'nocache' => 'Neulade-Hack für alte Browser hinzufügen.
Aktiviere dies, falls Neuladen nicht funktioniert.', + 'nocache' => 'Neulade-Hack für alte Browser hinzufügen.
Aktivieren Sie dies, falls Neuladen nicht funktioniert oder
für automatisches scrollen, wenn Narchrichten von oben nach unten sortiert sind.', 'disablepm' => 'Private Nachrichten deaktivieren', 'disablechat' => 'Chat deaktivieren', 'disabletext' => 'Chat deaktiviert Nachricht (html)', @@ -355,5 +355,6 @@ $T=array( 'enablegreeting' => 'Zeige eine Begrüßungsnachricht an, befor die Nachrichten geladen werden', 'unban' => 'Entsperren', 'sortupdown' => 'Nachrichten von oben nach unten sortieren', + 'sortframe' => 'Frames sortieren', ); ?> diff --git a/lang_en.php b/lang_en.php index 3bba0a0..f49f54b 100644 --- a/lang_en.php +++ b/lang_en.php @@ -328,7 +328,7 @@ $I=array( 'fatalerror' => 'Fatal error', 'prevmatch' => 'Your match was as follows', 'matchtoolong' => 'Your match was too long. You can use max. 255 characters. Try splitting it up.', - 'nocache' => 'Add refresh hack for old browsers.
Enable, if refreshing doesn\'t work.', + 'nocache' => 'Add refresh hack for old browsers.
Enable, if refreshing doesn\'t work or
for autoscrolling when sorting messages top to bottom.', 'disablepm' => 'Disable private messages', 'disablechat' => 'Disable chat', 'disabletext' => 'Chat disabled message (html)', @@ -355,5 +355,6 @@ $I=array( 'enablegreeting' => 'Show a greeting message before showing the messages', 'unban' => 'Unban', 'sortupdown' => 'Sort messages from top to bottom', + 'sortframe' => 'Sort frames', ); ?>