danwin1210/le-chat-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make colour input use colorChooser, if supported

Browse Source
This commit is contained in:
Daniel Winzen
2016-09-19 23:17:34 +02:00
parent 68a29558b1
commit 96ee911c53
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -8,6 +8,7 @@ Make nicknames in the chatters list clickable to send PMs more easily
Add better multi-byte character support - New dependency: mbstring extension Add better multi-byte character support - New dependency: mbstring extension
Don't send messages to inbox when in incognito Don't send messages to inbox when in incognito
Remove up to two characters from the end of @mention to also match @mention, etc. Remove up to two characters from the end of @mention to also match @mention, etc.
Make colour input use colorChooser, if supported
Version 1.21 - Aug. 29, 2016 Version 1.21 - Aug. 29, 2016
Don't display empty option for system messages in delete messages by name Don't display empty option for system messages in delete messages by name

27
chat.php
View File

@ -555,7 +555,7 @@ function send_setup($C){
foreach($C['colour_settings'] as $setting){ foreach($C['colour_settings'] as $setting){
thr(); thr();
echo '<tr><td><table class="left-table"><tr><th>'.$I[$setting].'</th><td class="right">'; echo '<tr><td><table class="left-table"><tr><th>'.$I[$setting].'</th><td class="right">';
echo "<input type=\"text\" name=\"$setting\" size=\"6\" maxlength=\"6\" pattern=\"[a-fA-F0-9]{6}\" value=\"".htmlspecialchars(get_setting($setting)).'">'; echo "<input type=\"color\" name=\"$setting\" value=\"#".htmlspecialchars(get_setting($setting)).'">';
echo '</td></tr></table></td></tr>'; echo '</td></tr></table></td></tr>';
} }
thr(); thr();
@ -1805,10 +1805,10 @@ function send_profile($arg=''){
thr(); thr();
preg_match('/#([0-9a-f]{6})/i', $U['style'], $matches); preg_match('/#([0-9a-f]{6})/i', $U['style'], $matches);
echo "<tr><td><table class=\"left-table\"><tr><td><b>$I[fontcolour]</b> (<a href=\"$_SERVER[SCRIPT_NAME]?action=colours&amp;session=$U[session]&amp;lang=$language\" target=\"view\">$I[viewexample]</a>)</td><td class=\"right\">"; echo "<tr><td><table class=\"left-table\"><tr><td><b>$I[fontcolour]</b> (<a href=\"$_SERVER[SCRIPT_NAME]?action=colours&amp;session=$U[session]&amp;lang=$language\" target=\"view\">$I[viewexample]</a>)</td><td class=\"right\">";
echo "<input type=\"text\" size=\"6\" maxlength=\"6\" pattern=\"[a-fA-F0-9]{6}\" value=\"$matches[1]\" name=\"colour\"></td></tr></table></td></tr>"; echo "<input type=\"color\" value=\"#$matches[1]\" name=\"colour\"></td></tr></table></td></tr>";
thr(); thr();
echo "<tr><td><table class=\"left-table\"><tr><td><b>$I[bgcolour]</b> (<a href=\"$_SERVER[SCRIPT_NAME]?action=colours&amp;session=$U[session]&amp;lang=$language\" target=\"view\">$I[viewexample]</a>)</td><td class=\"right\">"; echo "<tr><td><table class=\"left-table\"><tr><td><b>$I[bgcolour]</b> (<a href=\"$_SERVER[SCRIPT_NAME]?action=colours&amp;session=$U[session]&amp;lang=$language\" target=\"view\">$I[viewexample]</a>)</td><td class=\"right\">";
echo "<input type=\"text\" size=\"6\" maxlength=\"6\" pattern=\"[a-fA-F0-9]{6}\" value=\"$U[bgcolour]\" name=\"bgcolour\"></td></tr></table></td></tr>"; echo "<input type=\"color\" value=\"#$U[bgcolour]\" name=\"bgcolour\"></td></tr></table></td></tr>";
thr(); thr();
if($U['status']>=3){ if($U['status']>=3){
echo "<tr><td><table class=\"left-table\"><tr><th>$I[fontface]</th><td><table class=\"right-table\">"; echo "<tr><td><table class=\"left-table\"><tr><th>$I[fontface]</th><td><table class=\"right-table\">";
@ -2610,14 +2610,14 @@ function amend_profile(){
}elseif($U['refresh']>150){ }elseif($U['refresh']>150){
$U['refresh']=150; $U['refresh']=150;
} }
if(preg_match('/^[a-f0-9]{6}$/i', $_REQUEST['colour'])){ if(preg_match('/^#([a-f0-9]{6})$/i', $_REQUEST['colour'], $match)){
$U['colour']=$_REQUEST['colour']; $U['colour']=$match[1];
}else{ }else{
preg_match('/#([0-9a-f]{6})/i', $U['style'], $matches); preg_match('/#([0-9a-f]{6})/i', $U['style'], $matches);
$U['colour']=$matches[1]; $U['colour']=$matches[1];
} }
if(preg_match('/^[a-f0-9]{6}$/i', $_REQUEST['bgcolour'])){ if(preg_match('/^#([a-f0-9]{6})$/i', $_REQUEST['bgcolour'], $match)){
$U['bgcolour']=$_REQUEST['bgcolour']; $U['bgcolour']=$match[1];
} }
$fonttags=''; $fonttags='';
if($U['status']>=3 && isSet($_REQUEST['bold'])){ if($U['status']>=3 && isSet($_REQUEST['bold'])){
@ -3220,6 +3220,13 @@ function save_setup($C){
foreach($C['number_settings'] as $setting){ foreach($C['number_settings'] as $setting){
settype($_REQUEST[$setting], 'int'); settype($_REQUEST[$setting], 'int');
} }
foreach($C['colour_settings'] as $setting){
if(preg_match('/^#([a-f0-9]{6})$/i', $_REQUEST[$setting], $match)){
$_REQUEST[$setting]=$match[1];
}else{
unset($_REQUEST[$setting]);
}
}
settype($_REQUEST['guestaccess'], 'int'); settype($_REQUEST['guestaccess'], 'int');
if(!preg_match('/^[01234]$/', $_REQUEST['guestaccess'])){ if(!preg_match('/^[01234]$/', $_REQUEST['guestaccess'])){
unset($_REQUEST['guestaccess']); unset($_REQUEST['guestaccess']);
@ -3237,12 +3244,6 @@ function save_setup($C){
$_REQUEST['rulestxt']=preg_replace("/(\r?\n|\r\n?)/", '<br>', $_REQUEST['rulestxt']); $_REQUEST['rulestxt']=preg_replace("/(\r?\n|\r\n?)/", '<br>', $_REQUEST['rulestxt']);
$_REQUEST['chatname']=htmlspecialchars($_REQUEST['chatname']); $_REQUEST['chatname']=htmlspecialchars($_REQUEST['chatname']);
$_REQUEST['redirect']=htmlspecialchars($_REQUEST['redirect']); $_REQUEST['redirect']=htmlspecialchars($_REQUEST['redirect']);
if(!preg_match('/^[a-f0-9]{6}$/i', $_REQUEST['colbg'])){
unset($_REQUEST['colbg']);
}
if(!preg_match('/^[a-f0-9]{6}$/i', $_REQUEST['coltxt'])){
unset($_REQUEST['coltxt']);
}
if($_REQUEST['memberexpire']<5){ if($_REQUEST['memberexpire']<5){
$_REQUEST['memberexpire']=5; $_REQUEST['memberexpire']=5;
} }