{param}'); + $parser->addCodeDefinition($builder->build()); + $builder = new \JBBCode\CodeDefinitionBuilder('code', '
{param} tag.
+ $return = array('
');
+
+ // Compose the link to the first page.
+ if ($first_shown > 1)
+ {
+ if (strpos($base_url, '$PAGE') !== false)
+ {
+ $target_url = str_replace('$PAGE', 1, $base_url);
+ }
+ else
+ {
+ $target_url = $base_url . 1;
+ }
+
+ $return[] = self::_composeLink($target_url, '« 1');
+ $return[] = '...';
+ }
+
+ // Compose links for each page.
+ for ($page = $first_shown; $page <= $last_shown; $page++)
+ {
+ if ($page == $current_page)
+ {
+ $opening_span = '';
+ }
+ else
+ {
+ $opening_span = '';
+ }
+
+ if (strpos($base_url, '$PAGE') !== false)
+ {
+ $target_url = str_replace('$PAGE', $page, $base_url);
+ }
+ else
+ {
+ $target_url = $base_url . $page;
+ }
+
+ $return[] = self::_composeLink($target_url, $opening_span . $page . '');
+ }
+
+ // Compose the link to the last page.
+ if ($last_shown < $total_pages)
+ {
+ if (strpos($base_url, '$PAGE') !== false)
+ {
+ $target_url = str_replace('$PAGE', $total_pages, $base_url);
+ }
+ else
+ {
+ $target_url = $base_url . $total_pages;
+ }
+
+ $return[] = '...';
+ $return[] = self::_composeLink($target_url, '' . $total_pages . ' »');
+ }
+
+ // Close the that will be preserved.
+This is an [Image Title] that will be preserved.
diff --git a/tests/_data/formatter/less.source1.less b/tests/_data/formatter/less.source1.less
new file mode 100644
index 000000000..6ddfc752c
--- /dev/null
+++ b/tests/_data/formatter/less.source1.less
@@ -0,0 +1,3 @@
+.myfunction(@size) {
+ margin: @size;
+}
diff --git a/tests/_data/formatter/less.source2.less b/tests/_data/formatter/less.source2.less
new file mode 100644
index 000000000..900d74b23
--- /dev/null
+++ b/tests/_data/formatter/less.source2.less
@@ -0,0 +1,7 @@
+.rhymix {
+ color: @foo;
+ background: url('foo/bar.jpg');
+ span {
+ .myfunction(@bar);
+ }
+}
diff --git a/tests/_data/formatter/less.target1.css b/tests/_data/formatter/less.target1.css
new file mode 100644
index 000000000..8e961b07d
--- /dev/null
+++ b/tests/_data/formatter/less.target1.css
@@ -0,0 +1,9 @@
+@charset "UTF-8";
+.rhymix {
+ color: #123456;
+ background: url("../_data/formatter/foo/bar.jpg");
+}
+.rhymix span {
+ margin: 320px;
+}
+
diff --git a/tests/_data/formatter/less.target2.css b/tests/_data/formatter/less.target2.css
new file mode 100644
index 000000000..55b53b753
--- /dev/null
+++ b/tests/_data/formatter/less.target2.css
@@ -0,0 +1,2 @@
+@charset "UTF-8";
+.rhymix{color:#123456;background:url("../_data/formatter/foo/bar.jpg");}.rhymix span{margin:320px;}
diff --git a/tests/_data/formatter/markdown2html.source.md b/tests/_data/formatter/markdown2html.source.md
new file mode 100644
index 000000000..e8851914a
--- /dev/null
+++ b/tests/_data/formatter/markdown2html.source.md
@@ -0,0 +1,17 @@
+This is a Markdown document.
+These lines belong in the same paragraph.
+Markdown usually ignores single line breaks.
+
+ This is an indented code segment.
+ All Markdown variants will recognize it.
+
+```
+This is a fenced code segment.
+Only Markdown Extra will recognize it.
+```
+
+This is a [link](foobar.html).
+This is an .
+
+ - This is a list.
+ - It has two items.
diff --git a/tests/_data/formatter/markdown2html.target1.html b/tests/_data/formatter/markdown2html.target1.html
new file mode 100644
index 000000000..0b7bf1bfc
--- /dev/null
+++ b/tests/_data/formatter/markdown2html.target1.html
@@ -0,0 +1,17 @@
+
+Some of these lines are close together.
+
+Other lines are separated by two newlines.
+
+
+Or three newlines.
+This is a <p>tag</p> that will be escaped if encoded.
+Hello world!
diff --git a/tests/_data/formatter/text2html.target2.html b/tests/_data/formatter/text2html.target2.html new file mode 100644 index 000000000..3a4b2f0f9 --- /dev/null +++ b/tests/_data/formatter/text2html.target2.html @@ -0,0 +1,9 @@ +
tag.
+ $return[] = '
';
+
+ // Return the completed HTML.
+ return implode(' ', $return);
+ }
+
+ /**
+ * Link creation subroutine.
+ *
+ * @param string $target_url
+ * @param string $content
+ * @return string
+ */
+ protected static function _composeLink($target_url, $content)
+ {
+ return '' . $content . '';
+ }
+}
diff --git a/common/framework/parsers/configparser.php b/common/framework/parsers/configparser.php
index ff2ea2b06..51cf3a250 100644
--- a/common/framework/parsers/configparser.php
+++ b/common/framework/parsers/configparser.php
@@ -19,9 +19,9 @@ class ConfigParser
public static function convert()
{
// Load DB info file.
- if (file_exists(RX_BASEDIR . Config::$old_db_config_filename))
+ if (file_exists(\RX_BASEDIR . Config::$old_db_config_filename))
{
- include RX_BASEDIR . Config::$old_db_config_filename;
+ include \RX_BASEDIR . Config::$old_db_config_filename;
}
else
{
@@ -29,16 +29,16 @@ class ConfigParser
}
// Load FTP info file.
- if (file_exists(RX_BASEDIR . Config::$old_ftp_config_filename))
+ if (file_exists(\RX_BASEDIR . Config::$old_ftp_config_filename))
{
- include RX_BASEDIR . Config::$old_ftp_config_filename;
+ include \RX_BASEDIR . Config::$old_ftp_config_filename;
}
// Load selected language file.
- if (file_exists(RX_BASEDIR . Config::$old_lang_config_filename))
+ if (file_exists(\RX_BASEDIR . Config::$old_lang_config_filename))
{
$lang_selected = array();
- $lang_selected_raw = file_get_contents(RX_BASEDIR . Config::$old_lang_config_filename);
+ $lang_selected_raw = file_get_contents(\RX_BASEDIR . Config::$old_lang_config_filename);
$lang_selected_raw = array_map('trim', explode("\n", $lang_selected_raw));
foreach ($lang_selected_raw as $lang_selected_item)
{
@@ -59,7 +59,7 @@ class ConfigParser
}
// Load defaults for the new configuration.
- $config = (include RX_BASEDIR . Config::$default_config_filename);
+ $config = (include \RX_BASEDIR . Config::$default_config_filename);
// Convert database configuration.
if (!isset($db_info->master_db))
@@ -184,7 +184,7 @@ class ConfigParser
{
$default_url = \Context::decodeIdna($default_url);
}
- $config['url']['default'] = $default_url ?: (RX_SSL ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . \RX_BASEURL;
+ $config['url']['default'] = $default_url ?: (\RX_SSL ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . \RX_BASEURL;
$config['url']['http_port'] = $db_info->http_port ?: null;
$config['url']['https_port'] = $db_info->https_port ?: null;
$config['url']['ssl'] = $db_info->use_ssl ?: 'none';
diff --git a/common/framework/parsers/langparser.php b/common/framework/parsers/langparser.php
index 31523abe8..756201fdb 100644
--- a/common/framework/parsers/langparser.php
+++ b/common/framework/parsers/langparser.php
@@ -3,6 +3,7 @@
namespace Rhymix\Framework\Parsers;
use Rhymix\Framework\Lang;
+use Rhymix\Framework\Storage;
/**
* Lang parser class for XE compatibility.
@@ -32,7 +33,7 @@ class LangParser
foreach ($files as $filename)
{
$new_filename = preg_replace('/\.lang\.php$/', '.php', str_replace('jp.lang', 'ja.lang', $filename));
- \FileHandler::rename($filename, $new_filename);
+ Storage::move($filename, $new_filename);
}
}
}
@@ -49,7 +50,7 @@ class LangParser
// Check if the cache file already exists.
if ($output_filename === null)
{
- $output_filename = RX_BASEDIR . 'files/cache/lang/' . md5($filename) . '.' . $language . '.php';
+ $output_filename = \RX_BASEDIR . 'files/cache/lang/' . md5($filename) . '.' . $language . '.php';
if (file_exists($output_filename) && filemtime($output_filename) > filemtime($filename))
{
return $output_filename;
@@ -60,7 +61,7 @@ class LangParser
$xml = @simplexml_load_file($filename);
if ($xml === false)
{
- \FileHandler::writeFile($output_filename, '');
+ Storage::write($output_filename, '');
return false;
}
@@ -95,7 +96,7 @@ class LangParser
$buff .= '$lang->' . $key . ' = ' . var_export($value, true) . ";\n";
}
}
- \FileHandler::writeFile($output_filename, $buff);
+ Storage::write($output_filename, $buff);
return $output_filename;
}
diff --git a/common/framework/storage.php b/common/framework/storage.php
index 4fee32b08..e8de90d7b 100644
--- a/common/framework/storage.php
+++ b/common/framework/storage.php
@@ -7,5 +7,476 @@ namespace Rhymix\Framework;
*/
class Storage
{
+ /**
+ * Check if a path really exists.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function exists($path)
+ {
+ $path = rtrim($path, '/\\');
+ clearstatcache(true, $path);
+ return @file_exists($path);
+ }
+ /**
+ * Check if the given path is a file.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isFile($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @self::exists($path) && @is_file($path);
+ }
+
+ /**
+ * Check if the given path is an empty file.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isEmptyFile($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @self::exists($path) && @is_file($path) && (@filesize($path) == 0);
+ }
+
+
+ /**
+ * Check if the given path is a directory.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isDirectory($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @self::exists($path) && @is_dir($path);
+ }
+
+ /**
+ * Check if the given path is an empty directory.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isEmptyDirectory($path)
+ {
+ $path = rtrim($path, '/\\');
+ if (!self::isDirectory($path))
+ {
+ return false;
+ }
+
+ $iterator = new \FilesystemIterator($path, \FilesystemIterator::SKIP_DOTS);
+ return (iterator_count($iterator)) === 0 ? true : false;
+ }
+
+ /**
+ * Check if the given path is a symbolic link.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isSymlink($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @is_link($path);
+ }
+
+ /**
+ * Check if the given path is a valid symbolic link.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isValidSymlink($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @is_link($path) && ($target = @readlink($path)) !== false && self::exists($target);
+ }
+
+ /**
+ * Check if the given path is readable.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isReadable($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @self::exists($path) && @is_readable($path);
+ }
+
+ /**
+ * Check if the given path is writable.
+ *
+ * @param string $path
+ * @return bool
+ */
+ public static function isWritable($path)
+ {
+ $path = rtrim($path, '/\\');
+ return @self::exists($path) && @is_writable($path);
+ }
+
+ /**
+ * Get the size of a file.
+ *
+ * This method returns the size of a file, or false on error.
+ *
+ * @param string $filename
+ * @return int|false
+ */
+ public static function getSize($filename)
+ {
+ $filename = rtrim($filename, '/\\');
+ if (self::exists($filename) && @is_file($filename) && @is_readable($filename))
+ {
+ return @filesize($filename);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Get the content of a file.
+ *
+ * This method returns the content if it exists and is readable.
+ * Otherwise, it returns false.
+ *
+ * @param string $filename
+ * @return string|false
+ */
+ public static function read($filename)
+ {
+ $filename = rtrim($filename, '/\\');
+ if (self::exists($filename) && @is_file($filename) && @is_readable($filename))
+ {
+ return @file_get_contents($filename);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Write $content to a file.
+ *
+ * This method returns true on success and false on failure.
+ *
+ * @param string $filename
+ * @param string $content
+ * @param string $mode (optional)
+ * @param int $perms (optional)
+ * @return string|false
+ */
+ public static function write($filename, $content, $mode = 'w', $perms = null)
+ {
+ $filename = rtrim($filename, '/\\');
+ $destination_dir = dirname($filename);
+ if (!self::exists($destination_dir))
+ {
+ $mkdir_success = self::createDirectory($destination_dir);
+ if (!$mkdir_success)
+ {
+ return false;
+ }
+ }
+
+ $flags = ($mode === 'a') ? (\FILE_APPEND | \LOCK_EX) : (\LOCK_EX);
+ $write_success = @file_put_contents($filename, $content, $flags);
+ $result = ($write_success === strlen($content)) ? true : false;
+ @chmod($filename, ($perms === null ? (0666 & ~umask()) : $perms));
+ if (function_exists('opcache_invalidate') && substr($filename, -4) === '.php')
+ {
+ @opcache_invalidate($filename, true);
+ }
+ return $result;
+ }
+
+ /**
+ * Copy $source to $destination.
+ *
+ * This method returns true on success and false on failure.
+ * If the destination permissions are not given, they will be copied from the source.
+ *
+ * @param string $source
+ * @param string $destination
+ * @param int $destination_perms
+ * @return bool
+ */
+ public static function copy($source, $destination, $destination_perms = null)
+ {
+ $source = rtrim($source, '/\\');
+ $destination = rtrim($destination, '/\\');
+ if (!self::exists($source))
+ {
+ return false;
+ }
+
+ $destination_dir = dirname($destination);
+ if (!self::exists($destination_dir) && !self::createDirectory($destination_dir))
+ {
+ return false;
+ }
+ elseif (self::isDirectory($destination))
+ {
+ $destination = $destination . '/' . basename($source);
+ }
+
+ $copy_success = @copy($source, $destination);
+ if (!$copy_success)
+ {
+ return false;
+ }
+
+ if ($destination_perms === null)
+ {
+ @chmod($destination, 0777 & @fileperms($source));
+ }
+ else
+ {
+ @chmod($destination, $destination_perms);
+ }
+ return true;
+ }
+
+ /**
+ * Move $source to $destination.
+ *
+ * This method returns true on success and false on failure.
+ *
+ * @param string $source
+ * @param string $destination
+ * @return bool
+ */
+ public static function move($source, $destination)
+ {
+ $source = rtrim($source, '/\\');
+ $destination = rtrim($destination, '/\\');
+ if (!self::exists($source))
+ {
+ return false;
+ }
+
+ $destination_dir = dirname($destination);
+ if (!self::exists($destination_dir) && !self::createDirectory($destination_dir))
+ {
+ return false;
+ }
+ elseif (self::isDirectory($destination))
+ {
+ $destination = $destination . '/' . basename($source);
+ }
+
+ $result = @rename($source, $destination);
+ if (function_exists('opcache_invalidate') && substr($source, -4) === '.php')
+ {
+ @opcache_invalidate($source, true);
+ }
+ return $result;
+ }
+
+ /**
+ * Delete a file.
+ *
+ * This method returns true if the file exists and has been successfully
+ * deleted, and false on any kind of failure.
+ *
+ * @param string $filename
+ * @return bool
+ */
+ public static function delete($filename)
+ {
+ $filename = rtrim($filename, '/\\');
+ $result = @self::exists($filename) && @is_file($filename) && @unlink($filename);
+ if (function_exists('opcache_invalidate') && substr($filename, -4) === '.php')
+ {
+ @opcache_invalidate($filename, true);
+ }
+ return $result;
+ }
+
+ /**
+ * Create a directory.
+ *
+ * @param string $dirname
+ * @return bool
+ */
+ public static function createDirectory($dirname, $mode = null)
+ {
+ $dirname = rtrim($dirname, '/\\');
+ if ($mode === null)
+ {
+ $mode = 0777 & ~umask();
+ }
+ return @mkdir($dirname, $mode, true);
+ }
+
+ /**
+ * Read the list of files in a directory.
+ *
+ * @param string $dirname
+ * @param bool $full_path (optional)
+ * @param bool $skip_dotfiles (optional)
+ * @param bool $skip_subdirs (optional)
+ * @return array|false
+ */
+ public static function readDirectory($dirname, $full_path = true, $skip_dotfiles = true, $skip_subdirs = true)
+ {
+ $dirname = rtrim($dirname, '/\\');
+ if (!self::isDirectory($dirname))
+ {
+ return false;
+ }
+
+ try
+ {
+ $iterator = new \FilesystemIterator($dirname, \FilesystemIterator::CURRENT_AS_PATHNAME);
+ }
+ catch (\UnexpectedValueException $e)
+ {
+ return false;
+ }
+
+ $result = array();
+ foreach ($iterator as $fileinfo)
+ {
+ if (!$skip_subdirs || !is_dir($fileinfo))
+ {
+ $basename = basename($fileinfo);
+ if (!$skip_dotfiles || $basename[0] !== '.')
+ {
+ $result[] = $full_path ? $fileinfo : $basename;
+ }
+ }
+ }
+ sort($result);
+ return $result;
+ }
+
+ /**
+ * Copy a directory recursively.
+ *
+ * @param string $source
+ * @param string $destination
+ * @param string $exclude_regexp (optional)
+ * @return bool
+ */
+ public static function copyDirectory($source, $destination, $exclude_regexp = null)
+ {
+ $source = rtrim($source, '/\\');
+ $destination = rtrim($destination, '/\\');
+ if (!self::isDirectory($source))
+ {
+ return false;
+ }
+ if (!self::isDirectory($destination) && !self::createDirectory($destination))
+ {
+ return false;
+ }
+
+ $rdi_options = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS;
+ $rii_options = \RecursiveIteratorIterator::CHILD_FIRST;
+ $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($source, $rdi_options), $rii_options);
+
+ foreach ($iterator as $path)
+ {
+ $path_source = $path->getPathname();
+ if (strpos($path_source, $source) !== 0)
+ {
+ continue;
+ }
+ if ($exclude_regexp && preg_match($exclude_regexp, $path_source))
+ {
+ continue;
+ }
+
+ $path_destination = $destination . substr($path_source, strlen($source));
+ if ($path->isDir())
+ {
+ $status = self::isDirectory($path_destination) || self::createDirectory($path_destination, $path->getPerms());
+ if (!$status)
+ {
+ return false;
+ }
+ }
+ else
+ {
+ $status = self::copy($path_source, $path_destination, $path->getPerms());
+ if (!$status)
+ {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Move a directory.
+ *
+ * @param string $source
+ * @param string $destination
+ * @return bool
+ */
+ public static function moveDirectory($source, $destination)
+ {
+ return self::move($source, $destination);
+ }
+
+ /**
+ * Delete a directory recursively.
+ *
+ * @param string $dirname
+ * @param bool $delete_self (optional)
+ * @return bool
+ */
+ public static function deleteDirectory($dirname, $delete_self = true)
+ {
+ $dirname = rtrim($dirname, '/\\');
+ if (!self::isDirectory($dirname))
+ {
+ return false;
+ }
+
+ $rdi_options = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS;
+ $rii_options = \RecursiveIteratorIterator::CHILD_FIRST;
+ $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dirname, $rdi_options), $rii_options);
+
+ foreach ($iterator as $path)
+ {
+ if ($path->isDir())
+ {
+ if (!@rmdir($path->getPathname()))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if (!@unlink($path->getPathname()))
+ {
+ return false;
+ }
+ }
+ }
+
+ if ($delete_self)
+ {
+ return @rmdir($dirname);
+ }
+ else
+ {
+ return true;
+ }
+ }
}
diff --git a/common/framework/timer.php b/common/framework/timer.php
new file mode 100644
index 000000000..86842158a
--- /dev/null
+++ b/common/framework/timer.php
@@ -0,0 +1,109 @@
+ null,
+ 'version' => null,
+ 'os' => null,
+ 'is_mobile' => null,
+ 'is_tablet' => null,
+ );
+ if (is_null($ua))
+ {
+ return $result;
+ }
+
+ // Try to guess the OS.
+ if (preg_match('#(Windows|Android|Linux|iOS|OS X|Macintosh)#i', $ua, $matches))
+ {
+ if ($matches[1] === 'Linux' && strpos($ua, 'Android') !== false)
+ {
+ $matches[1] = 'Android';
+ }
+ if ($matches[1] === 'Macintosh' && strpos($ua, 'OS X') !== false)
+ {
+ $matches[1] = 'OS X';
+ }
+ $result->os = $matches[1];
+ }
+
+ // Fill in miscellaneous fields.
+ $result->is_mobile = self::isMobile($ua);
+ $result->is_tablet = self::isTablet($ua);
+
+ // Try to match some of the most common browsers.
+ if (preg_match('#Android ([0-9]+\\.[0-9]+)#', $ua, $matches) && strpos($ua, 'Chrome') === false)
+ {
+ $result->browser = 'Android';
+ $result->version = $matches[1];
+ return $result;
+ }
+ if (preg_match('#Edge/([0-9]+\\.)#', $ua, $matches))
+ {
+ $result->browser = 'Edge';
+ $result->version = $matches[1] . '0';
+ return $result;
+ }
+ if (preg_match('#Trident/([0-9]+)\\.[0-9]+#', $ua, $matches))
+ {
+ $result->browser = 'IE';
+ $result->version = ($matches[1] + 4) . '.0';
+ return $result;
+ }
+ if (preg_match('#(MSIE|Chrome|Firefox|Safari)[ /:]([0-9]+\\.[0-9]+)#', $ua, $matches))
+ {
+ $result->browser = $matches[1] === 'MSIE' ? 'IE' : $matches[1];
+ $result->version = $matches[2];
+ return $result;
+ }
+ if (preg_match('#^Opera/.+(?:Opera |Version/)([0-9]+\\.[0-9]+)$#', $ua, $matches))
+ {
+ $result->browser = 'Opera';
+ $result->version = $matches[1];
+ return $result;
+ }
+ if (preg_match('#(?:Konqueror|KHTML)/([0-9]+\\.[0-9]+)$#', $ua, $matches))
+ {
+ $result->browser = 'Konqueror';
+ $result->version = $matches[1];
+ return $result;
+ }
+
+ return $result;
+ }
+}
diff --git a/common/functions.php b/common/functions.php
index 553307c52..cd55a352c 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -519,6 +519,27 @@ function utf8_check($str)
}
}
+/**
+ * Remove BOM and invalid UTF-8 sequences from file content.
+ *
+ * @param string $str
+ * @return string
+ */
+function utf8_clean($str)
+{
+ if (strlen($str) >= 3 && substr($str, 0, 3) === "\xEF\xBB\xBF")
+ {
+ $str = substr($str, 3);
+ }
+
+ if (!utf8_check($str))
+ {
+ $str = @iconv('UTF-8', 'UTF-8//IGNORE', $str);
+ }
+
+ return $str;
+}
+
/**
* Encode UTF-8 characters outside of the Basic Multilingual Plane in the &#xxxxxx format.
* This allows emoticons and other characters to be stored in MySQL without utf8mb4 support.
diff --git a/common/legacy.php b/common/legacy.php
index 3d4af5102..eec558fd9 100644
--- a/common/legacy.php
+++ b/common/legacy.php
@@ -999,8 +999,7 @@ function json_encode2($data)
*/
function isCrawler($agent = NULL)
{
- $agent = $agent ?: $_SERVER['HTTP_USER_AGENT'];
- return (bool)preg_match('@bot|crawl|sp[iy]der|https?://|google|yahoo|slurp|yeti|daum|teoma|fish|hanrss|facebook|yandex|infoseek|askjeeves|stackrambler@i', $agent);
+ return Rhymix\Framework\UA::isRobot($agent);
}
/**
diff --git a/composer.json b/composer.json
index 5da1f2385..f73391383 100644
--- a/composer.json
+++ b/composer.json
@@ -1,39 +1,44 @@
{
- "name": "rhymix/rhymix",
- "description": "Rhymix",
- "homepage": "https://www.rhymix.org",
- "license": "GPL-2.0+",
- "type": "project",
- "authors": [
- { "name": "Rhymix Developers and Contributors", "email": "devops@rhymix.org" },
- { "name": "NAVER", "email": "developers@xpressengine.com" }
- ],
- "require": {
- "php": ">=5.3.3",
- "ext-curl": "*",
- "ext-gd": "*",
- "ext-iconv": "*",
- "ext-json": "*",
- "ext-mbstring": "*",
- "ext-mcrypt": "*",
- "ext-openssl": "*",
- "ext-pcre": "*",
- "ext-xml": "*",
- "defuse/php-encryption": "1.2.1",
- "ezyang/htmlpurifier": "4.7.*",
- "firephp/firephp-core": "0.4.0",
- "hautelook/phpass": "0.3.*",
- "matthiasmullie/minify": "1.3.*",
- "michelf/php-markdown": "1.5.*",
- "rmccue/requests": "1.6.*",
- "sunra/php-simple-html-dom-parser": "1.5.*",
+ "name": "rhymix/rhymix",
+ "description": "Rhymix",
+ "homepage": "https://www.rhymix.org",
+ "license": "GPL-2.0+",
+ "type": "project",
+ "authors": [
+ { "name": "Rhymix Developers and Contributors", "email": "devops@rhymix.org" },
+ { "name": "NAVER", "email": "developers@xpressengine.com" }
+ ],
+ "require": {
+ "php": ">=5.3.3",
+ "ext-curl": "*",
+ "ext-gd": "*",
+ "ext-iconv": "*",
+ "ext-json": "*",
+ "ext-mbstring": "*",
+ "ext-mcrypt": "*",
+ "ext-openssl": "*",
+ "ext-pcre": "*",
+ "ext-xml": "*",
+ "defuse/php-encryption": "1.2.1",
+ "ezyang/htmlpurifier": "4.7.*",
+ "firephp/firephp-core": "0.4.0",
+ "hautelook/phpass": "0.3.*",
+ "jbbcode/jbbcode": "1.3.*",
+ "leafo/lessphp": "0.5.*",
+ "leafo/scssphp": "0.4.*",
+ "league/html-to-markdown": "4.2.*",
+ "matthiasmullie/minify": "1.3.*",
+ "michelf/php-markdown": "1.6.*",
+ "michelf/php-smartypants": "1.6.0-beta1",
+ "rmccue/requests": "1.6.*",
+ "sunra/php-simple-html-dom-parser": "1.5.*",
"swiftmailer/swiftmailer": "5.4.*",
"true/punycode": "2.*"
- },
- "require-dev": {
- "php": ">=5.4.0",
- "codeception/codeception": "2.1.*",
- "codeception/verify": "0.3.*",
- "codeception/specify": "0.4.*"
- }
+ },
+ "require-dev": {
+ "php": ">=5.4.0",
+ "codeception/codeception": "2.1.*",
+ "codeception/verify": "0.3.*",
+ "codeception/specify": "0.4.*"
+ }
}
diff --git a/composer.lock b/composer.lock
index 05bcf4331..faa67f0d3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "9b062f27815a9b2ef1e700b4664ee864",
- "content-hash": "69345a9112733f99c09fa298ba72fa22",
+ "hash": "61ea4cb999dbb61cd01ba1a4ede5ead6",
+ "content-hash": "ec214228f19d828ce0ea5feeb0a72aba",
"packages": [
{
"name": "defuse/php-encryption",
@@ -176,6 +176,213 @@
],
"time": "2012-08-31 00:00:00"
},
+ {
+ "name": "jbbcode/jbbcode",
+ "version": "v1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jbowens/jBBCode.git",
+ "reference": "645b6a1c0afa92b7d029d3417ebd8b60a5c578b3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jbowens/jBBCode/zipball/645b6a1c0afa92b7d029d3417ebd8b60a5c578b3",
+ "reference": "645b6a1c0afa92b7d029d3417ebd8b60a5c578b3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "3.7.*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "JBBCode": "."
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jackson Owens",
+ "email": "jackson_owens@alumni.brown.edu",
+ "homepage": "http://jbowens.org/",
+ "role": "Developer"
+ }
+ ],
+ "description": "A lightweight but extensible BBCode parser written in PHP 5.3.",
+ "homepage": "http://jbbcode.com/",
+ "keywords": [
+ "BB",
+ "bbcode"
+ ],
+ "time": "2014-07-06 05:48:20"
+ },
+ {
+ "name": "leafo/lessphp",
+ "version": "v0.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/leafo/lessphp.git",
+ "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/leafo/lessphp/zipball/0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+ "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+ "shasum": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.4.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "lessc.inc.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT",
+ "GPL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Leaf Corcoran",
+ "email": "leafot@gmail.com",
+ "homepage": "http://leafo.net"
+ }
+ ],
+ "description": "lessphp is a compiler for LESS written in PHP.",
+ "homepage": "http://leafo.net/lessphp/",
+ "time": "2014-11-24 18:39:20"
+ },
+ {
+ "name": "leafo/scssphp",
+ "version": "v0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/leafo/scssphp.git",
+ "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/leafo/scssphp/zipball/78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a",
+ "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "kherge/box": "~2.5",
+ "phpunit/phpunit": "~3.7",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "bin": [
+ "bin/pscss"
+ ],
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "classmap.php"
+ ],
+ "psr-4": {
+ "Leafo\\ScssPhp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Leaf Corcoran",
+ "email": "leafot@gmail.com",
+ "homepage": "http://leafo.net"
+ }
+ ],
+ "description": "scssphp is a compiler for SCSS written in PHP.",
+ "homepage": "http://leafo.github.io/scssphp/",
+ "keywords": [
+ "css",
+ "less",
+ "sass",
+ "scss",
+ "stylesheet"
+ ],
+ "time": "2015-11-09 14:44:09"
+ },
+ {
+ "name": "league/html-to-markdown",
+ "version": "4.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/html-to-markdown.git",
+ "reference": "9a5becc8c6b520920fb846afefcfd7faf4c31712"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/9a5becc8c6b520920fb846afefcfd7faf4c31712",
+ "reference": "9a5becc8c6b520920fb846afefcfd7faf4c31712",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-xml": "*",
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "mikehaertl/php-shellcommand": "~1.1.0",
+ "phpunit/phpunit": "4.*",
+ "scrutinizer/ocular": "~1.1"
+ },
+ "bin": [
+ "bin/html-to-markdown"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\HTMLToMarkdown\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Colin O'Dell",
+ "email": "colinodell@gmail.com",
+ "homepage": "http://www.colinodell.com",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Nick Cernis",
+ "email": "nick@cern.is",
+ "homepage": "http://modernnerd.net",
+ "role": "Original Author"
+ }
+ ],
+ "description": "An HTML-to-markdown conversion helper for PHP",
+ "homepage": "https://github.com/thephpleague/html-to-markdown",
+ "keywords": [
+ "html",
+ "markdown"
+ ],
+ "time": "2016-02-01 16:49:02"
+ },
{
"name": "matthiasmullie/minify",
"version": "1.3.34",
@@ -284,16 +491,16 @@
},
{
"name": "michelf/php-markdown",
- "version": "1.5.0",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/michelf/php-markdown.git",
- "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9"
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9",
- "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9",
+ "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c",
"shasum": ""
},
"require": {
@@ -315,15 +522,15 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "John Gruber",
- "homepage": "http://daringfireball.net/"
- },
{
"name": "Michel Fortin",
"email": "michel.fortin@michelf.ca",
"homepage": "https://michelf.ca/",
"role": "Developer"
+ },
+ {
+ "name": "John Gruber",
+ "homepage": "https://daringfireball.net/"
}
],
"description": "PHP Markdown",
@@ -331,7 +538,62 @@
"keywords": [
"markdown"
],
- "time": "2015-03-01 12:03:08"
+ "time": "2015-12-24 01:37:31"
+ },
+ {
+ "name": "michelf/php-smartypants",
+ "version": "1.6.0-beta1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/michelf/php-smartypants.git",
+ "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/c0465c6d4c5ab853c2fa45df6c10bce7e35cc137",
+ "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-lib": "1.6.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Michelf": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Michel Fortin",
+ "email": "michel.fortin@michelf.ca",
+ "homepage": "http://michelf.ca/",
+ "role": "Developer"
+ },
+ {
+ "name": "John Gruber",
+ "homepage": "http://daringfireball.net/"
+ }
+ ],
+ "description": "PHP SmartyPants",
+ "homepage": "http://michelf.ca/projects/php-smartypants/",
+ "keywords": [
+ "dashes",
+ "quotes",
+ "spaces",
+ "typographer",
+ "typography"
+ ],
+ "time": "2013-07-31 18:13:10"
},
{
"name": "rmccue/requests",
@@ -528,7 +790,9 @@
"packages-dev": null,
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {
+ "michelf/php-smartypants": 10
+ },
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 593f6ea25..f4973ca5d 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1098,7 +1098,11 @@ class documentController extends document
function updateReadedCount(&$oDocument)
{
// Pass if Crawler access
- if(isCrawler()) return false;
+ if (\Rhymix\Framework\UA::isRobot())
+ {
+ return false;
+ }
+
$oDocumentModel = getModel('document');
$config = $oDocumentModel->getDocumentConfig();
diff --git a/tests/_data/formatter/bbcode.source.txt b/tests/_data/formatter/bbcode.source.txt
new file mode 100644
index 000000000..56b3d3ce5
--- /dev/null
+++ b/tests/_data/formatter/bbcode.source.txt
@@ -0,0 +1,6 @@
+This is the first paragraph.
+It contains [b]bold[/b] [i]italic[/i] text.
+
+[quote]This is quoted text.[/quote]
+
+This example belongs to the test suite for [url="https://www.rhymix.org"]Rhymix[/url].
diff --git a/tests/_data/formatter/bbcode.target.html b/tests/_data/formatter/bbcode.target.html
new file mode 100644
index 000000000..71c52e771
--- /dev/null
+++ b/tests/_data/formatter/bbcode.target.html
@@ -0,0 +1,6 @@
+This is the first paragraph.
+It contains bold italic text.
+
+This is quoted text.+ +This example belongs to the test suite for Rhymix. diff --git a/tests/_data/formatter/html2markdown.source.html b/tests/_data/formatter/html2markdown.source.html new file mode 100644 index 000000000..7cbbfc29b --- /dev/null +++ b/tests/_data/formatter/html2markdown.source.html @@ -0,0 +1,13 @@ +
This is a Markdown document. +These lines belong in the same paragraph. +Markdown usually ignores single line breaks. +
+ +This is a link.
+This is an 
.
+
-
+
- This is a list. +
- It has two items. +
+This is a sample text file.
+This is a paragraph with multiple lines.
+This is the third line.
+
+This is another paragraph. +
+
+This is a SPAN element that will be stripped away.
+This is a link that will be preserved.
+This is an 
that will be preserved.
+
This is a Markdown document. +These lines belong in the same paragraph. +Markdown usually ignores single line breaks.
+ +This is an indented code segment.
+All Markdown variants will recognize it.
+This is a fenced code segment.
+Only Markdown Extra will recognize it.
This is a link.
+This is an .
- This is a list. +
- It has two items. +
This is a Markdown document.
+These lines belong in the same paragraph.
+Markdown usually ignores single line breaks.
This is an indented code segment.
+All Markdown variants will recognize it.
+This is a fenced code segment.
+Only Markdown Extra will recognize it.
This is a link.
+This is an .
- This is a list. +
- It has two items. +
This is a Markdown document.
+These lines belong in the same paragraph.
+Markdown usually ignores single line breaks.
This is an indented code segment.
+All Markdown variants will recognize it.
+This is a fenced code segment.
+Only Markdown Extra will recognize it.
+This is a link.
+This is an .
- This is a list. +
- It has two items. +
This paragraph contains "dumb quotes" and short -- dashes.
+This paragraph contains ``backtick quotes'' and 'long' --- dashes...
diff --git a/tests/_data/formatter/smartypants.target.html b/tests/_data/formatter/smartypants.target.html new file mode 100644 index 000000000..5985b066f --- /dev/null +++ b/tests/_data/formatter/smartypants.target.html @@ -0,0 +1,2 @@ +This paragraph contains “dumb quotes” and short — dashes.
+This paragraph contains “backtick quotes” and ’long’ – dashes…
diff --git a/tests/_data/formatter/text2html.source.txt b/tests/_data/formatter/text2html.source.txt new file mode 100644 index 000000000..f4d3abac0 --- /dev/null +++ b/tests/_data/formatter/text2html.source.txt @@ -0,0 +1,9 @@ +This is a sample text file. +Some of these lines are close together. + +Other lines are separated by two newlines. + + +Or three newlines. +This is atag
that will be escaped if encoded. +Hello world! diff --git a/tests/_data/formatter/text2html.target1.html b/tests/_data/formatter/text2html.target1.html new file mode 100644 index 000000000..602a5b86b --- /dev/null +++ b/tests/_data/formatter/text2html.target1.html @@ -0,0 +1,9 @@ +This is a sample text file.+Some of these lines are close together.
+
+Other lines are separated by two newlines.
+
+
+Or three newlines.
+This is a <p>tag</p> that will be escaped if encoded.
+Hello world!
diff --git a/tests/_data/formatter/text2html.target2.html b/tests/_data/formatter/text2html.target2.html new file mode 100644 index 000000000..3a4b2f0f9 --- /dev/null +++ b/tests/_data/formatter/text2html.target2.html @@ -0,0 +1,9 @@ +
This is a sample text file.
+Some of these lines are close together.
+ +Other lines are separated by two newlines.
+ + +Or three newlines.
+This is a <p>tag</p> that will be escaped if encoded.
+Hello world!
diff --git a/tests/_data/formatter/text2html.target3.html b/tests/_data/formatter/text2html.target3.html new file mode 100644 index 000000000..743928e99 --- /dev/null +++ b/tests/_data/formatter/text2html.target3.html @@ -0,0 +1,12 @@ +
+This is a sample text file.
+Some of these lines are close together.
+
+Other lines are separated by two newlines. +
+
+Or three newlines.
+This is a <p>tag</p> that will be escaped if encoded.
+Hello world!
+
', $links);
+ $this->assertContains('', $links);
+ $this->assertContains('1', $links);
+ $this->assertContains('10', $links);
+
+ $links = Rhymix\Framework\Pagination::createLinks('/foo/bar/page/', 27, 13);
+ $this->assertContains('
', $links);
+ $this->assertContains('', $links);
+ $this->assertContains('11', $links);
+ $this->assertContains('20', $links);
+
+ $links = Rhymix\Framework\Pagination::createLinks('/rhymix?page=$PAGE&foo=bar', 27, 25);
+ $this->assertContains('
', $links);
+ $this->assertContains('', $links);
+ $this->assertContains('21', $links);
+ $this->assertContains('27', $links);
+
+ $links = Rhymix\Framework\Pagination::createLinks('p', 27, 3, 10, Rhymix\Framework\Pagination::COUNT_STYLE_CONTINUOUS);
+ $this->assertContains('
', $links);
+ $this->assertContains('1', $links);
+ $this->assertContains('10', $links);
+
+ $links = Rhymix\Framework\Pagination::createLinks('p', 27, 13, 10, Rhymix\Framework\Pagination::COUNT_STYLE_CONTINUOUS);
+ $this->assertContains('
', $links);
+ $this->assertContains('9', $links);
+ $this->assertContains('18', $links);
+
+ $links = Rhymix\Framework\Pagination::createLinks('p', 27, 25, 10, Rhymix\Framework\Pagination::COUNT_STYLE_CONTINUOUS);
+ $this->assertContains('
', $links);
+ $this->assertContains('18', $links);
+ $this->assertContains('27', $links);
+ }
+}
diff --git a/tests/unit/framework/StorageTest.php b/tests/unit/framework/StorageTest.php
new file mode 100644
index 000000000..0f19cf682
--- /dev/null
+++ b/tests/unit/framework/StorageTest.php
@@ -0,0 +1,260 @@
+assertTrue(Rhymix\Framework\Storage::exists(__FILE__));
+ $this->assertTrue(Rhymix\Framework\Storage::exists(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::exists(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::exists(__DIR__ . '/nonexistent.subdirectory'));
+ }
+
+ public function testIsFile()
+ {
+ $this->assertTrue(Rhymix\Framework\Storage::isFile(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::isFile(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::isFile(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::isFile(__DIR__ . '/nonexistent.subdirectory'));
+ }
+
+ public function testIsEmptyFile()
+ {
+ $emptyfile = \RX_BASEDIR . 'tests/_output/emptyfile.txt';
+ file_put_contents($emptyfile, '');
+
+ $this->assertTrue(Rhymix\Framework\Storage::isEmptyFile($emptyfile));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyFile($emptyfile . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyFile(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyFile(__DIR__));
+ }
+
+ public function testIsDirectory()
+ {
+ $this->assertTrue(Rhymix\Framework\Storage::isDirectory(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::isDirectory(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::isDirectory(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::isDirectory(__DIR__ . '/nonexistent.subdirectory'));
+ }
+
+ public function testIsEmptyDirectory()
+ {
+ $emptydir = \RX_BASEDIR . 'tests/_output/emptydir';
+ mkdir($emptydir);
+
+ $this->assertTrue(Rhymix\Framework\Storage::isEmptyDirectory($emptydir));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyDirectory($emptydir . '/nonexistent.subdirectory'));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyDirectory(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::isEmptyDirectory(__DIR__));
+ }
+
+ public function testIsSymlink()
+ {
+ if (strncasecmp(\PHP_OS, 'Win', 3) === 0)
+ {
+ return;
+ }
+
+ $symlink_source = \RX_BASEDIR . 'tests/_output/link.source.txt';
+ $symlink_target = \RX_BASEDIR . 'tests/_output/link.target.txt';
+ file_put_contents($symlink_target, 'foobar');
+ symlink($symlink_target, $symlink_source);
+
+ $this->assertTrue(Rhymix\Framework\Storage::isSymlink($symlink_source));
+ $this->assertFalse(Rhymix\Framework\Storage::isSymlink($symlink_target));
+ unlink($symlink_target);
+
+ $this->assertTrue(Rhymix\Framework\Storage::isSymlink($symlink_source));
+ $this->assertFalse(Rhymix\Framework\Storage::isValidSymlink($symlink_source));
+ $this->assertFalse(Rhymix\Framework\Storage::isSymlink($symlink_target));
+ $this->assertFalse(Rhymix\Framework\Storage::isValidSymlink($symlink_target));
+ }
+
+ public function testIsReadable()
+ {
+ $this->assertTrue(Rhymix\Framework\Storage::isReadable(__FILE__));
+ $this->assertTrue(Rhymix\Framework\Storage::isReadable(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::isReadable(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::isReadable('/dev/nonexistent'));
+ }
+
+ public function testIsWritable()
+ {
+ $testfile = \RX_BASEDIR . 'tests/_output/testfile.txt';
+ file_put_contents($testfile, 'foobar');
+
+ $this->assertTrue(Rhymix\Framework\Storage::isWritable(__FILE__));
+ $this->assertTrue(Rhymix\Framework\Storage::isWritable(__DIR__));
+ $this->assertTrue(Rhymix\Framework\Storage::isWritable($testfile));
+ $this->assertTrue(Rhymix\Framework\Storage::isWritable(dirname($testfile)));
+ $this->assertFalse(Rhymix\Framework\Storage::isWritable($testfile . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::isWritable('/dev/nonexistent'));
+ }
+
+ public function testGetSize()
+ {
+ $this->assertEquals(filesize(__FILE__), Rhymix\Framework\Storage::getSize(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::getSize(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::getSize(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::getSize('/dev/nonexistent'));
+ }
+
+ public function testRead()
+ {
+ $this->assertEquals(file_get_contents(__FILE__), Rhymix\Framework\Storage::read(__FILE__));
+ $this->assertFalse(Rhymix\Framework\Storage::read(__FILE__ . '.nonexistent.suffix'));
+ $this->assertFalse(Rhymix\Framework\Storage::read(__DIR__));
+ $this->assertFalse(Rhymix\Framework\Storage::read('/dev/nonexistent'));
+ }
+
+ public function testWrite()
+ {
+ $testfile = \RX_BASEDIR . 'tests/_output/subdirectory/testfile.txt';
+
+ $this->assertFalse(file_exists($testfile));
+ $this->assertTrue(Rhymix\Framework\Storage::write($testfile, 'foobarbazzjazz'));
+ $this->assertTrue(file_exists($testfile));
+ $this->assertEquals('foobarbazzjazz', file_get_contents($testfile));
+ }
+
+ public function testCopy()
+ {
+ $source = \RX_BASEDIR . 'tests/_output/copy.source.txt';
+ $target = \RX_BASEDIR . 'tests/_output/copy.target.txt';
+ file_put_contents($source, 'foobarbaz');
+ chmod($source, 0646);
+
+ $this->assertTrue(Rhymix\Framework\Storage::copy($source, $target));
+ $this->assertTrue(file_exists($target));
+ $this->assertTrue(file_get_contents($target) === 'foobarbaz');
+
+ if (strncasecmp(\PHP_OS, 'Win', 3) !== 0)
+ {
+ $this->assertEquals(0646, fileperms($target) & 0777);
+ $this->assertTrue(Rhymix\Framework\Storage::copy($source, $target, 0755));
+ $this->assertEquals(0755, fileperms($target) & 0777);
+ }
+ }
+
+ public function testMove()
+ {
+ $source = \RX_BASEDIR . 'tests/_output/move.source.txt';
+ $target = \RX_BASEDIR . 'tests/_output/move.target.txt';
+ file_put_contents($source, 'foobarbaz');
+
+ $this->assertTrue(Rhymix\Framework\Storage::move($source, $target));
+ $this->assertTrue(file_exists($target));
+ $this->assertTrue(file_get_contents($target) === 'foobarbaz');
+ $this->assertFalse(file_exists($source));
+ }
+
+ public function testDelete()
+ {
+ $testfile = \RX_BASEDIR . 'tests/_output/testfile.txt';
+ file_put_contents($testfile, 'foobar');
+
+ $this->assertTrue(Rhymix\Framework\Storage::delete($testfile));
+ $this->assertFalse(file_exists($testfile));
+ }
+
+ public function testCreateDirectory()
+ {
+ $emptydir = \RX_BASEDIR . 'tests/_output/emptydir';
+
+ $this->assertTrue(Rhymix\Framework\Storage::createDirectory($emptydir));
+ $this->assertTrue(file_exists($emptydir) && is_dir($emptydir));
+ }
+
+ public function testReadDirectory()
+ {
+ $testdir = \RX_BASEDIR . 'tests/_output/testdir';
+ mkdir($testdir);
+ mkdir($testdir . '/subdir');
+ file_put_contents($testdir . '/.dotfile', '');
+ file_put_contents($testdir . '/foo', 'foo');
+ file_put_contents($testdir . '/bar', 'bar');
+ file_put_contents($testdir . '/baz', 'baz');
+
+ $this->assertEquals(array($testdir . '/bar', $testdir . '/baz', $testdir . '/foo'), Rhymix\Framework\Storage::readDirectory($testdir));
+ $this->assertEquals(array('bar', 'baz', 'foo'), Rhymix\Framework\Storage::readDirectory($testdir, false));
+ $this->assertEquals(array('bar', 'baz', 'foo', 'subdir'), Rhymix\Framework\Storage::readDirectory($testdir, false, true, false));
+ $this->assertEquals(array('.dotfile', 'bar', 'baz', 'foo'), Rhymix\Framework\Storage::readDirectory($testdir, false, false, true));
+ $this->assertEquals(array('.dotfile', 'bar', 'baz', 'foo', 'subdir'), Rhymix\Framework\Storage::readDirectory($testdir, false, false, false));
+ $this->assertFalse(Rhymix\Framework\Storage::readDirectory('/opt/nonexistent.foobar'));
+ }
+
+ public function testCopyDirectory()
+ {
+ $sourcedir = \RX_BASEDIR . 'tests/_output/sourcedir';
+ mkdir($sourcedir);
+ mkdir($sourcedir . '/subdir');
+ file_put_contents($sourcedir . '/bar', 'bar');
+ file_put_contents($sourcedir . '/subdir/baz', 'baz');
+ $targetdir = \RX_BASEDIR . 'tests/_output/targetdir';
+
+ $this->assertTrue(Rhymix\Framework\Storage::copyDirectory($sourcedir, $targetdir));
+ $this->assertTrue(file_exists($targetdir . '/bar'));
+ $this->assertTrue(file_exists($targetdir . '/subdir/baz'));
+ $this->assertFalse(Rhymix\Framework\Storage::copyDirectory($sourcedir, '/opt/nonexistent.foobar'));
+ }
+
+ public function testMoveDirectory()
+ {
+ $sourcedir = \RX_BASEDIR . 'tests/_output/sourcedir';
+ mkdir($sourcedir);
+ mkdir($sourcedir . '/subdir');
+ file_put_contents($sourcedir . '/bar', 'bar');
+ file_put_contents($sourcedir . '/subdir/baz', 'baz');
+ $targetdir = \RX_BASEDIR . 'tests/_output/targetdir';
+
+ $this->assertTrue(Rhymix\Framework\Storage::moveDirectory($sourcedir, $targetdir));
+ $this->assertTrue(file_exists($targetdir . '/bar'));
+ $this->assertTrue(file_exists($targetdir . '/subdir/baz'));
+ $this->assertFalse(file_exists($sourcedir));
+ }
+
+ public function testDeleteDirectory()
+ {
+ $sourcedir = \RX_BASEDIR . 'tests/_output/sourcedir';
+ mkdir($sourcedir);
+ mkdir($sourcedir . '/subdir');
+ file_put_contents($sourcedir . '/bar', 'bar');
+ file_put_contents($sourcedir . '/subdir/baz', 'baz');
+ $nonexistent = \RX_BASEDIR . 'tests/_output/targetdir';
+
+ $this->assertTrue(Rhymix\Framework\Storage::deleteDirectory($sourcedir));
+ $this->assertFalse(file_exists($sourcedir . '/subdir/baz'));
+ $this->assertFalse(file_exists($sourcedir));
+ $this->assertFalse(Rhymix\Framework\Storage::deleteDirectory($nonexistent));
+ }
+
+ public function testDeleteDirectoryKeepRoot()
+ {
+ $sourcedir = \RX_BASEDIR . 'tests/_output/sourcedir';
+ mkdir($sourcedir);
+ mkdir($sourcedir . '/subdir');
+ file_put_contents($sourcedir . '/bar', 'bar');
+ file_put_contents($sourcedir . '/subdir/baz', 'baz');
+ $nonexistent = \RX_BASEDIR . 'tests/_output/targetdir';
+
+ $this->assertTrue(Rhymix\Framework\Storage::deleteDirectory($sourcedir, false));
+ $this->assertFalse(file_exists($sourcedir . '/subdir/baz'));
+ $this->assertTrue(file_exists($sourcedir));
+ $this->assertFalse(Rhymix\Framework\Storage::deleteDirectory($nonexistent));
+ }
+}
diff --git a/tests/unit/framework/TimerTest.php b/tests/unit/framework/TimerTest.php
new file mode 100644
index 000000000..1c9783c0d
--- /dev/null
+++ b/tests/unit/framework/TimerTest.php
@@ -0,0 +1,71 @@
+assertGreaterThanOrEqual($t1, $started);
+ $this->assertLessThanOrEqual($t2, $started);
+ $this->assertGreaterThanOrEqual($t2 - $started, $elapsed);
+ $this->assertLessThanOrEqual($t3 - $t1, $elapsed);
+ $this->assertGreaterThan(0, $elapsed);
+ }
+
+ function testNestedTimers()
+ {
+ $t1 = Rhymix\Framework\Timer::start();
+ usleep(1000);
+ $t2 = Rhymix\Framework\Timer::start();
+ usleep(1000);
+ $t3 = Rhymix\Framework\Timer::stop();
+ usleep(1000);
+ $t4 = Rhymix\Framework\Timer::stop();
+
+ $this->assertGreaterThanOrEqual($t1, $t2);
+ $this->assertGreaterThan($t3, $t4);
+ }
+
+ function testMultipleTimers()
+ {
+ $t1 = Rhymix\Framework\Timer::start('timer1');
+ usleep(5000);
+ $t2 = Rhymix\Framework\Timer::start('timer2');
+ usleep(1000);
+ $t3 = Rhymix\Framework\Timer::stop('timer1');
+ usleep(2000);
+ $t4 = Rhymix\Framework\Timer::stop('timer2');
+
+ $this->assertGreaterThanOrEqual($t1, $t2);
+ $this->assertGreaterThanOrEqual($t4, $t3);
+ }
+
+ function testTimerFormat()
+ {
+ $t1 = Rhymix\Framework\Timer::start();
+ usleep(1000);
+ $t2 = Rhymix\Framework\Timer::stopFormat();
+
+ $this->assertRegexp('/^[0-9\.,]+ms$/', $t2);
+ }
+
+ function testTimerSinceStartup()
+ {
+ $t1 = Rhymix\Framework\Timer::sinceStartup();
+ $t2 = Rhymix\Framework\Timer::sinceStartup();
+
+ $this->assertGreaterThanOrEqual($t1, $t2);
+
+ $t3 = Rhymix\Framework\Timer::sinceStartupFormat();
+ $this->assertRegexp('/^[0-9\.,]+ms$/', $t3);
+ }
+}
diff --git a/tests/unit/framework/UATest.php b/tests/unit/framework/UATest.php
new file mode 100644
index 000000000..ca2a6f03e
--- /dev/null
+++ b/tests/unit/framework/UATest.php
@@ -0,0 +1,104 @@
+assertTrue(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (Linux; Android 5.0; Nexus 5 Build/LPX13D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36'));
+ $this->assertTrue(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+
+ // Tablets
+ $this->assertTrue(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+ $this->assertTrue(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (Linux; Android 4.4.2; SM-T530 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Safari/537.36'));
+
+ // Not mobile
+ $this->assertFalse(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko'));
+ $this->assertFalse(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'));
+ $this->assertFalse(Rhymix\Framework\UA::isMobile('Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'));
+ $this->assertFalse(Rhymix\Framework\UA::isMobile('Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16'));
+ }
+
+ public function testIsTablet()
+ {
+ // Phones
+ $this->assertFalse(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (Linux; Android 5.0; Nexus 5 Build/LPX13D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36'));
+ $this->assertFalse(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+
+ // Tablets
+ $this->assertTrue(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+ $this->assertTrue(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (Linux; Android 4.4.2; SM-T530 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.117 Safari/537.36'));
+
+ // Not mobile
+ $this->assertFalse(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko'));
+ $this->assertFalse(Rhymix\Framework\UA::isTablet('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)'));
+ }
+
+ public function testIsRobot()
+ {
+ // Robot
+ $this->assertTrue(Rhymix\Framework\UA::isRobot('Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)'));
+ $this->assertTrue(Rhymix\Framework\UA::isRobot('Googlebot/2.1 (+http://www.googlebot.com/bot.html)'));
+ $this->assertTrue(Rhymix\Framework\UA::isRobot('Yeti/1.0 (NHN Corp.; http://help.naver.com/robots/)'));
+
+ // Not robot
+ $this->assertFalse(Rhymix\Framework\UA::isRobot('Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+ $this->assertFalse(Rhymix\Framework\UA::isRobot('Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'));
+ $this->assertFalse(Rhymix\Framework\UA::isRobot('Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko'));
+ }
+
+ public function testGetBrowserInfo()
+ {
+ // Android default browser
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; U; Android 4.0.3; Device Name) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30');
+ $this->assertEquals('Android', $browser->browser);
+ $this->assertEquals('4.0', $browser->version);
+ $this->assertEquals('Android', $browser->os);
+ $this->assertTrue($browser->is_mobile);
+ $this->assertTrue($browser->is_tablet);
+
+ // Mobile Chrome
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Linux; Android 5.0; Nexus 5 Build/LPX13D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.102 Mobile Safari/537.36');
+ $this->assertEquals('Chrome', $browser->browser);
+ $this->assertEquals('38.0', $browser->version);
+ $this->assertEquals('Android', $browser->os);
+ $this->assertTrue($browser->is_mobile);
+ $this->assertFalse($browser->is_tablet);
+
+ // Edge
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136');
+ $this->assertEquals('Edge', $browser->browser);
+ $this->assertEquals('12.0', $browser->version);
+ $this->assertEquals('Windows', $browser->os);
+ $this->assertFalse($browser->is_mobile);
+ $this->assertFalse($browser->is_tablet);
+
+ // IE 11
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko');
+ $this->assertEquals('IE', $browser->browser);
+ $this->assertEquals('11.0', $browser->version);
+ $this->assertEquals('Windows', $browser->os);
+
+ // IE 10 in compatibility mode
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/4.0 (Compatible; MSIE 8.0; Windows NT 5.2; Trident/6.0)');
+ $this->assertEquals('IE', $browser->browser);
+ $this->assertEquals('10.0', $browser->version);
+
+ // IE 8 in compatibility mode
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0)');
+ $this->assertEquals('IE', $browser->browser);
+ $this->assertEquals('8.0', $browser->version);
+
+ // Linux Chrome
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.0 Safari/537.36');
+ $this->assertEquals('Chrome', $browser->browser);
+ $this->assertEquals('41.0', $browser->version);
+ $this->assertEquals('Linux', $browser->os);
+
+ // OS X Firefox
+ $browser = Rhymix\Framework\UA::getBrowserInfo('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10; rv:33.0) Gecko/20100101 Firefox/33.0');
+ $this->assertEquals('Firefox', $browser->browser);
+ $this->assertEquals('33.0', $browser->version);
+ $this->assertEquals('OS X', $browser->os);
+ }
+}
diff --git a/tests/unit/framework/i18nTest.php b/tests/unit/framework/i18nTest.php
new file mode 100644
index 000000000..481ab9cf6
--- /dev/null
+++ b/tests/unit/framework/i18nTest.php
@@ -0,0 +1,41 @@
+assertEquals('AD', array_first($sort_code_2)->iso_3166_1_alpha2);
+ $this->assertEquals('AND', array_first_key($sort_code_2));
+
+ $sort_code_3 = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_CODE_3);
+ $this->assertEquals('ABW', array_first($sort_code_3)->iso_3166_1_alpha3);
+ $this->assertEquals('ABW', array_first_key($sort_code_3));
+
+ $sort_code_n = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_CODE_NUMERIC);
+ $this->assertEquals('004', array_first($sort_code_n)->iso_3166_1_numeric);
+ $this->assertEquals('AFG', array_first_key($sort_code_n));
+
+ $sort_cctld = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_CCTLD);
+ $this->assertEquals('zw', array_last($sort_cctld)->cctld);
+ $this->assertEquals('ZWE', array_last_key($sort_cctld));
+
+ $sort_english = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_NAME_ENGLISH);
+ $this->assertEquals('Afghanistan', array_first($sort_english)->name_english);
+ $this->assertEquals('AFG', array_first_key($sort_english));
+ $this->assertEquals('Åland Islands', array_last($sort_english)->name_english);
+ $this->assertEquals('ALA', array_last_key($sort_english));
+
+ $sort_korean = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_NAME_KOREAN);
+ $this->assertEquals('가나', array_first($sort_korean)->name_korean);
+ $this->assertEquals('GHA', array_first_key($sort_korean));
+ $this->assertEquals('홍콩', array_last($sort_korean)->name_korean);
+ $this->assertEquals('HKG', array_last_key($sort_korean));
+
+ $sort_native = Rhymix\Framework\i18n::listCountries(Rhymix\Framework\i18n::SORT_NAME_NATIVE);
+ $this->assertEquals('Amerika Sāmoa', array_first($sort_native)->name_native);
+ $this->assertEquals('대한민국', $sort_native['KOR']->name_korean);
+ $this->assertEquals('United States of America', $sort_native['USA']->name_english);
+ $this->assertEquals('nz', $sort_native['NZL']->cctld);
+ }
+}
diff --git a/tools/korea_ip_ranges/korea.ipv4.parser.php b/tools/korea_ip_ranges/korea.ipv4.parser.php
new file mode 100644
index 000000000..26fba1ce3
--- /dev/null
+++ b/tools/korea_ip_ranges/korea.ipv4.parser.php
@@ -0,0 +1,89 @@
+ array(
+ 'user_agent' => 'Mozilla/5.0 (compatible; IP range generator)',
+ 'header' => 'Referer: ' . $referer_url . "\r\n",
+ ),
+)));
+$content = gzdecode($content);
+if (!$content)
+{
+ exit 2;
+}
+
+/**
+ * Load IP range data.
+ */
+$ranges = array();
+$content = explode("\n", $content);
+foreach ($content as $line)
+{
+ $line = explode("\t", $line);
+ if (count($line) < 2) continue;
+ $start = trim($line[0]);
+ $end = trim($line[1]);
+ $ranges[$start] = array($start, $end);
+}
+
+/**
+ * Sort the ranges.
+ */
+ksort($ranges);
+$ranges = array_values($ranges);
+$count = count($ranges);
+
+/**
+ * Merge adjacent ranges.
+ */
+for ($i = 0; $i < $count; $i++)
+{
+ if ($i == 0) continue;
+ $previous_i = $i - 1;
+ while (true)
+ {
+ if ($ranges[$previous_i] !== null) break;
+ $previous_i--;
+ }
+
+ if ($ranges[$i][0] == $ranges[$previous_i][1] + 1)
+ {
+ $ranges[$previous_i][1] = $ranges[$i][1];
+ $ranges[$i] = null;
+ }
+}
+
+/**
+ * Organize into final format.
+ */
+$ranges_final = array();
+foreach ($ranges as $range)
+{
+ if ($range !== null) $ranges_final[] = $range;
+}
+
+/**
+ * Save to file.
+ */
+$content = '<' . '?php' . "\n\n" . '/**' . "\n" . ' * Source: ' . $referer_url . "\n";
+$content .= ' * Last Updated: ' . date('Y-m-d') . "\n" . ' */' . "\n";
+$content .= 'return ' . var_export($ranges_final, true) . ';' . "\n";
+file_put_contents('korea.ipv4.php', $content);
+
+/**
+ * Report status.
+ */
+echo count($ranges_final) . ' IPv4 ranges saved.' . PHP_EOL;
diff --git a/tools/korea_ip_ranges/korea.ipv6.parser.php b/tools/korea_ip_ranges/korea.ipv6.parser.php
new file mode 100644
index 000000000..a4052e7e9
--- /dev/null
+++ b/tools/korea_ip_ranges/korea.ipv6.parser.php
@@ -0,0 +1,92 @@
+ array(
+ 'user_agent' => 'Mozilla/5.0 (compatible; IP range generator)',
+ 'header' => 'Referer: ' . $referer_url . "\r\n",
+ ),
+)));
+if (!$content)
+{
+ exit 2;
+}
+
+/**
+ * Parse the HTML/Excel document.
+ */
+$regex = '#\\s*]+>([0-9a-f:]+::) \\s*]+>(/[0-9]+) #iU';
+preg_match_all($regex, $content, $matches, PREG_SET_ORDER);
+
+/**
+ * Extract the address and netmask for each range.
+ */
+$ranges = array();
+foreach ($matches as $match)
+{
+ $start = str_pad(str_replace(':', '', strtolower($match[1])), 16, '0', STR_PAD_RIGHT);
+ $mask = str_repeat('f', ((64 - trim($match[2], '/')) / 4));
+ $end = substr($start, 0, 16 - strlen($mask)) . $mask;
+ $ranges[$start] = array($start, $end);
+}
+
+/**
+ * Sort the ranges.
+ */
+ksort($ranges);
+$ranges = array_values($ranges);
+$count = count($ranges);
+
+/**
+ * Merge adjacent ranges.
+ */
+for ($i = 0; $i < $count; $i++)
+{
+ if ($i == 0) continue;
+ $previous_i = $i - 1;
+ while (true)
+ {
+ if ($ranges[$previous_i] !== null) break;
+ $previous_i--;
+ }
+
+ if (hexdec($ranges[$i][0]) == hexdec($ranges[$previous_i][1]) + 1)
+ {
+ $ranges[$previous_i][1] = $ranges[$i][1];
+ $ranges[$i] = null;
+ }
+}
+
+/**
+ * Organize into final format.
+ */
+$ranges_final = array();
+foreach ($ranges as $range)
+{
+ if ($range !== null) $ranges_final[] = $range;
+}
+
+/**
+ * Save to file.
+ */
+$content = '<' . '?php' . "\n\n" . '/**' . "\n" . ' * Source: ' . $referer_url . "\n";
+$content .= ' * Last Updated: ' . date('Y-m-d') . "\n" . ' */' . "\n";
+$content .= 'return ' . var_export($ranges_final, true) . ';' . "\n";
+file_put_contents('korea.ipv6.php', $content);
+
+/**
+ * Report status.
+ */
+echo count($ranges_final) . ' IPv6 ranges saved.' . PHP_EOL;
diff --git a/vendor/bin/html-to-markdown b/vendor/bin/html-to-markdown
new file mode 120000
index 000000000..6f8d9d2b1
--- /dev/null
+++ b/vendor/bin/html-to-markdown
@@ -0,0 +1 @@
+../league/html-to-markdown/bin/html-to-markdown
\ No newline at end of file
diff --git a/vendor/bin/pscss b/vendor/bin/pscss
new file mode 120000
index 000000000..395e1c8bd
--- /dev/null
+++ b/vendor/bin/pscss
@@ -0,0 +1 @@
+../leafo/scssphp/bin/pscss
\ No newline at end of file
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index b85d24e5d..3308cbc96 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -238,6 +238,67 @@ return array(
'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php',
'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php',
'Hautelook\\Phpass\\PasswordHash' => $vendorDir . '/hautelook/phpass/src/Hautelook/Phpass/PasswordHash.php',
+ 'JBBCode\\CodeDefinition' => $vendorDir . '/jbbcode/jbbcode/JBBCode/CodeDefinition.php',
+ 'JBBCode\\CodeDefinitionBuilder' => $vendorDir . '/jbbcode/jbbcode/JBBCode/CodeDefinitionBuilder.php',
+ 'JBBCode\\CodeDefinitionSet' => $vendorDir . '/jbbcode/jbbcode/JBBCode/CodeDefinitionSet.php',
+ 'JBBCode\\DefaultCodeDefinitionSet' => $vendorDir . '/jbbcode/jbbcode/JBBCode/DefaultCodeDefinitionSet.php',
+ 'JBBCode\\DocumentElement' => $vendorDir . '/jbbcode/jbbcode/JBBCode/DocumentElement.php',
+ 'JBBCode\\ElementNode' => $vendorDir . '/jbbcode/jbbcode/JBBCode/ElementNode.php',
+ 'JBBCode\\InputValidator' => $vendorDir . '/jbbcode/jbbcode/JBBCode/InputValidator.php',
+ 'JBBCode\\Node' => $vendorDir . '/jbbcode/jbbcode/JBBCode/Node.php',
+ 'JBBCode\\NodeVisitor' => $vendorDir . '/jbbcode/jbbcode/JBBCode/NodeVisitor.php',
+ 'JBBCode\\Parser' => $vendorDir . '/jbbcode/jbbcode/JBBCode/Parser.php',
+ 'JBBCode\\ParserException' => $vendorDir . '/jbbcode/jbbcode/JBBCode/ParserException.php',
+ 'JBBCode\\TextNode' => $vendorDir . '/jbbcode/jbbcode/JBBCode/TextNode.php',
+ 'JBBCode\\Tokenizer' => $vendorDir . '/jbbcode/jbbcode/JBBCode/Tokenizer.php',
+ 'JBBCode\\validators\\CssColorValidator' => $vendorDir . '/jbbcode/jbbcode/JBBCode/validators/CssColorValidator.php',
+ 'JBBCode\\validators\\UrlValidator' => $vendorDir . '/jbbcode/jbbcode/JBBCode/validators/UrlValidator.php',
+ 'JBBCode\\visitors\\HTMLSafeVisitor' => $vendorDir . '/jbbcode/jbbcode/JBBCode/visitors/HTMLSafeVisitor.php',
+ 'JBBCode\\visitors\\NestLimitVisitor' => $vendorDir . '/jbbcode/jbbcode/JBBCode/visitors/NestLimitVisitor.php',
+ 'JBBCode\\visitors\\SmileyVisitor' => $vendorDir . '/jbbcode/jbbcode/JBBCode/visitors/SmileyVisitor.php',
+ 'JBBCode\\visitors\\TagCountingVisitor' => $vendorDir . '/jbbcode/jbbcode/JBBCode/visitors/TagCountingVisitor.php',
+ 'Leafo\\ScssPhp\\Base\\Range' => $vendorDir . '/leafo/scssphp/src/Base/Range.php',
+ 'Leafo\\ScssPhp\\Block' => $vendorDir . '/leafo/scssphp/src/Block.php',
+ 'Leafo\\ScssPhp\\Colors' => $vendorDir . '/leafo/scssphp/src/Colors.php',
+ 'Leafo\\ScssPhp\\Compiler' => $vendorDir . '/leafo/scssphp/src/Compiler.php',
+ 'Leafo\\ScssPhp\\Compiler\\Environment' => $vendorDir . '/leafo/scssphp/src/Compiler/Environment.php',
+ 'Leafo\\ScssPhp\\Formatter' => $vendorDir . '/leafo/scssphp/src/Formatter.php',
+ 'Leafo\\ScssPhp\\Formatter\\Compact' => $vendorDir . '/leafo/scssphp/src/Formatter/Compact.php',
+ 'Leafo\\ScssPhp\\Formatter\\Compressed' => $vendorDir . '/leafo/scssphp/src/Formatter/Compressed.php',
+ 'Leafo\\ScssPhp\\Formatter\\Crunched' => $vendorDir . '/leafo/scssphp/src/Formatter/Crunched.php',
+ 'Leafo\\ScssPhp\\Formatter\\Debug' => $vendorDir . '/leafo/scssphp/src/Formatter/Debug.php',
+ 'Leafo\\ScssPhp\\Formatter\\Expanded' => $vendorDir . '/leafo/scssphp/src/Formatter/Expanded.php',
+ 'Leafo\\ScssPhp\\Formatter\\Nested' => $vendorDir . '/leafo/scssphp/src/Formatter/Nested.php',
+ 'Leafo\\ScssPhp\\Formatter\\OutputBlock' => $vendorDir . '/leafo/scssphp/src/Formatter/OutputBlock.php',
+ 'Leafo\\ScssPhp\\Node' => $vendorDir . '/leafo/scssphp/src/Node.php',
+ 'Leafo\\ScssPhp\\Node\\Number' => $vendorDir . '/leafo/scssphp/src/Node/Number.php',
+ 'Leafo\\ScssPhp\\Parser' => $vendorDir . '/leafo/scssphp/src/Parser.php',
+ 'Leafo\\ScssPhp\\Server' => $vendorDir . '/leafo/scssphp/src/Server.php',
+ 'Leafo\\ScssPhp\\Type' => $vendorDir . '/leafo/scssphp/src/Type.php',
+ 'Leafo\\ScssPhp\\Util' => $vendorDir . '/leafo/scssphp/src/Util.php',
+ 'Leafo\\ScssPhp\\Version' => $vendorDir . '/leafo/scssphp/src/Version.php',
+ 'League\\HTMLToMarkdown\\Configuration' => $vendorDir . '/league/html-to-markdown/src/Configuration.php',
+ 'League\\HTMLToMarkdown\\ConfigurationAwareInterface' => $vendorDir . '/league/html-to-markdown/src/ConfigurationAwareInterface.php',
+ 'League\\HTMLToMarkdown\\Converter\\BlockquoteConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/BlockquoteConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\CommentConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/CommentConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\ConverterInterface' => $vendorDir . '/league/html-to-markdown/src/Converter/ConverterInterface.php',
+ 'League\\HTMLToMarkdown\\Converter\\DefaultConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DefaultConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\DivConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/DivConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\EmphasisConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/EmphasisConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\HardBreakConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HardBreakConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\HeaderConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HeaderConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\HorizontalRuleConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\ImageConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ImageConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\LinkConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/LinkConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\ListBlockConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListBlockConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php',
+ 'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php',
+ 'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php',
+ 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php',
+ 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php',
+ 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php',
'MatthiasMullie\\Minify\\CSS' => $vendorDir . '/matthiasmullie/minify/src/CSS.php',
'MatthiasMullie\\Minify\\Exception' => $vendorDir . '/matthiasmullie/minify/src/Exception.php',
'MatthiasMullie\\Minify\\Exceptions\\BasicException' => $vendorDir . '/matthiasmullie/minify/src/Exceptions/BasicException.php',
@@ -304,4 +365,16 @@ return array(
'Requests_Utility_FilteredIterator' => $vendorDir . '/rmccue/requests/library/Requests/Utility/FilteredIterator.php',
'Sunra\\PhpSimple\\HtmlDomParser' => $vendorDir . '/sunra/php-simple-html-dom-parser/Src/Sunra/PhpSimple/HtmlDomParser.php',
'TrueBV\\Punycode' => $vendorDir . '/true/punycode/src/Punycode.php',
+ 'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+ 'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+ 'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+ 'lessc_formatter_lessjs' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+ 'lessc_parser' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+ 'scss_formatter' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scss_formatter_compressed' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scss_formatter_crunched' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scss_formatter_nested' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scss_parser' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scss_server' => $vendorDir . '/leafo/scssphp/classmap.php',
+ 'scssc' => $vendorDir . '/leafo/scssphp/classmap.php',
);
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 942fa8072..9d294bbb4 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -8,7 +8,8 @@ $baseDir = dirname($vendorDir);
return array(
'Sunra\\PhpSimple\\HtmlDomParser' => array($vendorDir . '/sunra/php-simple-html-dom-parser/Src'),
'Requests' => array($vendorDir . '/rmccue/requests/library'),
- 'Michelf' => array($vendorDir . '/michelf/php-markdown'),
+ 'Michelf' => array($vendorDir . '/michelf/php-markdown', $vendorDir . '/michelf/php-smartypants'),
+ 'JBBCode' => array($vendorDir . '/jbbcode/jbbcode'),
'Hautelook' => array($vendorDir . '/hautelook/phpass/src'),
'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'),
);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index fada27478..30cc463c6 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -9,4 +9,6 @@ return array(
'TrueBV\\' => array($vendorDir . '/true/punycode/src'),
'MatthiasMullie\\PathConverter\\' => array($vendorDir . '/matthiasmullie/path-converter/src'),
'MatthiasMullie\\Minify\\' => array($vendorDir . '/matthiasmullie/minify/src'),
+ 'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'),
+ 'Leafo\\ScssPhp\\' => array($vendorDir . '/leafo/scssphp/src'),
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 18e6cbbfb..77f6e6a65 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -92,59 +92,6 @@
"html"
]
},
- {
- "name": "michelf/php-markdown",
- "version": "1.5.0",
- "version_normalized": "1.5.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/michelf/php-markdown.git",
- "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9",
- "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "time": "2015-03-01 12:03:08",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-lib": "1.4.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Michelf": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "John Gruber",
- "homepage": "http://daringfireball.net/"
- },
- {
- "name": "Michel Fortin",
- "email": "michel.fortin@michelf.ca",
- "homepage": "https://michelf.ca/",
- "role": "Developer"
- }
- ],
- "description": "PHP Markdown",
- "homepage": "https://michelf.ca/projects/php-markdown/",
- "keywords": [
- "markdown"
- ]
- },
{
"name": "sunra/php-simple-html-dom-parser",
"version": "v1.5.0",
@@ -537,5 +484,330 @@
"password",
"security"
]
+ },
+ {
+ "name": "michelf/php-markdown",
+ "version": "1.6.0",
+ "version_normalized": "1.6.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/michelf/php-markdown.git",
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2015-12-24 01:37:31",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-lib": "1.4.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Michelf": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Michel Fortin",
+ "email": "michel.fortin@michelf.ca",
+ "homepage": "https://michelf.ca/",
+ "role": "Developer"
+ },
+ {
+ "name": "John Gruber",
+ "homepage": "https://daringfireball.net/"
+ }
+ ],
+ "description": "PHP Markdown",
+ "homepage": "https://michelf.ca/projects/php-markdown/",
+ "keywords": [
+ "markdown"
+ ]
+ },
+ {
+ "name": "jbbcode/jbbcode",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jbowens/jBBCode.git",
+ "reference": "645b6a1c0afa92b7d029d3417ebd8b60a5c578b3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jbowens/jBBCode/zipball/645b6a1c0afa92b7d029d3417ebd8b60a5c578b3",
+ "reference": "645b6a1c0afa92b7d029d3417ebd8b60a5c578b3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "3.7.*"
+ },
+ "time": "2014-07-06 05:48:20",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "JBBCode": "."
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jackson Owens",
+ "email": "jackson_owens@alumni.brown.edu",
+ "homepage": "http://jbowens.org/",
+ "role": "Developer"
+ }
+ ],
+ "description": "A lightweight but extensible BBCode parser written in PHP 5.3.",
+ "homepage": "http://jbbcode.com/",
+ "keywords": [
+ "BB",
+ "bbcode"
+ ]
+ },
+ {
+ "name": "leafo/lessphp",
+ "version": "v0.5.0",
+ "version_normalized": "0.5.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/leafo/lessphp.git",
+ "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/leafo/lessphp/zipball/0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+ "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+ "shasum": ""
+ },
+ "time": "2014-11-24 18:39:20",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.4.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "lessc.inc.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT",
+ "GPL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Leaf Corcoran",
+ "email": "leafot@gmail.com",
+ "homepage": "http://leafo.net"
+ }
+ ],
+ "description": "lessphp is a compiler for LESS written in PHP.",
+ "homepage": "http://leafo.net/lessphp/"
+ },
+ {
+ "name": "leafo/scssphp",
+ "version": "v0.4.0",
+ "version_normalized": "0.4.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/leafo/scssphp.git",
+ "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/leafo/scssphp/zipball/78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a",
+ "reference": "78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "kherge/box": "~2.5",
+ "phpunit/phpunit": "~3.7",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "time": "2015-11-09 14:44:09",
+ "bin": [
+ "bin/pscss"
+ ],
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "classmap.php"
+ ],
+ "psr-4": {
+ "Leafo\\ScssPhp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Leaf Corcoran",
+ "email": "leafot@gmail.com",
+ "homepage": "http://leafo.net"
+ }
+ ],
+ "description": "scssphp is a compiler for SCSS written in PHP.",
+ "homepage": "http://leafo.github.io/scssphp/",
+ "keywords": [
+ "css",
+ "less",
+ "sass",
+ "scss",
+ "stylesheet"
+ ]
+ },
+ {
+ "name": "league/html-to-markdown",
+ "version": "4.2.0",
+ "version_normalized": "4.2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/html-to-markdown.git",
+ "reference": "9a5becc8c6b520920fb846afefcfd7faf4c31712"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/9a5becc8c6b520920fb846afefcfd7faf4c31712",
+ "reference": "9a5becc8c6b520920fb846afefcfd7faf4c31712",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-xml": "*",
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "mikehaertl/php-shellcommand": "~1.1.0",
+ "phpunit/phpunit": "4.*",
+ "scrutinizer/ocular": "~1.1"
+ },
+ "time": "2016-02-01 16:49:02",
+ "bin": [
+ "bin/html-to-markdown"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "League\\HTMLToMarkdown\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Colin O'Dell",
+ "email": "colinodell@gmail.com",
+ "homepage": "http://www.colinodell.com",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Nick Cernis",
+ "email": "nick@cern.is",
+ "homepage": "http://modernnerd.net",
+ "role": "Original Author"
+ }
+ ],
+ "description": "An HTML-to-markdown conversion helper for PHP",
+ "homepage": "https://github.com/thephpleague/html-to-markdown",
+ "keywords": [
+ "html",
+ "markdown"
+ ]
+ },
+ {
+ "name": "michelf/php-smartypants",
+ "version": "1.6.0-beta1",
+ "version_normalized": "1.6.0.0-beta1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/michelf/php-smartypants.git",
+ "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/michelf/php-smartypants/zipball/c0465c6d4c5ab853c2fa45df6c10bce7e35cc137",
+ "reference": "c0465c6d4c5ab853c2fa45df6c10bce7e35cc137",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2013-07-31 18:13:10",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-lib": "1.6.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Michelf": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Michel Fortin",
+ "email": "michel.fortin@michelf.ca",
+ "homepage": "http://michelf.ca/",
+ "role": "Developer"
+ },
+ {
+ "name": "John Gruber",
+ "homepage": "http://daringfireball.net/"
+ }
+ ],
+ "description": "PHP SmartyPants",
+ "homepage": "http://michelf.ca/projects/php-smartypants/",
+ "keywords": [
+ "dashes",
+ "quotes",
+ "spaces",
+ "typographer",
+ "typography"
+ ]
}
]
diff --git a/vendor/jbbcode/jbbcode/.gitignore b/vendor/jbbcode/jbbcode/.gitignore
new file mode 100644
index 000000000..987e2a253
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor
diff --git a/vendor/jbbcode/jbbcode/JBBCode/CodeDefinition.php b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinition.php
new file mode 100644
index 000000000..f7a07f75e
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinition.php
@@ -0,0 +1,328 @@
+elCounter = 0;
+ $def->setTagName($tagName);
+ $def->setReplacementText($replacementText);
+ $def->useOption = $useOption;
+ $def->parseContent = $parseContent;
+ $def->nestLimit = $nestLimit;
+ $def->optionValidator = $optionValidator;
+ $def->bodyValidator = $bodyValidator;
+ return $def;
+ }
+
+ /**
+ * Constructs a new CodeDefinition.
+ *
+ * This constructor is deprecated. You should use the static construct() method or the
+ * CodeDefinitionBuilder class to construct a new CodeDefiniton.
+ *
+ * @deprecated
+ */
+ public function __construct()
+ {
+ /* WARNING: This function is deprecated and will be made protected in a future
+ * version of jBBCode. */
+ $this->parseContent = true;
+ $this->useOption = false;
+ $this->nestLimit = -1;
+ $this->elCounter = 0;
+ $this->optionValidator = array();
+ $this->bodyValidator = null;
+ }
+
+ /**
+ * Determines if the arguments to the given element are valid based on
+ * any validators attached to this CodeDefinition.
+ *
+ * @param $el the ElementNode to validate
+ * @return true if the ElementNode's {option} and {param} are OK, false if they're not
+ */
+ public function hasValidInputs(ElementNode $el)
+ {
+ if ($this->usesOption() && $this->optionValidator) {
+ $att = $el->getAttribute();
+
+ foreach($att as $name => $value){
+ if(isset($this->optionValidator[$name]) && !$this->optionValidator[$name]->validate($value)){
+ return false;
+ }
+ }
+ }
+
+ if (!$this->parseContent() && $this->bodyValidator) {
+ /* We only evaluate the content if we're not parsing the content. */
+ $content = "";
+ foreach ($el->getChildren() as $child) {
+ $content .= $child->getAsBBCode();
+ }
+ if (!$this->bodyValidator->validate($content)) {
+ /* The content of the element is not valid. */
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Accepts an ElementNode that is defined by this CodeDefinition and returns the HTML
+ * markup of the element. This is a commonly overridden class for custom CodeDefinitions
+ * so that the content can be directly manipulated.
+ *
+ * @param $el the element to return an html representation of
+ *
+ * @return the parsed html of this element (INCLUDING ITS CHILDREN)
+ */
+ public function asHtml(ElementNode $el)
+ {
+ if (!$this->hasValidInputs($el)) {
+ return $el->getAsBBCode();
+ }
+
+ $html = $this->getReplacementText();
+
+ if ($this->usesOption()) {
+ $options = $el->getAttribute();
+ if(count($options)==1){
+ $vals = array_values($options);
+ $html = str_ireplace('{option}', reset($vals), $html);
+ }
+ else{
+ foreach($options as $key => $val){
+ $html = str_ireplace('{' . $key . '}', $val, $html);
+ }
+ }
+ }
+
+ $content = $this->getContent($el);
+
+ $html = str_ireplace('{param}', $content, $html);
+
+ return $html;
+ }
+
+ protected function getContent(ElementNode $el){
+ if ($this->parseContent()) {
+ $content = "";
+ foreach ($el->getChildren() as $child)
+ $content .= $child->getAsHTML();
+ } else {
+ $content = "";
+ foreach ($el->getChildren() as $child)
+ $content .= $child->getAsBBCode();
+ }
+ return $content;
+ }
+
+ /**
+ * Accepts an ElementNode that is defined by this CodeDefinition and returns the text
+ * representation of the element. This may be overridden by a custom CodeDefinition.
+ *
+ * @param $el the element to return a text representation of
+ *
+ * @return the text representation of $el
+ */
+ public function asText(ElementNode $el)
+ {
+ if (!$this->hasValidInputs($el)) {
+ return $el->getAsBBCode();
+ }
+
+ $s = "";
+ foreach ($el->getChildren() as $child)
+ $s .= $child->getAsText();
+ return $s;
+ }
+
+ /**
+ * Returns the tag name of this code definition
+ *
+ * @return this definition's associated tag name
+ */
+ public function getTagName()
+ {
+ return $this->tagName;
+ }
+
+ /**
+ * Returns the replacement text of this code definition. This usually has little, if any meaning if the
+ * CodeDefinition class was extended. For default, html replacement CodeDefinitions this returns the html
+ * markup for the definition.
+ *
+ * @return the replacement text of this CodeDefinition
+ */
+ public function getReplacementText()
+ {
+ return $this->replacementText;
+ }
+
+ /**
+ * Returns whether or not this CodeDefinition uses the optional {option}
+ *
+ * @return true if this CodeDefinition uses the option, false otherwise
+ */
+ public function usesOption()
+ {
+ return $this->useOption;
+ }
+
+ /**
+ * Returns whether or not this CodeDefnition parses elements contained within it,
+ * or just treats its children as text.
+ *
+ * @return true if this CodeDefinition parses elements contained within itself
+ */
+ public function parseContent()
+ {
+ return $this->parseContent;
+ }
+
+ /**
+ * Returns the limit of how many elements defined by this CodeDefinition may be
+ * nested together. If after parsing elements are nested beyond this limit, the
+ * subtrees formed by those nodes will be removed from the parse tree. A nest
+ * limit of -1 signifies no limit.
+ */
+ public function getNestLimit()
+ {
+ return $this->nestLimit;
+ }
+
+ /**
+ * Sets the tag name of this CodeDefinition
+ *
+ * @deprecated
+ *
+ * @param the new tag name of this definition
+ */
+ public function setTagName($tagName)
+ {
+ $this->tagName = strtolower($tagName);
+ }
+
+ /**
+ * Sets the html replacement text of this CodeDefinition
+ *
+ * @deprecated
+ *
+ * @param the new replacement text
+ */
+ public function setReplacementText($txt)
+ {
+ $this->replacementText = $txt;
+ }
+
+ /**
+ * Sets whether or not this CodeDefinition uses the {option}
+ *
+ * @deprecated
+ *
+ * @param boolean $bool
+ */
+ public function setUseOption($bool)
+ {
+ $this->useOption = $bool;
+ }
+
+ /**
+ * Sets whether or not this CodeDefinition allows its children to be parsed as html
+ *
+ * @deprecated
+ *
+ * @param boolean $bool
+ */
+ public function setParseContent($bool)
+ {
+ $this->parseContent = $bool;
+ }
+
+ /**
+ * Increments the element counter. This is used for tracking depth of elements of the same type for next limits.
+ *
+ * @deprecated
+ *
+ * @return void
+ */
+ public function incrementCounter()
+ {
+ $this->elCounter++;
+ }
+
+ /**
+ * Decrements the element counter.
+ *
+ * @deprecated
+ *
+ * @return void
+ */
+ public function decrementCounter()
+ {
+ $this->elCounter--;
+ }
+
+ /**
+ * Resets the element counter.
+ *
+ * @deprecated
+ */
+ public function resetCounter()
+ {
+ $this->elCounter = 0;
+ }
+
+ /**
+ * Returns the current value of the element counter.
+ *
+ * @deprecated
+ *
+ * @return int
+ */
+ public function getCounter()
+ {
+ return $this->elCounter;
+ }
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionBuilder.php b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionBuilder.php
new file mode 100644
index 000000000..6e8bbc190
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionBuilder.php
@@ -0,0 +1,160 @@
+tagName = $tagName;
+ $this->replacementText = $replacementText;
+ }
+
+ /**
+ * Sets the tag name the CodeDefinition should be built with.
+ *
+ * @param $tagName the tag name for the new CodeDefinition
+ */
+ public function setTagName($tagName)
+ {
+ $this->tagName = $tagName;
+ return $this;
+ }
+
+ /**
+ * Sets the replacement text that the new CodeDefinition should be
+ * built with.
+ *
+ * @param $replacementText the replacement text for the new CodeDefinition
+ */
+ public function setReplacementText($replacementText)
+ {
+ $this->replacementText = $replacementText;
+ return $this;
+ }
+
+ /**
+ * Set whether or not the built CodeDefinition should use the {option} bbcode
+ * argument.
+ *
+ * @param $option ture iff the definition includes an option
+ */
+ public function setUseOption($option)
+ {
+ $this->useOption = $option;
+ return $this;
+ }
+
+ /**
+ * Set whether or not the built CodeDefinition should allow its content
+ * to be parsed and evaluated as bbcode.
+ *
+ * @param $parseContent true iff the content should be parsed
+ */
+ public function setParseContent($parseContent)
+ {
+ $this->parseContent = $parseContent;
+ return $this;
+ }
+
+ /**
+ * Sets the nest limit for this code definition.
+ *
+ * @param $nestLimit a positive integer, or -1 if there is no limit.
+ * @throws \InvalidArgumentException if the nest limit is invalid
+ */
+ public function setNestLimit($limit)
+ {
+ if(!is_int($limit) || ($limit <= 0 && -1 != $limit)) {
+ throw new \InvalidArgumentException("A nest limit must be a positive integer " .
+ "or -1.");
+ }
+ $this->nestLimit = $limit;
+ return $this;
+ }
+
+ /**
+ * Sets the InputValidator that option arguments should be validated with.
+ *
+ * @param $validator the InputValidator instance to use
+ */
+ public function setOptionValidator(\JBBCode\InputValidator $validator, $option=null)
+ {
+ if(empty($option)){
+ $option = $this->tagName;
+ }
+ $this->optionValidator[$option] = $validator;
+ return $this;
+ }
+
+ /**
+ * Sets the InputValidator that body ({param}) text should be validated with.
+ *
+ * @param $validator the InputValidator instance to use
+ */
+ public function setBodyValidator(\JBBCode\InputValidator $validator)
+ {
+ $this->bodyValidator = $validator;
+ return $this;
+ }
+
+ /**
+ * Removes the attached option validator if one is attached.
+ */
+ public function removeOptionValidator()
+ {
+ $this->optionValidator = array();
+ return $this;
+ }
+
+ /**
+ * Removes the attached body validator if one is attached.
+ */
+ public function removeBodyValidator()
+ {
+ $this->bodyValidator = null;
+ return $this;
+ }
+
+ /**
+ * Builds a CodeDefinition with the current state of the builder.
+ *
+ * @return a new CodeDefinition instance
+ */
+ public function build()
+ {
+ $definition = CodeDefinition::construct($this->tagName,
+ $this->replacementText,
+ $this->useOption,
+ $this->parseContent,
+ $this->nestLimit,
+ $this->optionValidator,
+ $this->bodyValidator);
+ return $definition;
+ }
+
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionSet.php b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionSet.php
new file mode 100644
index 000000000..1b166503a
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/CodeDefinitionSet.php
@@ -0,0 +1,22 @@
+{param}');
+ array_push($this->definitions, $builder->build());
+
+ /* [i] italics tag */
+ $builder = new CodeDefinitionBuilder('i', '{param}');
+ array_push($this->definitions, $builder->build());
+
+ /* [u] underline tag */
+ $builder = new CodeDefinitionBuilder('u', '{param}');
+ array_push($this->definitions, $builder->build());
+
+ $urlValidator = new \JBBCode\validators\UrlValidator();
+
+ /* [url] link tag */
+ $builder = new CodeDefinitionBuilder('url', '{param}');
+ $builder->setParseContent(false)->setBodyValidator($urlValidator);
+ array_push($this->definitions, $builder->build());
+
+ /* [url=http://example.com] link tag */
+ $builder = new CodeDefinitionBuilder('url', '{param}');
+ $builder->setUseOption(true)->setParseContent(true)->setOptionValidator($urlValidator);
+ array_push($this->definitions, $builder->build());
+
+ /* [img] image tag */
+ $builder = new CodeDefinitionBuilder('img', '
');
+ $builder->setUseOption(false)->setParseContent(false)->setBodyValidator($urlValidator);
+ array_push($this->definitions, $builder->build());
+
+ /* [img=alt text] image tag */
+ $builder = new CodeDefinitionBuilder('img', '');
+ $builder->setUseOption(true)->setParseContent(false)->setBodyValidator($urlValidator);
+ array_push($this->definitions, $builder->build());
+
+ /* [color] color tag */
+ $builder = new CodeDefinitionBuilder('color', '{param}');
+ $builder->setUseOption(true)->setOptionValidator(new \JBBCode\validators\CssColorValidator());
+ array_push($this->definitions, $builder->build());
+ }
+
+ /**
+ * Returns an array of the default code definitions.
+ */
+ public function getCodeDefinitions()
+ {
+ return $this->definitions;
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/DocumentElement.php b/vendor/jbbcode/jbbcode/JBBCode/DocumentElement.php
new file mode 100644
index 000000000..54b40c60f
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/DocumentElement.php
@@ -0,0 +1,67 @@
+setTagName("Document");
+ $this->setNodeId(0);
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.ElementNode::getAsBBCode()
+ *
+ * Returns the BBCode representation of this document
+ *
+ * @return this document's bbcode representation
+ */
+ public function getAsBBCode()
+ {
+ $s = "";
+ foreach($this->getChildren() as $child){
+ $s .= $child->getAsBBCode();
+ }
+
+ return $s;
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.ElementNode::getAsHTML()
+ *
+ * Documents don't add any html. They only exist as a container for their
+ * children, so getAsHTML() simply iterates through the document's children,
+ * returning their html.
+ *
+ * @return the HTML representation of this document
+ */
+ public function getAsHTML()
+ {
+ $s = "";
+ foreach($this->getChildren() as $child)
+ $s .= $child->getAsHTML();
+
+ return $s;
+ }
+
+ public function accept(NodeVisitor $visitor)
+ {
+ $visitor->visitDocumentElement($this);
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/ElementNode.php b/vendor/jbbcode/jbbcode/JBBCode/ElementNode.php
new file mode 100644
index 000000000..5393bb19b
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/ElementNode.php
@@ -0,0 +1,241 @@
+children = array();
+ $this->nestDepth = 0;
+ }
+
+ /**
+ * Accepts the given NodeVisitor. This is part of an implementation
+ * of the Visitor pattern.
+ *
+ * @param $nodeVisitor the visitor attempting to visit this node
+ */
+ public function accept(NodeVisitor $nodeVisitor)
+ {
+ $nodeVisitor->visitElementNode($this);
+ }
+
+ /**
+ * Gets the CodeDefinition that defines this element.
+ *
+ * @return this element's code definition
+ */
+ public function getCodeDefinition()
+ {
+ return $this->codeDefinition;
+ }
+
+ /**
+ * Sets the CodeDefinition that defines this element.
+ *
+ * @param codeDef the code definition that defines this element node
+ */
+ public function setCodeDefinition(CodeDefinition $codeDef)
+ {
+ $this->codeDefinition = $codeDef;
+ $this->setTagName($codeDef->getTagName());
+ }
+
+ /**
+ * Returns the tag name of this element.
+ *
+ * @return the element's tag name
+ */
+ public function getTagName()
+ {
+ return $this->tagName;
+ }
+
+ /**
+ * Returns the attribute (used as the option in bbcode definitions) of this element.
+ *
+ * @return the attribute of this element
+ */
+ public function getAttribute()
+ {
+ return $this->attribute;
+ }
+
+ /**
+ * Returns all the children of this element.
+ *
+ * @return an array of this node's child nodes
+ */
+ public function getChildren()
+ {
+ return $this->children;
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsText()
+ *
+ * Returns the element as text (not including any bbcode markup)
+ *
+ * @return the plain text representation of this node
+ */
+ public function getAsText()
+ {
+ if ($this->codeDefinition) {
+ return $this->codeDefinition->asText($this);
+ } else {
+ $s = "";
+ foreach ($this->getChildren() as $child)
+ $s .= $child->getAsText();
+ return $s;
+ }
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsBBCode()
+ *
+ * Returns the element as bbcode (with all unclosed tags closed)
+ *
+ * @return the bbcode representation of this element
+ */
+ public function getAsBBCode()
+ {
+ $str = "[".$this->tagName;
+ if (!empty($this->attribute)) {
+
+ foreach($this->attribute as $key => $value){
+ if($key == $this->tagName){
+ $str .= "=".$value;
+ }
+ else{
+ $str .= " ".$key."=" . $value;
+ }
+ }
+ }
+ $str .= "]";
+ foreach ($this->getChildren() as $child) {
+ $str .= $child->getAsBBCode();
+ }
+ $str .= "[/".$this->tagName."]";
+
+ return $str;
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsHTML()
+ *
+ * Returns the element as html with all replacements made
+ *
+ * @return the html representation of this node
+ */
+ public function getAsHTML()
+ {
+ if($this->codeDefinition) {
+ return $this->codeDefinition->asHtml($this);
+ } else {
+ return "";
+ }
+ }
+
+ /**
+ * Adds a child to this node's content. A child may be a TextNode, or
+ * another ElementNode... or anything else that may extend the
+ * abstract Node class.
+ *
+ * @param child the node to add as a child
+ */
+ public function addChild(Node $child)
+ {
+ array_push($this->children, $child);
+ $child->setParent($this);
+ }
+
+ /**
+ * Removes a child from this node's contnet.
+ *
+ * @param child the child node to remove
+ */
+ public function removeChild(Node $child)
+ {
+ foreach ($this->children as $key => $value) {
+ if ($value == $child)
+ unset($this->children[$key]);
+ }
+ }
+
+ /**
+ * Sets the tag name of this element node.
+ *
+ * @param tagName the element's new tag name
+ */
+ public function setTagName($tagName)
+ {
+ $this->tagName = $tagName;
+ }
+
+ /**
+ * Sets the attribute (option) of this element node.
+ *
+ * @param attribute the attribute of this element node
+ */
+ public function setAttribute($attribute)
+ {
+ $this->attribute = $attribute;
+ }
+
+ /**
+ * Traverses the parse tree upwards, going from parent to parent, until it finds a
+ * parent who has the given tag name. Returns the parent with the matching tag name
+ * if it exists, otherwise returns null.
+ *
+ * @param str the tag name to search for
+ *
+ * @return the closest parent with the given tag name
+ */
+ public function closestParentOfType($str)
+ {
+ $str = strtolower($str);
+ $currentEl = $this;
+
+ while (strtolower($currentEl->getTagName()) != $str && $currentEl->hasParent()) {
+ $currentEl = $currentEl->getParent();
+ }
+
+ if (strtolower($currentEl->getTagName()) != $str) {
+ return null;
+ } else {
+ return $currentEl;
+ }
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/InputValidator.php b/vendor/jbbcode/jbbcode/JBBCode/InputValidator.php
new file mode 100644
index 000000000..677470964
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/InputValidator.php
@@ -0,0 +1,20 @@
+nodeid;
+ }
+
+ /**
+ * Returns this node's immediate parent.
+ *
+ * @return the node's parent
+ */
+ public function getParent()
+ {
+ return $this->parent;
+ }
+
+ /**
+ * Determines if this node has a parent.
+ *
+ * @return true if this node has a parent, false otherwise
+ */
+ public function hasParent()
+ {
+ return $this->parent != null;
+ }
+
+ /**
+ * Returns true if this is a text node. Returns false otherwise.
+ * (Overridden by TextNode to return true)
+ *
+ * @return true if this node is a text node
+ */
+ public function isTextNode()
+ {
+ return false;
+ }
+
+ /**
+ * Accepts a NodeVisitor
+ *
+ * @param nodeVisitor the NodeVisitor traversing the graph
+ */
+ abstract public function accept(NodeVisitor $nodeVisitor);
+
+ /**
+ * Returns this node as text (without any bbcode markup)
+ *
+ * @return the plain text representation of this node
+ */
+ abstract public function getAsText();
+
+ /**
+ * Returns this node as bbcode
+ *
+ * @return the bbcode representation of this node
+ */
+ abstract public function getAsBBCode();
+
+ /**
+ * Returns this node as HTML
+ *
+ * @return the html representation of this node
+ */
+ abstract public function getAsHTML();
+
+ /**
+ * Sets this node's parent to be the given node.
+ *
+ * @param parent the node to set as this node's parent
+ */
+ public function setParent(Node $parent)
+ {
+ $this->parent = $parent;
+ }
+
+ /**
+ * Sets this node's nodeid
+ *
+ * @param nodeid this node's node id
+ */
+ public function setNodeId($nodeid)
+ {
+ $this->nodeid = $nodeid;
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/NodeVisitor.php b/vendor/jbbcode/jbbcode/JBBCode/NodeVisitor.php
new file mode 100644
index 000000000..1dd228a97
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/NodeVisitor.php
@@ -0,0 +1,20 @@
+reset();
+ $this->bbcodes = array();
+ }
+
+ /**
+ * Adds a simple (text-replacement only) bbcode definition
+ *
+ * @param string $tagName the tag name of the code (for example the b in [b])
+ * @param string $replace the html to use, with {param} and optionally {option} for replacements
+ * @param boolean $useOption whether or not this bbcode uses the secondary {option} replacement
+ * @param boolean $parseContent whether or not to parse the content within these elements
+ * @param integer $nestLimit an optional limit of the number of elements of this kind that can be nested within
+ * each other before the parser stops parsing them.
+ * @param InputValidator $optionValidator the validator to run {option} through
+ * @param BodyValidator $bodyValidator the validator to run {param} through (only used if $parseContent == false)
+ *
+ * @return Parser
+ */
+ public function addBBCode($tagName, $replace, $useOption = false, $parseContent = true, $nestLimit = -1,
+ InputValidator $optionValidator = null, InputValidator $bodyValidator = null)
+ {
+ $builder = new CodeDefinitionBuilder($tagName, $replace);
+
+ $builder->setUseOption($useOption);
+ $builder->setParseContent($parseContent);
+ $builder->setNestLimit($nestLimit);
+
+ if ($optionValidator) {
+ $builder->setOptionValidator($optionValidator);
+ }
+
+ if ($bodyValidator) {
+ $builder->setBodyValidator($bodyValidator);
+ }
+
+ $this->addCodeDefinition($builder->build());
+
+ return $this;
+ }
+
+ /**
+ * Adds a complex bbcode definition. You may subclass the CodeDefinition class, instantiate a definition of your new
+ * class and add it to the parser through this method.
+ *
+ * @param CodeDefinition $definition the bbcode definition to add
+ *
+ * @return Parser
+ */
+ public function addCodeDefinition(CodeDefinition $definition)
+ {
+ array_push($this->bbcodes, $definition);
+
+ return $this;
+ }
+
+ /**
+ * Adds a set of CodeDefinitions.
+ *
+ * @param CodeDefinitionSet $set the set of definitions to add
+ *
+ * @return Parser
+ */
+ public function addCodeDefinitionSet(CodeDefinitionSet $set) {
+ foreach ($set->getCodeDefinitions() as $def) {
+ $this->addCodeDefinition($def);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Returns the entire parse tree as text. Only {param} content is returned. BBCode markup will be ignored.
+ *
+ * @return string a text representation of the parse tree
+ */
+ public function getAsText()
+ {
+ return $this->treeRoot->getAsText();
+ }
+
+ /**
+ * Returns the entire parse tree as bbcode. This will be identical to the inputted string, except unclosed tags
+ * will be closed.
+ *
+ * @return string a bbcode representation of the parse tree
+ */
+ public function getAsBBCode()
+ {
+ return $this->treeRoot->getAsBBCode();
+ }
+
+ /**
+ * Returns the entire parse tree as HTML. All BBCode replacements will be made. This is generally the method
+ * you will want to use to retrieve the parsed bbcode.
+ *
+ * @return string a parsed html string
+ */
+ public function getAsHTML()
+ {
+ return $this->treeRoot->getAsHTML();
+ }
+
+ /**
+ * Accepts the given NodeVisitor at the root.
+ *
+ * @param NodeVisitor a NodeVisitor
+ *
+ * @return Parser
+ */
+ public function accept(NodeVisitor $nodeVisitor)
+ {
+ $this->treeRoot->accept($nodeVisitor);
+
+ return $this;
+ }
+ /**
+ * Constructs the parse tree from a string of bbcode markup.
+ *
+ * @param string $str the bbcode markup to parse
+ *
+ * @return Parser
+ */
+ public function parse($str)
+ {
+ /* Set the tree root back to a fresh DocumentElement. */
+ $this->reset();
+
+ $parent = $this->treeRoot;
+ $tokenizer = new Tokenizer($str);
+
+ while ($tokenizer->hasNext()) {
+ $parent = $this->parseStartState($parent, $tokenizer);
+ if ($parent->getCodeDefinition() && false ===
+ $parent->getCodeDefinition()->parseContent()) {
+ /* We're inside an element that does not allow its contents to be parseable. */
+ $this->parseAsTextUntilClose($parent, $tokenizer);
+ $parent = $parent->getParent();
+ }
+ }
+
+ /* We parsed ignoring nest limits. Do an O(n) traversal to remove any elements that
+ * are nested beyond their CodeDefinition's nest limit. */
+ $this->removeOverNestedElements();
+
+ return $this;
+ }
+
+ /**
+ * Removes any elements that are nested beyond their nest limit from the parse tree. This
+ * method is now deprecated. In a future release its access privileges will be made
+ * protected.
+ *
+ * @deprecated
+ */
+ public function removeOverNestedElements()
+ {
+ $nestLimitVisitor = new \JBBCode\visitors\NestLimitVisitor();
+ $this->accept($nestLimitVisitor);
+ }
+
+ /**
+ * Removes the old parse tree if one exists.
+ */
+ protected function reset()
+ {
+ // remove any old tree information
+ $this->treeRoot = new DocumentElement();
+ /* The document element is created with nodeid 0. */
+ $this->nextNodeid = 1;
+ }
+
+ /**
+ * Determines whether a bbcode exists based on its tag name and whether or not it uses an option
+ *
+ * @param string $tagName the bbcode tag name to check
+ * @param boolean $usesOption whether or not the bbcode accepts an option
+ *
+ * @return bool true if the code exists, false otherwise
+ */
+ public function codeExists($tagName, $usesOption = false)
+ {
+ foreach ($this->bbcodes as $code) {
+ if (strtolower($tagName) == $code->getTagName() && $usesOption == $code->usesOption()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns the CodeDefinition of a bbcode with the matching tag name and usesOption parameter
+ *
+ * @param string $tagName the tag name of the bbcode being searched for
+ * @param boolean $usesOption whether or not the bbcode accepts an option
+ *
+ * @return CodeDefinition if the bbcode exists, null otherwise
+ */
+ public function getCode($tagName, $usesOption = false)
+ {
+ foreach ($this->bbcodes as $code) {
+ if (strtolower($tagName) == $code->getTagName() && $code->usesOption() == $usesOption) {
+ return $code;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Adds a set of default, standard bbcode definitions commonly used across the web.
+ *
+ * This method is now deprecated. Please use DefaultCodeDefinitionSet and
+ * addCodeDefinitionSet() instead.
+ *
+ * @deprecated
+ */
+ public function loadDefaultCodes()
+ {
+ $defaultSet = new DefaultCodeDefinitionSet();
+ $this->addCodeDefinitionSet($defaultSet);
+ }
+
+ /**
+ * Creates a new text node with the given parent and text string.
+ *
+ * @param $parent the parent of the text node
+ * @param $string the text of the text node
+ *
+ * @return TextNode the newly created TextNode
+ */
+ protected function createTextNode(ElementNode $parent, $string)
+ {
+ if (count($parent->getChildren())) {
+ $children = $parent->getChildren();
+ $lastElement = end($children);
+ reset($children);
+
+ if ($lastElement->isTextNode()) {
+ $lastElement->setValue($lastElement->getValue() . $string);
+ return $lastElement;
+ }
+ }
+
+ $textNode = new TextNode($string);
+ $textNode->setNodeId(++$this->nextNodeid);
+ $parent->addChild($textNode);
+ return $textNode;
+ }
+
+ /**
+ * jBBCode parsing logic is loosely modelled after a FSM. While not every function maps
+ * to a unique DFSM state, each function handles the logic of one or more FSM states.
+ * This function handles the beginning parse state when we're not currently in a tag
+ * name.
+ *
+ * @param ElementNode $parent the current parent node we're under
+ * @param Tokenizer $tokenizer the tokenizer we're using
+ *
+ * @return ElementNode the new parent we should use for the next iteration.
+ */
+ protected function parseStartState(ElementNode $parent, Tokenizer $tokenizer)
+ {
+ $next = $tokenizer->next();
+
+ if ('[' == $next) {
+ return $this->parseTagOpen($parent, $tokenizer);
+ }
+ else {
+ $this->createTextNode($parent, $next);
+ /* Drop back into the main parse loop which will call this
+ * same method again. */
+ return $parent;
+ }
+ }
+
+ /**
+ * This function handles parsing the beginnings of an open tag. When we see a [
+ * at an appropriate time, this function is entered.
+ *
+ * @param ElementNode $parent the current parent node
+ * @param Tokenizer $tokenizer the tokenizer we're using
+ *
+ * @return ElementNode the new parent node
+ */
+ protected function parseTagOpen(ElementNode $parent, Tokenizer $tokenizer)
+ {
+
+ if (!$tokenizer->hasNext()) {
+ /* The [ that sent us to this state was just a trailing [, not the
+ * opening for a new tag. Treat it as such. */
+ $this->createTextNode($parent, '[');
+ return $parent;
+ }
+
+ $next = $tokenizer->next();
+
+ /* This while loop could be replaced by a recursive call to this same method,
+ * which would likely be a lot clearer but I decided to use a while loop to
+ * prevent stack overflow with a string like [[[[[[[[[...[[[.
+ */
+ while ('[' == $next) {
+ /* The previous [ was just a random bracket that should be treated as text.
+ * Continue until we get a non open bracket. */
+ $this->createTextNode($parent, '[');
+ if (!$tokenizer->hasNext()) {
+ $this->createTextNode($parent, '[');
+ return $parent;
+ }
+ $next = $tokenizer->next();
+ }
+
+ if (!$tokenizer->hasNext()) {
+ $this->createTextNode($parent, '['.$next);
+ return $parent;
+ }
+
+ $after_next = $tokenizer->next();
+ $tokenizer->stepBack();
+
+ if ($after_next != ']')
+ {
+ $this->createTextNode($parent, '['.$next);
+ return $parent;
+ }
+
+ /* At this point $next is either ']' or plain text. */
+ if (']' == $next) {
+ $this->createTextNode($parent, '[');
+ $this->createTextNode($parent, ']');
+ return $parent;
+ } else {
+ /* $next is plain text... likely a tag name. */
+ return $this->parseTag($parent, $tokenizer, $next);
+ }
+ }
+
+ protected function parseOptions($tagContent)
+ {
+ $buffer = "";
+ $tagName = "";
+ $state = static::OPTION_STATE_TAGNAME;
+ $keys = array();
+ $values = array();
+ $options = array();
+
+ $len = strlen($tagContent);
+ $done = false;
+ $idx = 0;
+
+ try{
+ while(!$done){
+ $char = $idx < $len ? $tagContent[$idx]:null;
+ switch($state){
+ case static::OPTION_STATE_TAGNAME:
+ switch($char){
+ case '=':
+ $state = static::OPTION_STATE_VALUE;
+ $tagName = $buffer;
+ $keys[] = $tagName;
+ $buffer = "";
+ break;
+ case ' ':
+ $state = static::OPTION_STATE_DEFAULT;
+ $tagName = $buffer;
+ $buffer = '';
+ $keys[] = $tagName;
+ break;
+
+ case null:
+ $tagName = $buffer;
+ $buffer = '';
+ $keys[] = $tagName;
+ break;
+ default:
+ $buffer .= $char;
+ }
+ break;
+
+ case static::OPTION_STATE_DEFAULT:
+ switch($char){
+ case ' ':
+ // do nothing
+ default:
+ $state = static::OPTION_STATE_KEY;
+ $buffer .= $char;
+ }
+ break;
+
+ case static::OPTION_STATE_VALUE:
+ switch($char){
+ case '"':
+ $state = static::OPTION_STATE_QUOTED_VALUE;
+ break;
+ case null: // intentional fall-through
+ case ' ': // key=value delimits to next key
+ $values[] = $buffer;
+ $buffer = "";
+ $state = static::OPTION_STATE_KEY;
+ break;
+ case ":":
+ if($buffer=="javascript"){
+ $state = static::OPTION_STATE_JAVASCRIPT;
+ }
+ $buffer .= $char;
+ break;
+ default:
+ $buffer .= $char;
+
+ }
+ break;
+
+ case static::OPTION_STATE_JAVASCRIPT:
+ switch($char){
+ case ";":
+ $buffer .= $char;
+ $values[] = $buffer;
+ $buffer = "";
+ $state = static::OPTION_STATE_KEY;
+
+ break;
+ default:
+ $buffer .= $char;
+ }
+ break;
+
+ case static::OPTION_STATE_KEY:
+ switch($char){
+ case '=':
+ $state = static::OPTION_STATE_VALUE;
+ $keys[] = $buffer;
+ $buffer = '';
+ break;
+ case ' ': // ignore key=value
+ break;
+ default:
+ $buffer .= $char;
+ break;
+ }
+ break;
+
+ case static::OPTION_STATE_QUOTED_VALUE:
+ switch($char){
+ case null:
+ case '"':
+ $state = static::OPTION_STATE_KEY;
+ $values[] = $buffer;
+ $buffer = '';
+
+ // peek ahead. If the next character is not a space or a closing brace, we have a bad tag and need to abort
+ if(isset($tagContent[$idx+1]) && $tagContent[$idx+1]!=" " && $tagContent[$idx+1]!="]" ){
+ throw new ParserException("Badly formed attribute: $tagContent");
+ }
+ break;
+ default:
+ $buffer .= $char;
+ break;
+ }
+ break;
+ default:
+ if(!empty($char)){
+ $state = static::OPTION_STATE_KEY;
+ }
+
+ }
+ if($idx >= $len){
+ $done = true;
+ }
+ $idx++;
+ }
+
+ if(count($keys) && count($values)){
+ if(count($keys)==(count($values)+1)){
+ array_unshift($values, "");
+ }
+
+ $options = array_combine($keys, $values);
+ }
+ }
+ catch(ParserException $e){
+ // if we're in this state, then something evidently went wrong. We'll consider everything that came after the tagname to be the attribute for that keyname
+ $options[$tagName]= substr($tagContent, strpos($tagContent, "=")+1);
+ }
+ return array($tagName, $options);
+ }
+
+ /**
+ * This is the next step in parsing a tag. It's possible for it to still be invalid at this
+ * point but many of the basic invalid tag name conditions have already been handled.
+ *
+ * @param ElementNode $parent the current parent element
+ * @param Tokenizer $tokenizer the tokenizer we're using
+ * @param string $tagContent the text between the [ and the ], assuming there is actually a ]
+ *
+ * @return ElementNode the new parent element
+ */
+ protected function parseTag(ElementNode $parent, Tokenizer $tokenizer, $tagContent)
+ {
+
+ $next;
+ if (!$tokenizer->hasNext() || ($next = $tokenizer->next()) != ']') {
+ /* This is a malformed tag. Both the previous [ and the tagContent
+ * is really just plain text. */
+ $this->createTextNode($parent, '[');
+ $this->createTextNode($parent, $tagContent);
+ return $parent;
+ }
+
+ /* This is a well-formed tag consisting of [something] or [/something], but
+ * we still need to ensure that 'something' is a valid tag name. Additionally,
+ * if it's a closing tag, we need to ensure that there was a previous matching
+ * opening tag.
+ */
+ /* There could be attributes. */
+ list($tmpTagName, $options) = $this->parseOptions($tagContent);
+
+ // $tagPieces = explode('=', $tagContent);
+ // $tmpTagName = $tagPieces[0];
+
+ $actualTagName;
+ if ('' != $tmpTagName && '/' == $tmpTagName[0]) {
+ /* This is a closing tag name. */
+ $actualTagName = substr($tmpTagName, 1);
+ } else {
+ $actualTagName = $tmpTagName;
+ }
+
+ if ('' != $tmpTagName && '/' == $tmpTagName[0]) {
+ /* This is attempting to close an open tag. We must verify that there exists an
+ * open tag of the same type and that there is no option (options on closing
+ * tags don't make any sense). */
+ $elToClose = $parent->closestParentOfType($actualTagName);
+ if (null == $elToClose || count($options) > 1) {
+ /* Closing an unopened tag or has an option. Treat everything as plain text. */
+ $this->createTextNode($parent, '[');
+ $this->createTextNode($parent, $tagContent);
+ $this->createTextNode($parent, ']');
+ return $parent;
+ } else {
+ /* We're closing $elToClose. In order to do that, we just need to return
+ * $elToClose's parent, since that will change our effective parent to be
+ * elToClose's parent. */
+ return $elToClose->getParent();
+ }
+ }
+
+ /* Verify that this is a known bbcode tag name. */
+ if ('' == $actualTagName || !$this->codeExists($actualTagName, !empty($options))) {
+ /* This is an invalid tag name! Treat everything we've seen as plain text. */
+ $this->createTextNode($parent, '[');
+ $this->createTextNode($parent, $tagContent);
+ $this->createTextNode($parent, ']');
+ return $parent;
+ }
+
+ /* If we're here, this is a valid opening tag. Let's make a new node for it. */
+ $el = new ElementNode();
+ $el->setNodeId(++$this->nextNodeid);
+ $code = $this->getCode($actualTagName, !empty($options));
+ $el->setCodeDefinition($code);
+ if (!empty($options)) {
+ /* We have an attribute we should save. */
+ $el->setAttribute($options);
+ }
+ $parent->addChild($el);
+ return $el;
+ }
+
+ /**
+ * Handles parsing elements whose CodeDefinitions disable parsing of element
+ * contents. This function uses a rolling window of 3 tokens until it finds the
+ * appropriate closing tag or reaches the end of the token stream.
+ *
+ * @param ElementNode $parent the current parent element
+ * @param Tokenizer $tokenizer the tokenizer we're using
+ *
+ * @return ElementNode the new parent element
+ */
+ protected function parseAsTextUntilClose(ElementNode $parent, Tokenizer $tokenizer)
+ {
+ /* $parent's code definition doesn't allow its contents to be parsed. Here we use
+ * a sliding window of three tokens until we find [ /tagname ], signifying the
+ * end of the parent. */
+ if (!$tokenizer->hasNext()) {
+ return $parent;
+ }
+ $prevPrev = $tokenizer->next();
+ if (!$tokenizer->hasNext()) {
+ $this->createTextNode($parent, $prevPrev);
+ return $parent;
+ }
+ $prev = $tokenizer->next();
+ if (!$tokenizer->hasNext()) {
+ $this->createTextNode($parent, $prevPrev);
+ $this->createTextNode($parent, $prev);
+ return $parent;
+ }
+ $curr = $tokenizer->next();
+ while ('[' != $prevPrev || '/'.$parent->getTagName() != strtolower($prev) ||
+ ']' != $curr) {
+ $this->createTextNode($parent, $prevPrev);
+ $prevPrev = $prev;
+ $prev = $curr;
+ if (!$tokenizer->hasNext()) {
+ $this->createTextNode($parent, $prevPrev);
+ $this->createTextNode($parent, $prev);
+ return $parent;
+ }
+ $curr = $tokenizer->next();
+ }
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/ParserException.php b/vendor/jbbcode/jbbcode/JBBCode/ParserException.php
new file mode 100644
index 000000000..89501cfcb
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/ParserException.php
@@ -0,0 +1,7 @@
+value = $val;
+ }
+
+ public function accept(NodeVisitor $visitor)
+ {
+ $visitor->visitTextNode($this);
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::isTextNode()
+ *
+ * returns true
+ */
+ public function isTextNode()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the text string value of this text node.
+ *
+ * @return string
+ */
+ public function getValue()
+ {
+ return $this->value;
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsText()
+ *
+ * Returns the text representation of this node.
+ *
+ * @return this node represented as text
+ */
+ public function getAsText()
+ {
+ return $this->getValue();
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsBBCode()
+ *
+ * Returns the bbcode representation of this node. (Just its value)
+ *
+ * @return this node represented as bbcode
+ */
+ public function getAsBBCode()
+ {
+ return $this->getValue();
+ }
+
+ /**
+ * (non-PHPdoc)
+ * @see JBBCode.Node::getAsHTML()
+ *
+ * Returns the html representation of this node. (Just its value)
+ *
+ * @return this node represented as HTML
+ */
+ public function getAsHTML()
+ {
+ return $this->getValue();
+ }
+
+ /**
+ * Edits the text value contained within this text node.
+ *
+ * @param newValue the new text value of the text node
+ */
+ public function setValue($newValue)
+ {
+ $this->value = $newValue;
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/Tokenizer.php b/vendor/jbbcode/jbbcode/JBBCode/Tokenizer.php
new file mode 100644
index 000000000..6d47c44bc
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/Tokenizer.php
@@ -0,0 +1,105 @@
+tokens, substr($str, $strStart, $index - $strStart));
+ $strStart = $index;
+ }
+
+ /* Add the [ or ] to the tokens array. */
+ array_push($this->tokens, $str[$index]);
+ $strStart = $index+1;
+ }
+ }
+
+ if ($strStart < strlen($str)) {
+ /* There are still characters in the buffer. Add them to the tokens. */
+ array_push($this->tokens, substr($str, $strStart, strlen($str) - $strStart));
+ }
+ }
+
+ /**
+ * Returns true if there is another token in the token stream.
+ */
+ public function hasNext()
+ {
+ return count($this->tokens) > 1 + $this->i;
+ }
+
+ /**
+ * Advances the token stream to the next token and returns the new token.
+ */
+ public function next()
+ {
+ if (!$this->hasNext()) {
+ return null;
+ } else {
+ return $this->tokens[++$this->i];
+ }
+ }
+
+ /**
+ * Retrieves the current token.
+ */
+ public function current()
+ {
+ if ($this->i < 0) {
+ return null;
+ } else {
+ return $this->tokens[$this->i];
+ }
+ }
+
+ /**
+ * Moves the token stream back a token.
+ */
+ public function stepBack()
+ {
+ if ($this->i > -1) {
+ $this->i--;
+ }
+ }
+
+ /**
+ * Restarts the tokenizer, returning to the beginning of the token stream.
+ */
+ public function restart()
+ {
+ $this->i = -1;
+ }
+
+ /**
+ * toString method that returns the entire string from the current index on.
+ */
+ public function toString()
+ {
+ return implode('', array_slice($this->tokens, $this->i + 1));
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/1-GettingStarted.php b/vendor/jbbcode/jbbcode/JBBCode/examples/1-GettingStarted.php
new file mode 100644
index 000000000..dd0c17440
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/1-GettingStarted.php
@@ -0,0 +1,12 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+
+$text = "The default codes include: [b]bold[/b], [i]italics[/i], [u]underlining[/u], ";
+$text .= "[url=http://jbbcode.com]links[/url], [color=red]color![/color] and more.";
+
+$parser->parse($text);
+
+print $parser->getAsHtml();
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/2-ClosingUnclosedTags.php b/vendor/jbbcode/jbbcode/JBBCode/examples/2-ClosingUnclosedTags.php
new file mode 100644
index 000000000..35ee7fdcd
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/2-ClosingUnclosedTags.php
@@ -0,0 +1,10 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+
+$text = "The bbcode in here [b]is never closed!";
+$parser->parse($text);
+
+print $parser->getAsBBCode();
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/3-MarkuplessText.php b/vendor/jbbcode/jbbcode/JBBCode/examples/3-MarkuplessText.php
new file mode 100644
index 000000000..47f20a3cd
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/3-MarkuplessText.php
@@ -0,0 +1,11 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+
+$text = "[b][u]There is [i]a lot[/i] of [url=http://en.wikipedia.org/wiki/Markup_language]markup[/url] in this";
+$text .= "[color=#333333]text[/color]![/u][/b]";
+$parser->parse($text);
+
+print $parser->getAsText();
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/4-CreatingNewCodes.php b/vendor/jbbcode/jbbcode/JBBCode/examples/4-CreatingNewCodes.php
new file mode 100644
index 000000000..e8335b017
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/4-CreatingNewCodes.php
@@ -0,0 +1,7 @@
+addBBCode("quote", '\n");
+}
+
+$inputText = $argv[1];
+$tagName = $argv[2];
+
+$parser->parse($inputText);
+
+$tagCountingVisitor = new \JBBCode\visitors\TagCountingVisitor();
+$parser->accept($tagCountingVisitor);
+
+echo $tagCountingVisitor->getFrequency($tagName) . "\n";
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToBBCodeTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToBBCodeTest.php
new file mode 100644
index 000000000..c832fcc7a
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToBBCodeTest.php
@@ -0,0 +1,85 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse($bbcode);
+ return $parser->getAsBBCode();
+ }
+
+ /**
+ * Asserts that the given bbcode matches the given text when
+ * the bbcode is run through defaultBBCodeParse
+ */
+ private function assertBBCodeOutput($bbcode, $text)
+ {
+ $this->assertEquals($this->defaultBBCodeParse($bbcode), $text);
+ }
+
+ public function testEmptyString()
+ {
+ $this->assertBBCodeOutput('', '');
+ }
+
+ public function testOneTag()
+ {
+ $this->assertBBCodeOutput('[b]this is bold[/b]', '[b]this is bold[/b]');
+ }
+
+ public function testOneTagWithSurroundingText()
+ {
+ $this->assertBBCodeOutput('buffer text [b]this is bold[/b] buffer text',
+ 'buffer text [b]this is bold[/b] buffer text');
+ }
+
+ public function testMultipleTags()
+ {
+ $bbcode = 'this is some text with [b]bold tags[/b] and [i]italics[/i] and ' .
+ 'things like [u]that[/u].';
+ $bbcodeOutput = 'this is some text with [b]bold tags[/b] and [i]italics[/i] and ' .
+ 'things like [u]that[/u].';
+ $this->assertBBCodeOutput($bbcode, $bbcodeOutput);
+ }
+
+ public function testCodeOptions()
+ {
+ $code = 'This contains a [url=http://jbbcode.com]url[/url] which uses an option.';
+ $codeOutput = 'This contains a [url=http://jbbcode.com]url[/url] which uses an option.';
+ $this->assertBBCodeOutput($code, $codeOutput);
+ }
+
+ /**
+ * @depends testCodeOptions
+ */
+ public function testOmittedOption()
+ {
+ $code = 'This doesn\'t use the url option [url]http://jbbcode.com[/url].';
+ $codeOutput = 'This doesn\'t use the url option [url]http://jbbcode.com[/url].';
+ $this->assertBBCodeOutput($code, $codeOutput);
+ }
+
+ public function testUnclosedTags()
+ {
+ $code = '[b]bold';
+ $codeOutput = '[b]bold[/b]';
+ $this->assertBBCodeOutput($code, $codeOutput);
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToTextTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToTextTest.php
new file mode 100644
index 000000000..193fc7cbe
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/BBCodeToTextTest.php
@@ -0,0 +1,78 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse($bbcode);
+ return $parser->getAsText();
+ }
+
+ /**
+ * Asserts that the given bbcode matches the given text when
+ * the bbcode is run through defaultTextParse
+ */
+ private function assertTextOutput($bbcode, $text)
+ {
+ $this->assertEquals($text, $this->defaultTextParse($bbcode));
+ }
+
+ public function testEmptyString()
+ {
+ $this->assertTextOutput('', '');
+ }
+
+ public function testOneTag()
+ {
+ $this->assertTextOutput('[b]this is bold[/b]', 'this is bold');
+ }
+
+ public function testOneTagWithSurroundingText()
+ {
+ $this->assertTextOutput('buffer text [b]this is bold[/b] buffer text',
+ 'buffer text this is bold buffer text');
+ }
+
+ public function testMultipleTags()
+ {
+ $bbcode = 'this is some text with [b]bold tags[/b] and [i]italics[/i] and ' .
+ 'things like [u]that[/u].';
+ $text = 'this is some text with bold tags and italics and things like that.';
+ $this->assertTextOutput($bbcode, $text);
+ }
+
+ public function testCodeOptions()
+ {
+ $code = 'This contains a [url=http://jbbcode.com]url[/url] which uses an option.';
+ $text = 'This contains a url which uses an option.';
+ $this->assertTextOutput($code, $text);
+ }
+
+ /**
+ * @depends testCodeOptions
+ */
+ public function testOmittedOption()
+ {
+ $code = 'This doesn\'t use the url option [url]http://jbbcode.com[/url].';
+ $text = 'This doesn\'t use the url option http://jbbcode.com.';
+ $this->assertTextOutput($code, $text);
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/DefaultCodesTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/DefaultCodesTest.php
new file mode 100644
index 000000000..e93399282
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/DefaultCodesTest.php
@@ -0,0 +1,54 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse($bbcode);
+ $this->assertEquals($html, $parser->getAsHtml());
+ }
+
+ /**
+ * Tests the [b] bbcode.
+ */
+ public function testBold()
+ {
+ $this->assertProduces('[b]this should be bold[/b]', 'this should be bold');
+ }
+
+ /**
+ * Tests the [color] bbcode.
+ */
+ public function testColor()
+ {
+ $this->assertProduces('[color=red]red[/color]', 'red');
+ }
+
+ /**
+ * Tests the example from the documentation.
+ */
+ public function testExample()
+ {
+ $text = "The default codes include: [b]bold[/b], [i]italics[/i], [u]underlining[/u], ";
+ $text .= "[url=http://jbbcode.com]links[/url], [color=red]color![/color] and more.";
+ $html = 'The default codes include: bold, italics, underlining, ';
+ $html .= 'links, color! and more.';
+ $this->assertProduces($text, $html);
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/HTMLSafeTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/HTMLSafeTest.php
new file mode 100644
index 000000000..bd9391b6e
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/HTMLSafeTest.php
@@ -0,0 +1,77 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse($bbcode);
+
+ $htmlsafer = new JBBCode\visitors\HTMLSafeVisitor();
+ $parser->accept($htmlsafer);
+
+ $this->assertEquals($html, $parser->getAsHtml());
+ }
+
+ /**
+ * Tests escaping quotes and ampersands in simple text
+ */
+ public function testQuoteAndAmp()
+ {
+ $this->assertProduces('te"xt te&xt', 'te"xt te&xt');
+ }
+
+ /**
+ * Tests escaping quotes and ampersands inside a BBCode tag
+ */
+ public function testQuoteAndAmpInTag()
+ {
+ $this->assertProduces('[b]te"xt te&xt[/b]', 'te"xt te&xt');
+ }
+
+ /**
+ * Tests escaping HTML tags
+ */
+ public function testHtmlTag()
+ {
+ $this->assertProduces('not bold', '<b>not bold</b>');
+ $this->assertProduces('[b]bold[/b]
', '<b>bold</b> <hr>'); + } + + /** + * Tests escaping ampersands in URL using [url]...[/url] + */ + public function testUrlParam() + { + $this->assertProduces('text [url]http://example.com/?a=b&c=d[/url] more text', 'text http://example.com/?a=b&c=d more text'); + } + + /** + * Tests escaping ampersands in URL using [url=...] tag + */ + public function testUrlOption() + { + $this->assertProduces('text [url=http://example.com/?a=b&c=d]this is a "link"[/url]', 'text this is a "link"'); + } + + /** + * Tests escaping ampersands in URL using [url=...] tag when URL is in quotes + */ + public function testUrlOptionQuotes() + { + $this->assertProduces('text [url="http://example.com/?a=b&c=d"]this is a "link"[/url]', 'text this is a "link"'); + } + +} diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php new file mode 100644 index 000000000..d826fefde --- /dev/null +++ b/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php @@ -0,0 +1,46 @@ +addBBCode('b', '{param}', false, true, -1); + $parser->parse('[b][b][b][b][b][b][b][b]bold text[/b][/b][/b][/b][/b][/b][/b][/b]'); + $this->assertEquals('' . + 'bold text' . + '', + $parser->getAsHtml()); + } + + /** + * Test over nesting. + */ + public function testOverNesting() + { + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('quote', 'bold tags and italics and
+things like that.
+EOD;
+ $this->assertProduces($bbcode, $html);
+ }
+
+ public function testCodeOptions()
+ {
+ $code = 'This contains a [url=http://jbbcode.com/?b=2]url[/url] which uses an option.';
+ $html = 'This contains a url which uses an option.';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testAttributes()
+ {
+ $parser = new JBBCode\Parser();
+ $builder = new JBBCode\CodeDefinitionBuilder('img', '');
+ $parser->addCodeDefinition($builder->setUseOption(true)->setParseContent(false)->build());
+
+ $expected = 'Multiple 
options.';
+
+ $code = 'Multiple [img height="50" alt="alt text"]http://jbbcode.com/img.png[/img] options.';
+ $parser->parse($code);
+ $result = $parser->getAsHTML();
+ $this->assertEquals($expected, $result);
+
+ $code = 'Multiple [img height=50 alt="alt text"]http://jbbcode.com/img.png[/img] options.';
+ $parser->parse($code);
+ $result = $parser->getAsHTML();
+ $this->assertEquals($expected, $result);
+ }
+
+ /**
+ * @depends testCodeOptions
+ */
+ public function testOmittedOption()
+ {
+ $code = 'This doesn\'t use the url option [url]http://jbbcode.com[/url].';
+ $html = 'This doesn\'t use the url option http://jbbcode.com.';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testUnclosedTag()
+ {
+ $code = 'hello [b]world';
+ $html = 'hello world';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testNestingTags()
+ {
+ $code = '[url=http://jbbcode.com][b]hello [u]world[/u][/b][/url]';
+ $html = 'hello world';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testBracketInTag()
+ {
+ $this->assertProduces('[b]:-[[/b]', ':-[');
+ }
+
+ public function testBracketWithSpaceInTag()
+ {
+ $this->assertProduces('[b]:-[ [/b]', ':-[ ');
+ }
+
+ public function testBracketWithTextInTag()
+ {
+ $this->assertProduces('[b]:-[ foobar[/b]', ':-[ foobar');
+ }
+
+ public function testMultibleBracketsWithTextInTag()
+ {
+ $this->assertProduces('[b]:-[ [fo[o[bar[/b]', ':-[ [fo[o[bar');
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php
new file mode 100644
index 000000000..a5431d33c
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php
@@ -0,0 +1,74 @@
+assertFalse($tokenizer->hasNext());
+ }
+
+ public function testPlainTextOnly()
+ {
+ $tokenizer = new JBBCode\Tokenizer('this is some plain text.');
+ $this->assertEquals('this is some plain text.', $tokenizer->next());
+ $this->assertEquals('this is some plain text.', $tokenizer->current());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testStartingBracket()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[this has a starting bracket.');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->current());
+ $this->assertEquals('this has a starting bracket.', $tokenizer->next());
+ $this->assertEquals('this has a starting bracket.', $tokenizer->current());
+ $this->assertFalse($tokenizer->hasNext());
+ $this->assertEquals(null, $tokenizer->next());
+ }
+
+ public function testOneTag()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[b]');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('b', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testMatchingTags()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[url]http://jbbcode.com[/url]');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('url', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('http://jbbcode.com', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('/url', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testLotsOfBrackets()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[[][]][');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php
new file mode 100644
index 000000000..e7dacb07b
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php
@@ -0,0 +1,151 @@
+assertFalse($urlValidator->validate('#yolo#swag'));
+ $this->assertFalse($urlValidator->validate('giehtiehwtaw352353%3'));
+ }
+
+ /**
+ * Tests a valid url directly on the UrlValidator.
+ */
+ public function testValidUrl()
+ {
+ $urlValidator = new \JBBCode\validators\UrlValidator();
+ $this->assertTrue($urlValidator->validate('http://google.com'));
+ $this->assertTrue($urlValidator->validate('http://jbbcode.com/docs'));
+ $this->assertTrue($urlValidator->validate('https://www.maps.google.com'));
+ }
+
+ /**
+ * Tests an invalid url as an option to a url bbcode.
+ *
+ * @depends testInvalidUrl
+ */
+ public function testInvalidOptionUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url=javascript:alert("HACKED!");]click me[/url]');
+ $this->assertEquals('[url=javascript:alert("HACKED!");]click me[/url]',
+ $parser->getAsHtml());
+ }
+
+ /**
+ * Tests an invalid url as the body to a url bbcode.
+ *
+ * @depends testInvalidUrl
+ */
+ public function testInvalidBodyUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url]javascript:alert("HACKED!");[/url]');
+ $this->assertEquals('[url]javascript:alert("HACKED!");[/url]', $parser->getAsHtml());
+ }
+
+ /**
+ * Tests a valid url as the body to a url bbcode.
+ *
+ * @depends testValidUrl
+ */
+ public function testValidUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url]http://jbbcode.com[/url]');
+ $this->assertEquals('http://jbbcode.com',
+ $parser->getAsHtml());
+ }
+
+ /**
+ * Tests valid english CSS color descriptions on the CssColorValidator.
+ */
+ public function testCssColorEnglish()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('red'));
+ $this->assertTrue($colorValidator->validate('yellow'));
+ $this->assertTrue($colorValidator->validate('LightGoldenRodYellow'));
+ }
+
+ /**
+ * Tests valid hexadecimal CSS color values on the CssColorValidator.
+ */
+ public function testCssColorHex()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('#000'));
+ $this->assertTrue($colorValidator->validate('#ff0000'));
+ $this->assertTrue($colorValidator->validate('#aaaaaa'));
+ }
+
+ /**
+ * Tests valid rgba CSS color values on the CssColorValidator.
+ */
+ public function testCssColorRgba()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('rgba(255, 0, 0, 0.5)'));
+ $this->assertTrue($colorValidator->validate('rgba(50, 50, 50, 0.0)'));
+ }
+
+ /**
+ * Tests invalid CSS color values on the CssColorValidator.
+ */
+ public function testInvalidCssColor()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertFalse($colorValidator->validate('" onclick="javascript: alert(\"gotcha!\");'));
+ $this->assertFalse($colorValidator->validate('">
{param}
');
+$parser->addBBCode("code", '{param}', false, false, 1);
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/SmileyVisitorTest.php b/vendor/jbbcode/jbbcode/JBBCode/examples/SmileyVisitorTest.php
new file mode 100644
index 000000000..cfea90fa2
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/SmileyVisitorTest.php
@@ -0,0 +1,22 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+
+if (count($argv) < 2) {
+ die("Usage: " . $argv[0] . " \"bbcode string\"\n");
+}
+
+$inputText = $argv[1];
+
+$parser->parse($inputText);
+
+$smileyVisitor = new \JBBCode\visitors\SmileyVisitor();
+$parser->accept($smileyVisitor);
+
+echo $parser->getAsHTML() . "\n";
diff --git a/vendor/jbbcode/jbbcode/JBBCode/examples/TagCountingVisitorTest.php b/vendor/jbbcode/jbbcode/JBBCode/examples/TagCountingVisitorTest.php
new file mode 100644
index 000000000..8ce5d9923
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/examples/TagCountingVisitorTest.php
@@ -0,0 +1,23 @@
+addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+
+if (count($argv) < 3) {
+ die("Usage: " . $argv[0] . " \"bbcode string\" ', '<b>bold</b> <hr>'); + } + + /** + * Tests escaping ampersands in URL using [url]...[/url] + */ + public function testUrlParam() + { + $this->assertProduces('text [url]http://example.com/?a=b&c=d[/url] more text', 'text http://example.com/?a=b&c=d more text'); + } + + /** + * Tests escaping ampersands in URL using [url=...] tag + */ + public function testUrlOption() + { + $this->assertProduces('text [url=http://example.com/?a=b&c=d]this is a "link"[/url]', 'text this is a "link"'); + } + + /** + * Tests escaping ampersands in URL using [url=...] tag when URL is in quotes + */ + public function testUrlOptionQuotes() + { + $this->assertProduces('text [url="http://example.com/?a=b&c=d"]this is a "link"[/url]', 'text this is a "link"'); + } + +} diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php new file mode 100644 index 000000000..d826fefde --- /dev/null +++ b/vendor/jbbcode/jbbcode/JBBCode/tests/NestLimitTest.php @@ -0,0 +1,46 @@ +addBBCode('b', '{param}', false, true, -1); + $parser->parse('[b][b][b][b][b][b][b][b]bold text[/b][/b][/b][/b][/b][/b][/b][/b]'); + $this->assertEquals('' . + 'bold text' . + '', + $parser->getAsHtml()); + } + + /** + * Test over nesting. + */ + public function testOverNesting() + { + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('quote', '
{param}', false, true, 2); + $bbcode = '[quote][quote][quote]wut[/quote] huh?[/quote] i don\'t know[/quote]'; + $parser->parse($bbcode); + $expectedBbcode = '[quote][quote] huh?[/quote] i don\'t know[/quote]'; + $expectedHtml = '
'; + $this->assertEquals($expectedBbcode, $parser->getAsBBCode()); + $this->assertEquals($expectedHtml, $parser->getAsHtml()); + } + +} diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/ParseContentTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/ParseContentTest.php new file mode 100644 index 000000000..1ea2c78a5 --- /dev/null +++ b/vendor/jbbcode/jbbcode/JBBCode/tests/ParseContentTest.php @@ -0,0 +1,97 @@ +addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('verbatim', '{param}', false, false); + + $parser->parse('[verbatim]plain text[/verbatim]'); + $this->assertEquals('plain text', $parser->getAsHtml()); + + $parser->parse('[verbatim][b]bold[/b][/verbatim]'); + $this->assertEquals('[b]bold[/b]', $parser->getAsHtml()); + + } + + public function testNoParsingWithBufferText() + { + + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('verbatim', '{param}', false, false); + + $parser->parse('buffer text[verbatim]buffer text[b]bold[/b]buffer text[/verbatim]buffer text'); + $this->assertEquals('buffer textbuffer text[b]bold[/b]buffer textbuffer text', $parser->getAsHtml()); + } + + /** + * Tests that when a tag is not closed within an unparseable tag, + * the BBCode output does not automatically close that tag (because + * the contents were not parsed). + */ + public function testUnclosedTag() + { + + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('verbatim', '{param}', false, false); + + $parser->parse('[verbatim]i wonder [b]what will happen[/verbatim]'); + $this->assertEquals('i wonder [b]what will happen', $parser->getAsHtml()); + $this->assertEquals('[verbatim]i wonder [b]what will happen[/verbatim]', $parser->getAsBBCode()); + } + + /** + * Tests that an unclosed tag with parseContent = false ends cleanly. + */ + public function testUnclosedVerbatimTag() + { + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('verbatim', '{param}', false, false); + + $parser->parse('[verbatim]yo this [b]text should not be bold[/b]'); + $this->assertEquals('yo this [b]text should not be bold[/b]', $parser->getAsHtml()); + } + + /** + * Tests a malformed closing tag for a verbatim block. + */ + public function testMalformedVerbatimClosingTag() + { + $parser = new JBBCode\Parser(); + $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->addBBCode('verbatim', '{param}', false, false); + $parser->parse('[verbatim]yo this [b]text should not be bold[/b][/verbatim'); + $this->assertEquals('yo this [b]text should not be bold[/b][/verbatim', $parser->getAsHtml()); + } + + /** + * Tests an immediate end after a verbatim. + */ + public function testVerbatimThenEof() + { + $parser = new JBBCode\Parser(); + $parser->addBBCode('verbatim', '{param}', false, false); + $parser->parse('[verbatim]'); + $this->assertEquals('', $parser->getAsHtml()); + } + +} diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/ParsingEdgeCaseTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/ParsingEdgeCaseTest.php new file mode 100644 index 000000000..a08f713ce --- /dev/null +++ b/vendor/jbbcode/jbbcode/JBBCode/tests/ParsingEdgeCaseTest.php @@ -0,0 +1,130 @@ +addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->parse($bbcode); + return $parser->getAsHtml(); + } + + /** + * Asserts that the given bbcode matches the given html when + * the bbcode is run through defaultParse. + */ + private function assertProduces($bbcode, $html) + { + $this->assertEquals($html, $this->defaultParse($bbcode)); + } + + /** + * Tests attempting to use a code that doesn't exist. + */ + public function testNonexistentCodeMalformed() + { + $this->assertProduces('[wat]', '[wat]'); + } + + /** + * Tests attempting to use a code that doesn't exist, but this + * time in a well-formed fashion. + * + * @depends testNonexistentCodeMalformed + */ + public function testNonexistentCodeWellformed() + { + $this->assertProduces('[wat]something[/wat]', '[wat]something[/wat]'); + } + + /** + * Tests a whole bunch of meaningless left brackets. + */ + public function testAllLeftBrackets() + { + $this->assertProduces('[[[[[[[[', '[[[[[[[['); + } + + /** + * Tests a whole bunch of meaningless right brackets. + */ + public function testAllRightBrackets() + { + $this->assertProduces(']]]]]', ']]]]]'); + } + + /** + * Intermixes well-formed, meaningful tags with meaningless brackets. + */ + public function testRandomBracketsInWellformedCode() + { + $this->assertProduces('[b][[][[i]heh[/i][/b]', + '[[][heh'); + } + + /** + * Tests an unclosed tag within a closed tag. + */ + public function testUnclosedWithinClosed() + { + $this->assertProduces('[url=http://jbbcode.com][b]oh yeah[/url]', + 'oh yeah'); + } + + /** + * Tests half completed opening tag. + */ + public function testHalfOpenTag() + { + $this->assertProduces('[b', '[b'); + $this->assertProduces('wut [url=http://jbbcode.com', + 'wut [url=http://jbbcode.com'); + } + + /** + * Tests half completed closing tag. + */ + public function testHalfClosingTag() + { + $this->assertProduces('[b]this should be bold[/b', + 'this should be bold[/b'); + } + + /** + * Tests lots of left brackets before the actual tag. For example: + * [[[[[[[[b]bold![/b] + */ + public function testLeftBracketsThenTag() + { + $this->assertProduces('[[[[[b]bold![/b]', + '[[[[bold!'); + } + + /** + * Tests a whitespace after left bracket. + */ + public function testWhitespaceAfterLeftBracketWhithoutTag() + { + $this->assertProduces('[ ABC ] ', + '[ ABC ] '); + } + +} diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/SimpleEvaluationTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/SimpleEvaluationTest.php new file mode 100644 index 000000000..65fb236c5 --- /dev/null +++ b/vendor/jbbcode/jbbcode/JBBCode/tests/SimpleEvaluationTest.php @@ -0,0 +1,131 @@ +addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet()); + $parser->parse($bbcode); + return $parser->getAsHtml(); + } + + /** + * Asserts that the given bbcode matches the given html when + * the bbcode is run through defaultParse. + */ + private function assertProduces($bbcode, $html) + { + $this->assertEquals($html, $this->defaultParse($bbcode)); + } + + + public function testEmptyString() + { + $this->assertProduces('', ''); + } + + public function testOneTag() + { + $this->assertProduces('[b]this is bold[/b]', 'this is bold'); + } + + public function testOneTagWithSurroundingText() + { + $this->assertProduces('buffer text [b]this is bold[/b] buffer text', + 'buffer text this is bold buffer text'); + } + + public function testMultipleTags() + { + $bbcode = <<huh?i don\'t know
options.';
+
+ $code = 'Multiple [img height="50" alt="alt text"]http://jbbcode.com/img.png[/img] options.';
+ $parser->parse($code);
+ $result = $parser->getAsHTML();
+ $this->assertEquals($expected, $result);
+
+ $code = 'Multiple [img height=50 alt="alt text"]http://jbbcode.com/img.png[/img] options.';
+ $parser->parse($code);
+ $result = $parser->getAsHTML();
+ $this->assertEquals($expected, $result);
+ }
+
+ /**
+ * @depends testCodeOptions
+ */
+ public function testOmittedOption()
+ {
+ $code = 'This doesn\'t use the url option [url]http://jbbcode.com[/url].';
+ $html = 'This doesn\'t use the url option http://jbbcode.com.';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testUnclosedTag()
+ {
+ $code = 'hello [b]world';
+ $html = 'hello world';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testNestingTags()
+ {
+ $code = '[url=http://jbbcode.com][b]hello [u]world[/u][/b][/url]';
+ $html = 'hello world';
+ $this->assertProduces($code, $html);
+ }
+
+ public function testBracketInTag()
+ {
+ $this->assertProduces('[b]:-[[/b]', ':-[');
+ }
+
+ public function testBracketWithSpaceInTag()
+ {
+ $this->assertProduces('[b]:-[ [/b]', ':-[ ');
+ }
+
+ public function testBracketWithTextInTag()
+ {
+ $this->assertProduces('[b]:-[ foobar[/b]', ':-[ foobar');
+ }
+
+ public function testMultibleBracketsWithTextInTag()
+ {
+ $this->assertProduces('[b]:-[ [fo[o[bar[/b]', ':-[ [fo[o[bar');
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php
new file mode 100644
index 000000000..a5431d33c
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/TokenizerTest.php
@@ -0,0 +1,74 @@
+assertFalse($tokenizer->hasNext());
+ }
+
+ public function testPlainTextOnly()
+ {
+ $tokenizer = new JBBCode\Tokenizer('this is some plain text.');
+ $this->assertEquals('this is some plain text.', $tokenizer->next());
+ $this->assertEquals('this is some plain text.', $tokenizer->current());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testStartingBracket()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[this has a starting bracket.');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->current());
+ $this->assertEquals('this has a starting bracket.', $tokenizer->next());
+ $this->assertEquals('this has a starting bracket.', $tokenizer->current());
+ $this->assertFalse($tokenizer->hasNext());
+ $this->assertEquals(null, $tokenizer->next());
+ }
+
+ public function testOneTag()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[b]');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('b', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testMatchingTags()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[url]http://jbbcode.com[/url]');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('url', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('http://jbbcode.com', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('/url', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+ public function testLotsOfBrackets()
+ {
+ $tokenizer = new JBBCode\Tokenizer('[[][]][');
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals(']', $tokenizer->next());
+ $this->assertEquals('[', $tokenizer->next());
+ $this->assertFalse($tokenizer->hasNext());
+ }
+
+}
diff --git a/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php b/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php
new file mode 100644
index 000000000..e7dacb07b
--- /dev/null
+++ b/vendor/jbbcode/jbbcode/JBBCode/tests/ValidatorTest.php
@@ -0,0 +1,151 @@
+assertFalse($urlValidator->validate('#yolo#swag'));
+ $this->assertFalse($urlValidator->validate('giehtiehwtaw352353%3'));
+ }
+
+ /**
+ * Tests a valid url directly on the UrlValidator.
+ */
+ public function testValidUrl()
+ {
+ $urlValidator = new \JBBCode\validators\UrlValidator();
+ $this->assertTrue($urlValidator->validate('http://google.com'));
+ $this->assertTrue($urlValidator->validate('http://jbbcode.com/docs'));
+ $this->assertTrue($urlValidator->validate('https://www.maps.google.com'));
+ }
+
+ /**
+ * Tests an invalid url as an option to a url bbcode.
+ *
+ * @depends testInvalidUrl
+ */
+ public function testInvalidOptionUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url=javascript:alert("HACKED!");]click me[/url]');
+ $this->assertEquals('[url=javascript:alert("HACKED!");]click me[/url]',
+ $parser->getAsHtml());
+ }
+
+ /**
+ * Tests an invalid url as the body to a url bbcode.
+ *
+ * @depends testInvalidUrl
+ */
+ public function testInvalidBodyUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url]javascript:alert("HACKED!");[/url]');
+ $this->assertEquals('[url]javascript:alert("HACKED!");[/url]', $parser->getAsHtml());
+ }
+
+ /**
+ * Tests a valid url as the body to a url bbcode.
+ *
+ * @depends testValidUrl
+ */
+ public function testValidUrlBBCode()
+ {
+ $parser = new JBBCode\Parser();
+ $parser->addCodeDefinitionSet(new JBBCode\DefaultCodeDefinitionSet());
+ $parser->parse('[url]http://jbbcode.com[/url]');
+ $this->assertEquals('http://jbbcode.com',
+ $parser->getAsHtml());
+ }
+
+ /**
+ * Tests valid english CSS color descriptions on the CssColorValidator.
+ */
+ public function testCssColorEnglish()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('red'));
+ $this->assertTrue($colorValidator->validate('yellow'));
+ $this->assertTrue($colorValidator->validate('LightGoldenRodYellow'));
+ }
+
+ /**
+ * Tests valid hexadecimal CSS color values on the CssColorValidator.
+ */
+ public function testCssColorHex()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('#000'));
+ $this->assertTrue($colorValidator->validate('#ff0000'));
+ $this->assertTrue($colorValidator->validate('#aaaaaa'));
+ }
+
+ /**
+ * Tests valid rgba CSS color values on the CssColorValidator.
+ */
+ public function testCssColorRgba()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertTrue($colorValidator->validate('rgba(255, 0, 0, 0.5)'));
+ $this->assertTrue($colorValidator->validate('rgba(50, 50, 50, 0.0)'));
+ }
+
+ /**
+ * Tests invalid CSS color values on the CssColorValidator.
+ */
+ public function testInvalidCssColor()
+ {
+ $colorValidator = new JBBCode\validators\CssColorValidator();
+ $this->assertFalse($colorValidator->validate('" onclick="javascript: alert(\"gotcha!\");'));
+ $this->assertFalse($colorValidator->validate('">