Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Code Issues Releases Wiki Activity

Fixing Color-Command

Browse Source
This commit is contained in:
Tim Düsterhus 2012-01-30 18:13:16 +01:00
parent 5eb9aea503
commit d2f6e3c88a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
file/lib/system/chat/commands/commands/Color.class.php
View File

@ -38,19 +38,25 @@ class Color extends \wcf\system\chat\commands\AbstractCommand {
public function __construct(\wcf\system\chat\commands\CommandHandler $commandHandler) { public function __construct(\wcf\system\chat\commands\CommandHandler $commandHandler) {
parent::__construct($commandHandler); parent::__construct($commandHandler);
list($color1, $color2) = explode(' ', $commandHandler->getParameters()); try {
if (isset(self::$colors[$color1])) $color1 = self::$colors[$color1]; list($color[1], $color[2]) = explode(' ', $commandHandler->getParameters());
else {
if (strlen($color1) == 3) $color1 = $color1[0].$color1[0].$color1[1].$color1[1].$color1[2].$color1[2];
$color1 = hexdec($color1);
} }
if (isset(self::$colors[$color2])) $color2 = self::$colors[$color2]; catch (\wcf\system\exception\SystemException $e) {
else { $color[1] = $color[2] = $commandHandler->getParameters();
if (strlen($color2) == 3) $color2 = $color2[0].$color2[0].$color2[1].$color2[1].$color2[2].$color2[2];
$color2 = hexdec($color2);
} }
\wcf\util\ChatUtil::writeUserData(array('color' => array(1 => $color1, 2 => $color2))); $regex = new \wcf\system\Regex('^#?([a-f0-9]{3}|[a-f0-9]{6})$', \wcf\system\Regex::CASE_INSENSITIVE);
foreach ($color as $key => $val) {
if (isset(self::$colors[$val])) $color[$key] = self::$colors[$val];
else {
if (!$regex->match($val)) throw new \wcf\system\chat\commands\NotFoundException();
$matches = $regex->getMatches();
$val = $matches[1];
if (strlen($val) == 3) $val = $val[0].$val[0].$val[1].$val[1].$val[2].$val[2];
$color[$key] = hexdec($val);
}
}
\wcf\util\ChatUtil::writeUserData(array('color' => $color));
} }
/** /**