diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2016-03-18 10:56:14 +0100 |
|---|---|---|
| committer | Jakub Senko <jakubsenko@gmail.com> | 2016-03-18 10:56:14 +0100 |
| commit | 46c79bbe901d31e93d321a8de46696d3ac277cd5 (patch) | |
| tree | 9e8e76021ad31be8e53fa1aa3883657a378d0f36 /phpBB | |
| parent | eca4726f3c2fda312b3150b7b252a300d4603fbe (diff) | |
| download | forums-46c79bbe901d31e93d321a8de46696d3ac277cd5.tar forums-46c79bbe901d31e93d321a8de46696d3ac277cd5.tar.gz forums-46c79bbe901d31e93d321a8de46696d3ac277cd5.tar.bz2 forums-46c79bbe901d31e93d321a8de46696d3ac277cd5.tar.xz forums-46c79bbe901d31e93d321a8de46696d3ac277cd5.zip | |
[ticket/9435] Convert bbcode magic numbers to constants
PHPBB3-9435
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/bbcode.php | 26 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 15 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 26 |
3 files changed, 41 insertions, 26 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index eb6133d013..3a71881730 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -219,7 +219,7 @@ class bbcode { switch ($bbcode_id) { - case 0: + case BBCODE_QUOTE_ID: $this->bbcode_cache[$bbcode_id] = array( 'str' => array( '[/quote:$uid]' => $this->bbcode_tpl('quote_close', $bbcode_id) @@ -232,7 +232,7 @@ class bbcode ); break; - case 1: + case BBCODE_B_ID: $this->bbcode_cache[$bbcode_id] = array( 'str' => array( '[b:$uid]' => $this->bbcode_tpl('b_open', $bbcode_id), @@ -241,7 +241,7 @@ class bbcode ); break; - case 2: + case BBCODE_I_ID: $this->bbcode_cache[$bbcode_id] = array( 'str' => array( '[i:$uid]' => $this->bbcode_tpl('i_open', $bbcode_id), @@ -250,7 +250,7 @@ class bbcode ); break; - case 3: + case BBCODE_URL_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '#\[url:$uid\]((.*?))\[/url:$uid\]#s' => $this->bbcode_tpl('url', $bbcode_id), @@ -259,7 +259,7 @@ class bbcode ); break; - case 4: + case BBCODE_IMG_ID: if ($user->optionget('viewimg')) { $this->bbcode_cache[$bbcode_id] = array( @@ -278,7 +278,7 @@ class bbcode } break; - case 5: + case BBCODE_SIZE_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '#\[size=([\-\+]?\d+):$uid\](.*?)\[/size:$uid\]#s' => $this->bbcode_tpl('size', $bbcode_id), @@ -286,7 +286,7 @@ class bbcode ); break; - case 6: + case BBCODE_COLOR_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+):$uid\](.*?)\[/color:$uid\]!is' => $this->bbcode_tpl('color', $bbcode_id), @@ -294,7 +294,7 @@ class bbcode ); break; - case 7: + case BBCODE_U_ID: $this->bbcode_cache[$bbcode_id] = array( 'str' => array( '[u:$uid]' => $this->bbcode_tpl('u_open', $bbcode_id), @@ -303,7 +303,7 @@ class bbcode ); break; - case 8: + case BBCODE_CODE_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '#\[code(?:=([a-z]+))?:$uid\](.*?)\[/code:$uid\]#is' => function ($match) { @@ -313,7 +313,7 @@ class bbcode ); break; - case 9: + case BBCODE_LIST_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '#(\[\/?(list|\*):[mou]?:?$uid\])[\n]{1}#' => "\$1", @@ -333,7 +333,7 @@ class bbcode ); break; - case 10: + case BBCODE_EMAIL_ID: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( '#\[email:$uid\]((.*?))\[/email:$uid\]#is' => $this->bbcode_tpl('email', $bbcode_id), @@ -342,7 +342,7 @@ class bbcode ); break; - case 11: + case BBCODE_FLASH_ID: if ($user->optionget('viewflash')) { $this->bbcode_cache[$bbcode_id] = array( @@ -361,7 +361,7 @@ class bbcode } break; - case 12: + case BBCODE_ATTACH_ID: $this->bbcode_cache[$bbcode_id] = array( 'str' => array( '[/attachment:$uid]' => $this->bbcode_tpl('inline_attachment_close', $bbcode_id) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3a186fd892..5c192d9676 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -183,6 +183,21 @@ define('BBCODE_UID_LEN', 8); // Number of core BBCodes define('NUM_CORE_BBCODES', 12); +// BBCode IDs +define('BBCODE_QUOTE_ID', 0); +define('BBCODE_B_ID', 1); +define('BBCODE_I_ID', 2); +define('BBCODE_URL_ID', 3); +define('BBCODE_IMG_ID', 4); +define('BBCODE_SIZE_ID', 5); +define('BBCODE_COLOR_ID', 6); +define('BBCODE_U_ID', 7); +define('BBCODE_CODE_ID', 8); +define('BBCODE_LIST_ID', 9); +define('BBCODE_EMAIL_ID', 10); +define('BBCODE_FLASH_ID', 11); +define('BBCODE_ATTACH_ID', 12); + // BBCode hard limit define('BBCODE_LIMIT', 1511); diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 97e0dd9f0d..ad277fd90a 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -141,67 +141,67 @@ class bbcode_firstpass extends bbcode // To perform custom validation in extension, use $this->validate_bbcode_by_extension() // method which accepts variable number of parameters $this->bbcodes = array( - 'code' => array('bbcode_id' => 8, 'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class) + 'code' => array('bbcode_id' => BBCODE_CODE_ID, 'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_code($match[1], $match[2]); } )), - 'quote' => array('bbcode_id' => 0, 'regexp' => array('#\[quote(?:="(.*?)")?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class) + 'quote' => array('bbcode_id' => BBCODE_QUOTE_ID, 'regexp' => array('#\[quote(?:="(.*?)")?\](.+)\[/quote\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_quote($match[0]); } )), - 'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class) + 'attachment' => array('bbcode_id' => BBCODE_ATTACH_ID, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_attachment($match[1], $match[2]); } )), - 'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class) + 'b' => array('bbcode_id' => BBCODE_B_ID, 'regexp' => array('#\[b\](.*?)\[/b\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_strong($match[1]); } )), - 'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class) + 'i' => array('bbcode_id' => BBCODE_I_ID, 'regexp' => array('#\[i\](.*?)\[/i\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_italic($match[1]); } )), - 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class) + 'url' => array('bbcode_id' => BBCODE_URL_ID, 'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiU' => function ($match) use($bbcode_class) { return $bbcode_class->validate_url($match[2], ($match[3]) ? $match[3] : $match[4]); } )), - 'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class) + 'img' => array('bbcode_id' => BBCODE_IMG_ID, 'regexp' => array('#\[img\](.*)\[/img\]#uiU' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_img($match[1]); } )), - 'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class) + 'size' => array('bbcode_id' => BBCODE_SIZE_ID, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_size($match[1], $match[2]); } )), - 'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class) + 'color' => array('bbcode_id' => BBCODE_COLOR_ID, 'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_color($match[1], $match[2]); } )), - 'u' => array('bbcode_id' => 7, 'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class) + 'u' => array('bbcode_id' => BBCODE_U_ID, 'regexp' => array('#\[u\](.*?)\[/u\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_underline($match[1]); } )), - 'list' => array('bbcode_id' => 9, 'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class) + 'list' => array('bbcode_id' => BBCODE_LIST_ID, 'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_parse_list($match[0]); } )), - 'email' => array('bbcode_id' => 10, 'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class) + 'email' => array('bbcode_id' => BBCODE_EMAIL_ID, 'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uis' => function ($match) use($bbcode_class) { return $bbcode_class->validate_email($match[1], $match[2]); } )), - 'flash' => array('bbcode_id' => 11, 'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class) + 'flash' => array('bbcode_id' => BBCODE_FLASH_ID, 'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ui' => function ($match) use($bbcode_class) { return $bbcode_class->bbcode_flash($match[1], $match[2], $match[3]); } |