diff --git a/CHANGELOG b/CHANGELOG index 3832e3a..1d0e23a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.11.1 - Jul. 12, 2015 +Bugfixes and minor changes + Version 1.11 - Jul. 11, 2015 Clean all messages of someone Kick via active session display diff --git a/chat.php b/chat.php index 239be7d..7ecbfbc 100755 --- a/chat.php +++ b/chat.php @@ -560,8 +560,10 @@ function send_sessions(){ if($temp['status']!=0 && $temp['entry']==0 && (!$temp['incognito'] || $temp['status']<$U['status'])){ if($temp['status']==1 || $temp['status']==2) $s=' (G)'; elseif($temp['status']==3) $s=''; - elseif($temp['status']==5 || $temp['status']==6) $s=' (M)'; - elseif($temp['status']>=7) $s=' (A)'; + elseif($temp['status']==5) $s=' (M)'; + elseif($temp['status']==6) $s=' (SM)'; + elseif($temp['status']==7) $s=' (A)'; + elseif($temp['status']==8) $s=' (SA)'; echo ''.style_this($temp['nickname'].$s, $temp['fontinfo']).''.get_timeout($temp['lastpost'], $temp['status']).''; if($U['status']>$temp['status'] || $U['session']==$temp['session']){ echo "$temp[useragent]"; @@ -668,7 +670,7 @@ function send_filter($arg=''){ function send_frameset(){ global $C, $H, $I, $U, $mysqli; header('Content-Type: text/html; charset=UTF-8'); header('Pragma: no-cache'); header('Cache-Control: no-cache'); header('Expires: 0'); - echo "$H[meta_html]"; + echo "$H[meta_html]"; print_stylesheet(); if(isSet($_COOKIE['test'])){ echo "<body>$I[noframes]$H[backtologin]</body>"; @@ -781,16 +783,15 @@ function send_waiting_room(){ }else{ if(isSet($_COOKIE['test'])){ header("Refresh: $C[defaultrefresh]; URL=$_SERVER[SCRIPT_NAME]?action=wait"); - echo "$H[meta_html]"; + print_start('waitingroom', $C['defaultrefresh'], "$_SERVER[SCRIPT_NAME]?action=wait"); }else{ header("Refresh: $C[defaultrefresh]; URL=$_SERVER[SCRIPT_NAME]?action=wait&session=$U[session]"); - echo "$H[meta_html]"; + print_start('waitingroom', $C['defaultrefresh'], "$_SERVER[SCRIPT_NAME]?action=wait&session=$U[session]&lang=$C[lang]"); } - print_stylesheet(); if($wait){ - echo "

$I[waitingroom]

".sprintf($I['waittext'], $U['displayname'], $timeleft).'

'.sprintf($I['waitreload'], $C['defaultrefresh']).'

'; + echo "

$I[waitingroom]

".sprintf($I['waittext'], $U['displayname'], $timeleft).'

'.sprintf($I['waitreload'], $C['defaultrefresh']).'

'; }else{ - echo "

$I[waitingroom]

".sprintf($I['admwaittext'], $U['displayname']).'

'.sprintf($I['waitreload'], $C['defaultrefresh']).'

'; + echo "

$I[waitingroom]

".sprintf($I['admwaittext'], $U['displayname']).'

'.sprintf($I['waitreload'], $C['defaultrefresh']).'

'; } echo "

'; echo "

$I[rules]

".get_setting('rulestxt').''; @@ -1101,8 +1102,10 @@ function print_memberslist(){ echo "'; } } @@ -1126,10 +1129,10 @@ function create_session($setup){ mysqli_stmt_bind_param($stmt, 'i', $_REQUEST['challenge']); mysqli_stmt_execute($stmt); mysqli_stmt_bind_result($stmt, $code); - if(!mysqli_stmt_fetch($stmt)) send_error($I['captchatime']); + if(!mysqli_stmt_fetch($stmt)) send_error($I['captchaexpire']); mysqli_stmt_close($stmt); }else{ - if(!$code=$memcached->get("$C[dbname]-$C[prefix]captcha-$_REQUEST[challenge]")) send_error($I['captchatime']); + if(!$code=$memcached->get("$C[dbname]-$C[prefix]captcha-$_REQUEST[challenge]")) send_error($I['captchaexpire']); $memcached->delete("$C[dbname]-$C[prefix]captcha-$_REQUEST[challenge]"); } if($_REQUEST['captcha']!=$code) send_error($I['wrongcaptcha']); @@ -2375,7 +2378,7 @@ function load_lang(){ function load_config(){ global $C; $C=array( - 'version' =>'1.11', // Script version + 'version' =>'1.11.1', // Script version 'dbversion' =>10, // Database version 'colbg' =>'000000', // Background colour 'coltxt' =>'FFFFFF', // Default text colour diff --git a/lang_de.php b/lang_de.php index 577eda2..c2e9d8b 100644 --- a/lang_de.php +++ b/lang_de.php @@ -93,7 +93,7 @@ $I=array( 'memsuguest' => 'Zu Anwerber machen (G)', 'memreg' => 'Zu regulärem Mitglied machen', 'memmod' => 'Zu Moderator machen (M)', - 'memsumod' => 'Zu Supermod machen (M)', + 'memsumod' => 'Zu Supermod machen (SM)', 'memadm' => 'Zu Admin machen (A)', 'change' => 'Ändern', 'regguest' => 'Gast registrieren', @@ -191,7 +191,7 @@ $I=array( 'butallowdeny' => 'Senden', 'waitempty' => 'Keine weiteren Beitrittsanfragen zu akzeptieren.', 'wrongcaptcha' => 'Falsches Captcha', - 'captchatime' => 'Captcha wurde bereits verwendet oder ist abgelaufen.', + 'captchaexpire' => 'Captcha wurde bereits verwendet oder ist abgelaufen.', 'noguests' => 'Entschuldigung, zur Zeit nur Mitglieder!', 'curchat' => 'Zurzeit sind %d Teilnehmer im Raum:', 'cantreg' => '%s kann nicht registriert werden', diff --git a/lang_en.php b/lang_en.php index db1722e..51c6146 100644 --- a/lang_en.php +++ b/lang_en.php @@ -1,4 +1,3 @@ - 'Superadmin Login', 'sunick' => 'Superadmin Nickname:', 'supass' => 'Superadmin Password:', - 'suconfirm' => 'Confirm Passorwd:', + 'suconfirm' => 'Confirm Password:', 'susuccess' => 'Successfully registered!', 'initbtn' => 'Initalise Chat', 'initdbexist' => 'Database tables already exist! To continue, you have to delete these tables manually first.', @@ -95,7 +94,7 @@ $I=array( 'memsuguest' => 'Set to applicant (G)', 'memreg' => 'Set to regular member', 'memmod' => 'Set to moderator (M)', - 'memsumod' => 'Set to supermod (M)', + 'memsumod' => 'Set to supermod (SM)', 'memadm' => 'Set to admin (A)', 'change' => 'Change', 'regguest' => 'Register Guest', @@ -125,7 +124,7 @@ $I=array( 'waitreload' => 'If this page doesn\'t refresh every %d seconds, use the button below to reload it manually!', 'reload' => 'Reload', 'rules' => 'Rules', - 'talkto' => 'Talk to', + 'talkto' => 'Send to', 'toall' => 'All chatters', 'tomem' => 'Members only', 'tostaff' => 'Staff only', @@ -193,7 +192,7 @@ $I=array( 'butallowdeny' => 'Submit', 'waitempty' => 'No more entry requests to approve.', 'wrongcaptcha' => 'Wrong Captcha', - 'captchatime' => 'Captcha already used or timed out.', + 'captchaexpire' => 'Captcha already used or timed out.', 'noguests' => 'Sorry, currently members only!', 'curchat' => 'Currently %d chatter(s) in room:', 'cantreg' => 'Can\'t register %s',