From fcad1fb41a36e88a8d8f839d548d8cc3afed404e Mon Sep 17 00:00:00 2001
From: Daniel Winzen <daniel@danwin1210.me>
Date: Sun, 27 Dec 2020 16:07:38 +0100
Subject: [PATCH] send to all, members, staff, admins from list of chatters

---
 chat.php         | 37 ++++++++++++++++++++++++-------------
 lang_bg.php      |  2 ++
 lang_cs.php      |  2 ++
 lang_de.php      |  2 ++
 lang_en.php      |  2 ++
 lang_es.php      |  2 ++
 lang_fr.php      |  2 ++
 lang_id.php      |  2 ++
 lang_it.php      |  2 ++
 lang_pt.php      |  2 ++
 lang_ru.php      |  2 ++
 lang_tr.php      |  2 ++
 lang_uk.php      |  2 ++
 lang_zh-Hans.php |  2 ++
 14 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/chat.php b/chat.php
index 70f7f96..c0ec0da 100644
--- a/chat.php
+++ b/chat.php
@@ -67,7 +67,7 @@ function route(){
 		send_waiting_room();
 	}elseif($_REQUEST['action']==='post'){
 		check_session();
-		if(isset($_POST['kick']) && isset($_POST['sendto']) && $_POST['sendto']!=='s &'){
+		if(isset($_POST['kick']) && isset($_POST['sendto']) && $_POST['sendto']!=='s _'){
 			if($U['status']>=5 || ($U['status']>=3 && get_count_mods()==0 && get_setting('memkick'))){
 				if(isset($_POST['what']) && $_POST['what']==='purge'){
 					kick_chatter([$_POST['sendto']], $_POST['message'], true);
@@ -974,7 +974,7 @@ function send_admin(string $arg){
 	$ga=(int) get_setting('guestaccess');
 	print_start('admin');
 	$chlist="<select name=\"name[]\" size=\"5\" multiple><option value=\"\">$I[choose]</option>";
-	$chlist.="<option value=\"s &amp;\">$I[allguests]</option>";
+	$chlist.="<option value=\"s &#42;\">$I[allguests]</option>";
 	$users=[];
 	$stmt=$db->query('SELECT nickname, style, status FROM ' . PREFIX . 'sessions WHERE entry!=0 AND status>0 ORDER BY LOWER(nickname);');
 	while($user=$stmt->fetch(PDO::FETCH_NUM)){
@@ -1796,17 +1796,17 @@ function send_post(string $rejected=''){
 	}
 	if($U['status']>=5){
 		echo '<option ';
-		if($_REQUEST['sendto']==='s #'){
+		if($_REQUEST['sendto']==='s %'){
 			echo 'selected ';
 		}
-		echo "value=\"s #\">-$I[tostaff]-</option>";
+		echo "value=\"s %\">-$I[tostaff]-</option>";
 	}
 	if($U['status']>=6){
 		echo '<option ';
-		if($_REQUEST['sendto']==='s &'){
+		if($_REQUEST['sendto']==='s _'){
 			echo 'selected ';
 		}
-		echo "value=\"s &amp;\">-$I[toadmin]-</option>";
+		echo "value=\"s _\">-$I[toadmin]-</option>";
 	}
 	$disablepm=(bool) get_setting('disablepm');
 	if(!$disablepm){
@@ -2233,21 +2233,32 @@ function print_chatters(){
 		$nc=substr(time(), -6);
 		$G=$M=[];
 		while($user=$stmt->fetch(PDO::FETCH_NUM)){
-			$link="<a href=\"$_SERVER[SCRIPT_NAME]?action=post&amp;session=$U[session]&amp;lang=$language&amp;nc=$nc&amp;sendto=".htmlspecialchars($user[0]).'" target="post">'.style_this(htmlspecialchars($user[0]), $user[1]).'</a>';
+			$lnk="<a href=\"$_SERVER[SCRIPT_NAME]?action=post&amp;session=$U[session]&amp;lang=$language&amp;nc=$nc&amp;sendto=";
+			$link=$lnk.htmlspecialchars($user[0]).'" target="post">'.style_this(htmlspecialchars($user[0]), $user[1]).'</a>';
 			if($user[2]<=2){
 				$G[]=$link;
 			}else{
 				$M[]=$link;
 			}
 		}
+		if($U['status']>5){
+			echo '<th>' . $lnk . 's _" target="post">[' . $I[admin] . ']</a></td>&nbsp;</a></td>';
+		}
+		if($U['status']>4){
+			echo '<th>' . $lnk . 's &#37;" target="post">[' . $I[staff] . ']</a></td>&nbsp;</a></td>';
+		}
 		if(!empty($M)){
+			if($U['status']<2){
 			echo "<th>$I[members]:</th><td>&nbsp;</td><td>".implode(' &nbsp; ', $M).'</td>';
-			if(!empty($G)){
+			} else {
+				echo '<th>' . $lnk . 's ?" target="post">' . $I[members] . ':</a></td>&nbsp;</a></td><td>'.implode(' &nbsp; ', $M).'</td>';
+			}
+			if(!empty($M)){
 				echo '<td>&nbsp;&nbsp;</td>';
 			}
 		}
 		if(!empty($G)){
-			echo "<th>$I[guests]:</th><td>&nbsp;</td><td>".implode(' &nbsp; ', $G).'</td>';
+			echo '<th>' . $lnk . 's *" target="post">' . $I[guests] . ':</a></td>&nbsp;</a></td><td>'.implode(' &nbsp; ', $G).'</td>';
 		}
 		echo '</tr></table></div>';
 	}
@@ -2468,7 +2479,7 @@ function kick_chatter(array $names, string $mes, bool $purge) : bool {
 	$check=$db->prepare('SELECT style, entry FROM ' . PREFIX . 'sessions WHERE nickname=? AND status!=0 AND (status<? OR nickname=?);');
 	$stmt=$db->prepare('UPDATE ' . PREFIX . 'sessions SET lastpost=?, status=0, kickmessage=? WHERE nickname=?;');
 	$all=false;
-	if($names[0]==='s &'){
+	if($names[0]==='s _'){
 		$tmp=$db->query('SELECT nickname FROM ' . PREFIX . 'sessions WHERE status=1;');
 		$names=[];
 		while($name=$tmp->fetch(PDO::FETCH_NUM)){
@@ -2507,7 +2518,7 @@ function kick_chatter(array $names, string $mes, bool $purge) : bool {
 function logout_chatter(array $names){
 	global $U, $db;
 	$stmt=$db->prepare('DELETE FROM ' . PREFIX . 'sessions WHERE nickname=? AND status<?;');
-	if($names[0]==='s &'){
+	if($names[0]==='s _'){
 		$tmp=$db->query('SELECT nickname FROM ' . PREFIX . 'sessions WHERE status=1;');
 		$names=[];
 		while($name=$tmp->fetch(PDO::FETCH_NUM)){
@@ -2960,10 +2971,10 @@ function validate_input() : string {
 	}elseif($_POST['sendto']==='s ?' && $U['status']>=3){
 		$poststatus=3;
 		$displaysend=sprintf(get_setting('msgsendmem'), style_this(htmlspecialchars($U['nickname']), $U['style']));
-	}elseif($_POST['sendto']==='s #' && $U['status']>=5){
+	}elseif($_POST['sendto']==='s %' && $U['status']>=5){
 		$poststatus=5;
 		$displaysend=sprintf(get_setting('msgsendmod'), style_this(htmlspecialchars($U['nickname']), $U['style']));
-	}elseif($_POST['sendto']==='s &' && $U['status']>=6){
+	}elseif($_POST['sendto']==='s _' && $U['status']>=6){
 		$poststatus=6;
 		$displaysend=sprintf(get_setting('msgsendadm'), style_this(htmlspecialchars($U['nickname']), $U['style']));
 	}else{ // known nick in room?
diff --git a/lang_bg.php b/lang_bg.php
index e290886..5dcb683 100644
--- a/lang_bg.php
+++ b/lang_bg.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Произволен цвят',
 	'enter' => 'Влез в чата',
 	'error' => 'Грешка',
+	'admin' => 'Админ',
+	'staff' => 'екипа',
 	'members' => 'Членове',
 	'guests' => 'Гости',
 	'approveguests' => '%d нови гости чакат одобрение',
diff --git a/lang_cs.php b/lang_cs.php
index 9ba5117..f955094 100644
--- a/lang_cs.php
+++ b/lang_cs.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Náhodná barva',
 	'enter' => 'Vstoupit',
 	'error' => 'Chyba',
+	'admin' => 'Admin',
+	'staff' => 'Stnanc',
 	'members' => 'Členové',
 	'guests' => 'Hosté',
 	'approveguests' => '%d noví hsté ke schválení',
diff --git a/lang_de.php b/lang_de.php
index aa1b445..5014824 100644
--- a/lang_de.php
+++ b/lang_de.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Zufällige Farbe',
 	'enter' => 'Chat beitreten',
 	'error' => 'Fehler',
+	'admin' => 'Admin',
+	'staff' => 'Moderatoren',
 	'members' => 'Mitglieder',
 	'guests' => 'Gäste',
 	'approveguests' => '%d neue Gäste zum Hereinlassen',
diff --git a/lang_en.php b/lang_en.php
index eb196da..ff5211a 100644
--- a/lang_en.php
+++ b/lang_en.php
@@ -179,6 +179,8 @@ $I=[
 	'randomcol' => 'Random Colour',
 	'enter' => 'Enter Chat',
 	'error' => 'Error',
+	'admin' => 'Admin',
+	'staff' => 'Staff',
 	'members' => 'Members',
 	'guests' => 'Guests',
 	'approveguests' => '%d new guests to approve',
diff --git a/lang_es.php b/lang_es.php
index cce620d..c8187a5 100644
--- a/lang_es.php
+++ b/lang_es.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Color al azar',
 	'enter' => 'Entrar a la sala',
 	'error' => 'Error',
+	'admin' => 'Admin',
+	'staff' => 'Equipo',
 	'members' => 'Miembros',
 	'guests' => 'Invitados',
 	'approveguests' => '%d nuevos invitados para aprobar',
diff --git a/lang_fr.php b/lang_fr.php
index 314edcc..0d58305 100644
--- a/lang_fr.php
+++ b/lang_fr.php
@@ -175,6 +175,8 @@ $T=[
 	'randomcol' => 'Couleur aléatoire',
 	'enter' => 'Entrer',
 	'error' => 'Erreur',
+	'admin' => 'Administrateur',
+	'staff' => 'Gestionnaire',
 	'members' => 'Membres',
 	'guests' => 'Invités',
 	'approveguests' => '%d nouveaux invités à approuver',
diff --git a/lang_id.php b/lang_id.php
index c6cb928..1c7412c 100644
--- a/lang_id.php
+++ b/lang_id.php
@@ -175,6 +175,8 @@ $T=[
 	'randomcol' => 'Warna acak',
 	'enter' => 'Masuk obrolan',
 	'error' => 'Kesalahan',
+	'admin' => 'Admin',
+	'staff' => 'Staf',
 	'members' => 'Anggota',
 	'guests' => 'Tamu',
 	'approveguests' => '%d tamu baru untuk disetujui',
diff --git a/lang_it.php b/lang_it.php
index 42bcd4c..5ca2c5a 100644
--- a/lang_it.php
+++ b/lang_it.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Colore a caso',
 	'enter' => 'Entrare',
 	'error' => 'Errore',
+	'admin' => 'Admin',
+	'staff' => 'Staff',
 	'members' => 'Registrati',
 	'guests' => 'Ospiti',
 	'approveguests' => '%d nuovi ospiti da accettare',
diff --git a/lang_pt.php b/lang_pt.php
index 73519e7..83f6599 100644
--- a/lang_pt.php
+++ b/lang_pt.php
@@ -179,6 +179,8 @@ $I=[
 	'randomcol' => 'Cor Aleatória',
 	'enter' => 'Entrar no Chat',
 	'error' => 'Erro',
+	'admin' => 'Admin',
+	'staff' => 'Staff',
 	'members' => 'Membros',
 	'guests' => 'Guests',
 	'approveguests' => '%d novos guests para aprovar',
diff --git a/lang_ru.php b/lang_ru.php
index 3e4e9f4..167ad68 100644
--- a/lang_ru.php
+++ b/lang_ru.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Случайный цвет',
 	'enter' => 'Войти в чат',
 	'error' => 'Ошибка',
+	'admin' => 'Администратор',
+	'staff' => 'Служебные',
 	'members' => 'Зарегистрированные',
 	'guests' => 'Гости',
 	'approveguests' => '%d новые гости для одобрения',
diff --git a/lang_tr.php b/lang_tr.php
index ea92876..77967ed 100644
--- a/lang_tr.php
+++ b/lang_tr.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Rastgele renk',
 	'enter' => 'Sohbete gir',
 	'error' => 'Hata',
+	'admin' => 'Yönetici',
+	'staff' => 'Yetkili',
 	'members' => 'Üyeler',
 	'guests' => 'Konuklar',
 	'approveguests' => '%d tane onaylanacak konuk',
diff --git a/lang_uk.php b/lang_uk.php
index d86d10e..afd0c5d 100644
--- a/lang_uk.php
+++ b/lang_uk.php
@@ -179,6 +179,8 @@ $T=[
 	'randomcol' => 'Случайний коляр',
 	'enter' => 'Війти в чат',
 	'error' => 'Ошибка',
+	'admin' => 'Администратор',
+	'staff' => 'Служебні',
 	'members' => 'Зарегістріруванні',
 	'guests' => 'Гості',
 	'approveguests' => '%d новіе гості для одобрення',
diff --git a/lang_zh-Hans.php b/lang_zh-Hans.php
index 1393758..449ce5c 100644
--- a/lang_zh-Hans.php
+++ b/lang_zh-Hans.php
@@ -158,6 +158,8 @@ $T=[
 	'randomcol' => '随机颜色',
 	'enter' => '回车',
 	'error' => '错误',
+	'admin' => '管理',
+	'staff' => '工作人员',
 	'members' => '会员',
 	'guests' => '游客',
 	'approveguests' => '%d新客人批准',