Allow changing frame sorting

This commit is contained in:
Daniel Winzen
2016-09-02 13:20:24 +02:00
parent 8e75c36572
commit abab38e67b
4 changed files with 34 additions and 8 deletions

View File

@ -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

View File

@ -1329,14 +1329,31 @@ function send_frameset(){
echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\"><html><head>$H[meta_html]";
echo '<title>'.get_setting('chatname').'</title>';
print_stylesheet();
echo '</head><frameset rows="100,*,60" border="3" frameborder="3" framespacing="3">';
echo "<frame name=\"post\" src=\"$_SERVER[SCRIPT_NAME]?action=post&session=$U[session]&lang=$language\">";
if(get_setting('enablegreeting')){
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=greeting&session=$U[session]&lang=$language\">";
echo '</head>';
if($U['sortupdown']){
$bottom='#bottom';
}else{
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language\">";
$bottom='';
}
if((!isset($_REQUEST['sort']) && !$U['sortupdown']) || (isset($_REQUEST['sort']) && $_REQUEST['sort']==0)){
echo '<frameset rows="100,*,50" border="3" frameborder="3" framespacing="3">';
echo "<frame name=\"post\" src=\"$_SERVER[SCRIPT_NAME]?action=post&session=$U[session]&lang=$language\">";
if(get_setting('enablegreeting')){
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=greeting&session=$U[session]&lang=$language\">";
}else{
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language$bottom\">";
}
echo "<frame name=\"controls\" src=\"$_SERVER[SCRIPT_NAME]?action=controls&session=$U[session]&lang=$language&sort=1\">";
}else{
echo '<frameset rows="50,*,100" border="3" frameborder="3" framespacing="3">';
echo "<frame name=\"controls\" src=\"$_SERVER[SCRIPT_NAME]?action=controls&session=$U[session]&lang=$language&sort=0\">";
if(get_setting('enablegreeting')){
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=greeting&session=$U[session]&lang=$language\">";
}else{
echo "<frame name=\"view\" src=\"$_SERVER[SCRIPT_NAME]?action=view&session=$U[session]&lang=$language$bottom\">";
}
echo "<frame name=\"post\" src=\"$_SERVER[SCRIPT_NAME]?action=post&session=$U[session]&lang=$language\">";
}
echo "<frame name=\"controls\" src=\"$_SERVER[SCRIPT_NAME]?action=controls&session=$U[session]&lang=$language\">";
echo "<noframes><body>$I[noframes]$H[backtologin]</body></noframes></frameset></html>";
exit;
}
@ -1909,6 +1926,12 @@ function send_controls(){
if($U['status']>=3){
echo "<td><$H[form] target=\"_blank\">$H[commonform]".hidden('action', 'login').submit($I['clone']).'</form></td>';
}
if(!isset($_REQUEST['sort'])){
$sort=0;
}else{
$sort=$_REQUEST['sort'];
}
echo "<td><$H[form] target=\"_parent\">$H[commonform]".hidden('action', 'login').hidden('sort', $sort).submit($I['sortframe']).'</form></td>';
echo "<td><$H[form] target=\"view\">$H[commonform]".hidden('action', 'help').submit($I['randh']).'</form></td>';
echo "<td><$H[form] target=\"_parent\">$H[commonform]".hidden('action', 'logout').submit($I['exit'], 'id="exitbutton"').'</form></td>';
echo '</tr></table>';

View File

@ -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.<br>Aktiviere dies, falls Neuladen nicht funktioniert.',
'nocache' => 'Neulade-Hack für alte Browser hinzufügen.<br>Aktivieren Sie dies, falls Neuladen nicht funktioniert oder<br>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',
);
?>

View File

@ -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.<br>Enable, if refreshing doesn\'t work.',
'nocache' => 'Add refresh hack for old browsers.<br>Enable, if refreshing doesn\'t work or<br>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',
);
?>